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

Jump to bottom

fix: section type Link does not render in "CartellaModulistica" #286

Merged
merged 3 commits into from
Aug 17, 2023
Merged

fix: section type Link does not render in "CartellaModulistica" #286

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1793fb1
fix: new condition create for type Link
Wagner3UB Aug 17, 2023
c8b1090
chore: new search
Wagner3UB Aug 17, 2023
5f77adb
chore: filterItemsFN function
Wagner3UB Aug 17, 2023
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
24 changes: 15 additions & 9 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 @@ -68,21 +68,31 @@ const CartellaModulisticaView = ({ content }) => {
);
};

const filterItemsFN = (item) => {
return item.title
? item.title
.toLowerCase()
.indexOf((searchableText ?? '').toLowerCase()) >= 0
: true;
};

const filterModulistica = (section) => {
if (section['@type'] === 'Document') {
if (searchableText?.length > 0) {
return (section?.items ?? []).filter(filterDocumento).length > 0;
}
return true;
} else if (section['@type'] === 'Link') {
return section.title
? section.title
.toLowerCase()
.indexOf((searchableText ?? '').toLowerCase()) >= 0
: true;
} else {
return (section?.items ?? []).filter(filterItemsFN)?.length > 0;
}
};

const filterItemsFN = (item) =>
item?.title.toLowerCase().indexOf((searchableText ?? '').toLowerCase()) >=
0;

return (
<>
<div className="container px-4 my-4 cartellamodulistica-view">
Expand Down Expand Up @@ -132,11 +142,7 @@ const CartellaModulisticaView = ({ content }) => {
</div>
) : (
<div className="document-row-section" key={section['@id']}>
<DocRow
doc={section}
key={section['@id']}
items={section.items.filter(filterItemsFN)}
/>
<DocRow doc={section} />
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perchè hai tolto la prop 'items'?
togliendola non si vedono i moduli figli di un contenuto di tipo Documento

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

document va nel ramo sopra dell'if, non lì

section['@type'] === 'Document' ? ...

eventualmente ora gli oggetti non document che hanno subitems non mostranno i subitem ma solo l'oggetto, ma è un caso che non era gestito neanche prima, e mi sembra di capire neanche previsto.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no.. vanno mostrati, gli oggetti non Document che hanno subitem possono essere oggetti di tipo Documento di cui si devono poter vedere i moduli

</div>
);
})}
Expand Down