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

add toggle to show hide non assessable nodes in framework audit tree views #871

Merged
merged 5 commits into from
Sep 27, 2024
Merged

add toggle to show hide non assessable nodes in framework audit tree views #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38aa91e
added the toggle button on non assessable nodes front but no liaison …
melinoix Sep 24, 2024
08c7a21
changed the tree view, connected the assessable nodes tree view
melinoix Sep 25, 2024
92d5367
Merge branch 'main' into CA-377-add-toggle-to-show-hide-non-assessabl…
nas-tabchiche Sep 26, 2024
9e73715
Merge branch 'main' into CA-377-add-toggle-to-show-hide-non-assessabl…
nas-tabchiche Sep 27, 2024
fa4939d
Rename assessableNode store to displayAssessableNodes
nas-tabchiche Sep 27, 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
2 changes: 2 additions & 0 deletions frontend/messages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,5 +740,7 @@
"noAnswer": "No answer",
"successfullyUpdatedClientSettings": "Client settings successfully updated, please refresh the page.",
"xRaysEmptyMessage": "You have to create at least one project to use X-rays.",
"ShowAllNodesMessage": "Show all nodes",
"ShowOnlyAssessable": "Only assessable nodes",
"NoPreviewMessage": "No preview available."
}
2 changes: 2 additions & 0 deletions frontend/messages/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,5 +673,7 @@
"waitingRiskAcceptances": "Bonjour ! Vous avez actuellement {number} risque{s} en attente d'acceptation. Vous pouvez les retrouver dans l'onglet risque.",
"successfullyUpdatedClientSettings": "Paramètres du client mis à jour avec succès. Vous pouvez rafrachir la page.",
"xRaysEmptyMessage": "Vous devez créer au moins un projet pour utiliser X-rays.",
"ShowAllNodesMessage": "Tous les noeuds",
"ShowOnlyAssessable": "uniquement les nœuds évaluables",
"NoPreviewMessage": "Aucun aperçu disponible."
}
1 change: 1 addition & 0 deletions frontend/src/lib/components/TreeView/RecursiveTreeViewItem.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
{#if nodes && nodes.length > 0}
{#each nodes as node, i}
<TreeViewItem
class={node.contentProps.hidden === true ? 'hidden' : null}
bind:this={treeItems[i]}
bind:children={children[i]}
bind:group
Expand Down
45 changes: 41 additions & 4 deletions frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
import { page } from '$app/stores';
import RecursiveTreeView from '$lib/components/TreeView/RecursiveTreeView.svelte';
import { breadcrumbObject } from '$lib/utils/stores';
import { displayOnlyAssessableNodes } from './store';

import type {
ModalComponent,
ModalSettings,
Expand All @@ -10,7 +12,7 @@
ToastStore,
TreeViewNode
} from '@skeletonlabs/skeleton';
import { getModalStore, getToastStore, popup } from '@skeletonlabs/skeleton';
import { getModalStore, getToastStore, popup, SlideToggle } from '@skeletonlabs/skeleton';
import type { PageData } from './$types';
import TreeViewItemContent from './TreeViewItemContent.svelte';
import TreeViewItemLead from './TreeViewItemLead.svelte';
Expand Down Expand Up @@ -70,10 +72,17 @@
function transformToTreeView(nodes: Node[]) {
return nodes.map(([id, node]) => {
node.resultCounts = countResults(node);
const hasAssessableChildren = Object.keys(node.children || {}).length > 0;
const hidden = !(!$displayOnlyAssessableNodes || node.assessable || hasAssessableChildren);

return {
id: id,
content: TreeViewItemContent,
contentProps: { ...node, canEditRequirementAssessment },
contentProps: {
...node,
canEditRequirementAssessment,
hidden
},
lead: TreeViewItemLead,
leadProps: {
statusI18n: node.status_i18n,
Expand All @@ -89,7 +98,7 @@
};
});
}
let treeViewNodes: TreeViewNode[] = transformToTreeView(Object.entries(tree));
const treeViewNodes: TreeViewNode[] = transformToTreeView(Object.entries(tree));

function assessableNodesCount(nodes: TreeViewNode[]): number {
let count = 0;
Expand Down Expand Up @@ -353,11 +362,39 @@
{assessableNodesCount(treeViewNodes)}
</span>
</h4>

<div class="flex items-center justify-center space-x-4">
{#if $displayOnlyAssessableNodes}
<p class="font-bold text-sm">{m.ShowAllNodesMessage()}</p>
{:else}
<p class="font-bold text-sm text-green-500">{m.ShowAllNodesMessage()}</p>
{/if}
<SlideToggle
name="questionnaireToggle"
class="flex flex-row items-center justify-center"
active="bg-primary-500"
background="bg-green-500"
bind:checked={$displayOnlyAssessableNodes}
on:click={() => ($displayOnlyAssessableNodes = !$displayOnlyAssessableNodes)}
>
{#if $displayOnlyAssessableNodes}
<p class="font-bold text-sm text-primary-500">{m.ShowOnlyAssessable()}</p>
{:else}
<p class="font-bold text-sm">{m.ShowOnlyAssessable()}</p>
{/if}
</SlideToggle>
</div>
<div class="flex items-center my-2 text-xs space-x-2 text-gray-500">
<i class="fa-solid fa-diagram-project" />
<p>{m.mappingInferenceTip()}</p>
</div>
<RecursiveTreeView nodes={treeViewNodes} bind:expandedNodes hover="hover:bg-initial" />
{#key $displayOnlyAssessableNodes}
<RecursiveTreeView
nodes={transformToTreeView(Object.entries(tree))}
bind:expandedNodes
hover="hover:bg-initial"
/>
{/key}
</div>
{/if}
</div>
Loading
Loading