Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: CartellaModulistica view improvements #687

Merged
merged 7 commits into from
Jun 17, 2024
Merged

feat: CartellaModulistica view improvements #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a4da0ab
feat: cartella modulistica - mostra ricerca in testata con flag nel c…
giuliaghisini May 30, 2024
518dd35
feat: higlight search in CartellaModulistica
giuliaghisini May 30, 2024
f944032
feat: expand item if searchableText is setted
giuliaghisini May 30, 2024
ae6ee96
fix: removed debug
giuliaghisini May 30, 2024
50f699f
feat: handle non_collassare_gli_elementi
giuliaghisini May 30, 2024
021ba21
fix: docrow link
giuliaghisini Jun 5, 2024
1c0ae90
feat: display Pagemetadata in CartellaModulistica if show_modified fi…
giuliaghisini Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions src/components/ItaliaTheme/View/CartellaModulisticaView/CartellaModulisticaView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ const CartellaModulisticaView = ({ content }) => {
<TextOrBlocks content={content} />

{/* -------SEARCH------- */}
<CartellaModulisticaSearchBar setSearchableText={setSearchableText} />
{content?.ricerca_in_testata && (
<CartellaModulisticaSearchBar setSearchableText={setSearchableText} />
)}

{modulistica.length > 0 && (
<section className="modulistica">
Expand Down Expand Up @@ -136,13 +138,23 @@ const CartellaModulisticaView = ({ content }) => {
<DocRow
doc={doc}
key={doc['@id']}
items={items.length === 0 ? doc.items : items}
/*se items.length ===0 significa che è stato fatto il match sul titolo del
documento, quindi devo mostrare tutti i suoi figli*/
searchableText={searchableText}
collapsable={!content.non_collassare_gli_elementi}
items={
items.length === 0 ? doc.items : items
} /*se items.length ===0 significa che è stato fatto il match sul titolo del
documento, quindi devo mostrare tutti i suoi figli*/
/>
);
} else {
return <DocRow doc={doc} key={doc['@id']} />;
return (
<DocRow
doc={doc}
key={doc['@id']}
searchableText={searchableText}
collapsable={!content.non_collassare_gli_elementi}
/>
);
}
})}
</div>
Expand All @@ -155,18 +167,24 @@ const CartellaModulisticaView = ({ content }) => {
items={
section.items ? section.items.filter(filterItemsFN) : []
}
searchableText={searchableText}
collapsable={!content.non_collassare_gli_elementi}
/>
</div>
) : (
<div className="document-row-section" key={section['@id']}>
{/*file,immagine,link*/}
<DocRow doc={section} />
<DocRow
doc={section}
searchableText={searchableText}
collapsable={!content.non_collassare_gli_elementi}
/>
</div>
);
})}
</section>
)}
<PageMetadata content={content} />
{content.show_modified && <PageMetadata content={content} />}
</div>

<CartellaModulisticaAfterContent content={content} />
Expand Down
134 changes: 94 additions & 40 deletions src/components/ItaliaTheme/View/CartellaModulisticaView/DocRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
* @module components/theme/View/DocRow
*/

import React, { useState } from 'react';
import React, { useState, useEffect } from 'react';
import cx from 'classnames';
import { v4 as uuid } from 'uuid';
import Highlighter from 'react-highlight-words';

import { UniversalLink } from '@plone/volto/components';
import { flattenToAppURL } from '@plone/volto/helpers';
import { DownloadFileFormat } from 'design-comuni-plone-theme/components/ItaliaTheme/View';
import { FontAwesomeIcon } from 'design-comuni-plone-theme/components/ItaliaTheme';
import { Icon } from 'design-comuni-plone-theme/components/ItaliaTheme';
import cx from 'classnames';

/**
* DocRow view component class.
Expand All @@ -18,13 +21,18 @@ import cx from 'classnames';
* @returns {string} Markup of the component.
*/

const Downloads = ({ item, titleDoc }) => {
const Downloads = ({ item, titleDoc, filteredWords }) => {
return item['@type'] === 'Modulo' ? (
<React.Fragment>
{!titleDoc ? (
<div className="title">{item.title}</div>
) : (
titleDoc !== item.title && <div className="title">{item.title}</div>
{(!titleDoc || titleDoc !== item.title) && (
<div className="title">
<Highlighter
highlightClassName="highlighted-text"
searchWords={filteredWords}
autoEscape={true}
textToHighlight={item.title}
/>
</div>
)}
<div className="downloads">
<DownloadFileFormat file={item?.file_principale} />
Expand All @@ -33,24 +41,54 @@ const Downloads = ({ item, titleDoc }) => {
</div>
</React.Fragment>
) : (
<UniversalLink
href={item.remoteUrl || flattenToAppURL(item['@id'])}
title={item.title}
className="modulistica-link"
>
<div className="title">{item.title}</div>
<FontAwesomeIcon
icon={['fas', 'link']}
alt={item.title}
role="presentation"
aria-hidden={true}
/>
</UniversalLink>
<>
<div className="title">
<UniversalLink
href={item.remoteUrl || flattenToAppURL(item['@id'])}
title={item.title}
>
<Highlighter
highlightClassName="highlighted-text"
searchWords={filteredWords}
autoEscape={true}
textToHighlight={item.title}
/>
</UniversalLink>
</div>
<div className="downloads">
<UniversalLink
href={item.remoteUrl || flattenToAppURL(item['@id'])}
title={item.title}
className="modulistica-link"
>
<FontAwesomeIcon
icon={['fas', 'link']}
alt={item.title}
role="presentation"
aria-hidden={true}
/>
</UniversalLink>
</div>
</>
);
};

const DocRow = ({ doc, items }) => {
const [itemOpen, setItemOpen] = useState(false);
const DocRow = ({ doc, items, searchableText, collapsable }) => {
const filteredWords = searchableText.split(' ');
const id = uuid();

const [itemOpen, setItemOpen] = useState(!collapsable);

useEffect(() => {
//se ho fatto una ricerca, espando l'elemento
if (collapsable) {
if (searchableText?.length > 0) {
setItemOpen(true);
} else {
setItemOpen(false);
}
}
}, [searchableText, collapsable]);

const titleWrapper = (
<div
Expand All @@ -60,7 +98,12 @@ const DocRow = ({ doc, items }) => {
>
<div id={`title-${doc.id}`} className="title">
<UniversalLink href={doc.remoteUrl || flattenToAppURL(doc['@id'])}>
{doc.title}
<Highlighter
highlightClassName="highlighted-text"
searchWords={filteredWords}
autoEscape={true}
textToHighlight={doc.title}
/>
</UniversalLink>
{doc?.description && (
<p className="description text-muted">{doc.description}</p>
Expand All @@ -85,7 +128,11 @@ const DocRow = ({ doc, items }) => {
{items?.length === 1 && (
<div className="doc">
{titleWrapper}
<Downloads item={items[0]} titleDoc={doc.title} />
<Downloads
item={items[0]}
titleDoc={doc.title}
filteredWords={filteredWords}
/>
</div>
)}

Expand All @@ -96,31 +143,38 @@ const DocRow = ({ doc, items }) => {
<div id="headingAccordion" className="accordion-header doc">
{titleWrapper}
</div>
<button
onClick={() => {
setItemOpen(itemOpen ? false : true);
}}
aria-expanded={itemOpen}
aria-controls="collapsedContent"
aria-labelledby={`title-${doc.id}`}
>
<Icon
color="primary"
icon={itemOpen ? 'it-minus' : 'it-plus'}
padding={false}
/>
</button>
{collapsable && (
<button
onClick={() => {
setItemOpen(itemOpen ? false : true);
}}
aria-expanded={itemOpen}
aria-controls={`accordion-content-${id}`}
aria-labelledby={`title-${doc.id}`}
>
<Icon
color="primary"
icon={itemOpen ? 'it-minus' : 'it-plus'}
padding={false}
key={itemOpen + id}
/>
</button>
)}
</div>
<div
id="collapsedContent"
id={`accordion-content-${id}`}
className={cx('accordion-content', { open: itemOpen })}
role="region"
aria-labelledby="headingAccordion"
>
<div className="accordion-inner">
{items.map((modulo) => (
<div className="doc modulo" key={modulo['@id']}>
<Downloads item={modulo} titleDoc={null} />
<Downloads
item={modulo}
titleDoc={null}
filteredWords={filteredWords}
/>
</div>
))}
</div>
Expand Down
19 changes: 15 additions & 4 deletions theme/ItaliaTheme/Views/_cartellaModulistica.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ $docs-section-margin: 3em;
}
}

mark.highlighted-text {
padding: 0.2rem 0;
background-color: $highlight-search;
}

section.modulistica {
.documents-section,
.document-row-section {
Expand Down Expand Up @@ -52,6 +57,7 @@ $docs-section-margin: 3em;
&.has-children {
padding-bottom: 1em;
}

.description {
font-size: 0.9rem;
}
Expand All @@ -68,10 +74,12 @@ $docs-section-margin: 3em;
&.single-row {
max-width: 70%;
}

.title {
font-size: 1.2em;
font-weight: 500;
}

p.description {
margin: 0;
}
Expand Down Expand Up @@ -102,10 +110,9 @@ $docs-section-margin: 3em;
}

a.modulistica-link {
display: flex;
width: 100%;
align-items: center;
justify-content: space-between;
.external-link {
display: none;
}

svg {
width: 2em;
Expand All @@ -124,6 +131,7 @@ $docs-section-margin: 3em;
color: $secondary;
font-size: 1rem;
}

button {
padding: 0 0.4em;
border: none;
Expand All @@ -135,6 +143,7 @@ $docs-section-margin: 3em;
}
}
}

.accordion-content {
overflow: hidden;
height: auto;
Expand Down Expand Up @@ -186,11 +195,13 @@ $docs-section-margin: 3em;
flex-wrap: wrap;
align-items: unset;
justify-content: unset;

.title-wrap {
&.single-row {
max-width: none;
}
}

.title,
.downloads {
flex: 1 1 100%;
Expand Down
Loading