From 3a96ba944afc2d2cd547f255044618123302836a Mon Sep 17 00:00:00 2001 From: Abderrahmane Smimite Date: Sun, 7 Jul 2024 16:08:57 +0200 Subject: [PATCH 1/2] Add requirements assessment special page --- frontend/messages/en.json | 3 ++- frontend/messages/fr.json | 3 ++- .../src/lib/components/SideBar/navData.ts | 11 +++++++- frontend/src/lib/utils/locales.ts | 1 + frontend/src/lib/utils/table.ts | 25 ++++++++++++++++++- 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/frontend/messages/en.json b/frontend/messages/en.json index da2e4aa4d..1495e4e8b 100644 --- a/frontend/messages/en.json +++ b/frontend/messages/en.json @@ -619,5 +619,6 @@ "sso": "SSO", "isSso": "Is SSO", "noResultFound": "No result found", - "filters": "Filters" + "filters": "Filters", + "advanced": "Advanced" } diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json index 20b5912a6..808c9e434 100644 --- a/frontend/messages/fr.json +++ b/frontend/messages/fr.json @@ -572,5 +572,6 @@ "libraryImportError": "Une erreur s'est produite lors de l'importation de la bibliothèque", "ssoSettingsupdated": "Paramètres SSO mis à jour", "ssoSettings": "Paramètres SSO", - "ssoSettingsDescription": "Configurez vos paramètres d'authentification unique ici." + "ssoSettingsDescription": "Configurez vos paramètres d'authentification unique ici.", + "advanced": "Avancé" } diff --git a/frontend/src/lib/components/SideBar/navData.ts b/frontend/src/lib/components/SideBar/navData.ts index ac5d868db..ef47e93eb 100644 --- a/frontend/src/lib/components/SideBar/navData.ts +++ b/frontend/src/lib/components/SideBar/navData.ts @@ -151,7 +151,6 @@ export const navData = { } ] }, - { name: 'extra', items: [ @@ -186,6 +185,16 @@ export const navData = { permissions: ['change_globalsettings'] } ] + }, + { + name: 'advanced', + items: [ + { + name: 'requirementAssessments', + fa_icon: 'fa-solid fa-cogs', + href: '/requirement-assessments' + } + ] } ] }; diff --git a/frontend/src/lib/utils/locales.ts b/frontend/src/lib/utils/locales.ts index 3592e82ae..cccf079e1 100644 --- a/frontend/src/lib/utils/locales.ts +++ b/frontend/src/lib/utils/locales.ts @@ -73,6 +73,7 @@ export function localItems(): LocalItems { compliance: m.compliance(), organization: m.organization(), extra: m.extra(), + advanced: m.advanced(), analytics: m.analytics(), calendar: m.calendar(), threats: m.threats(), diff --git a/frontend/src/lib/utils/table.ts b/frontend/src/lib/utils/table.ts index 77e091c4d..db0bcee26 100644 --- a/frontend/src/lib/utils/table.ts +++ b/frontend/src/lib/utils/table.ts @@ -82,6 +82,24 @@ const STATUS_FILTER: ListViewFilterConfig = { alwaysDisplay: true }; +const RESULT_FILTER: ListViewFilterConfig = { + component: SelectFilter, + getColumn: (row) => row.meta.result, + extraProps: { + defaultOptionName: 'result' + }, + alwaysDisplay: true +}; + +const AUDIT_FILTER: ListViewFilterConfig = { + component: SelectFilter, + getColumn: (row) => row.meta.compliance_assessment.str, + extraProps: { + defaultOptionName: 'complianceAssessment' + }, + alwaysDisplay: true +}; + const TREATMENT_FILTER: ListViewFilterConfig = { // I could make a function just make the code less repeatitive and long for nothing component: SelectFilter, @@ -374,7 +392,12 @@ export const listViewFields: ListViewFieldsConfig = { 'requirement-assessments': { head: ['name', 'description', 'complianceAssessment'], body: ['name', 'description', 'compliance_assessment'], - breadcrumb_link_disabled: true + breadcrumb_link_disabled: true, + filters: { + status: STATUS_FILTER, + result: RESULT_FILTER, + audit: AUDIT_FILTER + } }, evidences: { head: ['name', 'file', 'description'], From 091f5e91524d41b4200c0a6862a1cb9a1f9c9a0c Mon Sep 17 00:00:00 2001 From: Abderrahmane Smimite Date: Sun, 7 Jul 2024 16:46:09 +0200 Subject: [PATCH 2/2] format --- frontend/messages/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json index eb2e8e9cf..c08acbe44 100644 --- a/frontend/messages/fr.json +++ b/frontend/messages/fr.json @@ -607,5 +607,5 @@ "partial": "Partielle", "noResultFound": "Aucun résultat trouvé", "filters": "Filtres", - "advanced": "Avancé" + "advanced": "Avancé" }