From 9bd368b6ad2e98c811abf1793debb066b7896365 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Wed, 21 Feb 2024 12:03:01 +0100
Subject: [PATCH 01/32] Make risk scenario strength of knowledge optional

"--" maps to None
---
 backend/core/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/core/models.py b/backend/core/models.py
index 3999bc642..75e0a63df 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -857,7 +857,6 @@ class RiskScenario(AbstractBaseModel, NameDescriptionMixin):
     ]
 
     SOK_OPTIONS = [
-        ("--", _("--")),
         ("0", _("Low")),
         ("1", _("Medium")),
         ("2", _("High")),
@@ -938,7 +937,8 @@ class RiskScenario(AbstractBaseModel, NameDescriptionMixin):
     strength_of_knowledge = models.CharField(
         max_length=20,
         choices=SOK_OPTIONS,
-        default="--",
+        null=True,
+        blank=True,
         verbose_name=_("Strength of Knowledge"),
     )
     justification = models.CharField(

From 68f12a7bd7eaad268b02a8bd4848785478c40142 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Wed, 21 Feb 2024 12:19:51 +0100
Subject: [PATCH 02/32] Create /risk-scenarios/strength_of_knowledge endpoint

---
 backend/core/views.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/core/views.py b/backend/core/views.py
index 48a7d62e2..e95be76d0 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -657,6 +657,10 @@ class RiskScenarioViewSet(BaseModelViewSet):
     def treatment(self, request):
         return Response(dict(RiskScenario.TREATMENT_OPTIONS))
 
+    @action(detail=False, name="Get strength of knowledge choices")
+    def strength_of_knowledge(self, request):
+        return Response(dict(RiskScenario.SOK_OPTIONS))
+
     @action(detail=True, name="Get probability choices")
     def probability(self, request, pk):
         undefined = dict([(-1, "--")])

From 408e416daf34c5411c1de39fbf771a622d15a0cb Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Wed, 21 Feb 2024 12:20:06 +0100
Subject: [PATCH 03/32] Update Select component default value

---
 frontend/src/lib/components/Forms/Select.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/Forms/Select.svelte b/frontend/src/lib/components/Forms/Select.svelte
index 3c0b13da0..6810b0440 100644
--- a/frontend/src/lib/components/Forms/Select.svelte
+++ b/frontend/src/lib/components/Forms/Select.svelte
@@ -55,8 +55,8 @@
 			{...$constraints}
 			{...$$restProps}
 		>
-			{#if !$constraints?.required}
-				<option value="">--</option>
+			{#if !$constraints?.required && !options.find((o) => o.label === '--')}
+				<option selected>--</option>
 			{/if}
 			{#each options as option}
 				<option value={option.value} style="background-color: {color_map[option.value]}"

From 6085a1f9218e640e2d987d325eb270835cb69f12 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Wed, 21 Feb 2024 12:20:22 +0100
Subject: [PATCH 04/32] Add strength_of_knowledge field to risk scenario update
 form

---
 frontend/src/lib/utils/schemas.ts                     |  1 +
 .../risk-scenarios/[id=uuid]/edit/+page.server.ts     | 11 +++++++++++
 .../(app)/risk-scenarios/[id=uuid]/edit/+page.svelte  |  6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 902160d5d..1303c8121 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -80,6 +80,7 @@ export const RiskScenarioSchema = baseNamedObject({
 	residual_proba: z.number().optional(),
 	residual_impact: z.number().optional(),
 	treatment: z.string().optional(),
+	strength_of_knowledge: z.string().optional(),
 	justification: z.string().optional().nullable(),
 	risk_assessment: z.string(),
 	threats: z.string().uuid().optional().array(),
diff --git a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.server.ts
index 9d50eed01..e088142d1 100644
--- a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.server.ts
+++ b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.server.ts
@@ -113,6 +113,16 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 			}))
 		);
 
+	const strengthOfKnowledgeChoicesEndpoint = `${BASE_API_URL}/${URLModel}/strength_of_knowledge/`;
+	const strengthOfKnowledgeChoices = await fetch(strengthOfKnowledgeChoicesEndpoint)
+		.then((res) => res.json())
+		.then((data) =>
+			Object.entries(data).map(([key, value]) => ({
+				label: value,
+				value: key
+			}))
+		);
+
 	const measureCreateSchema = modelSchema('security-measures');
 	const initialData = {
 		folder: scenario.project.folder.id
@@ -170,6 +180,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 		probabilityChoices,
 		impactChoices,
 		treatmentChoices,
+		strengthOfKnowledgeChoices,
 		tables,
 		measureModel,
 		measureCreateForm
diff --git a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 6f1b24f6f..808af8d70 100644
--- a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -291,6 +291,12 @@
 			</div>
 		</div>
 		<div class="card px-4 py-2 bg-white shadow-lg">
+			<Select
+				{form}
+				options={data.strengthOfKnowledgeChoices}
+				field="strength_of_knowledge"
+				label="Strength of knowledge"
+			/>
 			<TextArea {form} field="justification" label="Justification" />
 		</div>
 		<div class="flex flex-row justify-between space-x-4">

From 75effe95ce6c44a672db214d8d0eeb2af59f5bd4 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 11:54:50 +0100
Subject: [PATCH 05/32] Fix regression in risk scenario nested model table

---
 .../routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts
index 28acea43e..5d03bbcc8 100644
--- a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts
+++ b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts
@@ -86,7 +86,7 @@ export const load: LayoutServerLoad = async ({ fetch, params }) => {
 				);
 
 				const table: TableSource = {
-					head: listViewFields[e.urlModel].head.filter((field) => field !== 'Risk assessment'),
+					head: listViewFields[e.urlModel].head.filter((field) => field !== 'riskAssessment'),
 					body: bodyData,
 					meta: metaData
 				};

From 16a0accbbe626bd74f2240478d247370d845ea58 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 11:55:27 +0100
Subject: [PATCH 06/32] Make RiskScenario.strength_of_knowledge an IntegerField

---
 backend/core/models.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/backend/core/models.py b/backend/core/models.py
index ba88a1405..5be0f54f1 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -22,6 +22,7 @@
 
 ########################### Referential objects #########################
 
+
 class ReferentialObjectMixin(NameDescriptionMixin, FolderMixin):
     """
     Mixin for referential objects.
@@ -355,6 +356,7 @@ class Meta:
 
 ########################### Domain objects #########################
 
+
 class Project(NameDescriptionMixin, FolderMixin):
     PRJ_LC_STATUS = [
         ("undefined", _("--")),
@@ -672,7 +674,7 @@ def save(self, *args, **kwargs):
 
 
 ########################### Secondary objects #########################
-        
+
 
 class Assessment(NameDescriptionMixin):
     class Status(models.TextChoices):
@@ -993,11 +995,13 @@ class RiskScenario(NameDescriptionMixin):
         ("transfer", _("Transfer")),
     ]
 
-    SOK_OPTIONS = [
-        ("0", _("Low")),
-        ("1", _("Medium")),
-        ("2", _("High")),
-    ]
+    DEFAULT_SOK_OPTIONS = {
+        -1: _("--"),
+        0: _("Low"),
+        1: _("Medium"),
+        2: _("High"),
+        3: _("Very High"),
+    }
 
     risk_assessment = models.ForeignKey(
         RiskAssessment,
@@ -1070,12 +1074,10 @@ class RiskScenario(NameDescriptionMixin):
         verbose_name=_("Treatment status"),
     )
 
-    strength_of_knowledge = models.CharField(
-        max_length=20,
-        choices=SOK_OPTIONS,
-        null=True,
-        blank=True,
+    strength_of_knowledge = models.IntegerField(
+        default=-1,
         verbose_name=_("Strength of Knowledge"),
+        help_text=_("The strength of the knowledge supporting the assessment"),
     )
     justification = models.CharField(
         max_length=500, blank=True, null=True, verbose_name=_("Justification")
@@ -1408,7 +1410,7 @@ class Meta:
 
 
 ########################### RiskAcesptance is a domain object relying on secondary objects #########################
-        
+
 
 class RiskAcceptance(NameDescriptionMixin, FolderMixin):
     ACCEPTANCE_STATE = [
@@ -1495,4 +1497,3 @@ def set_state(self, state):
         elif state == "revoked":
             self.revoked_at = datetime.now()
         self.save()
-

From 402b5897197426ce1ae45878869a9fbf2e453129 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 12:03:31 +0100
Subject: [PATCH 07/32] Include description and symbol in default SoK options

---
 backend/core/models.py | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/backend/core/models.py b/backend/core/models.py
index 5be0f54f1..f38c5f3f2 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -996,11 +996,40 @@ class RiskScenario(NameDescriptionMixin):
     ]
 
     DEFAULT_SOK_OPTIONS = {
-        -1: _("--"),
-        0: _("Low"),
-        1: _("Medium"),
-        2: _("High"),
-        3: _("Very High"),
+        -1: {
+            "name": _("--"),
+            "description": _(
+                "The strength of the knowledge supporting the assessment is undefined"
+            ),
+        },
+        0: {
+            "name": _("Low"),
+            "description": _(
+                "The strength of the knowledge supporting the assessment is low"
+            ),
+            "symbol": "◔",
+        },
+        1: {
+            "name": _("Medium"),
+            "description": _(
+                "The strength of the knowledge supporting the assessment is medium"
+            ),
+            "symbol": "◑",
+        },
+        2: {
+            "name": _("High"),
+            "description": _(
+                "The strength of the knowledge supporting the assessment is high"
+            ),
+            "symbol": "◕",
+        },
+        3: {
+            "name": _("Very High"),
+            "description": _(
+                "The strength of the knowledge supporting the assessment is very high"
+            ),
+            "symbol": "●",
+        },
     }
 
     risk_assessment = models.ForeignKey(

From 34470293881f87df22e4fda5c951251a571e753b Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 12:17:08 +0100
Subject: [PATCH 08/32] Internationalize library objects model table

---
 frontend/src/routes/(app)/libraries/[id=urn]/+page.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/routes/(app)/libraries/[id=urn]/+page.svelte b/frontend/src/routes/(app)/libraries/[id=urn]/+page.svelte
index 9469e789b..97e62f80f 100644
--- a/frontend/src/routes/(app)/libraries/[id=urn]/+page.svelte
+++ b/frontend/src/routes/(app)/libraries/[id=urn]/+page.svelte
@@ -37,17 +37,17 @@
 	import { enhance } from '$app/forms';
 
 	const riskMatricesTable: TableSource = {
-		head: ['Name', 'Description'],
+		head: ['name', 'description'],
 		body: tableSourceMapper(riskMatrices, ['name', 'description'])
 	};
 
 	const securityFunctionsTable: TableSource = {
-		head: { ref_id: 'Ref', name: 'Name', description: 'Description', category: 'Category' },
+		head: { ref_id: 'ref', name: 'name', description: 'description', category: 'category' },
 		body: tableSourceMapper(securityFunctions, ['ref_id', 'name', 'description', 'category'])
 	};
 
 	const threatsTable: TableSource = {
-		head: { ref_id: 'Ref', name: 'Name', description: 'Description' },
+		head: { ref_id: 'ref', name: 'name', description: 'description' },
 		body: tableSourceMapper(threats, ['ref_id', 'name', 'description'])
 	};
 

From ed8966a824f667ab7512cbde9fa2ed687369bee4 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 12:24:00 +0100
Subject: [PATCH 09/32] Add endpoint to get risk scenario strength of knowledge
 choices

---
 backend/core/views.py | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/backend/core/views.py b/backend/core/views.py
index fe07a6461..377b6e0d2 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -657,10 +657,6 @@ class RiskScenarioViewSet(BaseModelViewSet):
     def treatment(self, request):
         return Response(dict(RiskScenario.TREATMENT_OPTIONS))
 
-    @action(detail=False, name="Get strength of knowledge choices")
-    def strength_of_knowledge(self, request):
-        return Response(dict(RiskScenario.SOK_OPTIONS))
-
     @action(detail=True, name="Get probability choices")
     def probability(self, request, pk):
         undefined = dict([(-1, "--")])
@@ -685,6 +681,29 @@ def impact(self, request, pk):
         choices = undefined | _choices
         return Response(choices)
 
+    @action(detail=True, name="Get strength of knowledge choices")
+    def strength_of_knowledge(self, request, pk):
+        undefined = {-1: RiskScenario.DEFAULT_SOK_OPTIONS[-1]}
+        _sok_choices = self.get_object().get_matrix().get("strength_of_knowledge")
+        if _sok_choices is not None:
+            sok_choices = dict(
+                zip(
+                    list(range(0, 64)),
+                    [
+                        {
+                            "name": x["name"],
+                            "description": x.get("description"),
+                            "symbol": x.get("symbol"),
+                        }
+                        for x in _sok_choices
+                    ],
+                )
+            )
+        else:
+            sok_choices = RiskScenario.DEFAULT_SOK_OPTIONS
+        choices = undefined | sok_choices
+        return Response(choices)
+
     @action(detail=False, name="Get risk count per level")
     def count_per_level(self, request):
         return Response({"results": risks_count_per_level(request.user)})
@@ -770,10 +789,10 @@ class UserFilter(df.FilterSet):
     is_approver = df.BooleanFilter(method="filter_approver", label="Approver")
 
     def filter_approver(self, queryset, name, value):
-        """ we don't know yet which folders will be used, so filter on any folder"""
+        """we don't know yet which folders will be used, so filter on any folder"""
         approvers_id = []
         for candidate in User.objects.all():
-            if 'approve_riskacceptance' in candidate.permissions:
+            if "approve_riskacceptance" in candidate.permissions:
                 approvers_id.append(candidate.id)
         if value:
             return queryset.filter(id__in=approvers_id)

From acc25f9e6c92435af902f5339b7fb5f1c3dc574f Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 12:24:16 +0100
Subject: [PATCH 10/32] Include strength_of_knowledge in RiskMatrixImporter

---
 backend/library/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/library/utils.py b/backend/library/utils.py
index be7603a03..a02cd557e 100644
--- a/backend/library/utils.py
+++ b/backend/library/utils.py
@@ -287,7 +287,7 @@ def import_security_function(self, library_object: Library):
 # The couple (URN, locale) is unique. ===> Check this in the future
 class RiskMatrixImporter:
     REQUIRED_FIELDS = {"ref_id", "urn", "json_definition"}
-    MATRIX_FIELDS = {"probability", "impact", "risk", "grid"}
+    MATRIX_FIELDS = {"probability", "impact", "risk", "grid", "strength_of_knowledge"}
 
     def __init__(self, risk_matrix_data):
         self.risk_matrix_data = risk_matrix_data

From bbc53d790e45ff9d5ac7832b4ebaeb1f4b5f5a12 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 12:24:51 +0100
Subject: [PATCH 11/32] Include strength of knowledge in risk matrix libraries

---
 .../libraries/critical_matrix_3x3.yaml        | 107 ++++++-----
 .../libraries/critical_matrix_5x5.yaml        | 179 ++++++++++--------
 2 files changed, 156 insertions(+), 130 deletions(-)

diff --git a/backend/library/libraries/critical_matrix_3x3.yaml b/backend/library/libraries/critical_matrix_3x3.yaml
index 33cc3d15c..992b7d49d 100644
--- a/backend/library/libraries/critical_matrix_3x3.yaml
+++ b/backend/library/libraries/critical_matrix_3x3.yaml
@@ -8,50 +8,63 @@ provider: intuitem
 packager: intuitem
 objects:
   risk_matrix:
-  - urn: urn:intuitem:risk:matrix:critical_risk_matrix_3x3
-    ref_id: critical_3x3
-    name: critical 3x3
-    description: critical risk matrix 3x3
-    probability:
-    - abbreviation: L
-      name: Low
-      description: Unfrequent event
-    - abbreviation: M
-      name: Medium
-      description: Occasional event
-    - abbreviation: H
-      name: High
-      description: Frequent event
-    impact:
-    - abbreviation: L
-      name: Low
-      description: Low impact
-    - abbreviation: M
-      name: Medium
-      description: Medium impact
-    - abbreviation: H
-      name: High
-      description: High impact
-    risk:
-    - abbreviation: L
-      name: Low
-      description: acceptable risk
-      hexcolor: "#00FF00"
-    - abbreviation: M
-      name: Medium
-      description: risk requiring mitigation within 2 years
-      hexcolor: "#FFFF00"
-    - abbreviation: H
-      name: High
-      description: unacceptable risk
-      hexcolor: "#FF0000"
-    grid:
-    - - 0
-      - 1
-      - 1
-    - - 1
-      - 1
-      - 2
-    - - 1
-      - 2
-      - 2
+    - urn: urn:intuitem:risk:matrix:critical_risk_matrix_3x3
+      ref_id: critical_3x3
+      name: critical 3x3
+      description: critical risk matrix 3x3
+      probability:
+        - abbreviation: L
+          name: Low
+          description: Unfrequent event
+        - abbreviation: M
+          name: Medium
+          description: Occasional event
+        - abbreviation: H
+          name: High
+          description: Frequent event
+      impact:
+        - abbreviation: L
+          name: Low
+          description: Low impact
+        - abbreviation: M
+          name: Medium
+          description: Medium impact
+        - abbreviation: H
+          name: High
+          description: High impact
+      risk:
+        - abbreviation: L
+          name: Low
+          description: acceptable risk
+          hexcolor: "#00FF00"
+        - abbreviation: M
+          name: Medium
+          description: risk requiring mitigation within 2 years
+          hexcolor: "#FFFF00"
+        - abbreviation: H
+          name: High
+          description: unacceptable risk
+          hexcolor: "#FF0000"
+      grid:
+        - - 0
+          - 1
+          - 1
+        - - 1
+          - 1
+          - 2
+        - - 1
+          - 2
+          - 2
+      strength_of_knowledge:
+        - name: Low
+          description: Low strength of knowledge
+          symbol: ◔
+        - name: Medium
+          description: Medium strength of knowledge
+          symbol: ◑
+        - name: High
+          description: High strength of knowledge
+          symbol: ◕
+        - name: Very high
+          description: Very high strength of knowledge
+          symbol: ●
diff --git a/backend/library/libraries/critical_matrix_5x5.yaml b/backend/library/libraries/critical_matrix_5x5.yaml
index c44d2d997..460189d43 100644
--- a/backend/library/libraries/critical_matrix_5x5.yaml
+++ b/backend/library/libraries/critical_matrix_5x5.yaml
@@ -8,86 +8,99 @@ provider: intuitem
 packager: intuitem
 objects:
   risk_matrix:
-  - urn: urn:intuitem:risk:matrix:critical_risk_matrix_5x5
-    ref_id: critical_5x5
-    name: critical 5x5
-    description: critical risk matrix 5x5
-    probability:
-    - abbreviation: VL
-      name: Very Low
-      description: Very unfrequent event
-    - abbreviation: L
-      name: Low
-      description: Unfrequent event
-    - abbreviation: M
-      name: Medium
-      description: Occasional event
-    - abbreviation: H
-      name: High
-      description: Frequent event
-    - abbreviation: VH
-      name: Very High
-      description: Very frequent event
-    impact:
-    - abbreviation: VL
-      name: Very Low
-      description: Very low impact
-    - abbreviation: L
-      name: Low
-      description: Low impact
-    - abbreviation: M
-      name: Medium
-      description: Medium impact
-    - abbreviation: H
-      name: High
-      description: High impact
-    - abbreviation: VH
-      name: Very High
-      description: Very high impact
-    risk:
-    - abbreviation: VL
-      name: Very Low
-      description: negligible risk
-      hexcolor: "#BBF7D0"
-    - abbreviation: L
-      name: Low
-      description: acceptable risk
-      hexcolor: "#BEF264"
-    - abbreviation: M
-      name: Medium
-      description: risk requiring mitigation within 2 years
-      hexcolor: "#FEF08A"
-    - abbreviation: H
-      name: High
-      description: risk requiring mitigation within 6 months
-      hexcolor: "#FBBF24"
-    - abbreviation: VH
-      name: Very High
-      description: unacceptable risk
-      hexcolor: "#F87171"
-    grid:
-    - - 0
-      - 0
-      - 1
-      - 1
-      - 2
-    - - 0
-      - 1
-      - 1
-      - 2
-      - 2
-    - - 1
-      - 1
-      - 2
-      - 2
-      - 3
-    - - 1
-      - 2
-      - 2
-      - 3
-      - 4
-    - - 2
-      - 2
-      - 3
-      - 4
-      - 4
+    - urn: urn:intuitem:risk:matrix:critical_risk_matrix_5x5
+      ref_id: critical_5x5
+      name: critical 5x5
+      description: critical risk matrix 5x5
+      probability:
+        - abbreviation: VL
+          name: Very Low
+          description: Very unfrequent event
+        - abbreviation: L
+          name: Low
+          description: Unfrequent event
+        - abbreviation: M
+          name: Medium
+          description: Occasional event
+        - abbreviation: H
+          name: High
+          description: Frequent event
+        - abbreviation: VH
+          name: Very High
+          description: Very frequent event
+      impact:
+        - abbreviation: VL
+          name: Very Low
+          description: Very low impact
+        - abbreviation: L
+          name: Low
+          description: Low impact
+        - abbreviation: M
+          name: Medium
+          description: Medium impact
+        - abbreviation: H
+          name: High
+          description: High impact
+        - abbreviation: VH
+          name: Very High
+          description: Very high impact
+      risk:
+        - abbreviation: VL
+          name: Very Low
+          description: negligible risk
+          hexcolor: "#BBF7D0"
+        - abbreviation: L
+          name: Low
+          description: acceptable risk
+          hexcolor: "#BEF264"
+        - abbreviation: M
+          name: Medium
+          description: risk requiring mitigation within 2 years
+          hexcolor: "#FEF08A"
+        - abbreviation: H
+          name: High
+          description: risk requiring mitigation within 6 months
+          hexcolor: "#FBBF24"
+        - abbreviation: VH
+          name: Very High
+          description: unacceptable risk
+          hexcolor: "#F87171"
+      grid:
+        - - 0
+          - 0
+          - 1
+          - 1
+          - 2
+        - - 0
+          - 1
+          - 1
+          - 2
+          - 2
+        - - 1
+          - 1
+          - 2
+          - 2
+          - 3
+        - - 1
+          - 2
+          - 2
+          - 3
+          - 4
+        - - 2
+          - 2
+          - 3
+          - 4
+          - 4
+      strength_of_knowledge:
+        - name: Low
+          description: Low strength of knowledge
+          symbol: ◔
+        - name: Medium
+          description: Medium strength of knowledge
+          symbol: ◑
+        - name: High
+          description: High strength of knowledge
+          symbol: ◕
+        - name: Very high
+          description: Very high strength of knowledge
+          symbol: ●

From fd902278988c24c53804121ed404732ad73bfbc9 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 14:34:56 +0100
Subject: [PATCH 12/32] Make strength_of_knowledge a number in risk scenario
 schema

---
 frontend/src/lib/utils/schemas.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 1303c8121..9945b0dc7 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -80,7 +80,7 @@ export const RiskScenarioSchema = baseNamedObject({
 	residual_proba: z.number().optional(),
 	residual_impact: z.number().optional(),
 	treatment: z.string().optional(),
-	strength_of_knowledge: z.string().optional(),
+	strength_of_knowledge: z.number().default(-1).optional(),
 	justification: z.string().optional().nullable(),
 	risk_assessment: z.string(),
 	threats: z.string().uuid().optional().array(),

From e63fbe5e371aee93d58c92e740e3a16b44e17e31 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 14:54:47 +0100
Subject: [PATCH 13/32] Correctly type strength of knowledge entries

---
 frontend/src/lib/utils/types.ts               |  6 +++
 .../risk-assessments/[id=uuid]/+page.svelte   |  4 +-
 .../[id=uuid]/edit/+page.server.ts            | 37 +++++++++----------
 .../[id=uuid]/edit/+page.svelte               | 12 +++++-
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/frontend/src/lib/utils/types.ts b/frontend/src/lib/utils/types.ts
index b351301cb..6a3536d21 100644
--- a/frontend/src/lib/utils/types.ts
+++ b/frontend/src/lib/utils/types.ts
@@ -97,6 +97,12 @@ export interface RiskLevel {
 	residual: string[];
 }
 
+export interface StrengthOfKnowledgeEntry {
+	name: string;
+	description: string;
+	symbol: string;
+}
+
 export interface AggregatedData {
 	names: string[];
 }
diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
index f221fcbbb..566a3e2fa 100644
--- a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
@@ -256,7 +256,9 @@
 				<div class="bg-white">
 					<div class="flex flex-row justify-between">
 						<h4 class="text-lg font-semibold lowercase capitalize-first my-auto">
-							{localItems(languageTag())['associated' + capitalizeFirstLetter(model.info.localNamePlural)]}
+							{localItems(languageTag())[
+								'associated' + capitalizeFirstLetter(model.info.localNamePlural)
+							]}
 						</h4>
 					</div>
 					{#if model.table}
diff --git a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.server.ts
index e088142d1..cbd52b4ba 100644
--- a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.server.ts
+++ b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.server.ts
@@ -5,7 +5,7 @@ import { BASE_API_URL } from '$lib/utils/constants';
 import { getModelInfo, urlParamModelVerboseName } from '$lib/utils/crud';
 import { modelSchema } from '$lib/utils/schemas';
 import { listViewFields } from '$lib/utils/table';
-import type { urlModel } from '$lib/utils/types';
+import type { StrengthOfKnowledgeEntry, urlModel } from '$lib/utils/types';
 import { tableSourceMapper, type TableSource } from '@skeletonlabs/skeleton';
 import { fail, redirect, type Actions } from '@sveltejs/kit';
 import { setFlash } from 'sveltekit-flash-message/server';
@@ -87,20 +87,24 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 	const probabilityChoices = await fetch(probabilityChoicesEndpoint)
 		.then((res) => res.json())
 		.then((data) =>
-			Object.entries(data).map(([key, value]) => ({
-				label: value,
-				value: parseInt(key)
-			}))
+			Object.entries(data)
+				.map(([key, value]) => ({
+					label: value,
+					value: parseInt(key)
+				}))
+				.sort((a, b) => a.value - b.value)
 		);
 
 	const impactChoicesEndpoint = `${baseEndpoint}impact/`;
 	const impactChoices = await fetch(impactChoicesEndpoint)
 		.then((res) => res.json())
 		.then((data) =>
-			Object.entries(data).map(([key, value]) => ({
-				label: value,
-				value: parseInt(key)
-			}))
+			Object.entries(data)
+				.map(([key, value]) => ({
+					label: value,
+					value: parseInt(key)
+				}))
+				.sort((a, b) => a.value - b.value)
 		);
 
 	const treatmentChoicesEndpoint = `${BASE_API_URL}/${URLModel}/treatment/`;
@@ -113,15 +117,10 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 			}))
 		);
 
-	const strengthOfKnowledgeChoicesEndpoint = `${BASE_API_URL}/${URLModel}/strength_of_knowledge/`;
-	const strengthOfKnowledgeChoices = await fetch(strengthOfKnowledgeChoicesEndpoint)
-		.then((res) => res.json())
-		.then((data) =>
-			Object.entries(data).map(([key, value]) => ({
-				label: value,
-				value: key
-			}))
-		);
+	const strengthOfKnowledgeChoicesEndpoint = `${BASE_API_URL}/${URLModel}/${params.id}/strength_of_knowledge/`;
+	const strengthOfKnowledgeChoices: Record<string, StrengthOfKnowledgeEntry> = await fetch(
+		strengthOfKnowledgeChoicesEndpoint
+	).then((res) => res.json());
 
 	const measureCreateSchema = modelSchema('security-measures');
 	const initialData = {
@@ -180,7 +179,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 		probabilityChoices,
 		impactChoices,
 		treatmentChoices,
-		strengthOfKnowledgeChoices,
+		strengthOfKnowledgeChoices: strengthOfKnowledgeChoices,
 		tables,
 		measureModel,
 		measureCreateForm
diff --git a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte
index e42690d1c..25dc764c4 100644
--- a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -17,6 +17,7 @@
 		type ToastStore
 	} from '@skeletonlabs/skeleton';
 	import type { PageData } from './$types';
+	import type { StrengthOfKnowledgeEntry } from '$lib/utils/types';
 	import RiskLevel from './RiskLevel.svelte';
 
 	import { browser } from '$app/environment';
@@ -34,6 +35,15 @@
 
 	const schema = modelSchema(data.model.urlModel!);
 
+	const strengthOfKnowledgeFormChoices: { label: string; value: number }[] = (
+		Object.entries(data.strengthOfKnowledgeChoices) as StrengthOfKnowledgeEntry[]
+	)
+		.map(([key, value]) => ({
+			label: value.name,
+			value: parseInt(key)
+		}))
+		.sort((a, b) => a.value - b.value);
+
 	const modalStore: ModalStore = getModalStore();
 	const toastStore: ToastStore = getToastStore();
 
@@ -297,7 +307,7 @@
 		<div class="card px-4 py-2 bg-white shadow-lg">
 			<Select
 				{form}
-				options={data.strengthOfKnowledgeChoices}
+				options={strengthOfKnowledgeFormChoices}
 				field="strength_of_knowledge"
 				label="Strength of knowledge"
 			/>

From 3da087d4c0139cc700e20be6330152c16066e6ef Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 15:28:59 +0100
Subject: [PATCH 14/32] Internationalize risk scenario update page

---
 frontend/messages/en.json                     | 10 ++-
 frontend/messages/fr.json                     | 10 ++-
 frontend/src/lib/utils/locales.ts             |  8 +-
 .../[id=uuid]/edit/+page.svelte               | 73 ++++++++-----------
 4 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 1c2c88325..d82d92d6a 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -230,5 +230,13 @@
 	"probability": "Probability",
 	"riskLevels": "Risk levels",
 	"cancel": "Cancel",
-	"save": "Save"
+	"save": "Save",
+	"currentAssessment": "Current assessment",
+	"scope": "Scope",
+	"assetsImpactedByTheRiskScenario": "Assets impacted by the risk scenario",
+	"ecistingMeasures": "Existing measures",
+	"theExistingSecurityMeasuresToManageThisRisk": "The existing security measures to manage this risk",
+	"currentRiskLevelGivenCurrentMeasures": "The current risk level given the current security measures",
+	"targetAssessment": "Target assessment",
+	"riskLevelWhenAllExtraMeasuresDone": "The risk level when all extra measures are done"
 }
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
index d8cf2c16d..d5cf7a66f 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -230,5 +230,13 @@
 	"probability": "Probabilité",
 	"riskLevels": "Niveaux de risque",
 	"cancel": "Annuler",
-	"save": "Enregistrer"
+	"save": "Enregistrer",
+	"currentAssessment": "Évaluation actuelle",
+	"scope": "Périmètre",
+	"assetsImpactedByTheRiskScenario": "Biens sensibles impactés par le scénario de risque",
+	"ecistingMeasures": "Mesures existantes",
+	"theExistingSecurityMeasuresToManageThisRisk": "Les mesures de sécurité existantes pour gérer ce risque",
+	"currentRiskLevelGivenCurrentMeasures": "Niveau de risque courant compte tenu des mesures actuelles",
+	"targetAssessment": "Évaluation cible",
+	"riskLevelWhenAllExtraMeasuresDone": "Niveau de risque lorsque toutes les mesures supplémentaires sont appliquées"
 }
diff --git a/frontend/src/lib/utils/locales.ts b/frontend/src/lib/utils/locales.ts
index 195c3d353..c9b012707 100644
--- a/frontend/src/lib/utils/locales.ts
+++ b/frontend/src/lib/utils/locales.ts
@@ -12,7 +12,7 @@ export const LOCALE_MAP = {
 };
 
 export function toCamelCase(str: string) {
-	return str.replace(/[_-]\w/g, match => match.charAt(1).toUpperCase());
+	return str.replace(/[_-]\w/g, (match) => match.charAt(1).toUpperCase());
 }
 
 export function capitalizeFirstLetter(str: string) {
@@ -162,11 +162,13 @@ export function localItems(languageTag: string): LocalItems {
 		associatedRiskAssessments: m.associatedRiskAssessments({ languageTag: languageTag }),
 		associatedRiskScenarios: m.associatedRiskScenarios({ languageTag: languageTag }),
 		associatedRiskAcceptances: m.associatedRiskAcceptances({ languageTag: languageTag }),
-		associatedComplianceAssessments: m.associatedComplianceAssessments({ languageTag: languageTag }),
+		associatedComplianceAssessments: m.associatedComplianceAssessments({
+			languageTag: languageTag
+		}),
 		associatedEvidences: m.associatedEvidences({ languageTag: languageTag }),
 		associatedDomains: m.associatedDomains({ languageTag: languageTag }),
 		associatedProjects: m.associatedProjects({ languageTag: languageTag }),
-		associatedUsers: m.associatedUsers({ languageTag: languageTag }),
+		associatedUsers: m.associatedUsers({ languageTag: languageTag })
 	};
 	return LOCAL_ITEMS;
 }
diff --git a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 25dc764c4..c02915c22 100644
--- a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -135,10 +135,10 @@
 	>
 		<div class="flex flex-row space-x-2">
 			<div class="card px-4 py-2 bg-white shadow-lg w-3/4">
-				<h4 class="h4 font-semibold">Scope</h4>
+				<h4 class="h4 font-semibold">{m.scope()}</h4>
 				<div class="flex flex-row justify-between">
 					<span>
-						<p class="text-sm font-semibold text-gray-400">Project</p>
+						<p class="text-sm font-semibold text-gray-400">{m.project()}</p>
 						<a class="anchor text-sm font-semibold" href="/projects/{data.scenario.project.id}"
 							>{data.scenario.project.str}</a
 						>
@@ -147,27 +147,19 @@
 						{form}
 						options={getOptions({ objects: data.foreignKeys['risk_assessment'] })}
 						field="risk_assessment"
-						label="RiskAssessment"
+						label={m.riskAssessments()}
 					/>
 					<span>
-						<p class="text-sm font-semibold text-gray-400">Auditor</p>
-						{#if data.scenario.auditor}
-							<a class="anchor text-sm font-semibold" href="/users/{data.scenario.auditor.id}"
-								>{data.scenario.auditor.str}</a
-							>
-						{/if}
-					</span>
-					<span>
-						<p class="text-sm font-semibold text-gray-400">Version</p>
+						<p class="text-sm font-semibold text-gray-400">{m.version()}</p>
 						<p class="text-sm font-semibold">{data.scenario.version}</p>
 					</span>
 				</div>
 			</div>
 			<div class="card px-4 py-2 bg-white shadow-lg w-1/4">
-				<h4 class="h4 font-semibold">Status</h4>
+				<h4 class="h4 font-semibold">{m.status()}</h4>
 				<div class="flex flex-row justify-between">
 					<span>
-						<p class="text-sm font-semibold text-gray-400">Last update</p>
+						<p class="text-sm font-semibold text-gray-400">{m.updatedAt()}</p>
 						<p class="text-sm font-semibold">
 							{new Date(data.scenario.updated_at).toLocaleString()}
 						</p>
@@ -176,7 +168,7 @@
 						{form}
 						options={data.treatmentChoices}
 						field="treatment"
-						label="Treatment status"
+						label={m.treatmentStatus()}
 					/>
 				</div>
 			</div>
@@ -189,10 +181,10 @@
 					multiple
 					options={getOptions({ objects: data.foreignKeys['threats'] })}
 					field="threats"
-					label="Threats"
+					label={m.threats()}
 				/>
-				<TextField {form} field="name" label="Name" />
-				<TextArea {form} field="description" label="Description" />
+				<TextField {form} field="name" label={m.name()} />
+				<TextArea {form} field="description" label={m.description()} />
 			</div>
 			<div class="card px-4 py-2 bg-white shadow-lg w-1/2 max-h-96 overflow-y-scroll">
 				<AutocompleteSelect
@@ -200,8 +192,8 @@
 					{form}
 					options={getOptions({ objects: data.foreignKeys['assets'] })}
 					field="assets"
-					label="Assets"
-					helpText="Assets impacted by this risk scenario"
+					label={m.assets()}
+					helpText={m.assetsImpactedByTheRiskScenario()}
 				/>
 				<ModelTable source={data.tables['assets']} URLModel="assets" />
 			</div>
@@ -209,24 +201,24 @@
 		<input type="hidden" name="urlmodel" value={data.model.urlModel} />
 
 		<div class="card px-4 py-2 bg-white shadow-lg">
-			<h4 class="h4 font-semibold">Current risk</h4>
+			<h4 class="h4 font-semibold">{m.currentRisk()}</h4>
 			<div class="flex flex-row space-x-4 justify-between">
 				<TextArea
 					{form}
 					field="existing_measures"
-					label="Existing measures"
-					helpText="The existing security measures to manage this risk"
+					label={m.ecistingMeasures()}
+					helpText={m.theExistingSecurityMeasuresToManageThisRisk()}
 					regionContainer="w-1/2"
 				/>
 				<div class="flex flex-col">
-					<h5 class="h5 font-medium">Current assessment</h5>
+					<h5 class="h5 font-medium">{m.currentAssessment()}</h5>
 					<div class="flex flex-row space-x-4 my-auto">
 						<Select
 							{form}
 							options={data.probabilityChoices}
 							color_map={riskColorMap()}
 							field="current_proba"
-							label="Current probability"
+							label={m.currentProba()}
 						/>
 						<i class="fa-solid fa-xmark my-auto" />
 						<Select
@@ -234,17 +226,17 @@
 							options={data.impactChoices}
 							color_map={riskColorMap()}
 							field="current_impact"
-							label="Current impact"
+							label={m.currentImpact()}
 						/>
 						<i class="fa-solid fa-equals my-auto" />
 						<RiskLevel
 							{form}
 							field="current_risk_level"
-							label="Current risk level"
+							label={m.currentRisk()}
 							riskMatrix={data.riskMatrix}
 							probabilityField="current_proba"
 							impactField="current_impact"
-							helpText="The risk level given the current measures"
+							helpText={m.currentRiskLevelGivenCurrentMeasures()}
 						/>
 					</div>
 				</div>
@@ -252,15 +244,15 @@
 		</div>
 
 		<div class="card px-4 py-2 bg-white shadow-lg">
-			<h4 class="h4 font-semibold">Residual risk</h4>
+			<h4 class="h4 font-semibold">{m.residualRisk()}</h4>
 			<div class="flex flex-row space-x-4 justify-between">
-				<div class="flex flex-col w-1/2">
+				<div class="flex flex-col space-y-4 w-1/2">
 					<span class="flex flex-row justify-between items-center">
-						<h5 class="h5 font-medium">Associated security measures</h5>
+						<h5 class="h5 font-medium">{m.associatedSecurityMeasures()}</h5>
 						<button
 							class="btn variant-filled-primary self-end"
 							on:click={modalMeasureCreateForm}
-							type="button"><i class="fa-solid fa-plus mr-2" />New security measure</button
+							type="button"><i class="fa-solid fa-plus mr-2" />{m.addSecurityMeasure()}</button
 						>
 					</span>
 					<AutocompleteSelect
@@ -268,19 +260,18 @@
 						{form}
 						options={getOptions({ objects: data.foreignKeys['security_measures'] })}
 						field="security_measures"
-						label="Security measures"
 					/>
 					<ModelTable source={data.tables['security-measures']} URLModel="security-measures" />
 				</div>
 				<div class="flex flex-col">
-					<h5 class="h5 font-medium">Target assessment</h5>
+					<h5 class="h5 font-medium">{m.targetAssessment()}</h5>
 					<div class="flex flex-row space-x-4 my-auto">
 						<Select
 							{form}
 							options={data.probabilityChoices}
 							color_map={riskColorMap()}
 							field="residual_proba"
-							label="Residual probability"
+							label={m.residualProba()}
 						/>
 						<i class="fa-solid fa-xmark my-auto" />
 						<Select
@@ -288,17 +279,17 @@
 							options={data.impactChoices}
 							color_map={riskColorMap()}
 							field="residual_impact"
-							label="Residual impact"
+							label={m.residualImpact()}
 						/>
 						<i class="fa-solid fa-equals my-auto" />
 						<RiskLevel
 							{form}
-							field="current_risk_level"
-							label="Current risk level"
+							field="residual_risk_level"
+							label={m.residualRisk()}
 							riskMatrix={data.riskMatrix}
 							probabilityField="residual_proba"
 							impactField="residual_impact"
-							helpText="The risk level when all the extra measures are done"
+							helpText={m.riskLevelWhenAllExtraMeasuresDone()}
 						/>
 					</div>
 				</div>
@@ -309,9 +300,9 @@
 				{form}
 				options={strengthOfKnowledgeFormChoices}
 				field="strength_of_knowledge"
-				label="Strength of knowledge"
+				label={m.strengthOfKnowledge()}
 			/>
-			<TextArea {form} field="justification" label="Justification" />
+			<TextArea {form} field="justification" label={m.justification()} />
 		</div>
 		<div class="flex flex-row justify-between space-x-4">
 			<button

From c31c07e0e6f7d7510c4e394b8d289d80691c3085 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 16:12:32 +0100
Subject: [PATCH 15/32] Serialize strength of knowledge

---
 backend/core/models.py      | 5 +++++
 backend/core/serializers.py | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/backend/core/models.py b/backend/core/models.py
index f38c5f3f2..40b5efb37 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -1174,6 +1174,11 @@ def get_residual_proba(self):
         risk_matrix = self.get_matrix()
         return risk_matrix["probability"][self.residual_proba]
 
+    def get_strength_of_knowledge(self):
+        if self.strength_of_knowledge < 0:
+            return self.DEFAULT_SOK_OPTIONS[-1]
+        return self.DEFAULT_SOK_OPTIONS[self.strength_of_knowledge]
+
     def __str__(self):
         return (
             str(self.parent_project().folder)
diff --git a/backend/core/serializers.py b/backend/core/serializers.py
index 1c8c0e377..9bd961920 100644
--- a/backend/core/serializers.py
+++ b/backend/core/serializers.py
@@ -197,7 +197,10 @@ class RiskScenarioReadSerializer(RiskScenarioWriteSerializer):
     residual_impact = serializers.CharField(source="get_residual_impact.name")
     residual_level = serializers.JSONField(source="get_residual_risk")
 
+    strength_of_knowledge = serializers.JSONField(source="get_strength_of_knowledge")
+
     security_measures = FieldsRelatedField(many=True)
+    rid = serializers.CharField()
 
 
 class SecurityMeasureWriteSerializer(BaseModelSerializer):
@@ -463,6 +466,7 @@ class Meta:
         model = RequirementAssessment
         fields = "__all__"
 
+
 class LibraryReadSerializer(BaseModelSerializer):
     class Meta:
         model = Library

From 8a94e545ebadd858e23acbbbad5f758d49453990 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 16:12:38 +0100
Subject: [PATCH 16/32] chore: Make migrations

---
 ...alter_riskscenario_strength_of_knowledge.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 backend/core/migrations/0003_alter_riskscenario_strength_of_knowledge.py

diff --git a/backend/core/migrations/0003_alter_riskscenario_strength_of_knowledge.py b/backend/core/migrations/0003_alter_riskscenario_strength_of_knowledge.py
new file mode 100644
index 000000000..011b043b6
--- /dev/null
+++ b/backend/core/migrations/0003_alter_riskscenario_strength_of_knowledge.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.2 on 2024-02-26 14:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='riskscenario',
+            name='strength_of_knowledge',
+            field=models.IntegerField(default=-1, help_text='The strength of the knowledge supporting the assessment', verbose_name='Strength of Knowledge'),
+        ),
+    ]

From 1fc3692558a27c2fd80637b4f72e32cf9f3aa702 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 16:19:46 +0100
Subject: [PATCH 17/32] Write RiskScenarioItem component

---
 .../RiskMatrix/RiskScenarioItem.stories.ts    | 30 +++++++++++++++++++
 .../RiskMatrix/RiskScenarioItem.svelte        |  5 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 frontend/src/lib/components/RiskMatrix/RiskScenarioItem.stories.ts
 create mode 100644 frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte

diff --git a/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.stories.ts b/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.stories.ts
new file mode 100644
index 000000000..3119f8a21
--- /dev/null
+++ b/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.stories.ts
@@ -0,0 +1,30 @@
+import type { Meta, StoryObj } from '@storybook/svelte';
+
+import RiskScenarioItem from './RiskScenarioItem.svelte';
+
+// More on how to set up stories at: https://storybook.js.org/docs/writing-stories
+const meta = {
+	title: 'Component/RiskScenarioItem',
+	component: RiskScenarioItem,
+	tags: ['autodocs']
+} satisfies Meta<RiskScenarioItem>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+const scenario = {
+	id: '7059ef1b-7d4f-46bc-b735-ed41b531bb22',
+	name: 'RS1',
+	rid: 'R.1',
+	strength_of_knowledge: {
+		name: 'Very High',
+		description: 'The strength of the knowledge supporting the assessment is very high',
+		symbol: '●'
+	}
+};
+
+export const Basic: Story = {
+	args: {
+		data: scenario
+	}
+};
diff --git a/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte b/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte
new file mode 100644
index 000000000..fd88d61b8
--- /dev/null
+++ b/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte
@@ -0,0 +1,5 @@
+<script lang="ts">
+	export let data: any;
+</script>
+
+<p>{data.rid}<sub>{data.strength_of_knowledge.symbol}</sub></p>

From da251ac7d32455b1f4f8d687c65326b3299cb483 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 16:20:01 +0100
Subject: [PATCH 18/32] Integrate RiskScenarioItem into RiskMatrix component

---
 .../RiskMatrix/RiskMatrix.stories.ts          | 26 +++++++++++++++++++
 .../components/RiskMatrix/RiskMatrix.svelte   | 16 +++++++-----
 .../risk-assessments/[id=uuid]/+page.svelte   |  7 ++---
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/frontend/src/lib/components/RiskMatrix/RiskMatrix.stories.ts b/frontend/src/lib/components/RiskMatrix/RiskMatrix.stories.ts
index 532fdc4d4..3e481edcc 100644
--- a/frontend/src/lib/components/RiskMatrix/RiskMatrix.stories.ts
+++ b/frontend/src/lib/components/RiskMatrix/RiskMatrix.stories.ts
@@ -1,6 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/svelte';
 
 import RiskMatrix from './RiskMatrix.svelte';
+import RiskScenarioItem from './RiskScenarioItem.svelte';
 
 // More on how to set up stories at: https://storybook.js.org/docs/writing-stories
 const meta = {
@@ -45,12 +46,29 @@ const riskMatrix = {
 	})
 };
 
+const riskScenario = {
+	id: '7059ef1b-7d4f-46bc-b735-ed41b531bb22',
+	name: 'RS1',
+	rid: 'R.1',
+	strength_of_knowledge: {
+		name: 'Very High',
+		description: 'The strength of the knowledge supporting the assessment is very high',
+		symbol: '●'
+	}
+};
+
 const sampleData = [
 	[['R.1'], ['R.5'], ['R.8']],
 	[['R.7'], [], ['R.9', 'R.6']],
 	[['R.2'], ['R.3'], ['R.4']]
 ];
 
+const sampleDataItems = [
+	[[riskScenario], [], []],
+	[[], [], [riskScenario, riskScenario]],
+	[[], [riskScenario], []]
+];
+
 export default meta;
 type Story = StoryObj<typeof meta>;
 
@@ -66,3 +84,11 @@ export const WithData: Story = {
 		data: sampleData
 	}
 };
+
+export const WithRiskScenarioItemComponent: Story = {
+	args: {
+		riskMatrix: riskMatrix,
+		data: sampleDataItems,
+		dataItemComponent: RiskScenarioItem
+	}
+};
diff --git a/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte b/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte
index c249cdf10..16efd472b 100644
--- a/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte
+++ b/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
 	import { buildRiskMatrix } from './utils';
 
-	import * as m from '../../../paraglide/messages'
+	import * as m from '$paraglide/messages';
+	import type { ComponentType } from 'svelte';
 
 	export let riskMatrix;
 	export let wrapperClass: string | undefined = '';
@@ -13,6 +14,7 @@
 
 	const displayedRiskMatrix = buildRiskMatrix(grid, risk);
 	export let data: Array<any> | undefined = undefined;
+	export let dataItemComponent: ComponentType | undefined = undefined;
 	// reverse data array to display it in the right order
 	let displayedData: typeof data;
 	if (data) {
@@ -47,14 +49,16 @@
 			</div>
 			{#each row as cell, j}
 				<div
-					class="flex items-center justify-center h-20 [&>*]:pointer-events-none"
+					class="flex items-center justify-center space-x-1 h-20 [&>*]:pointer-events-none"
 					style="background-color: {cell.level.hexcolor};"
 					data-testid="cell"
 				>
-					{#if displayedData}
-						<slot name="data">
-							<div class="mx-auto text-center">{displayedData[i][j]}</div>
-						</slot>
+					{#if dataItemComponent}
+						{#each data[i][j] as item}
+							<svelte:component this={dataItemComponent} data={item} />
+						{/each}
+					{:else if displayedData}
+						<div class="mx-auto text-center">{displayedData[i][j]}</div>
 					{/if}
 				</div>
 			{/each}
diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
index 566a3e2fa..0b70bb19a 100644
--- a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
@@ -20,6 +20,7 @@
 	import * as m from '$paraglide/messages';
 	import { languageTag } from '$paraglide/runtime';
 	import { localItems, capitalizeFirstLetter } from '$lib/utils/locales.js';
+	import RiskScenarioItem from '$lib/components/RiskMatrix/RiskScenarioItem.svelte';
 
 	export let data;
 	const showRisks = true;
@@ -129,9 +130,7 @@
 		scenarios.forEach((scenario: RiskScenario, index: number) => {
 			const probability = scenario[`${risk}_proba`].value;
 			const impact = scenario[`${risk}_impact`].value;
-			probability >= 0 && impact >= 0
-				? grid[probability][impact].push(`R.${index + 1}`)
-				: undefined;
+			probability >= 0 && impact >= 0 ? grid[probability][impact].push(scenario) : undefined;
 		});
 		return grid;
 	};
@@ -288,6 +287,7 @@
 					{showRisks}
 					data={currentCluster}
 					wrapperClass="mt-8"
+					dataItemComponent={RiskScenarioItem}
 				/>
 			</div>
 			<div class="w-1/2 p-6">
@@ -297,6 +297,7 @@
 					riskMatrix={risk_assessment.risk_matrix}
 					data={residualCluster}
 					wrapperClass="mt-8"
+					dataItemComponent={RiskScenarioItem}
 				/>
 			</div>
 		</div>

From e2cb2c2605535d73c551926881bb8c5f8181781b Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 16:24:17 +0100
Subject: [PATCH 19/32] Update "Risk matrix view" french translation

---
 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 d5cf7a66f..4330abc93 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -224,7 +224,7 @@
 	"asPDF": "en PDF",
 	"asCSV": "en CSV",
 	"draft": "Brouillon",
-	"riskMatrixView": "Vue de la matrice de risque",
+	"riskMatrixView": "Vue matricielle",
 	"currentInMatrixView": "Courante",
 	"residualInMatrixView": "Residuelle",
 	"probability": "Probabilité",

From 511b93455c59c7a8650496786782d0270919e582 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 17:08:57 +0100
Subject: [PATCH 20/32] Improve display of cells with hexcolor attribute

---
 frontend/src/lib/components/ModelTable/ModelTable.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/ModelTable/ModelTable.svelte b/frontend/src/lib/components/ModelTable/ModelTable.svelte
index a8440f953..73eb6fa2a 100644
--- a/frontend/src/lib/components/ModelTable/ModelTable.svelte
+++ b/frontend/src/lib/components/ModelTable/ModelTable.svelte
@@ -229,7 +229,7 @@
                     {value.str ?? '-'}
                   {/if}
                 {:else if value && value.hexcolor}
-                  <p class="flex w-1/2 justify-center p-1 rounded-md ml-2" style="background-color: {value.hexcolor}">{value.name ?? value.str ?? '-'}</p>
+                  <p class="flex w-fit min-w-24 justify-center px-2 py-1 rounded-md ml-2 whitespace-nowrap" style="background-color: {value.hexcolor}">{value.name ?? value.str ?? '-'}</p>
                 {:else}
                   {value ?? '-'}
                 {/if}

From 9b9f30d9b4d5b357f2fa1a26da708a54b9107429 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 17:09:17 +0100
Subject: [PATCH 21/32] Allow scrolling within risk matrix cells

---
 .../lib/components/RiskMatrix/RiskMatrix.svelte  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte b/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte
index 16efd472b..e0bfc578d 100644
--- a/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte
+++ b/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte
@@ -49,16 +49,18 @@
 			</div>
 			{#each row as cell, j}
 				<div
-					class="flex items-center justify-center space-x-1 h-20 [&>*]:pointer-events-none"
+					class="flex flex-wrap items-center space-x-1 justify-center h-20 [&>*]:pointer-events-none whitespace-normal overflow-y-scroll hide-scrollbar"
 					style="background-color: {cell.level.hexcolor};"
 					data-testid="cell"
 				>
-					{#if dataItemComponent}
-						{#each data[i][j] as item}
-							<svelte:component this={dataItemComponent} data={item} />
-						{/each}
-					{:else if displayedData}
-						<div class="mx-auto text-center">{displayedData[i][j]}</div>
+					{#if displayedData}
+						{#if dataItemComponent}
+							{#each displayedData[i][j] as item}
+								<svelte:component this={dataItemComponent} data={item} />
+							{/each}
+						{:else}
+							<div class="mx-auto text-center">{displayedData[i][j]}</div>
+						{/if}
 					{/if}
 				</div>
 			{/each}

From e63475e7fca5b144de67490360e6a2c01609bf77 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 17:09:34 +0100
Subject: [PATCH 22/32] Manage strength of knowledge display in
 RiskScenarioItem component

---
 .../src/lib/components/RiskMatrix/RiskScenarioItem.svelte  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte b/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte
index fd88d61b8..e9ee95443 100644
--- a/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte
+++ b/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte
@@ -2,4 +2,9 @@
 	export let data: any;
 </script>
 
-<p>{data.rid}<sub>{data.strength_of_knowledge.symbol}</sub></p>
+<p class="whitespace-nowrap">
+	{data.rid}
+	{#if data.strength_of_knowledge && data.strength_of_knowledge.symbol !== undefined}
+		<sub>{data.strength_of_knowledge.symbol}</sub>
+	{/if}
+</p>

From dfa630cb1fc5c7e3a8ec848745fdf4f333290467 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 17:09:47 +0100
Subject: [PATCH 23/32] Improve risk matrices layout

---
 .../(app)/risk-assessments/[id=uuid]/+page.svelte  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
index 0b70bb19a..0631ef725 100644
--- a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
@@ -278,26 +278,24 @@
 	<!--Matrix view-->
 	<div class="card m-4 p-4 shadow bg-white page-break">
 		<div class="text-lg font-semibold">{m.riskMatrixView()}</div>
-		<div class="flex space-x-3">
-			<div class="w-1/2 p-6">
-				<h3 class="font-bold p-2 m-2 text-lg">{m.currentInMatrixView()}</h3>
+		<div class="flex flex-col xl:flex-row xl:space-x-4 justify-between">
+			<div class="flex-1">
+				<h3 class="font-bold p-2 m-2 text-lg text-center">{m.currentRisk()}</h3>
 
 				<RiskMatrix
 					riskMatrix={risk_assessment.risk_matrix}
-					{showRisks}
 					data={currentCluster}
-					wrapperClass="mt-8"
 					dataItemComponent={RiskScenarioItem}
 				/>
 			</div>
-			<div class="w-1/2 p-6">
-				<h3 class="font-bold p-2 m-2 text-lg">{m.residualInMatrixView()}</h3>
+			<div class="flex-1">
+				<h3 class="font-bold p-2 m-2 text-lg text-center">{m.residualRisk()}</h3>
 
 				<RiskMatrix
 					riskMatrix={risk_assessment.risk_matrix}
 					data={residualCluster}
-					wrapperClass="mt-8"
 					dataItemComponent={RiskScenarioItem}
+					{showRisks}
 				/>
 			</div>
 		</div>

From b6a6dbfeb291a0c7000fd58db99c6da9897eb915 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 17:10:05 +0100
Subject: [PATCH 24/32] Remove unused translation

---
 frontend/messages/en.json | 1 -
 frontend/messages/fr.json | 1 -
 2 files changed, 2 deletions(-)

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index d82d92d6a..9730d3a7d 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -226,7 +226,6 @@
 	"draft": "Draft",
 	"riskMatrixView": "Risk matrix view",
 	"currentInMatrixView": "Current",
-	"residualInMatrixView": "Residual",
 	"probability": "Probability",
 	"riskLevels": "Risk levels",
 	"cancel": "Cancel",
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
index 4330abc93..a368202f7 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -226,7 +226,6 @@
 	"draft": "Brouillon",
 	"riskMatrixView": "Vue matricielle",
 	"currentInMatrixView": "Courante",
-	"residualInMatrixView": "Residuelle",
 	"probability": "Probabilité",
 	"riskLevels": "Niveaux de risque",
 	"cancel": "Annuler",

From 8a4fa23dfd3039a17c2b1d4cc00f9b1827d7d56e Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Mon, 26 Feb 2024 17:59:03 +0100
Subject: [PATCH 25/32] Fix related model create modal title

---
 .../(app)/[model=urlmodel]/[id=uuid]/+page.svelte      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/routes/(app)/[model=urlmodel]/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/[model=urlmodel]/[id=uuid]/+page.svelte
index 3dd9acd6f..67f7e67f3 100644
--- a/frontend/src/routes/(app)/[model=urlmodel]/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/[model=urlmodel]/[id=uuid]/+page.svelte
@@ -62,7 +62,7 @@
 			type: 'component',
 			component: modalComponent,
 			// Data
-			title: localItems(languageTag())['add' + capitalizeFirstLetter(data.model.localName)]
+			title: localItems(languageTag())['add' + capitalizeFirstLetter(model.info.localName)]
 		};
 		modalStore.trigger(modal);
 	}
@@ -256,12 +256,16 @@
 					{#if tabSet === index}
 						<div class="flex flex-row justify-between px-4 py-2">
 							<h4 class="font-semibold lowercase capitalize-first my-auto">
-								{localItems(languageTag())['associated' + capitalizeFirstLetter(model.info.localNamePlural)]}
+								{localItems(languageTag())[
+									'associated' + capitalizeFirstLetter(model.info.localNamePlural)
+								]}
 							</h4>
 							<button
 								class="btn variant-filled-primary self-end my-auto"
 								on:click={(_) => modalCreateForm(model)}
-								><i class="fa-solid fa-plus mr-2 lowercase" />{localItems(languageTag())['add' + capitalizeFirstLetter(model.info.localName)]}</button
+								><i class="fa-solid fa-plus mr-2 lowercase" />{localItems(languageTag())[
+									'add' + capitalizeFirstLetter(model.info.localName)
+								]}</button
 							>
 						</div>
 						{#if model.table}

From 8ba3f6cdac7ae03fcf3c20141a81363cb2028a8c Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Tue, 27 Feb 2024 10:54:53 +0100
Subject: [PATCH 26/32] Show risk legend below both matrices

---
 .../src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
index 0631ef725..b9d267d5b 100644
--- a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
@@ -286,6 +286,7 @@
 					riskMatrix={risk_assessment.risk_matrix}
 					data={currentCluster}
 					dataItemComponent={RiskScenarioItem}
+					{showRisks}
 				/>
 			</div>
 			<div class="flex-1">

From 18ee6b9dc990ffe33e7fcd1f0ce4f81d9e23d65a Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Tue, 27 Feb 2024 10:55:18 +0100
Subject: [PATCH 27/32] Use relative path for paraglide import

For some reason, $paraglide could not be resolved.
---
 frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte b/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte
index e0bfc578d..64c408e1f 100644
--- a/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte
+++ b/frontend/src/lib/components/RiskMatrix/RiskMatrix.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { buildRiskMatrix } from './utils';
 
-	import * as m from '$paraglide/messages';
+	import * as m from '../../../paraglide/messages';
 	import type { ComponentType } from 'svelte';
 
 	export let riskMatrix;

From 8b52b8078aab78f233227837891cb71473bf96e3 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Tue, 27 Feb 2024 11:07:33 +0100
Subject: [PATCH 28/32] Fix translation files

---
 frontend/messages/en.json         | 5 +++--
 frontend/messages/fr.json         | 2 +-
 frontend/src/lib/utils/locales.ts | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index e493f5115..c39c5aa35 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -240,7 +240,7 @@
 	"theExistingSecurityMeasuresToManageThisRisk": "The existing security measures to manage this risk",
 	"currentRiskLevelGivenCurrentMeasures": "The current risk level given the current security measures",
 	"targetAssessment": "Target assessment",
-	"riskLevelWhenAllExtraMeasuresDone": "The risk level when all extra measures are done"
+	"riskLevelWhenAllExtraMeasuresDone": "The risk level when all extra measures are done",
 	"NA": "N/A",
 	"threatAgentFactors": "Threat agent factors",
 	"vulnerabilityFactors": "Vulnerability factors",
@@ -338,5 +338,6 @@
 	"dependencies": "Dependencies",
 	"copyright": "Copyright",
 	"uploadYourLibrary": "Upload your own library",
-	"libraryFileInYaml": "Library file in YAML format"
+	"libraryFileInYaml": "Library file in YAML format",
+	"rid": "RID"
 }
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
index 9f91f7418..74d83ac5f 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -240,7 +240,7 @@
 	"theExistingSecurityMeasuresToManageThisRisk": "Les mesures de sécurité existantes pour gérer ce risque",
 	"currentRiskLevelGivenCurrentMeasures": "Niveau de risque courant compte tenu des mesures actuelles",
 	"targetAssessment": "Évaluation cible",
-	"riskLevelWhenAllExtraMeasuresDone": "Niveau de risque lorsque toutes les mesures supplémentaires sont appliquées"
+	"riskLevelWhenAllExtraMeasuresDone": "Niveau de risque lorsque toutes les mesures supplémentaires sont appliquées",
 	"NA": "N/A",
 	"threatAgentFactors": "Facteurs liés aux agents de menace",
 	"vulnerabilityFactors": "Facteurs de vulnérabilité",
diff --git a/frontend/src/lib/utils/locales.ts b/frontend/src/lib/utils/locales.ts
index acc08ec3f..ec1212bcc 100644
--- a/frontend/src/lib/utils/locales.ts
+++ b/frontend/src/lib/utils/locales.ts
@@ -126,6 +126,7 @@ export function localItems(languageTag: string): LocalItems {
 		dateJoined: m.dateJoined({ languageTag: languageTag }),
 		version: m.version({ languageTag: languageTag }),
 		treatment: m.treatment({ languageTag: languageTag }),
+		rid: m.rid({ languageTag: languageTag }),
 		currentProba: m.currentProba({ languageTag: languageTag }),
 		currentImpact: m.currentImpact({ languageTag: languageTag }),
 		residualProba: m.residualProba({ languageTag: languageTag }),

From 2c26988c961d6fc896e01e104685fd728be63cd6 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Tue, 27 Feb 2024 11:44:47 +0100
Subject: [PATCH 29/32] Simplify risk assessments detail view

---
 .../[id=uuid]/+layout.server.ts               | 162 ++++--------------
 .../risk-assessments/[id=uuid]/+page.svelte   | 105 ++++++------
 2 files changed, 83 insertions(+), 184 deletions(-)

diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts
index 5d03bbcc8..e70ce5904 100644
--- a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts
+++ b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts
@@ -1,15 +1,11 @@
 import { BASE_API_URL } from '$lib/utils/constants';
-import { getModelInfo, type ModelMapEntry } from '$lib/utils/crud';
+import { getModelInfo } from '$lib/utils/crud';
 
 import { modelSchema } from '$lib/utils/schemas';
-import { listViewFields } from '$lib/utils/table';
+import { tableSourceMapper, type TableSource } from '@skeletonlabs/skeleton';
 import { superValidate } from 'sveltekit-superforms/server';
-import { z, type AnyZodObject } from 'zod';
+import { z } from 'zod';
 import type { LayoutServerLoad } from './$types';
-import type { UUID } from 'crypto';
-import { tableSourceMapper, type TableSource } from '@skeletonlabs/skeleton';
-import type { SuperValidated } from 'sveltekit-superforms';
-import type { urlModel } from '$lib/utils/types';
 
 export const load: LayoutServerLoad = async ({ fetch, params }) => {
 	const endpoint = `${BASE_API_URL}/risk-assessments/${params.id}/`;
@@ -18,139 +14,43 @@ export const load: LayoutServerLoad = async ({ fetch, params }) => {
 	const scenarios = await fetch(`${BASE_API_URL}/risk-scenarios/?risk_assessment=${params.id}`)
 		.then((res) => res.json())
 		.then((res) => res.results);
-	const scenariosFilter: string =
-		'?' +
-		scenarios.map((scenario: Record<string, any>) => `risk_scenarios=${scenario.id}`).join('&');
 
-	const measures = await fetch(`${BASE_API_URL}/security-measures/${scenariosFilter}`).then((res) =>
-		res.json().then((res) => {
-			const sorted = res.results.sort((a: Record<string, any>, b: Record<string, any>) => {
-				const dateA = new Date(a.created_at);
-				const dateB = new Date(b.created_at);
-				return dateA.getTime() - dateB.getTime();
-			});
-			return sorted;
-		})
-	);
 	const risk_matrix = await fetch(
 		`${BASE_API_URL}/risk-matrices/${risk_assessment.risk_matrix.id}/`
 	).then((res) => res.json());
 
-	// Create a lookup for measures based on their id
-	const measureLookup: { [id: string]: Record<string, any> } = measures.reduce(
-		(acc: Record<string, any>, measure: Record<string, any>) => {
-			acc[measure.id] = measure;
-			return acc;
-		},
-		{}
-	);
-
-	// Replace the measures' UUIDs in each scenario with the corresponding measure instances
-	const transformedScenarios = scenarios.map((scenario: Record<string, any>) => ({
-		...scenario,
-		security_measures: scenario.security_measures.map((childId: UUID) => measureLookup[childId])
-	}));
-
-	risk_assessment.risk_scenarios = transformedScenarios;
-	risk_assessment.risk_matrix = risk_matrix;
-
-	type RelatedModel = {
-		urlModel: urlModel;
-		info: ModelMapEntry;
-		table: TableSource;
-		deleteForm: SuperValidated<AnyZodObject>;
-		createForm: SuperValidated<AnyZodObject>;
-		foreignKeys: Record<string, any>;
-		selectOptions: Record<string, any>;
-	};
-
-	type RelatedModels = {
-		[K in urlModel]: RelatedModel;
+	const scenariosTable: TableSource = {
+		head: [
+			'rid',
+			'name',
+			'threats',
+			'existingMeasures',
+			'currentLevel',
+			'securityMeasures',
+			'residualLevel'
+		],
+		body: tableSourceMapper(scenarios, [
+			'rid',
+			'name',
+			'threats',
+			'existing_measures',
+			'current_level',
+			'security_measures',
+			'residual_level'
+		]),
+		meta: scenarios
 	};
 
-	const model = getModelInfo('risk-assessments');
-	const relatedModels = {} as RelatedModels;
-
-	if (model.reverseForeignKeyFields) {
-		await Promise.all(
-			model.reverseForeignKeyFields.map(async (e) => {
-				const relEndpoint = `${BASE_API_URL}/${e.urlModel}/?${e.field}=${params.id}`;
-				const res = await fetch(relEndpoint);
-				const data = await res.json().then((res) => res.results);
-
-				const metaData = tableSourceMapper(data, ['id']);
-
-				const bodyData = tableSourceMapper(
-					data,
-					listViewFields[e.urlModel].body.filter((field) => field !== 'risk_assessment')
-				);
-
-				const table: TableSource = {
-					head: listViewFields[e.urlModel].head.filter((field) => field !== 'riskAssessment'),
-					body: bodyData,
-					meta: metaData
-				};
-
-				const info = getModelInfo(e.urlModel);
-				const urlModel = e.urlModel;
-
-				const deleteForm = await superValidate(z.object({ id: z.string().uuid() }));
-				const createSchema = modelSchema(e.urlModel);
-				const createForm = await superValidate(
-					{ risk_assessment: risk_assessment.id },
-					createSchema,
-					{
-						errors: false
-					}
-				);
-
-				const foreignKeys: Record<string, any> = {};
+	risk_assessment.risk_scenarios = scenarios;
+	risk_assessment.risk_matrix = risk_matrix;
 
-				if (info.foreignKeyFields) {
-					for (const keyField of info.foreignKeyFields) {
-						const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
-						const url = `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
-						const response = await fetch(url);
-						if (response.ok) {
-							foreignKeys[keyField.field] = await response.json().then((data) => data.results);
-						} else {
-							console.error(`Failed to fetch data for ${keyField.field}: ${response.statusText}`);
-						}
-					}
-				}
+	const deleteSchema = z.object({ id: z.string() });
+	const scenarioDeleteForm = await superValidate(deleteSchema);
 
-				const selectOptions: Record<string, any> = {};
+	const scenarioSchema = modelSchema('risk-scenarios');
+	const scenarioCreateForm = await superValidate(scenarioSchema);
 
-				if (info.selectFields) {
-					for (const selectField of info.selectFields) {
-						const url = `${BASE_API_URL}/${urlModel}/${selectField.field}/`;
-						const response = await fetch(url);
-						if (response.ok) {
-							selectOptions[selectField.field] = await response.json().then((data) =>
-								Object.entries(data).map(([key, value]) => ({
-									label: value,
-									value: key
-								}))
-							);
-						} else {
-							console.error(
-								`Failed to fetch data for ${selectField.field}: ${response.statusText}`
-							);
-						}
-					}
-				}
-				relatedModels[e.urlModel] = {
-					urlModel,
-					info,
-					table,
-					deleteForm,
-					createForm,
-					foreignKeys,
-					selectOptions
-				};
-			})
-		);
-	}
+	const scenarioModel = getModelInfo('risk-scenarios');
 
-	return { risk_assessment, relatedModels };
+	return { risk_assessment, scenarioModel, scenariosTable, scenarioDeleteForm, scenarioCreateForm };
 };
diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
index b9d267d5b..948844bc5 100644
--- a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
@@ -1,26 +1,23 @@
 <script lang="ts">
-	import type { RiskScenario, RiskMatrixJsonDefinition } from '$lib/utils/types';
+	import { page } from '$app/stores';
+	import CreateModal from '$lib/components/Modals/CreateModal.svelte';
+	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
+	import RiskMatrix from '$lib/components/RiskMatrix/RiskMatrix.svelte';
+	import { URL_MODEL_MAP, getModelInfo } from '$lib/utils/crud.js';
+	import { breadcrumbObject } from '$lib/utils/stores';
+	import type { RiskMatrixJsonDefinition, RiskScenario } from '$lib/utils/types';
 	import type {
 		ModalComponent,
 		ModalSettings,
 		ModalStore,
+		PopupSettings,
 		ToastStore
 	} from '@skeletonlabs/skeleton';
-	import CreateModal from '$lib/components/Modals/CreateModal.svelte';
-	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
-	import RiskMatrix from '$lib/components/RiskMatrix/RiskMatrix.svelte';
-	import type { PopupSettings } from '@skeletonlabs/skeleton';
-	import { popup } from '@skeletonlabs/skeleton';
-	import { getModalStore, getToastStore } from '@skeletonlabs/skeleton';
-	import { breadcrumbObject } from '$lib/utils/stores';
+	import { getModalStore, getToastStore, popup } from '@skeletonlabs/skeleton';
 	import { superForm } from 'sveltekit-superforms/client';
-	import { page } from '$app/stores';
-	import { URL_MODEL_MAP } from '$lib/utils/crud.js';
 
-	import * as m from '$paraglide/messages';
-	import { languageTag } from '$paraglide/runtime';
-	import { localItems, capitalizeFirstLetter } from '$lib/utils/locales.js';
 	import RiskScenarioItem from '$lib/components/RiskMatrix/RiskScenarioItem.svelte';
+	import * as m from '$paraglide/messages';
 
 	export let data;
 	const showRisks = true;
@@ -56,30 +53,35 @@
 		}
 	}
 
-	function getForms(model: Record<string, any>) {
-		let { form: createForm, message: createMessage } = superForm(model.createForm, {
+	let { form: deleteForm, message: deleteMessage } = {
+		form: {},
+		message: {}
+	};
+
+	let { form: createForm, message: createMessage } = {
+		form: {},
+		message: {}
+	};
+
+	// NOTE: This is a workaround for an issue we had with getting the return value from the form actions after switching pages in route /[model=urlmodel]/ without a full page reload.
+	// invalidateAll() did not work.
+	$: {
+		({ form: createForm, message: createMessage } = superForm(data.scenarioCreateForm, {
 			onUpdated: ({ form }) =>
 				handleFormUpdated({ form, pageStatus: $page.status, closeModal: true })
-		});
-		let { form: deleteForm, message: deleteMessage } = superForm(model.deleteForm, {
+		}));
+		({ form: deleteForm, message: deleteMessage } = superForm(data.scenarioDeleteForm, {
 			onUpdated: ({ form }) =>
 				handleFormUpdated({ form, pageStatus: $page.status, closeModal: true })
-		});
-		return { createForm, createMessage, deleteForm, deleteMessage };
+		}));
 	}
 
-	let forms = {};
-
-	$: Object.entries(data.relatedModels).forEach(([key, value]) => {
-		forms[key] = getForms(value);
-	});
-
-	function modalCreateForm(model: Record<string, any>): void {
+	function modalCreateForm(): void {
 		const modalComponent: ModalComponent = {
 			ref: CreateModal,
 			props: {
-				form: model.createForm,
-				model: model,
+				form: data.scenarioCreateForm,
+				model: data.scenarioModel,
 				debug: false
 			}
 		};
@@ -87,7 +89,7 @@
 			type: 'component',
 			component: modalComponent,
 			// Data
-			title: localItems(languageTag())['add' + capitalizeFirstLetter(model.info.localName)]
+			title: m.addRiskScenario()
 		};
 		modalStore.trigger(modal);
 	}
@@ -250,30 +252,27 @@
 	</div>
 	<!--Risk risk_assessment-->
 	<div class="card m-4 p-4 shadow bg-white">
-		{#if data.relatedModels}
-			{#each Object.entries(data.relatedModels) as [urlmodel, model]}
-				<div class="bg-white">
-					<div class="flex flex-row justify-between">
-						<h4 class="text-lg font-semibold lowercase capitalize-first my-auto">
-							{localItems(languageTag())[
-								'associated' + capitalizeFirstLetter(model.info.localNamePlural)
-							]}
-						</h4>
-					</div>
-					{#if model.table}
-						<ModelTable source={model.table} deleteForm={model.deleteForm} URLModel={urlmodel}>
-							<button
-								slot="addButton"
-								class="btn variant-filled-primary self-end my-auto"
-								on:click={(_) => modalCreateForm(model)}
-								><i class="fa-solid fa-plus mr-2 lowercase" />
-								{localItems(languageTag())['add' + capitalizeFirstLetter(model.info.localName)]}
-							</button>
-						</ModelTable>
-					{/if}
-				</div>
-			{/each}
-		{/if}
+		<div class="bg-white">
+			<div class="flex flex-row justify-between">
+				<h4 class="text-lg font-semibold lowercase capitalize-first my-auto">
+					{m.associatedRiskScenarios()}
+				</h4>
+			</div>
+			<ModelTable
+				source={data.scenariosTable}
+				deleteForm={data.scenarioDeleteForm}
+				model={getModelInfo('risk-scenarios')}
+				URLModel="risk-scenarios"
+			>
+				<button
+					slot="addButton"
+					class="btn variant-filled-primary self-end my-auto"
+					on:click={(_) => modalCreateForm()}
+					><i class="fa-solid fa-plus mr-2 lowercase" />
+					{m.addRiskScenario()}
+				</button>
+			</ModelTable>
+		</div>
 	</div>
 	<!--Matrix view-->
 	<div class="card m-4 p-4 shadow bg-white page-break">

From d6abea33f565a4d29af5d5e7d6a1dc557d508e85 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Tue, 27 Feb 2024 12:07:46 +0100
Subject: [PATCH 30/32] Fix scenario create form

---
 .../[id=uuid]/+layout.server.ts               | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts
index e70ce5904..62e9dc2a4 100644
--- a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts
+++ b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+layout.server.ts
@@ -48,9 +48,52 @@ export const load: LayoutServerLoad = async ({ fetch, params }) => {
 	const scenarioDeleteForm = await superValidate(deleteSchema);
 
 	const scenarioSchema = modelSchema('risk-scenarios');
-	const scenarioCreateForm = await superValidate(scenarioSchema);
+	const initialData = {
+		risk_assessment: params.id
+	};
+	const scenarioCreateForm = await superValidate(initialData, scenarioSchema, {
+		errors: false
+	});
 
 	const scenarioModel = getModelInfo('risk-scenarios');
 
+	const foreignKeys: Record<string, any> = {};
+
+	if (scenarioModel.foreignKeyFields) {
+		for (const keyField of scenarioModel.foreignKeyFields) {
+			const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
+			const url = `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
+			const response = await fetch(url);
+			if (response.ok) {
+				foreignKeys[keyField.field] = await response.json().then((data) => data.results);
+			} else {
+				console.error(`Failed to fetch data for ${keyField.field}: ${response.statusText}`);
+			}
+		}
+	}
+
+	scenarioModel.foreignKeys = foreignKeys;
+
+	const selectOptions: Record<string, any> = {};
+
+	if (scenarioModel.selectFields) {
+		for (const selectField of scenarioModel.selectFields) {
+			const url = `${BASE_API_URL}/risk-scenarios/${selectField.field}/`;
+			const response = await fetch(url);
+			if (response.ok) {
+				selectOptions[selectField.field] = await response.json().then((data) =>
+					Object.entries(data).map(([key, value]) => ({
+						label: value,
+						value: key
+					}))
+				);
+			} else {
+				console.error(`Failed to fetch data for ${selectField.field}: ${response.statusText}`);
+			}
+		}
+	}
+
+	scenarioModel.selectOptions = selectOptions;
+
 	return { risk_assessment, scenarioModel, scenariosTable, scenarioDeleteForm, scenarioCreateForm };
 };

From bb5b1ab38c2f730c604241bd82324f42dd1a6ea0 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Wed, 28 Feb 2024 16:03:03 +0100
Subject: [PATCH 31/32] Update default SoK symbols

---
 backend/core/models.py                        | 13 ++---
 .../libraries/critical_matrix_3x3.yaml        | 13 -----
 .../libraries/critical_matrix_5x5.yaml        | 13 -----
 .../RiskMatrix/RiskMatrix.stories.ts          | 48 +++++++++++++++----
 .../RiskMatrix/RiskScenarioItem.svelte        |  7 ++-
 5 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/backend/core/models.py b/backend/core/models.py
index 40b5efb37..175ad1ecf 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -1007,28 +1007,21 @@ class RiskScenario(NameDescriptionMixin):
             "description": _(
                 "The strength of the knowledge supporting the assessment is low"
             ),
-            "symbol": "◔",
+            "symbol": "◇",
         },
         1: {
             "name": _("Medium"),
             "description": _(
                 "The strength of the knowledge supporting the assessment is medium"
             ),
-            "symbol": "◑",
+            "symbol": "⬙",
         },
         2: {
             "name": _("High"),
             "description": _(
                 "The strength of the knowledge supporting the assessment is high"
             ),
-            "symbol": "◕",
-        },
-        3: {
-            "name": _("Very High"),
-            "description": _(
-                "The strength of the knowledge supporting the assessment is very high"
-            ),
-            "symbol": "●",
+            "symbol": "◆",
         },
     }
 
diff --git a/backend/library/libraries/critical_matrix_3x3.yaml b/backend/library/libraries/critical_matrix_3x3.yaml
index 992b7d49d..ba72f3327 100644
--- a/backend/library/libraries/critical_matrix_3x3.yaml
+++ b/backend/library/libraries/critical_matrix_3x3.yaml
@@ -55,16 +55,3 @@ objects:
         - - 1
           - 2
           - 2
-      strength_of_knowledge:
-        - name: Low
-          description: Low strength of knowledge
-          symbol: ◔
-        - name: Medium
-          description: Medium strength of knowledge
-          symbol: ◑
-        - name: High
-          description: High strength of knowledge
-          symbol: ◕
-        - name: Very high
-          description: Very high strength of knowledge
-          symbol: ●
diff --git a/backend/library/libraries/critical_matrix_5x5.yaml b/backend/library/libraries/critical_matrix_5x5.yaml
index 460189d43..89c3c7f10 100644
--- a/backend/library/libraries/critical_matrix_5x5.yaml
+++ b/backend/library/libraries/critical_matrix_5x5.yaml
@@ -91,16 +91,3 @@ objects:
           - 3
           - 4
           - 4
-      strength_of_knowledge:
-        - name: Low
-          description: Low strength of knowledge
-          symbol: ◔
-        - name: Medium
-          description: Medium strength of knowledge
-          symbol: ◑
-        - name: High
-          description: High strength of knowledge
-          symbol: ◕
-        - name: Very high
-          description: Very high strength of knowledge
-          symbol: ●
diff --git a/frontend/src/lib/components/RiskMatrix/RiskMatrix.stories.ts b/frontend/src/lib/components/RiskMatrix/RiskMatrix.stories.ts
index 3e481edcc..cfccd5418 100644
--- a/frontend/src/lib/components/RiskMatrix/RiskMatrix.stories.ts
+++ b/frontend/src/lib/components/RiskMatrix/RiskMatrix.stories.ts
@@ -46,14 +46,46 @@ const riskMatrix = {
 	})
 };
 
-const riskScenario = {
-	id: '7059ef1b-7d4f-46bc-b735-ed41b531bb22',
-	name: 'RS1',
-	rid: 'R.1',
-	strength_of_knowledge: {
-		name: 'Very High',
-		description: 'The strength of the knowledge supporting the assessment is very high',
-		symbol: '●'
+const riskScenarios = [
+	{
+		id: '7059ef1b-7d4f-46bc-b735-ed41b531bb22',
+		name: 'RS1',
+		rid: 'R.1',
+		strength_of_knowledge: {
+			name: 'Low',
+			description: 'The strength of the knowledge supporting the assessment is very high',
+			symbol: '◇'
+		}
+	},
+	{
+		id: '7059ef1b-7d4f-46bc-b735-ed41b531bb22',
+		name: 'RS1',
+		rid: 'R.2',
+		strength_of_knowledge: {
+			name: 'Low',
+			description: 'The strength of the knowledge supporting the assessment is very high',
+			symbol: '⬙'
+		}
+	},
+	{
+		id: '7059ef1b-7d4f-46bc-b735-ed41b531bb22',
+		name: 'RS1',
+		rid: 'R.3',
+		strength_of_knowledge: {
+			name: 'Low',
+			description: 'The strength of the knowledge supporting the assessment is very high',
+			symbol: '◆'
+		}
+	},
+	{
+		id: '7059ef1b-7d4f-46bc-b735-ed41b531bb22',
+		name: 'RS4',
+		rid: 'R.1',
+		strength_of_knowledge: {
+			name: 'Low',
+			description: 'The strength of the knowledge supporting the assessment is very high',
+			symbol: '◆'
+		}
 	}
 };
 
diff --git a/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte b/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte
index e9ee95443..edfb03064 100644
--- a/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte
+++ b/frontend/src/lib/components/RiskMatrix/RiskScenarioItem.svelte
@@ -3,8 +3,7 @@
 </script>
 
 <p class="whitespace-nowrap">
-	{data.rid}
-	{#if data.strength_of_knowledge && data.strength_of_knowledge.symbol !== undefined}
-		<sub>{data.strength_of_knowledge.symbol}</sub>
-	{/if}
+	{#if data.strength_of_knowledge && data.strength_of_knowledge.symbol !== undefined}<sup
+			class="font-mono text-lg">{data.strength_of_knowledge.symbol}</sup
+		>{/if}{data.rid}
 </p>

From d35a4ad17a247aae8eb74221e86509a609d64b4a Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Wed, 28 Feb 2024 16:06:56 +0100
Subject: [PATCH 32/32] Fix typo

---
 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 3ac9651fd..9c5f200a8 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -151,7 +151,7 @@
 	"statistics": "Statistiques",
 	"myProjects": "Mes projets",
 	"scenarios": "Scénarios",
-	"assignedProjects": "Assigné à {number} project{s}",
+	"assignedProjects": "Assigné à {number} projet{s}",
 	"currentRiskLevelPerScenario": "Niveau de risque courant par scénario de risque",
 	"residualRiskLevelPerScenario": "Niveau de risque résiduel par scénario de risque",
 	"securityMeasuresStatus": "Statut des mesures de sécurité",