Skip to content

Add sort by name+section #297

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

Open
geekaryan wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add sort by name+section #297

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdb84b9
Add sort by name+section
geekaryan Jun 14, 2023
0279153
Merge branch 'main' into geekaryan-update-1
northdpole Jun 20, 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
34 changes: 20 additions & 14 deletions application/frontend/src/pages/CommonRequirementEnumeration/CommonRequirementEnumeration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ export const CommonRequirementEnumeration = () => {
display = currentUrlParams.get('applyFilters') === 'true' ? filteredCRE : cre;

const linksByType = useMemo(() => (display ? orderLinksByType(groupLinksByType(display)) : {}), [display]);
const sortedSections = Object.entries(linksByType).sort(([typeA], [typeB]) => {
const nameA = DOCUMENT_TYPE_NAMES[typeA] || '';
const nameB = DOCUMENT_TYPE_NAMES[typeB] || '';
const nameSectionA = nameA + typeA;
const nameSectionB = nameB + typeB;
return nameSectionA.localeCompare(nameSectionB);
});
return (
<div className="cre-page">
<LoadingAndErrorIndicator loading={loading} error={error} />
Expand Down Expand Up @@ -88,21 +95,20 @@ export const CommonRequirementEnumeration = () => {
''
)}
<div className="cre-page__links-container">
{Object.keys(linksByType).length > 0 &&
Object.entries(linksByType).map(([type, links]) => (
<div className="cre-page__links" key={type}>
<div className="cre-page__links-eader">
{getDocumentDisplayName(display)}
<b>{DOCUMENT_TYPE_NAMES[type]}</b>:
</div>
{links.map((link, i) => (
<div key={i} className="accordion ui fluid styled cre-page__links-container">
<DocumentNode node={link.document} linkType={type} />
<FilterButton document={link.document} />
</div>
))}
{sortedSections.map(([type, links]) => (
<div className="cre-page__links" key={type}>
<div className="cre-page__links-eader">
{getDocumentDisplayName(display)}
<b>{DOCUMENT_TYPE_NAMES[type]}</b>:
</div>
))}
{links.map((link, i) => (
<div key={i} className="accordion ui fluid styled cre-page__links-container">
<DocumentNode node={link.document} linkType={type} />
<FilterButton document={link.document} />
</div>
))}
</div>
))}
</div>
</>
)}
Expand Down