From e76473edb57828abdd23d56556c2213646fcee22 Mon Sep 17 00:00:00 2001 From: Mohamed-Hacene Date: Wed, 22 May 2024 11:36:24 +0200 Subject: [PATCH 1/5] feat: add evidences tips for requirement assessment --- frontend/messages/en.json | 4 +++- .../(app)/requirement-assessments/[id=uuid]/+page.svelte | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/messages/en.json b/frontend/messages/en.json index c60d2e3d5..a75213359 100644 --- a/frontend/messages/en.json +++ b/frontend/messages/en.json @@ -530,5 +530,7 @@ "incoming": "Incoming", "outdated": "Outdated", "exportBackupDescription": "This will serialize and create a backup of the database, including users and RBAC. Evidences and other files are not included in the backup.", - "importBackupDescription": "This will deserialize and restore the database from a backup. This will overwrite all existing data, including users and RBAC and cannot be undone." + "importBackupDescription": "This will deserialize and restore the database from a backup. This will overwrite all existing data, including users and RBAC and cannot be undone.", + "requirementAppliedControlHelpText": "Evidence linked to the selected measures will be automatically associated with the requirement.", + "requirementEvidenceHelpText": "This tab allows you to add extra evidences to the requirement." } diff --git a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte index d8115d7e2..65250849e 100644 --- a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte +++ b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte @@ -223,6 +223,7 @@ {m.evidences()} {#if tabSet === 0} +

{m.requirementAppliedControlHelpText()}

@@ -243,6 +244,7 @@
{/if} {#if tabSet === 1} +

{m.requirementEvidenceHelpText()}

From 129cb909d8f98d07818e6e3686448f17cb93b812 Mon Sep 17 00:00:00 2001 From: Mohamed-Hacene Date: Wed, 22 May 2024 11:36:58 +0200 Subject: [PATCH 2/5] style: plural evidence --- frontend/messages/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/messages/en.json b/frontend/messages/en.json index a75213359..2184080e0 100644 --- a/frontend/messages/en.json +++ b/frontend/messages/en.json @@ -531,6 +531,6 @@ "outdated": "Outdated", "exportBackupDescription": "This will serialize and create a backup of the database, including users and RBAC. Evidences and other files are not included in the backup.", "importBackupDescription": "This will deserialize and restore the database from a backup. This will overwrite all existing data, including users and RBAC and cannot be undone.", - "requirementAppliedControlHelpText": "Evidence linked to the selected measures will be automatically associated with the requirement.", + "requirementAppliedControlHelpText": "Evidences linked to the selected measures will be automatically associated with the requirement.", "requirementEvidenceHelpText": "This tab allows you to add extra evidences to the requirement." } From 52ea37a53fc7c75dd8465fb667cf34a5840d5a90 Mon Sep 17 00:00:00 2001 From: Mohamed-Hacene <90701924+Mohamed-Hacene@users.noreply.github.com> Date: Wed, 22 May 2024 11:38:23 +0200 Subject: [PATCH 3/5] =?UTF-8?q?chore:=20update=20translations=20with=20Fin?= =?UTF-8?q?k=20=F0=9F=90=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/messages/de.json | 4 +++- frontend/messages/es.json | 6 +++++- frontend/messages/fr.json | 4 +++- frontend/messages/it.json | 4 +++- frontend/messages/nl.json | 4 +++- frontend/messages/pt.json | 4 +++- 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/frontend/messages/de.json b/frontend/messages/de.json index c42dcccb7..b8aa43270 100644 --- a/frontend/messages/de.json +++ b/frontend/messages/de.json @@ -530,5 +530,7 @@ "incoming": "Eingehend", "outdated": "Veraltet", "exportBackupDescription": "Dies wird die Datenbank serialisieren und ein Backup erstellen, einschließlich Benutzer und RBAC. Beweise und andere Dateien sind im Backup nicht enthalten.", - "importBackupDescription": "Dies wird die Datenbank aus einem Backup deserialisieren und wiederherstellen. Dies wird alle vorhandenen Daten, einschließlich Benutzer und RBAC, überschreiben und kann nicht rückgängig gemacht werden." + "importBackupDescription": "Dies wird die Datenbank aus einem Backup deserialisieren und wiederherstellen. Dies wird alle vorhandenen Daten, einschließlich Benutzer und RBAC, überschreiben und kann nicht rückgängig gemacht werden.", + "requirementAppliedControlHelpText": "Mit den ausgewählten Maßnahmen verknüpfte Nachweise werden automatisch der Anforderung zugeordnet.", + "requirementEvidenceHelpText": "Über diese Registerkarte können Sie der Anforderung weitere Nachweise hinzufügen." } diff --git a/frontend/messages/es.json b/frontend/messages/es.json index da5c45dad..794b9aab4 100644 --- a/frontend/messages/es.json +++ b/frontend/messages/es.json @@ -528,5 +528,9 @@ "matchingRequirements": "Requisitos coincidentes", "asZIP": "como ZIP", "incoming": "Entrante", - "outdated": "Desactualizado" + "outdated": "Desactualizado", + "exportBackupDescription": "Esto serializará y creará una copia de seguridad de la base de datos, incluidos los usuarios y RBAC. Las pruebas y otros archivos no se incluyen en la copia de seguridad.", + "importBackupDescription": "Esto deserializará y restaurará la base de datos desde una copia de seguridad. Esto sobrescribirá todos los datos existentes, incluidos los usuarios y RBAC, y no se puede deshacer.", + "requirementAppliedControlHelpText": "Las evidencias vinculadas a las medidas seleccionadas se asociarán automáticamente al requisito.", + "requirementEvidenceHelpText": "Esta pestaña le permite agregar evidencias adicionales al requisito." } diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json index a533c6000..258cccda2 100644 --- a/frontend/messages/fr.json +++ b/frontend/messages/fr.json @@ -530,5 +530,7 @@ "incoming": "En approche", "outdated": "Dépassé", "exportBackupDescription": "Cela va sérialiser et créer une sauvegarde de la base de données, y compris les utilisateurs et RBAC. Les preuves et autres fichiers ne sont pas inclus dans la sauvegarde.", - "importBackupDescription": "Cela va désérialiser et restaurer la base de données à partir d'une sauvegarde. Cela va écraser toutes les données existantes, y compris les utilisateurs et RBAC. Cette action est irréversible." + "importBackupDescription": "Cela va désérialiser et restaurer la base de données à partir d'une sauvegarde. Cela va écraser toutes les données existantes, y compris les utilisateurs et RBAC. Cette action est irréversible.", + "requirementAppliedControlHelpText": "Les preuves liées aux mesures sélectionnées seront automatiquement associées à l'exigence.", + "requirementEvidenceHelpText": "Cet onglet vous permet d'ajouter des preuves supplémentaires à l'exigence." } diff --git a/frontend/messages/it.json b/frontend/messages/it.json index d449f84c6..d5ab8718e 100644 --- a/frontend/messages/it.json +++ b/frontend/messages/it.json @@ -530,5 +530,7 @@ "incoming": "In arrivo", "outdated": "Obsoleto", "exportBackupDescription": "Questo serializzerà e creerà un backup del database, inclusi utenti e RBAC. Le prove e altri file non sono inclusi nel backup.", - "importBackupDescription": "Questo deserializzerà e ripristinerà il database da un backup. Questo sovrascriverà tutti i dati esistenti, inclusi utenti e RBAC, e non può essere annullato." + "importBackupDescription": "Questo deserializzerà e ripristinerà il database da un backup. Questo sovrascriverà tutti i dati esistenti, inclusi utenti e RBAC, e non può essere annullato.", + "requirementAppliedControlHelpText": "Le evidenze legate alle misure selezionate verranno automaticamente associate al requisito.", + "requirementEvidenceHelpText": "Questa scheda ti consente di aggiungere ulteriori prove al requisito." } diff --git a/frontend/messages/nl.json b/frontend/messages/nl.json index 1c476570a..69299cc7b 100644 --- a/frontend/messages/nl.json +++ b/frontend/messages/nl.json @@ -530,5 +530,7 @@ "incoming": "Binnenkomend", "outdated": "Verouderd", "exportBackupDescription": "Dit zal de database serialiseren en een back-up maken, inclusief gebruikers en RBAC. Bewijzen en andere bestanden zijn niet inbegrepen in de back-up.", - "importBackupDescription": "Dit zal de database deserialiseren en herstellen vanaf een back-up. Dit zal alle bestaande gegevens, inclusief gebruikers en RBAC, overschrijven en kan niet ongedaan worden gemaakt." + "importBackupDescription": "Dit zal de database deserialiseren en herstellen vanaf een back-up. Dit zal alle bestaande gegevens, inclusief gebruikers en RBAC, overschrijven en kan niet ongedaan worden gemaakt.", + "requirementAppliedControlHelpText": "Bewijsstukken die verband houden met de geselecteerde maatregelen worden automatisch aan de eis gekoppeld.", + "requirementEvidenceHelpText": "Op dit tabblad kunt u extra bewijsstukken aan de eis toevoegen." } diff --git a/frontend/messages/pt.json b/frontend/messages/pt.json index 44fc4f918..5637fde19 100644 --- a/frontend/messages/pt.json +++ b/frontend/messages/pt.json @@ -530,5 +530,7 @@ "incoming": "aproximação", "outdated": "Desatualizado", "exportBackupDescription": "Isso irá serializar e criar um backup do banco de dados, incluindo usuários e RBAC. Evidências e outros arquivos não estão incluídos no backup.", - "importBackupDescription": "Isso irá desserializar e restaurar o banco de dados a partir de um backup. Isso substituirá todos os dados existentes, incluindo usuários e RBAC, e não poderá ser desfeito." + "importBackupDescription": "Isso irá desserializar e restaurar o banco de dados a partir de um backup. Isso substituirá todos os dados existentes, incluindo usuários e RBAC, e não poderá ser desfeito.", + "requirementAppliedControlHelpText": "As evidências vinculadas às medidas selecionadas serão automaticamente associadas ao requisito.", + "requirementEvidenceHelpText": "Esta aba permite adicionar evidências extras ao requisito." } From 3aab05cbe3cda7b12014a3d10ee59ab8b1d6cbf6 Mon Sep 17 00:00:00 2001 From: Mohamed-Hacene Date: Wed, 22 May 2024 11:40:04 +0200 Subject: [PATCH 4/5] chore: run format --- .../requirement-assessments/[id=uuid]/+page.svelte | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte index 65250849e..481fbedea 100644 --- a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte +++ b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte @@ -223,7 +223,10 @@ {m.evidences()} {#if tabSet === 0} -

{m.requirementAppliedControlHelpText()}

+
+ +

{m.requirementAppliedControlHelpText()}

+
@@ -244,7 +247,10 @@
{/if} {#if tabSet === 1} -

{m.requirementEvidenceHelpText()}

+
+ +

{m.requirementEvidenceHelpText()}

+
From d921a3a933e0c682dee3c8c26af04cf14e1b3a78 Mon Sep 17 00:00:00 2001 From: Mohamed-Hacene Date: Thu, 23 May 2024 13:23:53 +0200 Subject: [PATCH 5/5] fix: evidence duplication in audit export --- backend/core/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/core/views.py b/backend/core/views.py index e4bddba35..6f6baee7d 100644 --- a/backend/core/views.py +++ b/backend/core/views.py @@ -1745,7 +1745,7 @@ def generate_html_rec(requirement_node: RequirementNode): """ - return (content, selected_evidences) + return (content, list(set(selected_evidences))) def export_mp_csv(request):