From 04ef58a061045fad08566a6d4be56b9845ee87b4 Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Fri, 29 Nov 2024 11:06:25 +0100
Subject: [PATCH 01/38] starting point

---
 .../routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte    | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte

diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
new file mode 100644
index 000000000..093ce250c
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -0,0 +1,3 @@
+<script lang="ts"></script>
+
+<div></div>

From c32cad43ba180dbac0db68370b71e57397afa666 Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Fri, 29 Nov 2024 15:02:51 +0100
Subject: [PATCH 02/38] Basic tile styling

---
 frontend/messages/en.json                     | 10 +++++-
 frontend/messages/fr.json                     | 10 +++++-
 .../ebios-rm/[id=uuid]/+page.svelte           | 32 +++++++++++++++++--
 .../(internal)/ebios-rm/[id=uuid]/Tile.svelte | 28 ++++++++++++++++
 4 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 42a0fa288..088754cc7 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -893,5 +893,13 @@
 	"p1": "P1",
 	"p2": "P2",
 	"p3": "P3",
-	"p4": "P4"
+	"p4": "P4",
+	"ebiosWs1_1": "Workshop 1.1: Scope",
+	"ebiosWs1_2": "Workshop 1.2: Feared events",
+	"ebiosWs1_3": "Workshop 1.3: Baseline",
+	"ebiosWs2": "Workshop 2: Risk origins",
+	"ebiosWs3_1": "Workshop 3.1: Ecosystem",
+	"ebiosWs3_2": "Workshop 3.2: Strategic scenarios",
+	"ebiosWs4": "Workshop 4: Operational scenarios",
+	"ebiosWs5": "Workshop 5: Risk managenement plan"
 }
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
index dbe72b3a1..5c8e30db7 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -866,5 +866,13 @@
 	"forgotPassword": "Mot de passe oublié",
 	"ssoSettingsUpdated": "Paramètres SSO mis à jour",
 	"scoreSemiColon": "Score:",
-	"mappingInferenceHelpText": "Ces variables sont fixes et ne changeront pas en fonction de la source."
+	"mappingInferenceHelpText": "Ces variables sont fixes et ne changeront pas en fonction de la source.",
+	"ebiosWs1_1": "Atelier 1.1 : Cadrage",
+	"ebiosWs1_2": "Atelier 1.2 : Evenements redoutés",
+	"ebiosWs1_3": "Atelier 1.3 : Socle",
+	"ebiosWs2": "Atelier 2 : Source de risque",
+	"ebiosWs3_1": "Atelier 3.1 : Ecosysteme",
+	"ebiosWs3_2": "Atelier 3.2 : Scenarios stratégiques",
+	"ebiosWs4": "Atelier 4 : Scenarios opértionnels",
+	"ebiosWs5": "Atelier 5 : Traitement du risque"
 }
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index 093ce250c..b0903a1ac 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -1,3 +1,31 @@
-<script lang="ts"></script>
+<script lang="ts">
+	import * as m from '$paraglide/messages';
+	import Tile from './Tile.svelte';
+	const data = { ws1_1: [{ k: 'v' }, { k: 'v' }, { k: 'v' }] };
+</script>
 
-<div></div>
+<div class="h-screen w-full p-8">
+	<div class="card bg-white shadow-lg w-full h-full grid grid-cols-3 grid-rows-3 gap-8 p-8">
+		<div class="border col-span-3 grid grid-cols-3 gap-4 p-4 bg-pink-600">
+			<Tile title={m.ebiosWs1_1()} status="to_do" meta={data.ws1_1} />
+			<Tile title={m.ebiosWs1_2()} status="in_progress" />
+			<Tile title={m.ebiosWs1_3()} status="done" />
+		</div>
+		<div class="border bg-fuchsia-900 grid gap-4 p-4">
+			<Tile title={m.ebiosWs2()} status="to_do" />
+		</div>
+		<div class="border col-span-2 grid grid-cols-2 gap-4 p-4 bg-teal-500">
+			<Tile title={m.ebiosWs3_1()} status="to_do" />
+			<Tile title={m.ebiosWs3_2()} status="done" />
+		</div>
+		<div class="border bg-yellow-600 grid gap-4 p-4">
+			<Tile title={m.ebiosWs4()} status="in_progress" />
+		</div>
+		<div class="border bg-red-500 grid gap-4 p-4">
+			<Tile title={m.ebiosWs5()} status="to_do" />
+		</div>
+		<div class="border bg-purple-800 grid gap-4 p-4">
+			<Tile title={m.summary()} />
+		</div>
+	</div>
+</div>
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte
new file mode 100644
index 000000000..bf4491d86
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte
@@ -0,0 +1,28 @@
+<script lang="ts">
+	import * as m from '$paraglide/messages';
+
+	export let title = 'activity';
+	export let status = '';
+	export let meta = [];
+</script>
+
+<div class="rounded bg-white p-4 flex flex-col justify-between">
+	<div class="flex justify-between mb-2">
+		<div class="font-semibold">{title}</div>
+		<div>
+			{#if status == 'to_do'}
+				<i class="fa-solid fa-exclamation"></i>
+			{:else if status == 'in_progress'}
+				<i class="fa-solid fa-spinner"></i>
+			{:else if status == 'done'}
+				<i class="fa-solid fa-check"></i>
+			{/if}
+		</div>
+	</div>
+	{#each meta as kv}
+		<div class="mt-2">{kv}</div>
+	{/each}
+	<div class="justify-end flex">
+		<div class="text-xl text-zinc-700"><i class="fa-solid fa-play"></i></div>
+	</div>
+</div>

From 56835209150f367e0c459893743618f85e07067f Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Fri, 29 Nov 2024 18:35:34 +0100
Subject: [PATCH 03/38] wip

---
 .../routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte  | 2 +-
 .../src/routes/(app)/(internal)/experimental/+page.svelte   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte
index bf4491d86..699e227ce 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte
@@ -9,7 +9,7 @@
 <div class="rounded bg-white p-4 flex flex-col justify-between">
 	<div class="flex justify-between mb-2">
 		<div class="font-semibold">{title}</div>
-		<div>
+		<div class="text-xl">
 			{#if status == 'to_do'}
 				<i class="fa-solid fa-exclamation"></i>
 			{:else if status == 'in_progress'}
diff --git a/frontend/src/routes/(app)/(internal)/experimental/+page.svelte b/frontend/src/routes/(app)/(internal)/experimental/+page.svelte
index 7964bcdf6..d9a1f5d98 100644
--- a/frontend/src/routes/(app)/(internal)/experimental/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/experimental/+page.svelte
@@ -27,4 +27,10 @@
 		link="assets/graph"
 		tags={['analysis', 'assets']}
 	/>
+	<Article
+		title="Ebios RM (dev)"
+		desc="Tiles to manage the workshop"
+		link="/ebios-rm/5de0c0c3-678c-43f0-bdb6-b2ed434e1843"
+		tags={['analysis', 'risk']}
+	/>
 </div>

From f15e8e03e7f91bd25ac3797cb1d7c099522abbb4 Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Fri, 29 Nov 2024 18:46:01 +0100
Subject: [PATCH 04/38] wip

---
 .../(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte
index 699e227ce..58fd22023 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte
@@ -1,15 +1,17 @@
 <script lang="ts">
 	import * as m from '$paraglide/messages';
+	import { safeTranslate } from '$lib/utils/i18n';
 
 	export let title = 'activity';
 	export let status = '';
 	export let meta = [];
+	export let href = '#';
 </script>
 
 <div class="rounded bg-white p-4 flex flex-col justify-between">
 	<div class="flex justify-between mb-2">
 		<div class="font-semibold">{title}</div>
-		<div class="text-xl">
+		<div class="text-xl" title={safeTranslate(status)}>
 			{#if status == 'to_do'}
 				<i class="fa-solid fa-exclamation"></i>
 			{:else if status == 'in_progress'}
@@ -23,6 +25,8 @@
 		<div class="mt-2">{kv}</div>
 	{/each}
 	<div class="justify-end flex">
-		<div class="text-xl text-zinc-700"><i class="fa-solid fa-play"></i></div>
+		<div class="text-xl text-zinc-700">
+			<a class="hover:text-purple-500" {href}><i class="fa-solid fa-play"></i></a>
+		</div>
 	</div>
 </div>

From ff16985601e9c7cbbc08257beff37aad96960435 Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Sun, 1 Dec 2024 20:27:14 +0100
Subject: [PATCH 05/38] Closer to the training materials

---
 frontend/messages/en.json                     | 31 +++++---
 frontend/messages/fr.json                     | 30 ++++++--
 .../ebios-rm/[id=uuid]/+page.svelte           | 62 ++++++++++------
 .../(internal)/ebios-rm/[id=uuid]/Tile.svelte | 71 +++++++++++++------
 4 files changed, 136 insertions(+), 58 deletions(-)

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index b1763a53a..c3efe6ae6 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -897,12 +897,27 @@
 	"p2": "P2",
 	"p3": "P3",
 	"p4": "P4",
-	"ebiosWs1_1": "Workshop 1.1: Scope",
-	"ebiosWs1_2": "Workshop 1.2: Feared events",
-	"ebiosWs1_3": "Workshop 1.3: Baseline",
-	"ebiosWs2": "Workshop 2: Risk origins",
-	"ebiosWs3_1": "Workshop 3.1: Ecosystem",
-	"ebiosWs3_2": "Workshop 3.2: Strategic scenarios",
-	"ebiosWs4": "Workshop 4: Operational scenarios",
-	"ebiosWs5": "Workshop 5: Risk managenement plan"
+	"ebiosWs1": "Workshop 1: Framing and Security Foundation",
+	"ebiosWs2": "Workshop 2: Risk Sources",
+	"ebiosWs3": "Workshop 3: Strategic Scenarios",
+	"ebiosWs4": "Workshop 4: Operational Scenarios",
+	"ebiosWs5": "Workshop 5: Risk Treatment",
+	"ebiosWs1_1": "Define the study framework",
+	"ebiosWs1_2": "Define business and technical perimeter",
+	"ebiosWs1_3": "Identify feared events",
+	"ebiosWs1_4": "Determine the security foundation",
+	"ebiosWs2_1": "Identify risk sources and targeted objectives",
+	"ebiosWs2_2": "Evaluate RS/TO pairs",
+	"ebiosWs2_3": "Select RS/TO pairs",
+	"ebiosWs3_1": "Map the ecosystem",
+	"ebiosWs3_2": "Develop strategic scenarios",
+	"ebiosWs3_3": "Define security measures for the ecosystem",
+	"ebiosWs4_1": "Develop operational scenarios",
+	"ebiosWs4_2": "Evaluate the likelihood of operational scenarios",
+	"ebiosWs5_1": "Conduct a risk assessment",
+	"ebiosWs5_2": "Decide on risk treatment strategy",
+	"ebiosWs5_3": "Define security measures",
+	"ebiosWs5_4": "Assess and document residual risks",
+	"ebiosWs5_5": "Establish risk monitoring framework",
+  "activity": "Activity"
 }
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
index a0dd56cbb..7ba0259ea 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -873,12 +873,28 @@
 	"ssoSettingsUpdated": "Paramètres SSO mis à jour",
 	"scoreSemiColon": "Score:",
 	"mappingInferenceHelpText": "Ces variables sont fixes et ne changeront pas en fonction de la source.",
-	"ebiosWs1_1": "Atelier 1.1 : Cadrage",
-	"ebiosWs1_2": "Atelier 1.2 : Evenements redoutés",
-	"ebiosWs1_3": "Atelier 1.3 : Socle",
-	"ebiosWs2": "Atelier 2 : Source de risque",
-	"ebiosWs3_1": "Atelier 3.1 : Ecosysteme",
-	"ebiosWs3_2": "Atelier 3.2 : Scenarios stratégiques",
+	"ebiosWs1": "Atelier 1 : Cadrage et Socle de sécurité",
+	"ebiosWs2": "Atelier 2 : Sources de risque",
+	"ebiosWs3": "Atelier 3 : Scénarios stratégiques",
 	"ebiosWs4": "Atelier 4 : Scenarios opértionnels",
-	"ebiosWs5": "Atelier 5 : Traitement du risque"
+	"ebiosWs5": "Atelier 5 : Traitement du risque",
+  "ebiosWs1_1": "Définir le cadre de l’étude",
+  "ebiosWs1_2": "Définir le périmètre métier et technique",
+  "ebiosWs1_3": "Identifier les événements redoutés",
+  "ebiosWs1_4": "Déterminer le socle de sécurité",
+  "ebiosWs2_1": "Identifier les sources de risque et objectifs visés",
+  "ebiosWs2_2": "Évaluer les couples SR/OV",
+  "ebiosWs2_3": "Sélectionner les couples SR/OV",
+  "ebiosWs3_1": "Cartographier l’écosystème",
+  "ebiosWs3_2": "Élaborer les scénarios stratégiques",
+  "ebiosWs3_3": "Définir les mesures de sécurité sur l’écosystème",
+  "ebiosWs4_1": "Elaborer les scénarios opérationnels",
+  "ebiosWs4_2": "Evaluer la vraisemblance des scénarios opérationnel",
+  "ebiosWs5_1": "Réaliser une évaluation des risques",
+  "ebiosWs5_2": "Décider de la stratégie de traitement du risque",
+  "ebiosWs5_3": "Définir les mesures de sécurité",
+  "ebiosWs5_4": "Évaluer et documenter les risques résiduels",
+  "ebiosWs5_5": "Mettre en place le cadre de suivi des risques",
+  "activity": "Activité"
+
 }
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index b0903a1ac..33000896f 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -1,31 +1,47 @@
 <script lang="ts">
 	import * as m from '$paraglide/messages';
+	import { safeTranslate } from '$lib/utils/i18n';
 	import Tile from './Tile.svelte';
-	const data = { ws1_1: [{ k: 'v' }, { k: 'v' }, { k: 'v' }] };
+	const data = {
+		ws1: [
+			{ title: safeTranslate(m.ebiosWs1_1()), status: 'done', href: '#' },
+			{ title: safeTranslate(m.ebiosWs1_2()), status: 'done', href: '#' },
+			{ title: safeTranslate(m.ebiosWs1_3()), status: 'to_do', href: '#' },
+			{ title: safeTranslate(m.ebiosWs1_4()), status: 'to_do', href: '#' }
+		],
+		ws2: [
+			{ title: safeTranslate(m.ebiosWs2_1()), status: 'to_do', href: '#' },
+			{ title: safeTranslate(m.ebiosWs2_2()), status: 'to_do', href: '#' },
+			{ title: safeTranslate(m.ebiosWs2_3()), status: 'to_do', href: '#' }
+		],
+		ws3: [
+			{ title: safeTranslate(m.ebiosWs3_1()), status: 'to_do', href: '#' },
+			{ title: safeTranslate(m.ebiosWs3_2()), status: 'to_do', href: '#' },
+			{ title: safeTranslate(m.ebiosWs3_3()), status: 'done', href: '#' }
+		],
+		ws4: [
+			{ title: safeTranslate(m.ebiosWs4_1()), status: 'to_do', href: '#' },
+			{ title: safeTranslate(m.ebiosWs4_2()), status: 'to_do', href: '#' }
+		],
+		ws5: [
+			{ title: safeTranslate(m.ebiosWs5_1()), status: 'done', href: '#' },
+			{ title: safeTranslate(m.ebiosWs5_2()), status: 'done', href: '#' },
+			{ title: safeTranslate(m.ebiosWs5_3()), status: 'to_do', href: '#' },
+			{ title: safeTranslate(m.ebiosWs5_4()), status: 'to_do', href: '#' },
+			{ title: safeTranslate(m.ebiosWs5_5()), status: 'done', href: '#' }
+		]
+	};
 </script>
 
 <div class="h-screen w-full p-8">
-	<div class="card bg-white shadow-lg w-full h-full grid grid-cols-3 grid-rows-3 gap-8 p-8">
-		<div class="border col-span-3 grid grid-cols-3 gap-4 p-4 bg-pink-600">
-			<Tile title={m.ebiosWs1_1()} status="to_do" meta={data.ws1_1} />
-			<Tile title={m.ebiosWs1_2()} status="in_progress" />
-			<Tile title={m.ebiosWs1_3()} status="done" />
-		</div>
-		<div class="border bg-fuchsia-900 grid gap-4 p-4">
-			<Tile title={m.ebiosWs2()} status="to_do" />
-		</div>
-		<div class="border col-span-2 grid grid-cols-2 gap-4 p-4 bg-teal-500">
-			<Tile title={m.ebiosWs3_1()} status="to_do" />
-			<Tile title={m.ebiosWs3_2()} status="done" />
-		</div>
-		<div class="border bg-yellow-600 grid gap-4 p-4">
-			<Tile title={m.ebiosWs4()} status="in_progress" />
-		</div>
-		<div class="border bg-red-500 grid gap-4 p-4">
-			<Tile title={m.ebiosWs5()} status="to_do" />
-		</div>
-		<div class="border bg-purple-800 grid gap-4 p-4">
-			<Tile title={m.summary()} />
-		</div>
+	<div
+		class="card bg-white shadow-lg w-full h-full grid xl:grid-cols-3 lg:grid-cols-2 md:grid-cols-1 gap-8 p-8"
+	>
+		<Tile title={m.ebiosWs1()} accent_color="bg-pink-600" status="to_do" meta={data.ws1} />
+		<Tile title={m.ebiosWs2()} accent_color="bg-fuchsia-900" status="to_do" meta={data.ws2} />
+		<Tile title={m.ebiosWs3()} accent_color="bg-teal-500" status="to_do" meta={data.ws3} />
+		<Tile title={m.ebiosWs4()} accent_color="bg-yellow-600" status="to_do" meta={data.ws4} />
+		<Tile title={m.ebiosWs5()} accent_color="bg-red-500" status="to_do" meta={data.ws5} />
+		<Tile title={m.summary()} accent_color="bg-purple-800" status="to_do" />
 	</div>
 </div>
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte
index 58fd22023..00fe2faee 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/Tile.svelte
@@ -4,29 +4,60 @@
 
 	export let title = 'activity';
 	export let status = '';
-	export let meta = [];
+	export let meta = null;
 	export let href = '#';
+	export let accent_color = '';
 </script>
 
-<div class="rounded bg-white p-4 flex flex-col justify-between">
-	<div class="flex justify-between mb-2">
-		<div class="font-semibold">{title}</div>
-		<div class="text-xl" title={safeTranslate(status)}>
-			{#if status == 'to_do'}
-				<i class="fa-solid fa-exclamation"></i>
-			{:else if status == 'in_progress'}
-				<i class="fa-solid fa-spinner"></i>
-			{:else if status == 'done'}
-				<i class="fa-solid fa-check"></i>
-			{/if}
-		</div>
-	</div>
-	{#each meta as kv}
-		<div class="mt-2">{kv}</div>
-	{/each}
-	<div class="justify-end flex">
-		<div class="text-xl text-zinc-700">
-			<a class="hover:text-purple-500" {href}><i class="fa-solid fa-play"></i></a>
+<div class="p-5 {accent_color}">
+	<div class="rounded-lg bg-white p-4 flex flex-col justify-between h-full">
+		<div class="flex justify-between mb-2">
+			<div class="font-semibold">{title}</div>
+			<div class="text-xl" title={safeTranslate(status)}>
+				{#if status == 'to_do'}
+					<i class="fa-solid fa-exclamation"></i>
+				{:else if status == 'in_progress'}
+					<i class="fa-solid fa-spinner"></i>
+				{:else if status == 'done'}
+					<i class="fa-solid fa-check"></i>
+				{/if}
+			</div>
 		</div>
+		{#if meta}
+			<div class="flex mx-auto">
+				<div>
+					<ol class="relative text-gray-500 border-s border-gray-200">
+						{#each meta as step, i}
+							{#if step.status == 'done'}
+								<li class="mb-10 ms-6">
+									<a href={step.href} class="hover:text-purple-800">
+										<span
+											class="absolute flex items-center justify-center w-8 h-8 bg-green-200 rounded-full -start-4 ring-4 ring-white"
+										>
+											<i class="fa-solid fa-check"></i>
+										</span>
+										<h3 class="font-medium leading-tight">{m.activity()} {i + 1}</h3>
+										<p class="text-sm">{step.title}</p>
+									</a>
+								</li>
+							{:else}
+								<li class="mb-10 ms-6">
+									<a href={step.href} class="hover:text-purple-800">
+										<span
+											class="absolute flex items-center justify-center w-8 h-8 bg-gray-100 rounded-full -start-4 ring-4 ring-white"
+										>
+											<i class="fa-solid fa-clipboard-check"></i>
+										</span>
+										<h3 class="font-medium leading-tight">{m.activity()} {i + 1}</h3>
+										<p class="text-sm">{step.title}</p>
+									</a>
+								</li>
+							{/if}
+						{/each}
+					</ol>
+				</div>
+			</div>
+		{/if}
+		<div class="justify-end flex"></div>
 	</div>
 </div>

From 454aae000556a9691110b44d6f0648f592c52034 Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Sun, 1 Dec 2024 20:28:03 +0100
Subject: [PATCH 06/38] Formatter

---
 frontend/messages/en.json |  2 +-
 frontend/messages/fr.json | 37 ++++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index c3efe6ae6..8be7b78d0 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -919,5 +919,5 @@
 	"ebiosWs5_3": "Define security measures",
 	"ebiosWs5_4": "Assess and document residual risks",
 	"ebiosWs5_5": "Establish risk monitoring framework",
-  "activity": "Activity"
+	"activity": "Activity"
 }
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
index 7ba0259ea..29ce9296c 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -878,23 +878,22 @@
 	"ebiosWs3": "Atelier 3 : Scénarios stratégiques",
 	"ebiosWs4": "Atelier 4 : Scenarios opértionnels",
 	"ebiosWs5": "Atelier 5 : Traitement du risque",
-  "ebiosWs1_1": "Définir le cadre de l’étude",
-  "ebiosWs1_2": "Définir le périmètre métier et technique",
-  "ebiosWs1_3": "Identifier les événements redoutés",
-  "ebiosWs1_4": "Déterminer le socle de sécurité",
-  "ebiosWs2_1": "Identifier les sources de risque et objectifs visés",
-  "ebiosWs2_2": "Évaluer les couples SR/OV",
-  "ebiosWs2_3": "Sélectionner les couples SR/OV",
-  "ebiosWs3_1": "Cartographier l’écosystème",
-  "ebiosWs3_2": "Élaborer les scénarios stratégiques",
-  "ebiosWs3_3": "Définir les mesures de sécurité sur l’écosystème",
-  "ebiosWs4_1": "Elaborer les scénarios opérationnels",
-  "ebiosWs4_2": "Evaluer la vraisemblance des scénarios opérationnel",
-  "ebiosWs5_1": "Réaliser une évaluation des risques",
-  "ebiosWs5_2": "Décider de la stratégie de traitement du risque",
-  "ebiosWs5_3": "Définir les mesures de sécurité",
-  "ebiosWs5_4": "Évaluer et documenter les risques résiduels",
-  "ebiosWs5_5": "Mettre en place le cadre de suivi des risques",
-  "activity": "Activité"
-
+	"ebiosWs1_1": "Définir le cadre de l’étude",
+	"ebiosWs1_2": "Définir le périmètre métier et technique",
+	"ebiosWs1_3": "Identifier les événements redoutés",
+	"ebiosWs1_4": "Déterminer le socle de sécurité",
+	"ebiosWs2_1": "Identifier les sources de risque et objectifs visés",
+	"ebiosWs2_2": "Évaluer les couples SR/OV",
+	"ebiosWs2_3": "Sélectionner les couples SR/OV",
+	"ebiosWs3_1": "Cartographier l’écosystème",
+	"ebiosWs3_2": "Élaborer les scénarios stratégiques",
+	"ebiosWs3_3": "Définir les mesures de sécurité sur l’écosystème",
+	"ebiosWs4_1": "Elaborer les scénarios opérationnels",
+	"ebiosWs4_2": "Evaluer la vraisemblance des scénarios opérationnel",
+	"ebiosWs5_1": "Réaliser une évaluation des risques",
+	"ebiosWs5_2": "Décider de la stratégie de traitement du risque",
+	"ebiosWs5_3": "Définir les mesures de sécurité",
+	"ebiosWs5_4": "Évaluer et documenter les risques résiduels",
+	"ebiosWs5_5": "Mettre en place le cadre de suivi des risques",
+	"activity": "Activité"
 }

From 4f9c994033fb8132fb6b5d3f8dd0593d03399385 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Mon, 2 Dec 2024 16:42:02 +0100
Subject: [PATCH 07/38] workshop1: prepare step 1/2

---
 .../components/Breadcrumbs/Breadcrumbs.svelte |  2 +-
 .../src/lib/components/Forms/ModelForm.svelte |  3 +
 .../Forms/ModelForm/EbiosRmStudy.svelte       | 37 ++++++++++
 frontend/src/lib/utils/crud.ts                |  7 ++
 frontend/src/lib/utils/schemas.ts             | 13 +++-
 frontend/src/lib/utils/types.ts               |  3 +-
 .../ebios-rm/[id=uuid]/+page.svelte           |  4 +-
 .../ebios-rm-study/+page.server.ts            | 69 +++++++++++++++++++
 .../workshop-one/ebios-rm-study/+page.svelte  | 18 +++++
 .../workshop-one/feared-events/+page.svelte   |  0
 10 files changed, 152 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/EbiosRmStudy.svelte
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.svelte

diff --git a/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte b/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte
index 7ceac4475..ff92026a7 100644
--- a/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte
+++ b/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte
@@ -17,7 +17,7 @@
 		let tokenPath = '';
 		crumbs = tokens.map((t) => {
 			tokenPath += '/' + t;
-			if (t === $breadcrumbObject.id) {
+			if (t === $breadcrumbObject?.id) {
 				if ($breadcrumbObject.name) {
 					t = $breadcrumbObject.name;
 				} else if ($breadcrumbObject.first_name && $breadcrumbObject.last_name) {
diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index 2a331686a..909a99cc9 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -26,6 +26,7 @@
 	import SsoSettingsForm from './ModelForm/SsoSettingForm.svelte';
 	import FolderForm from './ModelForm/FolderForm.svelte';
 	import GeneralSettingsForm from './ModelForm/GeneralSettingForm.svelte';
+	import EbiosRmStudy from './ModelForm/EbiosRmStudy.svelte';
 
 	import AutocompleteSelect from './AutocompleteSelect.svelte';
 
@@ -254,6 +255,8 @@
 		<GeneralSettingsForm {form} {model} {cacheLocks} {formDataCache} {data} />
 	{:else if URLModel === 'filtering-labels'}
 		<FilteringLabelForm {form} {model} {cacheLocks} {formDataCache} />
+	{:else if URLModel === 'ebios-rm-study'}
+		<EbiosRmStudy {form} {model} {cacheLocks} {formDataCache} />
 	{/if}
 	<div class="flex flex-row justify-between space-x-4">
 		{#if closeModal}
diff --git a/frontend/src/lib/components/Forms/ModelForm/EbiosRmStudy.svelte b/frontend/src/lib/components/Forms/ModelForm/EbiosRmStudy.svelte
new file mode 100644
index 000000000..b345f56f9
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/EbiosRmStudy.svelte
@@ -0,0 +1,37 @@
+<script lang="ts">
+    import type { SuperValidated } from 'sveltekit-superforms';
+    import type { ModelInfo, CacheLock } from '$lib/utils/types';
+    import TextField from '$lib/components/Forms/TextField.svelte';
+    import Select from '$lib/components/Forms/Select.svelte';
+    import * as m from '$paraglide/messages.js';
+	import TextArea from '../TextArea.svelte';
+
+    export let form: SuperValidated<any>;
+    export let model: ModelInfo;
+    export let cacheLocks: Record<string, CacheLock> = {};
+    export let formDataCache: Record<string, any> = {};
+    export let initialData: Record<string, any> = {};
+</script>
+
+<TextField
+	{form}
+	field="version"
+	label={m.version()}
+	cacheLock={cacheLocks['version']}
+	bind:cachedValue={formDataCache['version']}
+/>
+<TextArea
+	{form}
+	field="observation"
+	label={m.observation()}
+	cacheLock={cacheLocks['observation']}
+	bind:cachedValue={formDataCache['observation']}
+/>
+<!-- <Select
+	{form}
+	options={model.selectOptions['status']}
+	field="status"
+	label={m.status()}
+	cacheLock={cacheLocks['status']}
+	bind:cachedValue={formDataCache['status']}
+/> -->
\ No newline at end of file
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 52a7e0830..e4f44e288 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -574,6 +574,13 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'entity', urlModel: 'entities' },
 			{ field: 'user', urlModel: 'users' }
 		]
+	},
+	'ebios-rm-study': {
+		name: 'ebiosrmstudy',
+		localName: 'ebiosRMStudy',
+		localNamePlural: 'ebiosRMStudies',
+		verboseName: 'Ebios RM Study',
+		verboseNamePlural: 'Ebios RM Studies',
 	}
 };
 
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 42a10b1a6..f0a28bfdc 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -1,4 +1,6 @@
 // schema for the validation of forms
+import { authors, observation } from '$paraglide/messages';
+import { version } from 'os';
 import { z, type AnyZodObject } from 'zod';
 
 const toArrayPreprocessor = (value: unknown) => {
@@ -370,6 +372,14 @@ export const vulnerabilitySchema = baseNamedObject({
 	filtering_labels: z.string().optional().array().optional()
 });
 
+export const ebiosRMStudySchema = baseNamedObject({
+	version: z.string().optional().default('0.1'),
+	status: z.string().optional().nullable(),
+	authors: z.array(z.string().optional()).optional(),
+	reviewers: z.array(z.string().optional()).optional(),
+	observation: z.string().optional().nullable()
+});
+
 const SCHEMA_MAP: Record<string, AnyZodObject> = {
 	folders: FolderSchema,
 	projects: ProjectSchema,
@@ -394,7 +404,8 @@ const SCHEMA_MAP: Record<string, AnyZodObject> = {
 	representatives: representativeSchema,
 	solutions: solutionSchema,
 	vulnerabilities: vulnerabilitySchema,
-	'filtering-labels': FilteringLabelSchema
+	'filtering-labels': FilteringLabelSchema,
+	'ebios-rm-study': ebiosRMStudySchema
 };
 
 export const modelSchema = (model: string) => {
diff --git a/frontend/src/lib/utils/types.ts b/frontend/src/lib/utils/types.ts
index 8d11ac1d0..f0be1a243 100644
--- a/frontend/src/lib/utils/types.ts
+++ b/frontend/src/lib/utils/types.ts
@@ -52,7 +52,8 @@ export const URL_MODEL = [
 	'solutions',
 	'representatives',
 	'vulnerabilities',
-	'filtering-labels'
+	'filtering-labels',
+	'ebios-rm-study',
 ] as const;
 
 export const THIRD_PARTY_URL_MODEL = ['compliance-assessments', 'evidences'] as const;
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index 33000896f..d1bc6de16 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -2,9 +2,11 @@
 	import * as m from '$paraglide/messages';
 	import { safeTranslate } from '$lib/utils/i18n';
 	import Tile from './Tile.svelte';
+	import { page } from '$app/stores';
+
 	const data = {
 		ws1: [
-			{ title: safeTranslate(m.ebiosWs1_1()), status: 'done', href: '#' },
+			{ title: safeTranslate(m.ebiosWs1_1()), status: 'done', href: `${$page.url.pathname}/workshop-one/ebios-rm-study?next=${$page.url.pathname}` },
 			{ title: safeTranslate(m.ebiosWs1_2()), status: 'done', href: '#' },
 			{ title: safeTranslate(m.ebiosWs1_3()), status: 'to_do', href: '#' },
 			{ title: safeTranslate(m.ebiosWs1_4()), status: 'to_do', href: '#' }
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
new file mode 100644
index 000000000..dd948f1b2
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
@@ -0,0 +1,69 @@
+import { BASE_API_URL } from '$lib/utils/constants';
+import {
+	getModelInfo,
+	urlParamModelForeignKeyFields,
+	urlParamModelSelectFields
+} from '$lib/utils/crud';
+import { modelSchema } from '$lib/utils/schemas';
+import type { ModelInfo } from '$lib/utils/types';
+import { superValidate } from 'sveltekit-superforms';
+import { zod } from 'sveltekit-superforms/adapters';
+import { z } from 'zod';
+import type { PageServerLoad } from './$types';
+
+export const load: LayoutServerLoad = async (event) => {
+	const URLModel = 'ebios-rm-study';
+	const schema = modelSchema(URLModel);
+	// const objectEndpoint = `${BASE_API_URL}/${URLModel}/${event.params.id}/object/`;
+	const object = {
+        version: '1.0',
+        status: '',
+        authors: '',
+        reviewers: '',
+        observation: ''
+    };
+
+	const form = await superValidate(object, zod(schema), { errors: false });
+	const model = getModelInfo(URLModel!);
+	const foreignKeyFields = model.foreignKeyFields;
+	const selectFields = model.selectFields;
+
+	const foreignKeys: Record<string, any> = {};
+
+	if (foreignKeyFields) {
+		for (const keyField of foreignKeyFields) {
+			const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
+			const url = `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
+			const response = await event.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 selectOptions: Record<string, any> = {};
+
+	if (selectFields) {
+		for (const selectField of selectFields) {
+			const url = `${BASE_API_URL}/${URLModel}/${
+				selectField.detail ? event.params.id + '/' : ''
+			}${selectField.field}/`;
+			const response = await event.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}`);
+			}
+		}
+	}
+	model.foreignKeys = foreignKeys;
+	model.selectOptions = selectOptions;
+	return { form, model, object, foreignKeys, selectOptions, URLModel };
+};
\ No newline at end of file
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte
new file mode 100644
index 000000000..ffe13f1db
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte
@@ -0,0 +1,18 @@
+<script lang="ts">
+	import type { PageData } from './$types';
+	import ModelForm from '$lib/components/Forms/ModelForm.svelte';
+
+	export let data: PageData;
+
+</script>
+
+<div class="card p-4 bg-white shadow-lg">
+    <ModelForm
+        form={data.form}
+        object={data.object}
+        selectOptions={data.selectOptions}
+        foreignKeys={data.foreignKeys}
+        model={data.model}
+        context="edit"
+    />
+</div>
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.svelte
new file mode 100644
index 000000000..e69de29bb

From c3e6497b3d38c76de93a5ca93053d85297b5120e Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 3 Dec 2024 11:43:46 +0100
Subject: [PATCH 08/38] chore: remove bad imports

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

diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index f0a28bfdc..5fbc9b4b5 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -1,6 +1,4 @@
 // schema for the validation of forms
-import { authors, observation } from '$paraglide/messages';
-import { version } from 'os';
 import { z, type AnyZodObject } from 'zod';
 
 const toArrayPreprocessor = (value: unknown) => {

From 2b6b927099d1ce8fbcfcf43ac2ea90a734a965c1 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 3 Dec 2024 12:55:04 +0100
Subject: [PATCH 09/38] feat: add ebios rm base endpoint

---
 backend/core/startup.py                     |  4 ++++
 backend/core/urls.py                        |  2 ++
 backend/ebios_rm/migrations/0001_initial.py |  5 +++++
 backend/ebios_rm/models.py                  |  5 +++++
 backend/ebios_rm/serializers.py             | 23 ++++++++++++++++++++
 backend/ebios_rm/views.py                   | 24 +++++++++++++++++++--
 6 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 backend/ebios_rm/serializers.py

diff --git a/backend/core/startup.py b/backend/core/startup.py
index d74419221..da29f4f91 100644
--- a/backend/core/startup.py
+++ b/backend/core/startup.py
@@ -339,6 +339,10 @@
     "view_filteringlabel",
     "change_filteringlabel",
     "delete_filteringlabel",
+    "add_ebiosrmstudy",
+    "view_ebiosrmstudy",
+    "change_ebiosrmstudy",
+    "delete_ebiosrmstudy",
 ]
 
 THIRD_PARTY_RESPONDENT_PERMISSIONS_LIST = [
diff --git a/backend/core/urls.py b/backend/core/urls.py
index 5c5c5ddec..189ae345f 100644
--- a/backend/core/urls.py
+++ b/backend/core/urls.py
@@ -5,6 +5,7 @@
     SolutionViewSet,
     EntityAssessmentViewSet,
 )
+from ebios_rm.views import EbiosRMStudyViewSet
 from library.views import StoredLibraryViewSet, LoadedLibraryViewSet
 import importlib
 
@@ -27,6 +28,7 @@
 router.register(r"risk-matrices", RiskMatrixViewSet, basename="risk-matrices")
 router.register(r"vulnerabilities", VulnerabilityViewSet, basename="vulnerabilities")
 router.register(r"risk-assessments", RiskAssessmentViewSet, basename="risk-assessments")
+router.register(r"ebios-rm", EbiosRMStudyViewSet, basename="ebios-rm")
 router.register(r"threats", ThreatViewSet, basename="threats")
 router.register(r"risk-scenarios", RiskScenarioViewSet, basename="risk-scenarios")
 router.register(r"applied-controls", AppliedControlViewSet, basename="applied-controls")
diff --git a/backend/ebios_rm/migrations/0001_initial.py b/backend/ebios_rm/migrations/0001_initial.py
index 21643211d..ab4a84383 100644
--- a/backend/ebios_rm/migrations/0001_initial.py
+++ b/backend/ebios_rm/migrations/0001_initial.py
@@ -93,6 +93,7 @@ class Migration(migrations.Migration):
                         related_name="ebios_rm_studies",
                         to="core.asset",
                         verbose_name="Assets",
+                        blank=True,
                     ),
                 ),
                 (
@@ -111,6 +112,7 @@ class Migration(migrations.Migration):
                         related_name="ebios_rm_studies",
                         to="core.complianceassessment",
                         verbose_name="Compliance assessments",
+                        blank=True,
                     ),
                 ),
                 (
@@ -138,6 +140,7 @@ class Migration(migrations.Migration):
                         related_name="ebios_rm_studies",
                         to="core.riskassessment",
                         verbose_name="Risk assessments",
+                        blank=True,
                     ),
                 ),
                 (
@@ -148,6 +151,8 @@ class Migration(migrations.Migration):
                         related_name="ebios_rm_studies",
                         to="core.riskmatrix",
                         verbose_name="Risk matrix",
+                        blank=True,
+                        null=True,
                     ),
                 ),
             ],
diff --git a/backend/ebios_rm/models.py b/backend/ebios_rm/models.py
index e30a9a2c7..5db5c0bc8 100644
--- a/backend/ebios_rm/models.py
+++ b/backend/ebios_rm/models.py
@@ -31,12 +31,15 @@ class Status(models.TextChoices):
         help_text=_(
             "Risk matrix used as a reference for the study. Defaults to `urn:intuitem:risk:library:risk-matrix-4x4-ebios-rm`"
         ),
+        blank=True,
+        null=True,
     )
     assets = models.ManyToManyField(
         Asset,
         verbose_name=_("Assets"),
         related_name="ebios_rm_studies",
         help_text=_("Assets that are pertinent to the study"),
+        blank=True,
     )
     compliance_assessments = models.ManyToManyField(
         ComplianceAssessment,
@@ -45,12 +48,14 @@ class Status(models.TextChoices):
         help_text=_(
             "Compliance assessments established as security baseline during workshop 1.4"
         ),
+        blank=True,
     )
     risk_assessments = models.ManyToManyField(
         RiskAssessment,
         verbose_name=_("Risk assessments"),
         related_name="ebios_rm_studies",
         help_text=_("Risk assessments generated at the end of workshop 4"),
+        blank=True,
     )
 
     ref_id = models.CharField(max_length=100)
diff --git a/backend/ebios_rm/serializers.py b/backend/ebios_rm/serializers.py
new file mode 100644
index 000000000..74c83f561
--- /dev/null
+++ b/backend/ebios_rm/serializers.py
@@ -0,0 +1,23 @@
+from core.serializers import BaseModelSerializer, FieldsRelatedField, AssessmentReadSerializer
+from .models import EbiosRMStudy
+from rest_framework import serializers
+
+
+class EbiosRMStudyWriteSerializer(BaseModelSerializer):
+    class Meta:
+        model = EbiosRMStudy
+        exclude = ["created_at", "updated_at"]
+
+
+class EbiosRMStudyReadSerializer(AssessmentReadSerializer):
+    str = serializers.CharField(source="__str__")
+    project = FieldsRelatedField(["id", "folder"])
+    folder = FieldsRelatedField()
+    risk_matrix = FieldsRelatedField()
+    assets = FieldsRelatedField(many=True)
+    compliance_assessments = FieldsRelatedField(many=True)
+    risk_assessments = FieldsRelatedField(many=True)
+
+    class Meta:
+        model = EbiosRMStudy
+        fields = "__all__"
\ No newline at end of file
diff --git a/backend/ebios_rm/views.py b/backend/ebios_rm/views.py
index 91ea44a21..97cf5df3f 100644
--- a/backend/ebios_rm/views.py
+++ b/backend/ebios_rm/views.py
@@ -1,3 +1,23 @@
-from django.shortcuts import render
+from core.views import BaseModelViewSet as AbstractBaseModelViewSet
+from .models import EbiosRMStudy
+from django.utils.decorators import method_decorator
+from django.views.decorators.cache import cache_page
+from rest_framework.decorators import action
+from rest_framework.response import Response
 
-# Create your views here.
+LONG_CACHE_TTL = 60  # mn
+
+class BaseModelViewSet(AbstractBaseModelViewSet):
+    serializers_module = "ebios_rm.serializers"
+
+class EbiosRMStudyViewSet(BaseModelViewSet):
+    """
+    API endpoint that allows ebios rm studies to be viewed or edited.
+    """
+    
+    model = EbiosRMStudy
+    
+    @method_decorator(cache_page(60 * LONG_CACHE_TTL))
+    @action(detail=False, name="Get status choices")
+    def status(self, request):
+        return Response(dict(EbiosRMStudy.Status.choices))
\ No newline at end of file

From 25e369fd9118766afaf6828d5b2d4789e4f5951d Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 3 Dec 2024 12:56:10 +0100
Subject: [PATCH 10/38] feat: manage ebios rm from front

---
 .../src/lib/components/Forms/ModelForm.svelte |  6 +-
 .../{EbiosRmStudy.svelte => EbiosRm.svelte}   | 12 ++-
 frontend/src/lib/utils/crud.ts                |  2 +-
 frontend/src/lib/utils/schemas.ts             |  7 +-
 frontend/src/lib/utils/table.ts               |  4 +
 frontend/src/lib/utils/types.ts               |  2 +-
 .../(app)/(internal)/ebios-rm/+page.server.ts | 99 +++++++++++++++++++
 .../(app)/(internal)/ebios-rm/+page.svelte    | 59 +++++++++++
 .../ebios-rm-study/+page.server.ts            |  2 +-
 .../(internal)/experimental/+page.svelte      |  6 --
 10 files changed, 180 insertions(+), 19 deletions(-)
 rename frontend/src/lib/components/Forms/ModelForm/{EbiosRmStudy.svelte => EbiosRm.svelte} (86%)
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte

diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index 909a99cc9..317f20204 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -26,7 +26,7 @@
 	import SsoSettingsForm from './ModelForm/SsoSettingForm.svelte';
 	import FolderForm from './ModelForm/FolderForm.svelte';
 	import GeneralSettingsForm from './ModelForm/GeneralSettingForm.svelte';
-	import EbiosRmStudy from './ModelForm/EbiosRmStudy.svelte';
+	import EbiosRm from './ModelForm/EbiosRm.svelte';
 
 	import AutocompleteSelect from './AutocompleteSelect.svelte';
 
@@ -255,8 +255,8 @@
 		<GeneralSettingsForm {form} {model} {cacheLocks} {formDataCache} {data} />
 	{:else if URLModel === 'filtering-labels'}
 		<FilteringLabelForm {form} {model} {cacheLocks} {formDataCache} />
-	{:else if URLModel === 'ebios-rm-study'}
-		<EbiosRmStudy {form} {model} {cacheLocks} {formDataCache} />
+	{:else if URLModel === 'ebios-rm'}
+		<EbiosRm {form} {model} {cacheLocks} {formDataCache} />
 	{/if}
 	<div class="flex flex-row justify-between space-x-4">
 		{#if closeModal}
diff --git a/frontend/src/lib/components/Forms/ModelForm/EbiosRmStudy.svelte b/frontend/src/lib/components/Forms/ModelForm/EbiosRm.svelte
similarity index 86%
rename from frontend/src/lib/components/Forms/ModelForm/EbiosRmStudy.svelte
rename to frontend/src/lib/components/Forms/ModelForm/EbiosRm.svelte
index b345f56f9..3f578b651 100644
--- a/frontend/src/lib/components/Forms/ModelForm/EbiosRmStudy.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/EbiosRm.svelte
@@ -20,13 +20,21 @@
 	cacheLock={cacheLocks['version']}
 	bind:cachedValue={formDataCache['version']}
 />
-<TextArea
+<TextField
+	{form}
+	required
+	field="ref_id"
+	label={m.refId()}
+	cacheLock={cacheLocks['ref_id']}
+	bind:cachedValue={formDataCache['ref_id']}
+/>
+<!-- <TextArea
 	{form}
 	field="observation"
 	label={m.observation()}
 	cacheLock={cacheLocks['observation']}
 	bind:cachedValue={formDataCache['observation']}
-/>
+/> -->
 <!-- <Select
 	{form}
 	options={model.selectOptions['status']}
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index e4f44e288..833a904bb 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -575,7 +575,7 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'user', urlModel: 'users' }
 		]
 	},
-	'ebios-rm-study': {
+	'ebios-rm': {
 		name: 'ebiosrmstudy',
 		localName: 'ebiosRMStudy',
 		localNamePlural: 'ebiosRMStudies',
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 5fbc9b4b5..d21841aed 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -372,10 +372,7 @@ export const vulnerabilitySchema = baseNamedObject({
 
 export const ebiosRMStudySchema = baseNamedObject({
 	version: z.string().optional().default('0.1'),
-	status: z.string().optional().nullable(),
-	authors: z.array(z.string().optional()).optional(),
-	reviewers: z.array(z.string().optional()).optional(),
-	observation: z.string().optional().nullable()
+	ref_id: z.string().default(''),
 });
 
 const SCHEMA_MAP: Record<string, AnyZodObject> = {
@@ -403,7 +400,7 @@ const SCHEMA_MAP: Record<string, AnyZodObject> = {
 	solutions: solutionSchema,
 	vulnerabilities: vulnerabilitySchema,
 	'filtering-labels': FilteringLabelSchema,
-	'ebios-rm-study': ebiosRMStudySchema
+	'ebios-rm': ebiosRMStudySchema
 };
 
 export const modelSchema = (model: string) => {
diff --git a/frontend/src/lib/utils/table.ts b/frontend/src/lib/utils/table.ts
index 012b8268c..f9c6215f5 100644
--- a/frontend/src/lib/utils/table.ts
+++ b/frontend/src/lib/utils/table.ts
@@ -527,5 +527,9 @@ export const listViewFields: ListViewFieldsConfig = {
 	representatives: {
 		head: ['email', 'entity', 'role'],
 		body: ['email', 'entity', 'role']
+	},
+	'ebios-rm': {
+		head: ['name', 'description'],
+		body: ['name', 'description']
 	}
 };
diff --git a/frontend/src/lib/utils/types.ts b/frontend/src/lib/utils/types.ts
index f0be1a243..c6ba7a190 100644
--- a/frontend/src/lib/utils/types.ts
+++ b/frontend/src/lib/utils/types.ts
@@ -53,7 +53,7 @@ export const URL_MODEL = [
 	'representatives',
 	'vulnerabilities',
 	'filtering-labels',
-	'ebios-rm-study',
+	// 'ebios-rm',
 ] as const;
 
 export const THIRD_PARTY_URL_MODEL = ['compliance-assessments', 'evidences'] as const;
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
new file mode 100644
index 000000000..d842f1070
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
@@ -0,0 +1,99 @@
+import { defaultDeleteFormAction, defaultWriteFormAction } from '$lib/utils/actions';
+import { BASE_API_URL } from '$lib/utils/constants';
+import {
+	getModelInfo,
+	urlParamModelForeignKeyFields,
+	urlParamModelSelectFields
+} from '$lib/utils/crud';
+import { modelSchema } from '$lib/utils/schemas';
+import type { ModelInfo, urlModel } from '$lib/utils/types';
+import { type Actions } from '@sveltejs/kit';
+import { superValidate } from 'sveltekit-superforms';
+import { zod } from 'sveltekit-superforms/adapters';
+import { z } from 'zod';
+import type { PageServerLoad } from './$types';
+import { listViewFields } from '$lib/utils/table';
+import { tableSourceMapper, type TableSource } from '@skeletonlabs/skeleton';
+
+export const load: PageServerLoad = async ({ params, fetch }) => {
+	const schema = z.object({ id: z.string().uuid() });
+	const deleteForm = await superValidate(zod(schema));
+	const URLModel = "ebios-rm";
+	const createSchema = modelSchema(URLModel);
+	const createForm = await superValidate(zod(createSchema));
+	const model: ModelInfo = getModelInfo(URLModel);
+	const foreignKeyFields = urlParamModelForeignKeyFields(URLModel);
+	const selectFields = urlParamModelSelectFields(URLModel);
+
+	const foreignKeys: Record<string, any> = {};
+
+	for (const keyField of 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}`);
+		}
+	}
+
+	model['foreignKeys'] = foreignKeys;
+
+	const selectOptions: Record<string, any> = {};
+
+	for (const selectField of selectFields) {
+		if (selectField.detail) continue;
+		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}`);
+		}
+	}
+
+	model['selectOptions'] = selectOptions;
+
+    const endpoint = `${BASE_API_URL}/${URLModel}`;
+    const res = await fetch(endpoint);
+    const data = await res.json().then((res) => res.results);
+
+    const bodyData = tableSourceMapper(data, listViewFields[URLModel as urlModel].body);
+
+	const headData: Record<string, string> = listViewFields[URLModel as urlModel].body.reduce(
+		(obj, key, index) => {
+			obj[key] = listViewFields[URLModel as urlModel].head[index];
+			return obj;
+		},
+		{}
+	);
+
+	const table: TableSource = {
+		head: headData,
+		body: bodyData,
+		meta: data // metaData
+	};
+
+	return { createForm, deleteForm, model, URLModel, table };
+};
+
+export const actions: Actions = {
+	create: async (event) => {
+		// const redirectToWrittenObject = Boolean(event.params.model === 'entity-assessments');
+		return defaultWriteFormAction({
+			event,
+			urlModel: 'ebios-rm',
+			action: 'create',
+			// redirectToWrittenObject: redirectToWrittenObject
+		});
+	},
+	delete: async (event) => {
+		return defaultDeleteFormAction({ event, urlModel: 'ebios-rm' });
+	}
+};
\ No newline at end of file
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte
new file mode 100644
index 000000000..9db9b00ff
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte
@@ -0,0 +1,59 @@
+<script lang="ts">
+    import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
+    import type { PageData } from './$types';
+    import { safeTranslate } from '$lib/utils/i18n';
+    import type { ModalComponent, ModalSettings, ModalStore } from '@skeletonlabs/skeleton';
+    import { getModalStore } from '@skeletonlabs/skeleton';
+    import CreateModal from '$lib/components/Modals/CreateModal.svelte';
+    import MissingConstraintsModal from '$lib/components/Modals/MissingConstraintsModal.svelte';
+    import { checkConstraints } from '$lib/utils/crud';
+
+    const modalStore: ModalStore = getModalStore();
+
+    export let data: PageData;
+    const URLModel = data.URLModel;
+
+    function modalCreateForm(): void {
+		let modalComponent: ModalComponent = {
+			ref: CreateModal,
+			props: {
+				form: data.createForm,
+				model: data.model
+			}
+		};
+		let modal: ModalSettings = {
+			type: 'component',
+			component: modalComponent,
+			// Data
+			title: safeTranslate('add-' + data.model.localName)
+		};
+		if (checkConstraints(data.createForm.constraints, data.model.foreignKeys).length > 0) {
+			modalComponent = {
+				ref: MissingConstraintsModal
+			};
+			modal = {
+				type: 'component',
+				component: modalComponent,
+				title: m.warning(),
+				body: safeTranslate('add-' + data.model.localName).toLowerCase(),
+				value: checkConstraints(data.createForm.constraints, data.model.foreignKeys)
+			};
+		}
+		modalStore.trigger(modal);
+	}
+
+</script>
+
+<ModelTable source={data.table} deleteForm={data.deleteForm} {URLModel}>
+    <div slot="addButton">
+        <span class="inline-flex overflow-hidden rounded-md border bg-white shadow-sm">
+                <button
+                    class="inline-block border-e p-3 btn-mini-primary w-12 focus:relative"
+                    data-testid="add-button"
+                    title={safeTranslate('add-' + data.model.localName)}
+                    on:click={modalCreateForm}
+                    ><i class="fa-solid fa-file-circle-plus"></i>
+                </button>
+        </span>
+    </div>
+</ModelTable>
\ No newline at end of file
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
index dd948f1b2..2e6137307 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
@@ -12,7 +12,7 @@ import { z } from 'zod';
 import type { PageServerLoad } from './$types';
 
 export const load: LayoutServerLoad = async (event) => {
-	const URLModel = 'ebios-rm-study';
+	const URLModel = 'ebios-rm';
 	const schema = modelSchema(URLModel);
 	// const objectEndpoint = `${BASE_API_URL}/${URLModel}/${event.params.id}/object/`;
 	const object = {
diff --git a/frontend/src/routes/(app)/(internal)/experimental/+page.svelte b/frontend/src/routes/(app)/(internal)/experimental/+page.svelte
index d9a1f5d98..7964bcdf6 100644
--- a/frontend/src/routes/(app)/(internal)/experimental/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/experimental/+page.svelte
@@ -27,10 +27,4 @@
 		link="assets/graph"
 		tags={['analysis', 'assets']}
 	/>
-	<Article
-		title="Ebios RM (dev)"
-		desc="Tiles to manage the workshop"
-		link="/ebios-rm/5de0c0c3-678c-43f0-bdb6-b2ed434e1843"
-		tags={['analysis', 'risk']}
-	/>
 </div>

From fa9c7c6dc68b19fb9cc4c8ecfac9abbb859ace48 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 3 Dec 2024 13:04:20 +0100
Subject: [PATCH 11/38] feat: set ebios object breadcrumbs

---
 .../ebios-rm/[id=uuid]/+page.server.ts         |  7 +++++++
 .../(internal)/ebios-rm/[id=uuid]/+page.svelte | 18 ++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.server.ts

diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.server.ts
new file mode 100644
index 000000000..7b348480e
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.server.ts
@@ -0,0 +1,7 @@
+import { loadDetail } from '$lib/utils/load';
+import type { PageServerLoad } from './$types';
+import { getModelInfo } from '$lib/utils/crud';
+
+export const load: PageServerLoad = async (event) => {
+	return await loadDetail({ event, model: getModelInfo('ebios-rm'), id: event.params.id });
+};
\ No newline at end of file
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index d1bc6de16..4f078ec71 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -3,8 +3,14 @@
 	import { safeTranslate } from '$lib/utils/i18n';
 	import Tile from './Tile.svelte';
 	import { page } from '$app/stores';
+	import type { PageData } from './$types';
+	import { breadcrumbObject } from '$lib/utils/stores';
 
-	const data = {
+	export let data: PageData;
+
+	$: breadcrumbObject.set(data.data);
+
+	const dummydata = {
 		ws1: [
 			{ title: safeTranslate(m.ebiosWs1_1()), status: 'done', href: `${$page.url.pathname}/workshop-one/ebios-rm-study?next=${$page.url.pathname}` },
 			{ title: safeTranslate(m.ebiosWs1_2()), status: 'done', href: '#' },
@@ -39,11 +45,11 @@
 	<div
 		class="card bg-white shadow-lg w-full h-full grid xl:grid-cols-3 lg:grid-cols-2 md:grid-cols-1 gap-8 p-8"
 	>
-		<Tile title={m.ebiosWs1()} accent_color="bg-pink-600" status="to_do" meta={data.ws1} />
-		<Tile title={m.ebiosWs2()} accent_color="bg-fuchsia-900" status="to_do" meta={data.ws2} />
-		<Tile title={m.ebiosWs3()} accent_color="bg-teal-500" status="to_do" meta={data.ws3} />
-		<Tile title={m.ebiosWs4()} accent_color="bg-yellow-600" status="to_do" meta={data.ws4} />
-		<Tile title={m.ebiosWs5()} accent_color="bg-red-500" status="to_do" meta={data.ws5} />
+		<Tile title={m.ebiosWs1()} accent_color="bg-pink-600" status="to_do" meta={dummydata.ws1} />
+		<Tile title={m.ebiosWs2()} accent_color="bg-fuchsia-900" status="to_do" meta={dummydata.ws2} />
+		<Tile title={m.ebiosWs3()} accent_color="bg-teal-500" status="to_do" meta={dummydata.ws3} />
+		<Tile title={m.ebiosWs4()} accent_color="bg-yellow-600" status="to_do" meta={dummydata.ws4} />
+		<Tile title={m.ebiosWs5()} accent_color="bg-red-500" status="to_do" meta={dummydata.ws5} />
 		<Tile title={m.summary()} accent_color="bg-purple-800" status="to_do" />
 	</div>
 </div>

From 07899775c94053faeb1d5d5514ff268c20276248 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 3 Dec 2024 14:44:00 +0100
Subject: [PATCH 12/38] feat: add risk matrix field in ebios rm

---
 backend/ebios_rm/migrations/0001_initial.py     |  1 -
 backend/ebios_rm/models.py                      |  1 -
 backend/ebios_rm/serializers.py                 | 17 +++++++++++++++++
 frontend/messages/en.json                       |  3 ++-
 .../src/lib/components/Forms/ModelForm.svelte   |  4 ++--
 .../{EbiosRm.svelte => EbiosRmForm.svelte}      | 11 +++++++++++
 frontend/src/lib/utils/crud.ts                  |  3 +++
 frontend/src/lib/utils/schemas.ts               |  2 ++
 .../(app)/(internal)/ebios-rm/+page.svelte      |  8 +++++++-
 .../(internal)/ebios-rm/[id=uuid]/+page.svelte  |  2 +-
 10 files changed, 45 insertions(+), 7 deletions(-)
 rename frontend/src/lib/components/Forms/ModelForm/{EbiosRm.svelte => EbiosRmForm.svelte} (75%)

diff --git a/backend/ebios_rm/migrations/0001_initial.py b/backend/ebios_rm/migrations/0001_initial.py
index ab4a84383..69dd0ef94 100644
--- a/backend/ebios_rm/migrations/0001_initial.py
+++ b/backend/ebios_rm/migrations/0001_initial.py
@@ -152,7 +152,6 @@ class Migration(migrations.Migration):
                         to="core.riskmatrix",
                         verbose_name="Risk matrix",
                         blank=True,
-                        null=True,
                     ),
                 ),
             ],
diff --git a/backend/ebios_rm/models.py b/backend/ebios_rm/models.py
index 5db5c0bc8..14ca08513 100644
--- a/backend/ebios_rm/models.py
+++ b/backend/ebios_rm/models.py
@@ -32,7 +32,6 @@ class Status(models.TextChoices):
             "Risk matrix used as a reference for the study. Defaults to `urn:intuitem:risk:library:risk-matrix-4x4-ebios-rm`"
         ),
         blank=True,
-        null=True,
     )
     assets = models.ManyToManyField(
         Asset,
diff --git a/backend/ebios_rm/serializers.py b/backend/ebios_rm/serializers.py
index 74c83f561..ff5e2f5f8 100644
--- a/backend/ebios_rm/serializers.py
+++ b/backend/ebios_rm/serializers.py
@@ -1,9 +1,26 @@
 from core.serializers import BaseModelSerializer, FieldsRelatedField, AssessmentReadSerializer
+from core.models import StoredLibrary, RiskMatrix
 from .models import EbiosRMStudy
 from rest_framework import serializers
 
 
 class EbiosRMStudyWriteSerializer(BaseModelSerializer):
+    
+    def create(self, validated_data):
+        if not validated_data.get('risk_matrix'):
+            try:
+                ebios_matrix_library = StoredLibrary.objects.get(
+                    urn="urn:intuitem:risk:library:risk-matrix-4x4-ebios-rm"
+                )
+                ebios_matrix_library.load()
+
+                validated_data['risk_matrix'] = RiskMatrix.objects.get(
+                    urn="urn:intuitem:risk:matrix:risk-matrix-4x4-ebios-rm"
+                )
+            except (StoredLibrary.DoesNotExist, RiskMatrix.DoesNotExist) as e:
+                raise serializers.ValidationError(f"Erreur : {str(e)}")
+        return super().create(validated_data)
+        
     class Meta:
         model = EbiosRMStudy
         exclude = ["created_at", "updated_at"]
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 8be7b78d0..27c0b9b69 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -919,5 +919,6 @@
 	"ebiosWs5_3": "Define security measures",
 	"ebiosWs5_4": "Assess and document residual risks",
 	"ebiosWs5_5": "Establish risk monitoring framework",
-	"activity": "Activity"
+	"activity": "Activity",
+	"ebiosRmMatrixHelpText": "Risk matrix used as a reference for the study. Defaults to `urn:intuitem:risk:library:risk-matrix-4x4-ebios-rm`"
 }
diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index 317f20204..4634dedaf 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -26,7 +26,7 @@
 	import SsoSettingsForm from './ModelForm/SsoSettingForm.svelte';
 	import FolderForm from './ModelForm/FolderForm.svelte';
 	import GeneralSettingsForm from './ModelForm/GeneralSettingForm.svelte';
-	import EbiosRm from './ModelForm/EbiosRm.svelte';
+	import EbiosRmForm from './ModelForm/EbiosRmForm.svelte';
 
 	import AutocompleteSelect from './AutocompleteSelect.svelte';
 
@@ -256,7 +256,7 @@
 	{:else if URLModel === 'filtering-labels'}
 		<FilteringLabelForm {form} {model} {cacheLocks} {formDataCache} />
 	{:else if URLModel === 'ebios-rm'}
-		<EbiosRm {form} {model} {cacheLocks} {formDataCache} />
+		<EbiosRmForm {form} {model} {cacheLocks} {formDataCache} />
 	{/if}
 	<div class="flex flex-row justify-between space-x-4">
 		{#if closeModal}
diff --git a/frontend/src/lib/components/Forms/ModelForm/EbiosRm.svelte b/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
similarity index 75%
rename from frontend/src/lib/components/Forms/ModelForm/EbiosRm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
index 3f578b651..dfc7279c3 100644
--- a/frontend/src/lib/components/Forms/ModelForm/EbiosRm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
@@ -2,8 +2,10 @@
     import type { SuperValidated } from 'sveltekit-superforms';
     import type { ModelInfo, CacheLock } from '$lib/utils/types';
     import TextField from '$lib/components/Forms/TextField.svelte';
+	import AutocompleteSelect from '$lib/components/Forms/AutocompleteSelect.svelte';
     import Select from '$lib/components/Forms/Select.svelte';
     import * as m from '$paraglide/messages.js';
+	import { getOptions } from '$lib/utils/crud';
 	import TextArea from '../TextArea.svelte';
 
     export let form: SuperValidated<any>;
@@ -28,6 +30,15 @@
 	cacheLock={cacheLocks['ref_id']}
 	bind:cachedValue={formDataCache['ref_id']}
 />
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
+	field="risk_matrix"
+	cacheLock={cacheLocks['risk_matrix']}
+	bind:cachedValue={formDataCache['risk_matrix']}
+	label={m.riskMatrix()}
+	helpText={m.ebiosRmMatrixHelpText()}
+/>
 <!-- <TextArea
 	{form}
 	field="observation"
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 833a904bb..0614ef137 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -581,6 +581,9 @@ export const URL_MODEL_MAP: ModelMap = {
 		localNamePlural: 'ebiosRMStudies',
 		verboseName: 'Ebios RM Study',
 		verboseNamePlural: 'Ebios RM Studies',
+		foreignKeyFields: [
+			{ field: 'risk_matrix', urlModel: 'risk-matrices' }
+		]
 	}
 };
 
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index d21841aed..a316b8acf 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -1,4 +1,5 @@
 // schema for the validation of forms
+import { risk } from '$paraglide/messages';
 import { z, type AnyZodObject } from 'zod';
 
 const toArrayPreprocessor = (value: unknown) => {
@@ -373,6 +374,7 @@ export const vulnerabilitySchema = baseNamedObject({
 export const ebiosRMStudySchema = baseNamedObject({
 	version: z.string().optional().default('0.1'),
 	ref_id: z.string().default(''),
+	risk_matrix: z.string().optional(),
 });
 
 const SCHEMA_MAP: Record<string, AnyZodObject> = {
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte
index 9db9b00ff..a856abf9f 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte
@@ -7,6 +7,7 @@
     import CreateModal from '$lib/components/Modals/CreateModal.svelte';
     import MissingConstraintsModal from '$lib/components/Modals/MissingConstraintsModal.svelte';
     import { checkConstraints } from '$lib/utils/crud';
+	import * as m from '$paraglide/messages.js';
 
     const modalStore: ModalStore = getModalStore();
 
@@ -27,7 +28,12 @@
 			// Data
 			title: safeTranslate('add-' + data.model.localName)
 		};
-		if (checkConstraints(data.createForm.constraints, data.model.foreignKeys).length > 0) {
+		if (checkConstraints(
+			data.createForm.constraints, 
+			Object.fromEntries(
+				Object.entries(data.model.foreignKeys).filter(([key]) => key !== 'risk_matrix')
+			)
+			).length > 0) {
 			modalComponent = {
 				ref: MissingConstraintsModal
 			};
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index 4f078ec71..0a2a227a7 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -41,7 +41,7 @@
 	};
 </script>
 
-<div class="h-screen w-full p-8">
+<div class="h-full w-full p-8">
 	<div
 		class="card bg-white shadow-lg w-full h-full grid xl:grid-cols-3 lg:grid-cols-2 md:grid-cols-1 gap-8 p-8"
 	>

From 7e730ea3cb73c6aed9fc3b2cb097ce21d951e54d Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 3 Dec 2024 14:47:06 +0100
Subject: [PATCH 13/38] chore: remove repeated argument

---
 backend/ebios_rm/migrations/0001_initial.py | 3 ---
 backend/ebios_rm/models.py                  | 2 --
 2 files changed, 5 deletions(-)

diff --git a/backend/ebios_rm/migrations/0001_initial.py b/backend/ebios_rm/migrations/0001_initial.py
index 8d3373fd9..d5c610f5e 100644
--- a/backend/ebios_rm/migrations/0001_initial.py
+++ b/backend/ebios_rm/migrations/0001_initial.py
@@ -95,7 +95,6 @@ class Migration(migrations.Migration):
                         related_name="ebios_rm_studies",
                         to="core.asset",
                         verbose_name="Assets",
-                        blank=True,
                     ),
                 ),
                 (
@@ -115,7 +114,6 @@ class Migration(migrations.Migration):
                         related_name="ebios_rm_studies",
                         to="core.complianceassessment",
                         verbose_name="Compliance assessments",
-                        blank=True,
                     ),
                 ),
                 (
@@ -155,7 +153,6 @@ class Migration(migrations.Migration):
                         related_name="ebios_rm_studies",
                         to="core.riskassessment",
                         verbose_name="Risk assessments",
-                        blank=True,
                     ),
                 ),
                 (
diff --git a/backend/ebios_rm/models.py b/backend/ebios_rm/models.py
index 7894360ef..fea80f6b5 100644
--- a/backend/ebios_rm/models.py
+++ b/backend/ebios_rm/models.py
@@ -48,7 +48,6 @@ class Status(models.TextChoices):
         help_text=_(
             "Compliance assessments established as security baseline during workshop 1.4"
         ),
-        blank=True,
     )
     risk_assessments = models.ManyToManyField(
         RiskAssessment,
@@ -56,7 +55,6 @@ class Status(models.TextChoices):
         verbose_name=_("Risk assessments"),
         related_name="ebios_rm_studies",
         help_text=_("Risk assessments generated at the end of workshop 4"),
-        blank=True,
     )
     reference_entity = models.ForeignKey(
         Entity,

From b6084b4d428281af11e051853c27bab79292098b Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 3 Dec 2024 16:11:42 +0100
Subject: [PATCH 14/38] feat: prepare step 1/2

---
 backend/core/views.py                         |   2 +-
 frontend/messages/en.json                     |   4 +-
 .../src/lib/components/Forms/ModelForm.svelte |   2 +-
 .../Forms/ModelForm/EbiosRmForm.svelte        | 133 +++++++++++++-----
 frontend/src/lib/utils/crud.ts                |  17 ++-
 frontend/src/lib/utils/schemas.ts             |  10 +-
 .../ebios-rm/[id=uuid]/+page.svelte           |   2 +-
 .../ebios-rm-study/+page.server.ts            |  30 ++--
 .../workshop-one/ebios-rm-study/+page.svelte  |   3 +-
 9 files changed, 133 insertions(+), 70 deletions(-)

diff --git a/backend/core/views.py b/backend/core/views.py
index ba3aadc7f..a2cbf9ddf 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -356,7 +356,7 @@ class AssetViewSet(BaseModelViewSet):
     """
 
     model = Asset
-    filterset_fields = ["folder", "parent_assets", "type", "risk_scenarios"]
+    filterset_fields = ["folder", "parent_assets", "type", "risk_scenarios", "ebios_rm_studies"]
     search_fields = ["name", "description", "business_value"]
 
     @action(detail=False, name="Get type choices")
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 27c0b9b69..0d2c5a4b7 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -920,5 +920,7 @@
 	"ebiosWs5_4": "Assess and document residual risks",
 	"ebiosWs5_5": "Establish risk monitoring framework",
 	"activity": "Activity",
-	"ebiosRmMatrixHelpText": "Risk matrix used as a reference for the study. Defaults to `urn:intuitem:risk:library:risk-matrix-4x4-ebios-rm`"
+	"ebiosRmMatrixHelpText": "Risk matrix used as a reference for the study. Defaults to `urn:intuitem:risk:library:risk-matrix-4x4-ebios-rm`",
+	"activityOne": "Activity 1",
+	"activityTwo": "Activity 2"
 }
diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index 4634dedaf..b0eba843d 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -256,7 +256,7 @@
 	{:else if URLModel === 'filtering-labels'}
 		<FilteringLabelForm {form} {model} {cacheLocks} {formDataCache} />
 	{:else if URLModel === 'ebios-rm'}
-		<EbiosRmForm {form} {model} {cacheLocks} {formDataCache} />
+		<EbiosRmForm {form} {model} {cacheLocks} {formDataCache} {context}/>
 	{/if}
 	<div class="flex flex-row justify-between space-x-4">
 		{#if closeModal}
diff --git a/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
index dfc7279c3..ee0efe3d4 100644
--- a/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
@@ -13,44 +13,99 @@
     export let cacheLocks: Record<string, CacheLock> = {};
     export let formDataCache: Record<string, any> = {};
     export let initialData: Record<string, any> = {};
+	export let context: string;
 </script>
 
-<TextField
-	{form}
-	field="version"
-	label={m.version()}
-	cacheLock={cacheLocks['version']}
-	bind:cachedValue={formDataCache['version']}
-/>
-<TextField
-	{form}
-	required
-	field="ref_id"
-	label={m.refId()}
-	cacheLock={cacheLocks['ref_id']}
-	bind:cachedValue={formDataCache['ref_id']}
-/>
-<AutocompleteSelect
-	{form}
-	options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
-	field="risk_matrix"
-	cacheLock={cacheLocks['risk_matrix']}
-	bind:cachedValue={formDataCache['risk_matrix']}
-	label={m.riskMatrix()}
-	helpText={m.ebiosRmMatrixHelpText()}
-/>
-<!-- <TextArea
-	{form}
-	field="observation"
-	label={m.observation()}
-	cacheLock={cacheLocks['observation']}
-	bind:cachedValue={formDataCache['observation']}
-/> -->
-<!-- <Select
-	{form}
-	options={model.selectOptions['status']}
-	field="status"
-	label={m.status()}
-	cacheLock={cacheLocks['status']}
-	bind:cachedValue={formDataCache['status']}
-/> -->
\ No newline at end of file
+{#if context !== 'ebiosRmStudy'}
+	<TextField
+		{form}
+		field="version"
+		label={m.version()}
+		cacheLock={cacheLocks['version']}
+		bind:cachedValue={formDataCache['version']}
+	/>
+	<TextField
+		{form}
+		required
+		field="ref_id"
+		label={m.refId()}
+		cacheLock={cacheLocks['ref_id']}
+		bind:cachedValue={formDataCache['ref_id']}
+	/>
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['folder'] })}
+		field="folder"
+		cacheLock={cacheLocks['folder']}
+		bind:cachedValue={formDataCache['folder']}
+		label={m.domain()}
+		hidden={initialData.folder}
+	/>
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
+		field="risk_matrix"
+		cacheLock={cacheLocks['risk_matrix']}
+		bind:cachedValue={formDataCache['risk_matrix']}
+		label={m.riskMatrix()}
+		helpText={m.ebiosRmMatrixHelpText()}
+	/>
+{:else if context === 'ebiosRmStudy'}
+	<div class="relative p-2 space-y-2 border rounded-md">
+		<p class="absolute -top-3 bg-white font-bold">{m.activityOne()}</p>
+		<TextField
+			{form}
+			field="version"
+			label={m.version()}
+			cacheLock={cacheLocks['version']}
+			bind:cachedValue={formDataCache['version']}
+		/>
+		<TextField
+			{form}
+			required
+			field="ref_id"
+			label={m.refId()}
+			cacheLock={cacheLocks['ref_id']}
+			bind:cachedValue={formDataCache['ref_id']}
+		/>
+		<TextArea
+			{form}
+			field="observation"
+			label={m.observation()}
+			cacheLock={cacheLocks['observation']}
+			bind:cachedValue={formDataCache['observation']}
+		/>
+		<AutocompleteSelect
+			multiple
+			{form}
+			options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
+			field="authors"
+			cacheLock={cacheLocks['authors']}
+			bind:cachedValue={formDataCache['authors']}
+			label={m.authors()}
+		/>
+		<AutocompleteSelect
+			multiple
+			{form}
+			options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
+			field="reviewers"
+			cacheLock={cacheLocks['reviewers']}
+			bind:cachedValue={formDataCache['reviewers']}
+			label={m.reviewers()}
+		/>
+	</div>
+	<div class="relative p-2 space-y-2 border rounded-md">
+		<p class="absolute -top-3 bg-white font-bold">{m.activityTwo()}</p>
+		<AutocompleteSelect
+			multiple
+			{form}
+			options={getOptions({
+				objects: model.foreignKeys['assets'],
+				extra_fields: [['folder', 'str']],
+				label: 'auto'
+			})}
+			field="assets"
+			label={m.assets()}
+		/>
+	</div>
+{/if}
\ No newline at end of file
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 0614ef137..a357918ca 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -577,14 +577,19 @@ export const URL_MODEL_MAP: ModelMap = {
 	},
 	'ebios-rm': {
 		name: 'ebiosrmstudy',
-		localName: 'ebiosRMStudy',
-		localNamePlural: 'ebiosRMStudies',
-		verboseName: 'Ebios RM Study',
-		verboseNamePlural: 'Ebios RM Studies',
+		localName: 'ebiosRMstudy',
+		localNamePlural: 'ebiosRMstudy',
+		verboseName: 'Ebios RMstudy',
+		verboseNamePlural: 'Ebios RMstudy',
 		foreignKeyFields: [
-			{ field: 'risk_matrix', urlModel: 'risk-matrices' }
+			{ field: 'risk_matrix', urlModel: 'risk-matrices' },
+			{ field: 'risk_matrix', urlModel: 'risk-matrices' },
+			{ field: 'assets', urlModel: 'assets' },
+			{ field: 'authors', urlModel: 'users', urlParams: 'is_third_party=false' },
+			{ field: 'reviewers', urlModel: 'users', urlParams: 'is_third_party=false' },
+			{ field: 'folder', urlModel: 'folders', urlParams: 'content_type=DO' }
 		]
-	}
+	},
 };
 
 export const CUSTOM_ACTIONS_COMPONENT = Symbol('CustomActions');
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index a316b8acf..9ba921ca8 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -1,5 +1,4 @@
 // schema for the validation of forms
-import { risk } from '$paraglide/messages';
 import { z, type AnyZodObject } from 'zod';
 
 const toArrayPreprocessor = (value: unknown) => {
@@ -371,10 +370,15 @@ export const vulnerabilitySchema = baseNamedObject({
 	filtering_labels: z.string().optional().array().optional()
 });
 
-export const ebiosRMStudySchema = baseNamedObject({
+export const ebiosRMSchema = baseNamedObject({
 	version: z.string().optional().default('0.1'),
 	ref_id: z.string().default(''),
 	risk_matrix: z.string().optional(),
+	authors: z.array(z.string().optional()).optional(),
+	reviewers: z.array(z.string().optional()).optional(),
+	observation: z.string().optional().nullable(),
+	assets: z.string().uuid().optional().array().optional(),
+	folder: z.string()
 });
 
 const SCHEMA_MAP: Record<string, AnyZodObject> = {
@@ -402,7 +406,7 @@ const SCHEMA_MAP: Record<string, AnyZodObject> = {
 	solutions: solutionSchema,
 	vulnerabilities: vulnerabilitySchema,
 	'filtering-labels': FilteringLabelSchema,
-	'ebios-rm': ebiosRMStudySchema
+	'ebios-rm': ebiosRMSchema,
 };
 
 export const modelSchema = (model: string) => {
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index 0a2a227a7..5fc3cff1a 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -13,7 +13,7 @@
 	const dummydata = {
 		ws1: [
 			{ title: safeTranslate(m.ebiosWs1_1()), status: 'done', href: `${$page.url.pathname}/workshop-one/ebios-rm-study?next=${$page.url.pathname}` },
-			{ title: safeTranslate(m.ebiosWs1_2()), status: 'done', href: '#' },
+			{ title: safeTranslate(m.ebiosWs1_2()), status: 'done', href: `${$page.url.pathname}/workshop-one/ebios-rm-study?next=${$page.url.pathname}` },
 			{ title: safeTranslate(m.ebiosWs1_3()), status: 'to_do', href: '#' },
 			{ title: safeTranslate(m.ebiosWs1_4()), status: 'to_do', href: '#' }
 		],
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
index 2e6137307..6a52baaa7 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
@@ -1,30 +1,22 @@
 import { BASE_API_URL } from '$lib/utils/constants';
 import {
-	getModelInfo,
-	urlParamModelForeignKeyFields,
-	urlParamModelSelectFields
+	getModelInfo
 } from '$lib/utils/crud';
 import { modelSchema } from '$lib/utils/schemas';
-import type { ModelInfo } from '$lib/utils/types';
 import { superValidate } from 'sveltekit-superforms';
 import { zod } from 'sveltekit-superforms/adapters';
-import { z } from 'zod';
-import type { PageServerLoad } from './$types';
+import type { PageServerLoad, Actions } from './$types';
+import { defaultWriteFormAction } from '$lib/utils/actions';
 
-export const load: LayoutServerLoad = async (event) => {
+export const load: PageServerLoad = async (event) => {
 	const URLModel = 'ebios-rm';
 	const schema = modelSchema(URLModel);
-	// const objectEndpoint = `${BASE_API_URL}/${URLModel}/${event.params.id}/object/`;
-	const object = {
-        version: '1.0',
-        status: '',
-        authors: '',
-        reviewers: '',
-        observation: ''
-    };
+	const objectEndpoint = `${BASE_API_URL}/${URLModel}/${event.params.id}/object/`;
+	const objectResponse = await event.fetch(objectEndpoint);
+	const object = await objectResponse.json();
 
 	const form = await superValidate(object, zod(schema), { errors: false });
-	const model = getModelInfo(URLModel!);
+	const model = getModelInfo(URLModel);
 	const foreignKeyFields = model.foreignKeyFields;
 	const selectFields = model.selectFields;
 
@@ -66,4 +58,10 @@ export const load: LayoutServerLoad = async (event) => {
 	model.foreignKeys = foreignKeys;
 	model.selectOptions = selectOptions;
 	return { form, model, object, foreignKeys, selectOptions, URLModel };
+};
+
+export const actions: Actions = {
+	default: async (event) => {
+		return defaultWriteFormAction({ event, urlModel: 'ebios-rm', action: 'edit' });
+	}
 };
\ No newline at end of file
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte
index ffe13f1db..955c5068f 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 	import type { PageData } from './$types';
 	import ModelForm from '$lib/components/Forms/ModelForm.svelte';
-
 	export let data: PageData;
 
 </script>
@@ -13,6 +12,6 @@
         selectOptions={data.selectOptions}
         foreignKeys={data.foreignKeys}
         model={data.model}
-        context="edit"
+        context="ebiosRmStudy"
     />
 </div>

From 334bf99e7608294d35f7302d6318dd52bf9fdc90 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <90701924+Mohamed-Hacene@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:15:54 +0100
Subject: [PATCH 15/38] Fix code scanning alert no. 18: Information exposure
 through an exception

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
---
 backend/ebios_rm/serializers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/ebios_rm/serializers.py b/backend/ebios_rm/serializers.py
index ff5e2f5f8..f17d2e898 100644
--- a/backend/ebios_rm/serializers.py
+++ b/backend/ebios_rm/serializers.py
@@ -2,6 +2,7 @@
 from core.models import StoredLibrary, RiskMatrix
 from .models import EbiosRMStudy
 from rest_framework import serializers
+import logging
 
 
 class EbiosRMStudyWriteSerializer(BaseModelSerializer):
@@ -18,7 +19,8 @@ def create(self, validated_data):
                     urn="urn:intuitem:risk:matrix:risk-matrix-4x4-ebios-rm"
                 )
             except (StoredLibrary.DoesNotExist, RiskMatrix.DoesNotExist) as e:
-                raise serializers.ValidationError(f"Erreur : {str(e)}")
+                logging.error(f"Error loading risk matrix: {str(e)}")
+                raise serializers.ValidationError("An error occurred while loading the risk matrix.")
         return super().create(validated_data)
         
     class Meta:

From e0b15215105e38bddb61f05ac5c016e5b71d3d30 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 3 Dec 2024 16:17:05 +0100
Subject: [PATCH 16/38] chore: format

---
 backend/core/views.py                         |  8 ++-
 backend/ebios_rm/serializers.py               | 15 +++--
 backend/ebios_rm/views.py                     |  8 ++-
 .../src/lib/components/Forms/ModelForm.svelte |  2 +-
 .../Forms/ModelForm/EbiosRmForm.svelte        | 22 +++----
 frontend/src/lib/utils/crud.ts                |  2 +-
 frontend/src/lib/utils/schemas.ts             |  2 +-
 frontend/src/lib/utils/types.ts               |  2 +-
 .../(app)/(internal)/ebios-rm/+page.server.ts | 14 ++---
 .../(app)/(internal)/ebios-rm/+page.svelte    | 63 ++++++++++---------
 .../ebios-rm/[id=uuid]/+page.server.ts        |  2 +-
 .../ebios-rm/[id=uuid]/+page.svelte           | 12 +++-
 .../ebios-rm-study/+page.server.ts            |  6 +-
 .../workshop-one/ebios-rm-study/+page.svelte  | 17 +++--
 14 files changed, 96 insertions(+), 79 deletions(-)

diff --git a/backend/core/views.py b/backend/core/views.py
index a2cbf9ddf..0ff3dbdb8 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -356,7 +356,13 @@ class AssetViewSet(BaseModelViewSet):
     """
 
     model = Asset
-    filterset_fields = ["folder", "parent_assets", "type", "risk_scenarios", "ebios_rm_studies"]
+    filterset_fields = [
+        "folder",
+        "parent_assets",
+        "type",
+        "risk_scenarios",
+        "ebios_rm_studies",
+    ]
     search_fields = ["name", "description", "business_value"]
 
     @action(detail=False, name="Get type choices")
diff --git a/backend/ebios_rm/serializers.py b/backend/ebios_rm/serializers.py
index ff5e2f5f8..467e98b52 100644
--- a/backend/ebios_rm/serializers.py
+++ b/backend/ebios_rm/serializers.py
@@ -1,26 +1,29 @@
-from core.serializers import BaseModelSerializer, FieldsRelatedField, AssessmentReadSerializer
+from core.serializers import (
+    BaseModelSerializer,
+    FieldsRelatedField,
+    AssessmentReadSerializer,
+)
 from core.models import StoredLibrary, RiskMatrix
 from .models import EbiosRMStudy
 from rest_framework import serializers
 
 
 class EbiosRMStudyWriteSerializer(BaseModelSerializer):
-    
     def create(self, validated_data):
-        if not validated_data.get('risk_matrix'):
+        if not validated_data.get("risk_matrix"):
             try:
                 ebios_matrix_library = StoredLibrary.objects.get(
                     urn="urn:intuitem:risk:library:risk-matrix-4x4-ebios-rm"
                 )
                 ebios_matrix_library.load()
 
-                validated_data['risk_matrix'] = RiskMatrix.objects.get(
+                validated_data["risk_matrix"] = RiskMatrix.objects.get(
                     urn="urn:intuitem:risk:matrix:risk-matrix-4x4-ebios-rm"
                 )
             except (StoredLibrary.DoesNotExist, RiskMatrix.DoesNotExist) as e:
                 raise serializers.ValidationError(f"Erreur : {str(e)}")
         return super().create(validated_data)
-        
+
     class Meta:
         model = EbiosRMStudy
         exclude = ["created_at", "updated_at"]
@@ -37,4 +40,4 @@ class EbiosRMStudyReadSerializer(AssessmentReadSerializer):
 
     class Meta:
         model = EbiosRMStudy
-        fields = "__all__"
\ No newline at end of file
+        fields = "__all__"
diff --git a/backend/ebios_rm/views.py b/backend/ebios_rm/views.py
index 97cf5df3f..50a2f2d10 100644
--- a/backend/ebios_rm/views.py
+++ b/backend/ebios_rm/views.py
@@ -7,17 +7,19 @@
 
 LONG_CACHE_TTL = 60  # mn
 
+
 class BaseModelViewSet(AbstractBaseModelViewSet):
     serializers_module = "ebios_rm.serializers"
 
+
 class EbiosRMStudyViewSet(BaseModelViewSet):
     """
     API endpoint that allows ebios rm studies to be viewed or edited.
     """
-    
+
     model = EbiosRMStudy
-    
+
     @method_decorator(cache_page(60 * LONG_CACHE_TTL))
     @action(detail=False, name="Get status choices")
     def status(self, request):
-        return Response(dict(EbiosRMStudy.Status.choices))
\ No newline at end of file
+        return Response(dict(EbiosRMStudy.Status.choices))
diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index b0eba843d..dc7906482 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -256,7 +256,7 @@
 	{:else if URLModel === 'filtering-labels'}
 		<FilteringLabelForm {form} {model} {cacheLocks} {formDataCache} />
 	{:else if URLModel === 'ebios-rm'}
-		<EbiosRmForm {form} {model} {cacheLocks} {formDataCache} {context}/>
+		<EbiosRmForm {form} {model} {cacheLocks} {formDataCache} {context} />
 	{/if}
 	<div class="flex flex-row justify-between space-x-4">
 		{#if closeModal}
diff --git a/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
index ee0efe3d4..30a784ad0 100644
--- a/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
@@ -1,18 +1,18 @@
 <script lang="ts">
-    import type { SuperValidated } from 'sveltekit-superforms';
-    import type { ModelInfo, CacheLock } from '$lib/utils/types';
-    import TextField from '$lib/components/Forms/TextField.svelte';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import TextField from '$lib/components/Forms/TextField.svelte';
 	import AutocompleteSelect from '$lib/components/Forms/AutocompleteSelect.svelte';
-    import Select from '$lib/components/Forms/Select.svelte';
-    import * as m from '$paraglide/messages.js';
+	import Select from '$lib/components/Forms/Select.svelte';
+	import * as m from '$paraglide/messages.js';
 	import { getOptions } from '$lib/utils/crud';
 	import TextArea from '../TextArea.svelte';
 
-    export let form: SuperValidated<any>;
-    export let model: ModelInfo;
-    export let cacheLocks: Record<string, CacheLock> = {};
-    export let formDataCache: Record<string, any> = {};
-    export let initialData: Record<string, any> = {};
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
 	export let context: string;
 </script>
 
@@ -108,4 +108,4 @@
 			label={m.assets()}
 		/>
 	</div>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index a357918ca..919004e19 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -589,7 +589,7 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'reviewers', urlModel: 'users', urlParams: 'is_third_party=false' },
 			{ field: 'folder', urlModel: 'folders', urlParams: 'content_type=DO' }
 		]
-	},
+	}
 };
 
 export const CUSTOM_ACTIONS_COMPONENT = Symbol('CustomActions');
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 9ba921ca8..b1a346cbe 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -406,7 +406,7 @@ const SCHEMA_MAP: Record<string, AnyZodObject> = {
 	solutions: solutionSchema,
 	vulnerabilities: vulnerabilitySchema,
 	'filtering-labels': FilteringLabelSchema,
-	'ebios-rm': ebiosRMSchema,
+	'ebios-rm': ebiosRMSchema
 };
 
 export const modelSchema = (model: string) => {
diff --git a/frontend/src/lib/utils/types.ts b/frontend/src/lib/utils/types.ts
index c6ba7a190..97c3a84af 100644
--- a/frontend/src/lib/utils/types.ts
+++ b/frontend/src/lib/utils/types.ts
@@ -52,7 +52,7 @@ export const URL_MODEL = [
 	'solutions',
 	'representatives',
 	'vulnerabilities',
-	'filtering-labels',
+	'filtering-labels'
 	// 'ebios-rm',
 ] as const;
 
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
index d842f1070..c64ef63a9 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
@@ -18,7 +18,7 @@ import { tableSourceMapper, type TableSource } from '@skeletonlabs/skeleton';
 export const load: PageServerLoad = async ({ params, fetch }) => {
 	const schema = z.object({ id: z.string().uuid() });
 	const deleteForm = await superValidate(zod(schema));
-	const URLModel = "ebios-rm";
+	const URLModel = 'ebios-rm';
 	const createSchema = modelSchema(URLModel);
 	const createForm = await superValidate(zod(createSchema));
 	const model: ModelInfo = getModelInfo(URLModel);
@@ -60,11 +60,11 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 
 	model['selectOptions'] = selectOptions;
 
-    const endpoint = `${BASE_API_URL}/${URLModel}`;
-    const res = await fetch(endpoint);
-    const data = await res.json().then((res) => res.results);
+	const endpoint = `${BASE_API_URL}/${URLModel}`;
+	const res = await fetch(endpoint);
+	const data = await res.json().then((res) => res.results);
 
-    const bodyData = tableSourceMapper(data, listViewFields[URLModel as urlModel].body);
+	const bodyData = tableSourceMapper(data, listViewFields[URLModel as urlModel].body);
 
 	const headData: Record<string, string> = listViewFields[URLModel as urlModel].body.reduce(
 		(obj, key, index) => {
@@ -89,11 +89,11 @@ export const actions: Actions = {
 		return defaultWriteFormAction({
 			event,
 			urlModel: 'ebios-rm',
-			action: 'create',
+			action: 'create'
 			// redirectToWrittenObject: redirectToWrittenObject
 		});
 	},
 	delete: async (event) => {
 		return defaultDeleteFormAction({ event, urlModel: 'ebios-rm' });
 	}
-};
\ No newline at end of file
+};
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte
index a856abf9f..4d1ae36d4 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.svelte
@@ -1,20 +1,20 @@
 <script lang="ts">
-    import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
-    import type { PageData } from './$types';
-    import { safeTranslate } from '$lib/utils/i18n';
-    import type { ModalComponent, ModalSettings, ModalStore } from '@skeletonlabs/skeleton';
-    import { getModalStore } from '@skeletonlabs/skeleton';
-    import CreateModal from '$lib/components/Modals/CreateModal.svelte';
-    import MissingConstraintsModal from '$lib/components/Modals/MissingConstraintsModal.svelte';
-    import { checkConstraints } from '$lib/utils/crud';
+	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
+	import type { PageData } from './$types';
+	import { safeTranslate } from '$lib/utils/i18n';
+	import type { ModalComponent, ModalSettings, ModalStore } from '@skeletonlabs/skeleton';
+	import { getModalStore } from '@skeletonlabs/skeleton';
+	import CreateModal from '$lib/components/Modals/CreateModal.svelte';
+	import MissingConstraintsModal from '$lib/components/Modals/MissingConstraintsModal.svelte';
+	import { checkConstraints } from '$lib/utils/crud';
 	import * as m from '$paraglide/messages.js';
 
-    const modalStore: ModalStore = getModalStore();
+	const modalStore: ModalStore = getModalStore();
 
-    export let data: PageData;
-    const URLModel = data.URLModel;
+	export let data: PageData;
+	const URLModel = data.URLModel;
 
-    function modalCreateForm(): void {
+	function modalCreateForm(): void {
 		let modalComponent: ModalComponent = {
 			ref: CreateModal,
 			props: {
@@ -28,12 +28,14 @@
 			// Data
 			title: safeTranslate('add-' + data.model.localName)
 		};
-		if (checkConstraints(
-			data.createForm.constraints, 
-			Object.fromEntries(
-				Object.entries(data.model.foreignKeys).filter(([key]) => key !== 'risk_matrix')
-			)
-			).length > 0) {
+		if (
+			checkConstraints(
+				data.createForm.constraints,
+				Object.fromEntries(
+					Object.entries(data.model.foreignKeys).filter(([key]) => key !== 'risk_matrix')
+				)
+			).length > 0
+		) {
 			modalComponent = {
 				ref: MissingConstraintsModal
 			};
@@ -47,19 +49,18 @@
 		}
 		modalStore.trigger(modal);
 	}
-
 </script>
 
 <ModelTable source={data.table} deleteForm={data.deleteForm} {URLModel}>
-    <div slot="addButton">
-        <span class="inline-flex overflow-hidden rounded-md border bg-white shadow-sm">
-                <button
-                    class="inline-block border-e p-3 btn-mini-primary w-12 focus:relative"
-                    data-testid="add-button"
-                    title={safeTranslate('add-' + data.model.localName)}
-                    on:click={modalCreateForm}
-                    ><i class="fa-solid fa-file-circle-plus"></i>
-                </button>
-        </span>
-    </div>
-</ModelTable>
\ No newline at end of file
+	<div slot="addButton">
+		<span class="inline-flex overflow-hidden rounded-md border bg-white shadow-sm">
+			<button
+				class="inline-block border-e p-3 btn-mini-primary w-12 focus:relative"
+				data-testid="add-button"
+				title={safeTranslate('add-' + data.model.localName)}
+				on:click={modalCreateForm}
+				><i class="fa-solid fa-file-circle-plus"></i>
+			</button>
+		</span>
+	</div>
+</ModelTable>
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.server.ts
index 7b348480e..cb361f306 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.server.ts
@@ -4,4 +4,4 @@ import { getModelInfo } from '$lib/utils/crud';
 
 export const load: PageServerLoad = async (event) => {
 	return await loadDetail({ event, model: getModelInfo('ebios-rm'), id: event.params.id });
-};
\ No newline at end of file
+};
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index 5fc3cff1a..ca001e3c8 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -12,8 +12,16 @@
 
 	const dummydata = {
 		ws1: [
-			{ title: safeTranslate(m.ebiosWs1_1()), status: 'done', href: `${$page.url.pathname}/workshop-one/ebios-rm-study?next=${$page.url.pathname}` },
-			{ title: safeTranslate(m.ebiosWs1_2()), status: 'done', href: `${$page.url.pathname}/workshop-one/ebios-rm-study?next=${$page.url.pathname}` },
+			{
+				title: safeTranslate(m.ebiosWs1_1()),
+				status: 'done',
+				href: `${$page.url.pathname}/workshop-one/ebios-rm-study?next=${$page.url.pathname}`
+			},
+			{
+				title: safeTranslate(m.ebiosWs1_2()),
+				status: 'done',
+				href: `${$page.url.pathname}/workshop-one/ebios-rm-study?next=${$page.url.pathname}`
+			},
 			{ title: safeTranslate(m.ebiosWs1_3()), status: 'to_do', href: '#' },
 			{ title: safeTranslate(m.ebiosWs1_4()), status: 'to_do', href: '#' }
 		],
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
index 6a52baaa7..f6bcbda77 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
@@ -1,7 +1,5 @@
 import { BASE_API_URL } from '$lib/utils/constants';
-import {
-	getModelInfo
-} from '$lib/utils/crud';
+import { getModelInfo } from '$lib/utils/crud';
 import { modelSchema } from '$lib/utils/schemas';
 import { superValidate } from 'sveltekit-superforms';
 import { zod } from 'sveltekit-superforms/adapters';
@@ -64,4 +62,4 @@ export const actions: Actions = {
 	default: async (event) => {
 		return defaultWriteFormAction({ event, urlModel: 'ebios-rm', action: 'edit' });
 	}
-};
\ No newline at end of file
+};
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte
index 955c5068f..beafb4be4 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.svelte
@@ -2,16 +2,15 @@
 	import type { PageData } from './$types';
 	import ModelForm from '$lib/components/Forms/ModelForm.svelte';
 	export let data: PageData;
-
 </script>
 
 <div class="card p-4 bg-white shadow-lg">
-    <ModelForm
-        form={data.form}
-        object={data.object}
-        selectOptions={data.selectOptions}
-        foreignKeys={data.foreignKeys}
-        model={data.model}
-        context="ebiosRmStudy"
-    />
+	<ModelForm
+		form={data.form}
+		object={data.object}
+		selectOptions={data.selectOptions}
+		foreignKeys={data.foreignKeys}
+		model={data.model}
+		context="ebiosRmStudy"
+	/>
 </div>

From 2023fd5cafcca4a4943487972e291e87003efb70 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 3 Dec 2024 16:20:06 +0100
Subject: [PATCH 17/38] chore: format serializer

---
 backend/ebios_rm/serializers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/ebios_rm/serializers.py b/backend/ebios_rm/serializers.py
index 3bd6aef16..2c95f71eb 100644
--- a/backend/ebios_rm/serializers.py
+++ b/backend/ebios_rm/serializers.py
@@ -23,7 +23,9 @@ def create(self, validated_data):
                 )
             except (StoredLibrary.DoesNotExist, RiskMatrix.DoesNotExist) as e:
                 logging.error(f"Error loading risk matrix: {str(e)}")
-                raise serializers.ValidationError("An error occurred while loading the risk matrix.")
+                raise serializers.ValidationError(
+                    "An error occurred while loading the risk matrix."
+                )
         return super().create(validated_data)
 
     class Meta:

From 4a9da32a6313837d917c0f428b08ed4a0926393e Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Wed, 4 Dec 2024 15:07:43 +0100
Subject: [PATCH 18/38] feat: map new ebios endpoint

---
 backend/core/urls.py                                      | 2 --
 frontend/src/lib/utils/actions.ts                         | 8 +++++---
 frontend/src/lib/utils/crud.ts                            | 2 ++
 frontend/src/lib/utils/load.ts                            | 2 +-
 .../src/routes/(app)/(internal)/ebios-rm/+page.server.ts  | 2 +-
 .../[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts | 4 ++--
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/backend/core/urls.py b/backend/core/urls.py
index b04b4cb2e..d0aa4054d 100644
--- a/backend/core/urls.py
+++ b/backend/core/urls.py
@@ -5,7 +5,6 @@
     SolutionViewSet,
     EntityAssessmentViewSet,
 )
-from ebios_rm.views import EbiosRMStudyViewSet
 from library.views import StoredLibraryViewSet, LoadedLibraryViewSet
 import importlib
 
@@ -28,7 +27,6 @@
 router.register(r"risk-matrices", RiskMatrixViewSet, basename="risk-matrices")
 router.register(r"vulnerabilities", VulnerabilityViewSet, basename="vulnerabilities")
 router.register(r"risk-assessments", RiskAssessmentViewSet, basename="risk-assessments")
-router.register(r"ebios-rm", EbiosRMStudyViewSet, basename="ebios-rm")
 router.register(r"threats", ThreatViewSet, basename="threats")
 router.register(r"risk-scenarios", RiskScenarioViewSet, basename="risk-scenarios")
 router.register(r"applied-controls", AppliedControlViewSet, basename="applied-controls")
diff --git a/frontend/src/lib/utils/actions.ts b/frontend/src/lib/utils/actions.ts
index f85adeeed..9ee56d971 100644
--- a/frontend/src/lib/utils/actions.ts
+++ b/frontend/src/lib/utils/actions.ts
@@ -48,11 +48,12 @@ function getEndpoint({
 	urlModel: string;
 	event: RequestEvent;
 }) {
+	const model = getModelInfo(urlModel);
 	if (action === 'create') {
-		return `${BASE_API_URL}/${urlModel}/`;
+		return model.endpointUrl ? `${BASE_API_URL}/${model.endpointUrl}/` : `${BASE_API_URL}/${urlModel}/`;
 	}
 	const id = event.params.id;
-	return `${BASE_API_URL}/${urlModel}/${id}/`;
+	return model.endpointUrl ? `${BASE_API_URL}/${model.endpointUrl}/${id}/` : `${BASE_API_URL}/${urlModel}/${id}/`;
 }
 
 export async function handleErrorResponse({
@@ -199,9 +200,10 @@ export async function defaultDeleteFormAction({
 	const formData = await event.request.formData();
 	const schema = z.object({ id: z.string().uuid() });
 	const deleteForm = await superValidate(formData, zod(schema));
+	const model = getModelInfo(urlModel);
 
 	const id = deleteForm.data.id;
-	const endpoint = `${BASE_API_URL}/${urlModel}/${id}/`;
+	const endpoint = model.endpointUrl ? `${BASE_API_URL}/${model.endpointUrl}/${id}/` : `${BASE_API_URL}/${model.urlModel}/${id}/`;
 
 	if (!deleteForm.valid) {
 		console.error(deleteForm.errors);
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 919004e19..41ef9a0e9 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -131,6 +131,7 @@ export interface ModelMapEntry {
 	fileFields?: string[];
 	filters?: SelectField[];
 	path?: string;
+	endpointUrl?: string;
 }
 
 type ModelMap = {
@@ -576,6 +577,7 @@ export const URL_MODEL_MAP: ModelMap = {
 		]
 	},
 	'ebios-rm': {
+		endpointUrl:'ebios-rm/studies', 
 		name: 'ebiosrmstudy',
 		localName: 'ebiosRMstudy',
 		localNamePlural: 'ebiosRMstudy',
diff --git a/frontend/src/lib/utils/load.ts b/frontend/src/lib/utils/load.ts
index 165d2a64c..62e0ba165 100644
--- a/frontend/src/lib/utils/load.ts
+++ b/frontend/src/lib/utils/load.ts
@@ -11,7 +11,7 @@ import { zod } from 'sveltekit-superforms/adapters';
 import { z, type AnyZodObject } from 'zod';
 
 export const loadDetail = async ({ event, model, id }) => {
-	const endpoint = `${BASE_API_URL}/${model.urlModel}/${id}/`;
+	const endpoint = model.endpointUrl ? `${BASE_API_URL}/${model.endpointUrl}/${id}/` : `${BASE_API_URL}/${model.urlModel}/${id}/`;
 
 	const res = await event.fetch(endpoint);
 	const data = await res.json();
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
index c64ef63a9..1c395758c 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
@@ -60,7 +60,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 
 	model['selectOptions'] = selectOptions;
 
-	const endpoint = `${BASE_API_URL}/${URLModel}`;
+	const endpoint = `${BASE_API_URL}/${model.endpointUrl}`;
 	const res = await fetch(endpoint);
 	const data = await res.json().then((res) => res.results);
 
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
index f6bcbda77..e28cc52ea 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
@@ -8,13 +8,13 @@ import { defaultWriteFormAction } from '$lib/utils/actions';
 
 export const load: PageServerLoad = async (event) => {
 	const URLModel = 'ebios-rm';
+	const model = getModelInfo(URLModel);
 	const schema = modelSchema(URLModel);
-	const objectEndpoint = `${BASE_API_URL}/${URLModel}/${event.params.id}/object/`;
+	const objectEndpoint = `${BASE_API_URL}/${model.endpointUrl}/${event.params.id}/object/`;
 	const objectResponse = await event.fetch(objectEndpoint);
 	const object = await objectResponse.json();
 
 	const form = await superValidate(object, zod(schema), { errors: false });
-	const model = getModelInfo(URLModel);
 	const foreignKeyFields = model.foreignKeyFields;
 	const selectFields = model.selectFields;
 

From 3ef30525d84ddbe2124c297df11d6ad9ea22b0c1 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Wed, 4 Dec 2024 15:10:09 +0100
Subject: [PATCH 19/38] chore: format

---
 frontend/src/lib/utils/actions.ts | 12 +++++++++---
 frontend/src/lib/utils/crud.ts    |  2 +-
 frontend/src/lib/utils/load.ts    |  4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/frontend/src/lib/utils/actions.ts b/frontend/src/lib/utils/actions.ts
index 9ee56d971..c869da8fa 100644
--- a/frontend/src/lib/utils/actions.ts
+++ b/frontend/src/lib/utils/actions.ts
@@ -50,10 +50,14 @@ function getEndpoint({
 }) {
 	const model = getModelInfo(urlModel);
 	if (action === 'create') {
-		return model.endpointUrl ? `${BASE_API_URL}/${model.endpointUrl}/` : `${BASE_API_URL}/${urlModel}/`;
+		return model.endpointUrl
+			? `${BASE_API_URL}/${model.endpointUrl}/`
+			: `${BASE_API_URL}/${urlModel}/`;
 	}
 	const id = event.params.id;
-	return model.endpointUrl ? `${BASE_API_URL}/${model.endpointUrl}/${id}/` : `${BASE_API_URL}/${urlModel}/${id}/`;
+	return model.endpointUrl
+		? `${BASE_API_URL}/${model.endpointUrl}/${id}/`
+		: `${BASE_API_URL}/${urlModel}/${id}/`;
 }
 
 export async function handleErrorResponse({
@@ -203,7 +207,9 @@ export async function defaultDeleteFormAction({
 	const model = getModelInfo(urlModel);
 
 	const id = deleteForm.data.id;
-	const endpoint = model.endpointUrl ? `${BASE_API_URL}/${model.endpointUrl}/${id}/` : `${BASE_API_URL}/${model.urlModel}/${id}/`;
+	const endpoint = model.endpointUrl
+		? `${BASE_API_URL}/${model.endpointUrl}/${id}/`
+		: `${BASE_API_URL}/${model.urlModel}/${id}/`;
 
 	if (!deleteForm.valid) {
 		console.error(deleteForm.errors);
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 41ef9a0e9..3270c8392 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -577,7 +577,7 @@ export const URL_MODEL_MAP: ModelMap = {
 		]
 	},
 	'ebios-rm': {
-		endpointUrl:'ebios-rm/studies', 
+		endpointUrl: 'ebios-rm/studies',
 		name: 'ebiosrmstudy',
 		localName: 'ebiosRMstudy',
 		localNamePlural: 'ebiosRMstudy',
diff --git a/frontend/src/lib/utils/load.ts b/frontend/src/lib/utils/load.ts
index 62e0ba165..596570cb9 100644
--- a/frontend/src/lib/utils/load.ts
+++ b/frontend/src/lib/utils/load.ts
@@ -11,7 +11,9 @@ import { zod } from 'sveltekit-superforms/adapters';
 import { z, type AnyZodObject } from 'zod';
 
 export const loadDetail = async ({ event, model, id }) => {
-	const endpoint = model.endpointUrl ? `${BASE_API_URL}/${model.endpointUrl}/${id}/` : `${BASE_API_URL}/${model.urlModel}/${id}/`;
+	const endpoint = model.endpointUrl
+		? `${BASE_API_URL}/${model.endpointUrl}/${id}/`
+		: `${BASE_API_URL}/${model.urlModel}/${id}/`;
 
 	const res = await event.fetch(endpoint);
 	const data = await res.json();

From 356b5521212bc0fbd235fc83c9595ffa66b32aeb Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Wed, 4 Dec 2024 16:09:21 +0100
Subject: [PATCH 20/38] feat: add step 1.3

---
 backend/ebios_rm/views.py                     |  4 +
 frontend/messages/en.json                     |  3 +-
 .../src/lib/components/Forms/ModelForm.svelte |  3 +
 .../Forms/ModelForm/FearedEventForm.svelte    | 52 ++++++++++++
 frontend/src/lib/utils/crud.ts                | 14 +++-
 frontend/src/lib/utils/schemas.ts             | 13 ++-
 frontend/src/lib/utils/table.ts               |  4 +
 frontend/src/lib/utils/types.ts               |  3 +-
 .../[model=urlmodel]/+layout.server.ts        |  4 +-
 .../[id=uuid]/edit/+layout.server.ts          | 10 ++-
 .../ebios-rm/[id=uuid]/+page.svelte           |  6 +-
 .../feared-events/+page.server.ts             | 84 +++++++++++++++++++
 .../workshop-one/feared-events/+page.svelte   | 67 +++++++++++++++
 13 files changed, 258 insertions(+), 9 deletions(-)
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts

diff --git a/backend/ebios_rm/views.py b/backend/ebios_rm/views.py
index 69676bf77..7bdfa29f3 100644
--- a/backend/ebios_rm/views.py
+++ b/backend/ebios_rm/views.py
@@ -27,3 +27,7 @@ def status(self, request):
 
 class FearedEventViewSet(BaseModelViewSet):
     model = FearedEvent
+
+    filterset_fields = [
+        "ebios_rm_study",
+    ]
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 0d2c5a4b7..9410d2051 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -922,5 +922,6 @@
 	"activity": "Activity",
 	"ebiosRmMatrixHelpText": "Risk matrix used as a reference for the study. Defaults to `urn:intuitem:risk:library:risk-matrix-4x4-ebios-rm`",
 	"activityOne": "Activity 1",
-	"activityTwo": "Activity 2"
+	"activityTwo": "Activity 2",
+	"ebiosRmStudy": "Ebios RM study"
 }
diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index dc7906482..054b51a71 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -27,6 +27,7 @@
 	import FolderForm from './ModelForm/FolderForm.svelte';
 	import GeneralSettingsForm from './ModelForm/GeneralSettingForm.svelte';
 	import EbiosRmForm from './ModelForm/EbiosRmForm.svelte';
+	import FearedEventForm from './ModelForm/FearedEventForm.svelte';
 
 	import AutocompleteSelect from './AutocompleteSelect.svelte';
 
@@ -257,6 +258,8 @@
 		<FilteringLabelForm {form} {model} {cacheLocks} {formDataCache} />
 	{:else if URLModel === 'ebios-rm'}
 		<EbiosRmForm {form} {model} {cacheLocks} {formDataCache} {context} />
+	{:else if URLModel === 'feared-events'}
+		<FearedEventForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{/if}
 	<div class="flex flex-row justify-between space-x-4">
 		{#if closeModal}
diff --git a/frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte b/frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte
new file mode 100644
index 000000000..6f2749f20
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte
@@ -0,0 +1,52 @@
+<script lang="ts">
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import AutocompleteSelect from '$lib/components/Forms/AutocompleteSelect.svelte';
+	import Select from '$lib/components/Forms/Select.svelte';
+	import * as m from '$paraglide/messages.js';
+	import { getOptions } from '$lib/utils/crud';
+	import TextArea from '../TextArea.svelte';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let context: string;
+</script>
+
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['ebios_rm_study'] })}
+	field="ebios_rm_study"
+	cacheLock={cacheLocks['ebios_rm_study']}
+	bind:cachedValue={formDataCache['ebios_rm_study']}
+	label={m.ebiosRmStudy()}
+	hidden={initialData.ebios_rm_study}
+/>
+<TextField
+	{form}
+	field="ref_id"
+	label={m.refId()}
+	cacheLock={cacheLocks['ref_id']}
+	bind:cachedValue={formDataCache['ref_id']}
+/>
+<TextArea
+	{form}
+	field="justification"
+	label={m.justification()}
+	cacheLock={cacheLocks['justification']}
+	bind:cachedValue={formDataCache['justification']}
+/>
+<AutocompleteSelect
+	multiple
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['assets'],
+		extra_fields: [['folder', 'str']],
+		label: 'auto'
+	})}
+	field="assets"
+	label={m.assets()}
+/>
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 3270c8392..c2485094c 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -584,13 +584,25 @@ export const URL_MODEL_MAP: ModelMap = {
 		verboseName: 'Ebios RMstudy',
 		verboseNamePlural: 'Ebios RMstudy',
 		foreignKeyFields: [
-			{ field: 'risk_matrix', urlModel: 'risk-matrices' },
 			{ field: 'risk_matrix', urlModel: 'risk-matrices' },
 			{ field: 'assets', urlModel: 'assets' },
 			{ field: 'authors', urlModel: 'users', urlParams: 'is_third_party=false' },
 			{ field: 'reviewers', urlModel: 'users', urlParams: 'is_third_party=false' },
 			{ field: 'folder', urlModel: 'folders', urlParams: 'content_type=DO' }
 		]
+	},
+	'feared-events': {
+		endpointUrl: 'ebios-rm/feared-events',
+		name: 'fearedevent',
+		localName: 'fearedEvent',
+		localNamePlural: 'fearedEvents',
+		verboseName: 'Feared event',
+		verboseNamePlural: 'Feared events',
+		foreignKeyFields: [
+			{ field: 'ebios_rm_study', urlModel: 'ebios-rm' },
+			{ field: 'assets', urlModel: 'assets' }
+			// { field: 'qualifications', urlModel: 'qualifications' }
+		]
 	}
 };
 
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index b1a346cbe..102742df6 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -381,6 +381,16 @@ export const ebiosRMSchema = baseNamedObject({
 	folder: z.string()
 });
 
+export const fearedEventsSchema = baseNamedObject({
+	ref_id: z.string().optional(),
+	gravity: z.number().optional(),
+	is_selected: z.boolean().optional(),
+	justification: z.string().optional(),
+	ebios_rm_study: z.string(),
+	assets: z.string().uuid().optional().array().optional(),
+	qualifications: z.string().optional().array().optional()
+});
+
 const SCHEMA_MAP: Record<string, AnyZodObject> = {
 	folders: FolderSchema,
 	projects: ProjectSchema,
@@ -406,7 +416,8 @@ const SCHEMA_MAP: Record<string, AnyZodObject> = {
 	solutions: solutionSchema,
 	vulnerabilities: vulnerabilitySchema,
 	'filtering-labels': FilteringLabelSchema,
-	'ebios-rm': ebiosRMSchema
+	'ebios-rm': ebiosRMSchema,
+	'feared-events': fearedEventsSchema
 };
 
 export const modelSchema = (model: string) => {
diff --git a/frontend/src/lib/utils/table.ts b/frontend/src/lib/utils/table.ts
index f9c6215f5..e04670da2 100644
--- a/frontend/src/lib/utils/table.ts
+++ b/frontend/src/lib/utils/table.ts
@@ -531,5 +531,9 @@ export const listViewFields: ListViewFieldsConfig = {
 	'ebios-rm': {
 		head: ['name', 'description'],
 		body: ['name', 'description']
+	},
+	'feared-events': {
+		head: ['selected', 'assets', 'fearedEvent', 'impacts', 'gravity'],
+		body: ['is_selected', 'assets', 'description', 'qualifications', 'gravity']
 	}
 };
diff --git a/frontend/src/lib/utils/types.ts b/frontend/src/lib/utils/types.ts
index 97c3a84af..d0c365d1c 100644
--- a/frontend/src/lib/utils/types.ts
+++ b/frontend/src/lib/utils/types.ts
@@ -52,7 +52,8 @@ export const URL_MODEL = [
 	'solutions',
 	'representatives',
 	'vulnerabilities',
-	'filtering-labels'
+	'filtering-labels',
+	'feared-events'
 	// 'ebios-rm',
 ] as const;
 
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+layout.server.ts b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+layout.server.ts
index 128452015..45ce69a1f 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+layout.server.ts
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+layout.server.ts
@@ -14,7 +14,9 @@ export const load = (async ({ fetch, params }) => {
 		const fetch_function = CUSTOM_MODEL_FETCH_MAP[params.model];
 		data = await fetch_function({ fetch, params }, languageTag());
 	} else {
-		const endpoint = `${BASE_API_URL}/${params.model}/${model.listViewUrlParams || ''}`;
+		const endpoint = model.endpointUrl
+			? `${BASE_API_URL}/${model.endpointUrl}/${model.listViewUrlParams || ''}`
+			: `${BASE_API_URL}/${params.model}/${model.listViewUrlParams || ''}`;
 		const res = await fetch(endpoint);
 		data = await res.json().then((res) => res.results);
 	}
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts
index 8639fad8d..b87656e4f 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts
@@ -12,11 +12,13 @@ import { zod } from 'sveltekit-superforms/adapters';
 export const load: LayoutServerLoad = async (event) => {
 	const URLModel = event.params.model!;
 	const schema = modelSchema(event.params.model);
-	const objectEndpoint = `${BASE_API_URL}/${event.params.model}/${event.params.id}/object/`;
+	const model = getModelInfo(event.params.model!);
+	const objectEndpoint = model.endpointUrl
+		? `${BASE_API_URL}/${model.endpointUrl}/${event.params.id}/object/`
+		: `${BASE_API_URL}/${event.params.model}/${event.params.id}/object/`;
 	const object = await event.fetch(objectEndpoint).then((res) => res.json());
 
 	const form = await superValidate(object, zod(schema), { errors: false });
-	const model = getModelInfo(event.params.model!);
 	const foreignKeyFields = model.foreignKeyFields;
 	const selectFields = model.selectFields;
 
@@ -46,7 +48,9 @@ export const load: LayoutServerLoad = async (event) => {
 	if (foreignKeyFields) {
 		for (const keyField of foreignKeyFields) {
 			const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
-			const url = `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
+			const url = model.endpointUrl
+				? `${BASE_API_URL}/${model.endpointUrl}/${queryParams}`
+				: `${BASE_API_URL}/${model.urlModel}/${queryParams}`;
 			const response = await event.fetch(url);
 			if (response.ok) {
 				foreignKeys[keyField.field] = await response.json().then((data) => data.results);
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index ca001e3c8..225dbbaba 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -22,7 +22,11 @@
 				status: 'done',
 				href: `${$page.url.pathname}/workshop-one/ebios-rm-study?next=${$page.url.pathname}`
 			},
-			{ title: safeTranslate(m.ebiosWs1_3()), status: 'to_do', href: '#' },
+			{
+				title: safeTranslate(m.ebiosWs1_3()),
+				status: 'to_do',
+				href: `${$page.url.pathname}/workshop-one/feared-events?next=${$page.url.pathname}`
+			},
 			{ title: safeTranslate(m.ebiosWs1_4()), status: 'to_do', href: '#' }
 		],
 		ws2: [
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts
new file mode 100644
index 000000000..bb8c37006
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts
@@ -0,0 +1,84 @@
+import { defaultDeleteFormAction, defaultWriteFormAction } from '$lib/utils/actions';
+import { BASE_API_URL } from '$lib/utils/constants';
+import {
+	getModelInfo,
+	urlParamModelForeignKeyFields,
+	urlParamModelSelectFields
+} from '$lib/utils/crud';
+import { modelSchema } from '$lib/utils/schemas';
+import type { ModelInfo, urlModel } from '$lib/utils/types';
+import { type Actions } from '@sveltejs/kit';
+import { superValidate } from 'sveltekit-superforms';
+import { zod } from 'sveltekit-superforms/adapters';
+import { z } from 'zod';
+import type { PageServerLoad } from './$types';
+import { listViewFields } from '$lib/utils/table';
+import { tableSourceMapper, type TableSource } from '@skeletonlabs/skeleton';
+
+export const load: PageServerLoad = async ({ params, fetch }) => {
+	const schema = z.object({ id: z.string().uuid() });
+	const deleteForm = await superValidate(zod(schema));
+	const URLModel = 'feared-events';
+	const createSchema = modelSchema(URLModel);
+	const initialData = {
+		ebios_rm_study: params.id
+	};
+	const createForm = await superValidate(initialData, zod(createSchema), { errors: false });
+	const model: ModelInfo = getModelInfo(URLModel);
+	const foreignKeyFields = urlParamModelForeignKeyFields(URLModel);
+
+	const foreignKeys: Record<string, any> = {};
+
+	for (const keyField of foreignKeyFields) {
+		const model = getModelInfo(keyField.urlModel);
+		const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
+		const url = model.endpointUrl
+			? `${BASE_API_URL}/${model.endpointUrl}/${queryParams}`
+			: `${BASE_API_URL}/${model.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}`);
+		}
+	}
+
+	model['foreignKeys'] = foreignKeys;
+
+	const endpoint = `${BASE_API_URL}/${model.endpointUrl}?ebios_rm_study=${params.id}`;
+	const res = await fetch(endpoint);
+	const data = await res.json().then((res) => res.results);
+
+	const bodyData = tableSourceMapper(data, listViewFields[URLModel as urlModel].body);
+
+	const headData: Record<string, string> = listViewFields[URLModel as urlModel].body.reduce(
+		(obj, key, index) => {
+			obj[key] = listViewFields[URLModel as urlModel].head[index];
+			return obj;
+		},
+		{}
+	);
+
+	const table: TableSource = {
+		head: headData,
+		body: bodyData,
+		meta: data // metaData
+	};
+
+	return { createForm, deleteForm, model, URLModel, table };
+};
+
+export const actions: Actions = {
+	create: async (event) => {
+		// const redirectToWrittenObject = Boolean(event.params.model === 'entity-assessments');
+		return defaultWriteFormAction({
+			event,
+			urlModel: 'feared-events',
+			action: 'create'
+			// redirectToWrittenObject: redirectToWrittenObject
+		});
+	},
+	delete: async (event) => {
+		return defaultDeleteFormAction({ event, urlModel: 'feared-events' });
+	}
+};
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.svelte
index e69de29bb..08ebedae8 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.svelte
@@ -0,0 +1,67 @@
+<script lang="ts">
+	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
+	import type { PageData } from './$types';
+	import { safeTranslate } from '$lib/utils/i18n';
+	import type { ModalComponent, ModalSettings, ModalStore } from '@skeletonlabs/skeleton';
+	import { getModalStore } from '@skeletonlabs/skeleton';
+	import CreateModal from '$lib/components/Modals/CreateModal.svelte';
+	import MissingConstraintsModal from '$lib/components/Modals/MissingConstraintsModal.svelte';
+	import { checkConstraints } from '$lib/utils/crud';
+	import * as m from '$paraglide/messages.js';
+
+	const modalStore: ModalStore = getModalStore();
+
+	export let data: PageData;
+
+	const URLModel = data.URLModel;
+
+	function modalCreateForm(): void {
+		let modalComponent: ModalComponent = {
+			ref: CreateModal,
+			props: {
+				form: data.createForm,
+				model: data.model
+			}
+		};
+		let modal: ModalSettings = {
+			type: 'component',
+			component: modalComponent,
+			// Data
+			title: safeTranslate('add-' + data.model.localName)
+		};
+		if (
+			checkConstraints(
+				data.createForm.constraints,
+				Object.fromEntries(
+					Object.entries(data.model.foreignKeys).filter(([key]) => key !== 'risk_matrix')
+				)
+			).length > 0
+		) {
+			modalComponent = {
+				ref: MissingConstraintsModal
+			};
+			modal = {
+				type: 'component',
+				component: modalComponent,
+				title: m.warning(),
+				body: safeTranslate('add-' + data.model.localName).toLowerCase(),
+				value: checkConstraints(data.createForm.constraints, data.model.foreignKeys)
+			};
+		}
+		modalStore.trigger(modal);
+	}
+</script>
+
+<ModelTable source={data.table} deleteForm={data.deleteForm} {URLModel}>
+	<div slot="addButton">
+		<span class="inline-flex overflow-hidden rounded-md border bg-white shadow-sm">
+			<button
+				class="inline-block border-e p-3 btn-mini-primary w-12 focus:relative"
+				data-testid="add-button"
+				title={safeTranslate('add-' + data.model.localName)}
+				on:click={modalCreateForm}
+				><i class="fa-solid fa-file-circle-plus"></i>
+			</button>
+		</span>
+	</div>
+</ModelTable>

From 3c7ec09b53dd42abe691d59a540638f745227c6e Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Wed, 4 Dec 2024 16:10:33 +0100
Subject: [PATCH 21/38] fix: typos

---
 frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte | 1 -
 frontend/src/lib/utils/crud.ts                                 | 1 -
 2 files changed, 2 deletions(-)

diff --git a/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
index 30a784ad0..20ba8c544 100644
--- a/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
@@ -26,7 +26,6 @@
 	/>
 	<TextField
 		{form}
-		required
 		field="ref_id"
 		label={m.refId()}
 		cacheLock={cacheLocks['ref_id']}
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 3270c8392..53fc12a4c 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -584,7 +584,6 @@ export const URL_MODEL_MAP: ModelMap = {
 		verboseName: 'Ebios RMstudy',
 		verboseNamePlural: 'Ebios RMstudy',
 		foreignKeyFields: [
-			{ field: 'risk_matrix', urlModel: 'risk-matrices' },
 			{ field: 'risk_matrix', urlModel: 'risk-matrices' },
 			{ field: 'assets', urlModel: 'assets' },
 			{ field: 'authors', urlModel: 'users', urlParams: 'is_third_party=false' },

From 41373e56e918a1880bb218ee8f3cd17f32374d1f Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Wed, 4 Dec 2024 16:34:29 +0100
Subject: [PATCH 22/38] feat: add qualifications endpoints

---
 backend/core/serializers.py                           | 10 ++++++++++
 backend/core/startup.py                               |  4 ++++
 backend/core/urls.py                                  |  5 +++++
 backend/core/views.py                                 |  9 +++++++++
 backend/ebios_rm/serializers.py                       |  2 +-
 frontend/messages/en.json                             |  4 +++-
 .../components/Forms/ModelForm/FearedEventForm.svelte |  9 +++++++++
 frontend/src/lib/utils/crud.ts                        | 11 +++++++++--
 frontend/src/lib/utils/table.ts                       |  2 +-
 .../[model=urlmodel]/[id=uuid]/edit/+layout.server.ts |  7 ++++---
 10 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/backend/core/serializers.py b/backend/core/serializers.py
index 1b2661a14..f61807a06 100644
--- a/backend/core/serializers.py
+++ b/backend/core/serializers.py
@@ -705,3 +705,13 @@ class FilteringLabelWriteSerializer(BaseModelSerializer):
     class Meta:
         model = FilteringLabel
         exclude = ["folder", "is_published"]
+
+
+class QualificationReadSerializer(ReferentialSerializer):
+    class Meta:
+        model = Qualification
+        exclude = ["translations"]
+
+
+class QualificationWriteSerializer(QualificationReadSerializer):
+    pass
diff --git a/backend/core/startup.py b/backend/core/startup.py
index 833cff177..63d952859 100644
--- a/backend/core/startup.py
+++ b/backend/core/startup.py
@@ -363,6 +363,10 @@
     "view_operationalscenario",
     "change_operationalscenario",
     "delete_operationalscenario",
+    "view_qualification",
+    "add_qualification",
+    "change_qualification",
+    "delete_qualification",
 ]
 
 THIRD_PARTY_RESPONDENT_PERMISSIONS_LIST = [
diff --git a/backend/core/urls.py b/backend/core/urls.py
index d0aa4054d..a1a1ab108 100644
--- a/backend/core/urls.py
+++ b/backend/core/urls.py
@@ -66,6 +66,11 @@
     FilteringLabelViewSet,
     basename="filtering-labels",
 )
+router.register(
+    r"qualifications",
+    QualificationViewSet,
+    basename="qualifications",
+)
 
 ROUTES = settings.ROUTES
 MODULES = settings.MODULES.values()
diff --git a/backend/core/views.py b/backend/core/views.py
index 8802cda6b..334d74198 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -1956,6 +1956,15 @@ def post(self, request, *args, **kwargs):
         return Response(status=status.HTTP_400_BAD_REQUEST)
 
 
+class QualificationViewSet(BaseModelViewSet):
+    """
+    API endpoint that allows qualifications to be viewed or edited.
+    """
+
+    model = Qualification
+    search_fields = ["name"]
+
+
 class ComplianceAssessmentViewSet(BaseModelViewSet):
     """
     API endpoint that allows compliance assessments to be viewed or edited.
diff --git a/backend/ebios_rm/serializers.py b/backend/ebios_rm/serializers.py
index 3507bf69f..39dfdd6f7 100644
--- a/backend/ebios_rm/serializers.py
+++ b/backend/ebios_rm/serializers.py
@@ -65,8 +65,8 @@ class Meta:
 
 
 class FearedEventReadSerializer(BaseModelSerializer):
-    str = serializers.CharField(source="__str__")
     ebios_rm_study = FieldsRelatedField()
+    qualifications = FieldsRelatedField(["name"], many=True)
     folder = FieldsRelatedField()
 
     class Meta:
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 9410d2051..d16cc46f7 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -923,5 +923,7 @@
 	"ebiosRmMatrixHelpText": "Risk matrix used as a reference for the study. Defaults to `urn:intuitem:risk:library:risk-matrix-4x4-ebios-rm`",
 	"activityOne": "Activity 1",
 	"activityTwo": "Activity 2",
-	"ebiosRmStudy": "Ebios RM study"
+	"ebiosRmStudy": "Ebios RM study",
+	"qualifications": "Qualifications",
+	"impacts": "Impacts"
 }
diff --git a/frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte b/frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte
index 6f2749f20..d3548da56 100644
--- a/frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte
@@ -50,3 +50,12 @@
 	field="assets"
 	label={m.assets()}
 />
+<AutocompleteSelect
+	multiple
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['qualifications']
+	})}
+	field="qualifications"
+	label={m.qualifications()}
+/>
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index c2485094c..4c482149f 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -576,6 +576,13 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'user', urlModel: 'users' }
 		]
 	},
+	qualifications: {
+		name: 'qualification',
+		localName: 'qualification',
+		localNamePlural: 'qualifications',
+		verboseName: 'Qualification',
+		verboseNamePlural: 'Qualifications'
+	},
 	'ebios-rm': {
 		endpointUrl: 'ebios-rm/studies',
 		name: 'ebiosrmstudy',
@@ -600,8 +607,8 @@ export const URL_MODEL_MAP: ModelMap = {
 		verboseNamePlural: 'Feared events',
 		foreignKeyFields: [
 			{ field: 'ebios_rm_study', urlModel: 'ebios-rm' },
-			{ field: 'assets', urlModel: 'assets' }
-			// { field: 'qualifications', urlModel: 'qualifications' }
+			{ field: 'assets', urlModel: 'assets' },
+			{ field: 'qualifications', urlModel: 'qualifications' }
 		]
 	}
 };
diff --git a/frontend/src/lib/utils/table.ts b/frontend/src/lib/utils/table.ts
index e04670da2..c4623fa3b 100644
--- a/frontend/src/lib/utils/table.ts
+++ b/frontend/src/lib/utils/table.ts
@@ -533,7 +533,7 @@ export const listViewFields: ListViewFieldsConfig = {
 		body: ['name', 'description']
 	},
 	'feared-events': {
-		head: ['selected', 'assets', 'fearedEvent', 'impacts', 'gravity'],
+		head: ['selected', 'assets', 'fearedEvent', 'qualifications', 'gravity'],
 		body: ['is_selected', 'assets', 'description', 'qualifications', 'gravity']
 	}
 };
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts
index b87656e4f..a6d843e1e 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts
@@ -48,9 +48,10 @@ export const load: LayoutServerLoad = async (event) => {
 	if (foreignKeyFields) {
 		for (const keyField of foreignKeyFields) {
 			const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
-			const url = model.endpointUrl
-				? `${BASE_API_URL}/${model.endpointUrl}/${queryParams}`
-				: `${BASE_API_URL}/${model.urlModel}/${queryParams}`;
+			const keyModel = getModelInfo(keyField.urlModel);
+			const url = keyModel.endpointUrl
+				? `${BASE_API_URL}/${keyModel.endpointUrl}/${queryParams}`
+				: `${BASE_API_URL}/${keyModel.urlModel}/${queryParams}`;
 			const response = await event.fetch(url);
 			if (response.ok) {
 				foreignKeys[keyField.field] = await response.json().then((data) => data.results);

From 1abf468bab979089efc7705a3e1c607311c04591 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Wed, 4 Dec 2024 17:16:39 +0100
Subject: [PATCH 23/38] feat: add step 1.4

---
 backend/core/serializers.py                   |   9 ++
 backend/core/views.py                         |   2 +-
 frontend/messages/en.json                     |   3 +-
 frontend/src/lib/components/Forms/Form.svelte |   2 +-
 .../ModelForm/ComplianceAssessmentForm.svelte |  12 ++
 frontend/src/lib/utils/crud.ts                |   3 +-
 frontend/src/lib/utils/schemas.ts             |   3 +-
 .../ebios-rm/[id=uuid]/+page.svelte           |   6 +-
 .../workshop-one/base/+page.server.ts         | 110 ++++++++++++++++++
 .../[id=uuid]/workshop-one/base/+page.svelte  |  67 +++++++++++
 10 files changed, 211 insertions(+), 6 deletions(-)
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.server.ts
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.svelte

diff --git a/backend/core/serializers.py b/backend/core/serializers.py
index f61807a06..6789ac88b 100644
--- a/backend/core/serializers.py
+++ b/backend/core/serializers.py
@@ -5,6 +5,7 @@
 
 from core.models import *
 from iam.models import *
+from ebios_rm.models import EbiosRMStudy
 
 from rest_framework import serializers
 from rest_framework.exceptions import PermissionDenied
@@ -593,6 +594,14 @@ class ComplianceAssessmentWriteSerializer(BaseModelSerializer):
         required=False,
         allow_null=True,
     )
+    ebios_rm_studies = serializers.SlugRelatedField(
+        many=True,
+        slug_field="id",
+        queryset=EbiosRMStudy.objects.all(),
+        required=False,
+        allow_null=True,
+        write_only=True,
+    )
     create_applied_controls_from_suggestions = serializers.BooleanField(
         write_only=True, required=False, default=False
     )
diff --git a/backend/core/views.py b/backend/core/views.py
index 334d74198..8dfae78bc 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -1971,7 +1971,7 @@ class ComplianceAssessmentViewSet(BaseModelViewSet):
     """
 
     model = ComplianceAssessment
-    filterset_fields = ["framework", "project", "status"]
+    filterset_fields = ["framework", "project", "status", "ebios_rm_studies"]
     search_fields = ["name", "description", "ref_id"]
     ordering_fields = ["name", "description"]
 
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index d16cc46f7..6e7a41f20 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -925,5 +925,6 @@
 	"activityTwo": "Activity 2",
 	"ebiosRmStudy": "Ebios RM study",
 	"qualifications": "Qualifications",
-	"impacts": "Impacts"
+	"impacts": "Impacts",
+	"ebiosRmStudies": "Ebios RM studies"
 }
diff --git a/frontend/src/lib/components/Forms/Form.svelte b/frontend/src/lib/components/Forms/Form.svelte
index 8536ca26c..1c91780fa 100644
--- a/frontend/src/lib/components/Forms/Form.svelte
+++ b/frontend/src/lib/components/Forms/Form.svelte
@@ -49,7 +49,7 @@
 	const { form, message, tainted, delayed, errors, allErrors, enhance } = _form;
 </script>
 
-{#if debug}
+{#if true}
 	<SuperDebug data={$form} />
 	<SuperDebug data={$tainted} />
 	<SuperDebug data={$errors} />
diff --git a/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte
index c53338fa0..0bba0a55c 100644
--- a/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte
@@ -38,6 +38,18 @@
 		options={getOptions({ objects: model.foreignKeys['baseline'] })}
 	/>
 {/if}
+{#if initialData.ebios_rm_studies}
+	<AutocompleteSelect
+		{form}
+		field="ebios_rm_studies"
+		multiple
+		cacheLock={cacheLocks['ebios_rm_studies']}
+		bind:cachedValue={formDataCache['ebios_rm_studies']}
+		label={m.ebiosRmStudies()}
+		options={getOptions({ objects: model.foreignKeys['ebios_rm_studies'] })}
+		hidden
+	/>
+{/if}
 <AutocompleteSelect
 	{form}
 	options={getOptions({
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 4c482149f..1a4543220 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -451,7 +451,8 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'framework', urlModel: 'frameworks' },
 			{ field: 'authors', urlModel: 'users' },
 			{ field: 'reviewers', urlModel: 'users', urlParams: 'is_third_party=false' },
-			{ field: 'baseline', urlModel: 'compliance-assessments' }
+			{ field: 'baseline', urlModel: 'compliance-assessments' },
+			{ field: 'ebios_rm_studies', urlModel: 'ebios-rm' }
 		],
 		selectFields: [{ field: 'status' }],
 		filters: [{ field: 'status' }]
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 102742df6..cff94ef08 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -254,7 +254,8 @@ export const ComplianceAssessmentSchema = baseNamedObject({
 	reviewers: z.array(z.string().optional()).optional(),
 	baseline: z.string().optional().nullable(),
 	create_applied_controls_from_suggestions: z.boolean().optional().default(false),
-	observation: z.string().optional().nullable()
+	observation: z.string().optional().nullable(),
+	ebios_rm_studies: z.string().uuid().optional().array().optional()
 });
 
 export const EvidenceSchema = baseNamedObject({
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index 225dbbaba..af9816e3d 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -27,7 +27,11 @@
 				status: 'to_do',
 				href: `${$page.url.pathname}/workshop-one/feared-events?next=${$page.url.pathname}`
 			},
-			{ title: safeTranslate(m.ebiosWs1_4()), status: 'to_do', href: '#' }
+			{
+				title: safeTranslate(m.ebiosWs1_4()),
+				status: 'to_do',
+				href: `${$page.url.pathname}/workshop-one/base?next=${$page.url.pathname}`
+			}
 		],
 		ws2: [
 			{ title: safeTranslate(m.ebiosWs2_1()), status: 'to_do', href: '#' },
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.server.ts
new file mode 100644
index 000000000..b4dd9b6c2
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.server.ts
@@ -0,0 +1,110 @@
+import { defaultDeleteFormAction, defaultWriteFormAction } from '$lib/utils/actions';
+import { BASE_API_URL } from '$lib/utils/constants';
+import {
+	getModelInfo,
+	urlParamModelForeignKeyFields,
+	urlParamModelSelectFields
+} from '$lib/utils/crud';
+import { modelSchema } from '$lib/utils/schemas';
+import type { ModelInfo, urlModel } from '$lib/utils/types';
+import { type Actions } from '@sveltejs/kit';
+import { superValidate } from 'sveltekit-superforms';
+import { zod } from 'sveltekit-superforms/adapters';
+import { z } from 'zod';
+import type { PageServerLoad } from './$types';
+import { listViewFields } from '$lib/utils/table';
+import { tableSourceMapper, type TableSource } from '@skeletonlabs/skeleton';
+
+export const load: PageServerLoad = async ({ params, fetch }) => {
+	const schema = z.object({ id: z.string().uuid() });
+	const deleteForm = await superValidate(zod(schema));
+	const URLModel = 'compliance-assessments';
+	const createSchema = modelSchema(URLModel);
+	const initialData = {
+		ebios_rm_studies: [params.id]
+	};
+	const createForm = await superValidate(initialData, zod(createSchema), { errors: false });
+	const model: ModelInfo = getModelInfo(URLModel);
+	const foreignKeyFields = urlParamModelForeignKeyFields(URLModel);
+	const selectFields = model.selectFields;
+
+	const foreignKeys: Record<string, any> = {};
+
+	for (const keyField of foreignKeyFields) {
+		const model = getModelInfo(keyField.urlModel);
+		const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
+		const url = model.endpointUrl
+			? `${BASE_API_URL}/${model.endpointUrl}/${queryParams}`
+			: `${BASE_API_URL}/${model.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}`);
+		}
+	}
+
+	model['foreignKeys'] = foreignKeys;
+
+	const selectOptions: Record<string, any> = {};
+
+	if (selectFields) {
+		for (const selectField of selectFields) {
+			const url = `${BASE_API_URL}/${URLModel}/${
+				selectField.detail ? params.id + '/' : ''
+			}${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}`);
+			}
+		}
+	}
+
+	model['selectOptions'] = selectOptions;
+
+	const endpoint = model.endpointUrl
+		? `${BASE_API_URL}/${model.endpointUrl}?ebios_rm_studies=${params.id}`
+		: `${BASE_API_URL}/${model.urlModel}?ebios_rm_studies=${params.id}`;
+	const res = await fetch(endpoint);
+	const data = await res.json().then((res) => res.results);
+
+	const bodyData = tableSourceMapper(data, listViewFields[URLModel as urlModel].body);
+
+	const headData: Record<string, string> = listViewFields[URLModel as urlModel].body.reduce(
+		(obj, key, index) => {
+			obj[key] = listViewFields[URLModel as urlModel].head[index];
+			return obj;
+		},
+		{}
+	);
+
+	const table: TableSource = {
+		head: headData,
+		body: bodyData,
+		meta: data // metaData
+	};
+
+	return { createForm, deleteForm, model, URLModel, table };
+};
+
+export const actions: Actions = {
+	create: async (event) => {
+		// const redirectToWrittenObject = Boolean(event.params.model === 'entity-assessments');
+		return defaultWriteFormAction({
+			event,
+			urlModel: 'compliance-assessments',
+			action: 'create'
+			// redirectToWrittenObject: redirectToWrittenObject
+		});
+	},
+	delete: async (event) => {
+		return defaultDeleteFormAction({ event, urlModel: 'compliance-assessments' });
+	}
+};
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.svelte
new file mode 100644
index 000000000..08ebedae8
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.svelte
@@ -0,0 +1,67 @@
+<script lang="ts">
+	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
+	import type { PageData } from './$types';
+	import { safeTranslate } from '$lib/utils/i18n';
+	import type { ModalComponent, ModalSettings, ModalStore } from '@skeletonlabs/skeleton';
+	import { getModalStore } from '@skeletonlabs/skeleton';
+	import CreateModal from '$lib/components/Modals/CreateModal.svelte';
+	import MissingConstraintsModal from '$lib/components/Modals/MissingConstraintsModal.svelte';
+	import { checkConstraints } from '$lib/utils/crud';
+	import * as m from '$paraglide/messages.js';
+
+	const modalStore: ModalStore = getModalStore();
+
+	export let data: PageData;
+
+	const URLModel = data.URLModel;
+
+	function modalCreateForm(): void {
+		let modalComponent: ModalComponent = {
+			ref: CreateModal,
+			props: {
+				form: data.createForm,
+				model: data.model
+			}
+		};
+		let modal: ModalSettings = {
+			type: 'component',
+			component: modalComponent,
+			// Data
+			title: safeTranslate('add-' + data.model.localName)
+		};
+		if (
+			checkConstraints(
+				data.createForm.constraints,
+				Object.fromEntries(
+					Object.entries(data.model.foreignKeys).filter(([key]) => key !== 'risk_matrix')
+				)
+			).length > 0
+		) {
+			modalComponent = {
+				ref: MissingConstraintsModal
+			};
+			modal = {
+				type: 'component',
+				component: modalComponent,
+				title: m.warning(),
+				body: safeTranslate('add-' + data.model.localName).toLowerCase(),
+				value: checkConstraints(data.createForm.constraints, data.model.foreignKeys)
+			};
+		}
+		modalStore.trigger(modal);
+	}
+</script>
+
+<ModelTable source={data.table} deleteForm={data.deleteForm} {URLModel}>
+	<div slot="addButton">
+		<span class="inline-flex overflow-hidden rounded-md border bg-white shadow-sm">
+			<button
+				class="inline-block border-e p-3 btn-mini-primary w-12 focus:relative"
+				data-testid="add-button"
+				title={safeTranslate('add-' + data.model.localName)}
+				on:click={modalCreateForm}
+				><i class="fa-solid fa-file-circle-plus"></i>
+			</button>
+		</span>
+	</div>
+</ModelTable>

From 5eeb5a3009947a44677f72ac977d9f22cc411364 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Thu, 5 Dec 2024 10:33:02 +0100
Subject: [PATCH 24/38] chore: remove form debug

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

diff --git a/frontend/src/lib/components/Forms/Form.svelte b/frontend/src/lib/components/Forms/Form.svelte
index 1c91780fa..8536ca26c 100644
--- a/frontend/src/lib/components/Forms/Form.svelte
+++ b/frontend/src/lib/components/Forms/Form.svelte
@@ -49,7 +49,7 @@
 	const { form, message, tainted, delayed, errors, allErrors, enhance } = _form;
 </script>
 
-{#if true}
+{#if debug}
 	<SuperDebug data={$form} />
 	<SuperDebug data={$tainted} />
 	<SuperDebug data={$errors} />

From 050c587f925bc59c8d9a2193d1e53378ff4f705c Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Thu, 5 Dec 2024 10:53:12 +0100
Subject: [PATCH 25/38] fix: typos

---
 backend/ebios_rm/views.py         | 1 +
 frontend/src/lib/utils/schemas.ts | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/ebios_rm/views.py b/backend/ebios_rm/views.py
index fbf0136f6..1ca61f709 100644
--- a/backend/ebios_rm/views.py
+++ b/backend/ebios_rm/views.py
@@ -39,6 +39,7 @@ class FearedEventViewSet(BaseModelViewSet):
         "ebios_rm_study",
     ]
 
+
 class RoToViewSet(BaseModelViewSet):
     model = RoTo
 
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 60e09fd74..f862915fd 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -390,7 +390,8 @@ export const vulnerabilitySchema = z.object({
 	filtering_labels: z.string().optional().array().optional()
 });
 
-export const ebiosRMSchema = baseNamedObject({
+export const ebiosRMSchema = z.object({
+	...NameDescriptionMixin,
 	version: z.string().optional().default('0.1'),
 	ref_id: z.string().default(''),
 	risk_matrix: z.string().optional(),
@@ -401,7 +402,8 @@ export const ebiosRMSchema = baseNamedObject({
 	folder: z.string()
 });
 
-export const fearedEventsSchema = baseNamedObject({
+export const fearedEventsSchema = z.object({
+	...NameDescriptionMixin,
 	ref_id: z.string().optional(),
 	gravity: z.number().optional(),
 	is_selected: z.boolean().optional(),

From 17c48aa1a20707b187686cdc76804763ab24efe0 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Thu, 5 Dec 2024 17:04:06 +0100
Subject: [PATCH 26/38] Rename base route to baseline

---
 .../src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte | 2 +-
 .../[id=uuid]/workshop-one/{base => baseline}/+page.server.ts   | 0
 .../[id=uuid]/workshop-one/{base => baseline}/+page.svelte      | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/{base => baseline}/+page.server.ts (100%)
 rename frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/{base => baseline}/+page.svelte (100%)

diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index af9816e3d..21df4f60f 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -30,7 +30,7 @@
 			{
 				title: safeTranslate(m.ebiosWs1_4()),
 				status: 'to_do',
-				href: `${$page.url.pathname}/workshop-one/base?next=${$page.url.pathname}`
+				href: `${$page.url.pathname}/workshop-one/baseline?next=${$page.url.pathname}`
 			}
 		],
 		ws2: [
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/baseline/+page.server.ts
similarity index 100%
rename from frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.server.ts
rename to frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/baseline/+page.server.ts
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/baseline/+page.svelte
similarity index 100%
rename from frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.svelte
rename to frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/baseline/+page.svelte

From 6e269749f493295b3845fae9573f8045a9f1920c Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Thu, 5 Dec 2024 17:14:29 +0100
Subject: [PATCH 27/38] Add risk_matrix property and endpoint to feared events

---
 backend/ebios_rm/models.py | 4 ++++
 backend/ebios_rm/views.py  | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/backend/ebios_rm/models.py b/backend/ebios_rm/models.py
index f51d4fc8b..0d03410e2 100644
--- a/backend/ebios_rm/models.py
+++ b/backend/ebios_rm/models.py
@@ -137,6 +137,10 @@ def save(self, *args, **kwargs):
         self.folder = self.ebios_rm_study.folder
         super().save(*args, **kwargs)
 
+    @property
+    def risk_matrix(self):
+        return self.ebios_rm_study.risk_matrix
+
 
 class RoTo(AbstractBaseModel, FolderMixin):
     class RiskOrigin(models.TextChoices):
diff --git a/backend/ebios_rm/views.py b/backend/ebios_rm/views.py
index 1ca61f709..20a4424cf 100644
--- a/backend/ebios_rm/views.py
+++ b/backend/ebios_rm/views.py
@@ -1,3 +1,4 @@
+from core.serializers import RiskMatrixReadSerializer
 from core.views import BaseModelViewSet as AbstractBaseModelViewSet
 from .models import (
     EbiosRMStudy,
@@ -39,6 +40,11 @@ class FearedEventViewSet(BaseModelViewSet):
         "ebios_rm_study",
     ]
 
+    @action(detail=True, name="Get risk matrix", url_path="risk-matrix")
+    def risk_matrix(self, request, pk=None):
+        feared_event = self.get_object()
+        return Response(RiskMatrixReadSerializer(feared_event.risk_matrix).data)
+
 
 class RoToViewSet(BaseModelViewSet):
     model = RoTo

From 052c06740d63577ff84e3418bce37949ec3ca70b Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Thu, 5 Dec 2024 17:21:01 +0100
Subject: [PATCH 28/38] Add gravity choices endpoint for feared events

---
 backend/ebios_rm/models.py |  4 ++++
 backend/ebios_rm/views.py  | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/backend/ebios_rm/models.py b/backend/ebios_rm/models.py
index 0d03410e2..a2d050858 100644
--- a/backend/ebios_rm/models.py
+++ b/backend/ebios_rm/models.py
@@ -141,6 +141,10 @@ def save(self, *args, **kwargs):
     def risk_matrix(self):
         return self.ebios_rm_study.risk_matrix
 
+    @property
+    def parsed_matrix(self):
+        return self.risk_matrix.parse_json_translated()
+
 
 class RoTo(AbstractBaseModel, FolderMixin):
     class RiskOrigin(models.TextChoices):
diff --git a/backend/ebios_rm/views.py b/backend/ebios_rm/views.py
index 20a4424cf..47cfac6b2 100644
--- a/backend/ebios_rm/views.py
+++ b/backend/ebios_rm/views.py
@@ -45,6 +45,20 @@ def risk_matrix(self, request, pk=None):
         feared_event = self.get_object()
         return Response(RiskMatrixReadSerializer(feared_event.risk_matrix).data)
 
+    @method_decorator(cache_page(60 * LONG_CACHE_TTL))
+    @action(detail=True, name="Get gravity choices")
+    def gravity(self, request, pk):
+        feared_event: FearedEvent = self.get_object()
+        undefined = dict([(-1, "--")])
+        _choices = dict(
+            zip(
+                list(range(0, 64)),
+                [x["name"] for x in feared_event.parsed_matrix["impact"]],
+            )
+        )
+        choices = undefined | _choices
+        return Response(choices)
+
 
 class RoToViewSet(BaseModelViewSet):
     model = RoTo

From 7f03d85446907b0f128cbaa68424c39373cc30da Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Thu, 5 Dec 2024 17:48:03 +0100
Subject: [PATCH 29/38] Internationalize gravity field

---
 frontend/messages/en.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index ca6cab15a..77a6d510b 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -929,5 +929,6 @@
 	"impacts": "Impacts",
 	"ebiosRmStudies": "Ebios RM studies",
 	"bringTheEvidences": "Bring the evidences",
-	"bringTheEvidencesHelpText": "If disabled, the object will be duplicated without its evidences"
+	"bringTheEvidencesHelpText": "If disabled, the object will be duplicated without its evidences",
+	"gravity": "Gravity"
 }

From 981bb3439fda21c6d217df7782ad8d164b2b7f45 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Thu, 5 Dec 2024 17:48:15 +0100
Subject: [PATCH 30/38] Add gravity field to feared event form

---
 .../lib/components/Forms/ModelForm/FearedEventForm.svelte | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte b/frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte
index d3548da56..9580233a3 100644
--- a/frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/FearedEventForm.svelte
@@ -32,6 +32,14 @@
 	cacheLock={cacheLocks['ref_id']}
 	bind:cachedValue={formDataCache['ref_id']}
 />
+<Select
+	{form}
+	options={model.selectOptions['gravity']}
+	field="gravity"
+	label={m.gravity()}
+	cacheLock={cacheLocks['gravity']}
+	bind:cachedValue={formDataCache['gravity']}
+/>
 <TextArea
 	{form}
 	field="justification"

From 4db984a8911af2e2a2cd5849bf8c258cf5835503 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Thu, 5 Dec 2024 17:48:55 +0100
Subject: [PATCH 31/38] Add valueType parameter to SelectField interface

This allows to parse the value of a select option if it is a number
---
 frontend/src/lib/utils/crud.ts                              | 4 +++-
 frontend/src/lib/utils/load.ts                              | 2 +-
 .../(app)/(internal)/[model=urlmodel]/+page.server.ts       | 2 +-
 .../[model=urlmodel]/[id=uuid]/edit/+layout.server.ts       | 4 ++--
 .../src/routes/(app)/(internal)/ebios-rm/+page.server.ts    | 2 +-
 .../[id=uuid]/workshop-one/baseline/+page.server.ts         | 2 +-
 .../[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts   | 2 +-
 .../(internal)/risk-assessments/[id=uuid]/+layout.server.ts | 2 +-
 .../(internal)/risk-matrices/[id=uuid]/+layout.server.ts    | 2 +-
 .../risk-scenarios/[id=uuid]/edit/+page.server.ts           | 4 ++--
 .../src/routes/(app)/(internal)/settings/+page.server.ts    | 4 ++--
 .../[model=thirdparty_urlmodels]/+page.server.ts            | 2 +-
 .../[id=uuid]/edit/+layout.server.ts                        | 2 +-
 .../compliance-assessments/[id=uuid]/+page.server.ts        | 2 +-
 .../requirement-assessments/[id=uuid]/edit/+page.server.ts  | 6 +++---
 15 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 0c9c667f4..49f30e7ab 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -114,6 +114,7 @@ interface Field {
 interface SelectField {
 	field: string;
 	detail?: boolean;
+	valueType?: 'string' | 'number';
 }
 
 export interface ModelMapEntry {
@@ -620,7 +621,8 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'ebios_rm_study', urlModel: 'ebios-rm' },
 			{ field: 'assets', urlModel: 'assets' },
 			{ field: 'qualifications', urlModel: 'qualifications' }
-		]
+		],
+		selectFields: [{ field: 'gravity', valueType: 'number', detail: true }]
 	}
 };
 
diff --git a/frontend/src/lib/utils/load.ts b/frontend/src/lib/utils/load.ts
index 25155d91f..b4a42ec11 100644
--- a/frontend/src/lib/utils/load.ts
+++ b/frontend/src/lib/utils/load.ts
@@ -109,7 +109,7 @@ export const loadDetail = async ({ event, model, id }) => {
 								selectOptions[selectField.field] = await response.json().then((data) =>
 									Object.entries(data).map(([key, value]) => ({
 										label: value,
-										value: key
+										value: selectField.valueType === 'number' ? parseInt(key) : key
 									}))
 								);
 							} else {
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts
index 61f425852..fe10f5bf2 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts
@@ -48,7 +48,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 			selectOptions[selectField.field] = await response.json().then((data) =>
 				Object.entries(data).map(([key, value]) => ({
 					label: value,
-					value: key
+					value: selectField.valueType === 'number' ? parseInt(key) : key
 				}))
 			);
 		} else {
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts
index a6d843e1e..918df2f18 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/edit/+layout.server.ts
@@ -65,7 +65,7 @@ export const load: LayoutServerLoad = async (event) => {
 
 	if (selectFields) {
 		for (const selectField of selectFields) {
-			const url = `${BASE_API_URL}/${event.params.model}/${
+			const url = `${BASE_API_URL}/${model.endpointUrl ?? event.params.model}/${
 				selectField.detail ? event.params.id + '/' : ''
 			}${selectField.field}/`;
 			const response = await event.fetch(url);
@@ -73,7 +73,7 @@ export const load: LayoutServerLoad = async (event) => {
 				selectOptions[selectField.field] = await response.json().then((data) =>
 					Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}))
 				);
 			} else {
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
index 1c395758c..809ca81b9 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/+page.server.ts
@@ -50,7 +50,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 			selectOptions[selectField.field] = await response.json().then((data) =>
 				Object.entries(data).map(([key, value]) => ({
 					label: value,
-					value: key
+					value: selectField.valueType === 'number' ? parseInt(key) : key
 				}))
 			);
 		} else {
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/baseline/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/baseline/+page.server.ts
index b4dd9b6c2..2d907c25f 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/baseline/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/baseline/+page.server.ts
@@ -58,7 +58,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 				selectOptions[selectField.field] = await response.json().then((data) =>
 					Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}))
 				);
 			} else {
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
index e28cc52ea..346bfdee2 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts
@@ -45,7 +45,7 @@ export const load: PageServerLoad = async (event) => {
 				selectOptions[selectField.field] = await response.json().then((data) =>
 					Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}))
 				);
 			} else {
diff --git a/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+layout.server.ts b/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+layout.server.ts
index f1d747965..80f149cec 100644
--- a/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+layout.server.ts
+++ b/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+layout.server.ts
@@ -94,7 +94,7 @@ export const load: LayoutServerLoad = async ({ fetch, params }) => {
 				selectOptions[selectField.field] = await response.json().then((data) =>
 					Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}))
 				);
 			} else {
diff --git a/frontend/src/routes/(app)/(internal)/risk-matrices/[id=uuid]/+layout.server.ts b/frontend/src/routes/(app)/(internal)/risk-matrices/[id=uuid]/+layout.server.ts
index bfc57593b..36d5cfa30 100644
--- a/frontend/src/routes/(app)/(internal)/risk-matrices/[id=uuid]/+layout.server.ts
+++ b/frontend/src/routes/(app)/(internal)/risk-matrices/[id=uuid]/+layout.server.ts
@@ -69,7 +69,7 @@ export const load: LayoutServerLoad = async ({ fetch, params }) => {
 							selectOptions[selectField.field] = await response.json().then((data) =>
 								Object.entries(data).map(([key, value]) => ({
 									label: value,
-									value: key
+									value: selectField.valueType === 'number' ? parseInt(key) : key
 								}))
 							);
 						} else {
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts
index 1f9f71221..3e79e183a 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts
@@ -79,7 +79,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 				selectOptions[selectField.field] = await response.json().then((data) =>
 					Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}))
 				);
 			} else {
@@ -152,7 +152,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 				measureSelectOptions[selectField.field] = await response.json().then((data) =>
 					Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}))
 				);
 			} else {
diff --git a/frontend/src/routes/(app)/(internal)/settings/+page.server.ts b/frontend/src/routes/(app)/(internal)/settings/+page.server.ts
index 450eab6b2..cc2dba5b9 100644
--- a/frontend/src/routes/(app)/(internal)/settings/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/settings/+page.server.ts
@@ -28,7 +28,7 @@ export const load: PageServerLoad = async ({ fetch }) => {
 				selectOptions[selectField.field] = await response.json().then((data) =>
 					Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}))
 				);
 			} else {
@@ -47,7 +47,7 @@ export const load: PageServerLoad = async ({ fetch }) => {
 				selectOptions[selectField.field] = await response.json().then((data) =>
 					Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}))
 				);
 			} else {
diff --git a/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.server.ts b/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.server.ts
index e1a02c463..ce9f05aab 100644
--- a/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.server.ts
+++ b/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.server.ts
@@ -51,7 +51,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 			selectOptions[selectField.field] = await response.json().then((data) =>
 				Object.entries(data).map(([key, value]) => ({
 					label: value,
-					value: key
+					value: selectField.valueType === 'number' ? parseInt(key) : key
 				}))
 			);
 		} else {
diff --git a/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/[id=uuid]/edit/+layout.server.ts b/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/[id=uuid]/edit/+layout.server.ts
index 5b0ef3913..c152b8703 100644
--- a/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/[id=uuid]/edit/+layout.server.ts
+++ b/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/[id=uuid]/edit/+layout.server.ts
@@ -67,7 +67,7 @@ export const load: LayoutServerLoad = async (event) => {
 				selectOptions[selectField.field] = await response.json().then((data) =>
 					Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}))
 				);
 			} else {
diff --git a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.server.ts
index 6ee0140c1..983c9c84a 100644
--- a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.server.ts
+++ b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.server.ts
@@ -71,7 +71,7 @@ export const load = (async ({ fetch, params }) => {
 				selectOptions[selectField.field] = await response.json().then((data) =>
 					Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}))
 				);
 			} else {
diff --git a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.server.ts
index 08e68fed1..9670f9657 100644
--- a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.server.ts
+++ b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.server.ts
@@ -72,7 +72,7 @@ export const load = (async ({ fetch, params }) => {
 				if (data) {
 					selectOptions[selectField.field] = Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}));
 				}
 			})
@@ -98,7 +98,7 @@ export const load = (async ({ fetch, params }) => {
 				if (data) {
 					measureSelectOptions[selectField.field] = Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}));
 				} else {
 					console.error(`Failed to fetch data for ${selectField.field}: ${response.statusText}`);
@@ -169,7 +169,7 @@ export const load = (async ({ fetch, params }) => {
 				if (data) {
 					evidenceSelectOptions[selectField.field] = Object.entries(data).map(([key, value]) => ({
 						label: value,
-						value: key
+						value: selectField.valueType === 'number' ? parseInt(key) : key
 					}));
 				}
 			})

From 1bfca6e1a5d82a46bb2feb79eec7b698720ff805 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Fri, 6 Dec 2024 10:49:53 +0100
Subject: [PATCH 32/38] chore: use PrimaryKeyRelatedField insteand of
 SlugRelatedField

---
 backend/core/serializers.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/core/serializers.py b/backend/core/serializers.py
index 5d1602395..e55df2c53 100644
--- a/backend/core/serializers.py
+++ b/backend/core/serializers.py
@@ -601,9 +601,8 @@ class ComplianceAssessmentWriteSerializer(BaseModelSerializer):
         required=False,
         allow_null=True,
     )
-    ebios_rm_studies = serializers.SlugRelatedField(
+    ebios_rm_studies = serializers.PrimaryKeyRelatedField(
         many=True,
-        slug_field="id",
         queryset=EbiosRMStudy.objects.all(),
         required=False,
         allow_null=True,

From 0120a295662b97fb58c1a83478c9d1f265262440 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Fri, 6 Dec 2024 11:48:34 +0100
Subject: [PATCH 33/38] Remove required contraint from ref_id

---
 frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte | 1 -
 frontend/src/lib/utils/schemas.ts                              | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
index 20ba8c544..9a96e0eb8 100644
--- a/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
@@ -61,7 +61,6 @@
 		/>
 		<TextField
 			{form}
-			required
 			field="ref_id"
 			label={m.refId()}
 			cacheLock={cacheLocks['ref_id']}
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index f862915fd..16e2e136c 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -393,7 +393,7 @@ export const vulnerabilitySchema = z.object({
 export const ebiosRMSchema = z.object({
 	...NameDescriptionMixin,
 	version: z.string().optional().default('0.1'),
-	ref_id: z.string().default(''),
+	ref_id: z.string().optional().default(''),
 	risk_matrix: z.string().optional(),
 	authors: z.array(z.string().optional()).optional(),
 	reviewers: z.array(z.string().optional()).optional(),

From c8b5471af950a654f89c490c4312f04fdeeccee1 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Fri, 6 Dec 2024 11:49:01 +0100
Subject: [PATCH 34/38] Add ebios_rm before core in INSTALLED_APPS

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

diff --git a/backend/ciso_assistant/settings.py b/backend/ciso_assistant/settings.py
index bff8abcd7..61f3528bf 100644
--- a/backend/ciso_assistant/settings.py
+++ b/backend/ciso_assistant/settings.py
@@ -138,9 +138,9 @@ def set_ciso_assistant_url(_, __, event_dict):
     "tailwind",
     "iam",
     "global_settings",
+    "ebios_rm",
     "tprm",
     "core",
-    "ebios_rm",
     "cal",
     "django_filters",
     "library",

From c597f00835b897b8bf3b5c9a63fb24215e8a6a84 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Fri, 6 Dec 2024 12:15:27 +0100
Subject: [PATCH 35/38] Add selectOptions for feared event

---
 .../feared-events/+page.server.ts             | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts
index bb8c37006..12d667e74 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts
@@ -27,6 +27,29 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 	const model: ModelInfo = getModelInfo(URLModel);
 	const foreignKeyFields = urlParamModelForeignKeyFields(URLModel);
 
+	const selectOptions: Record<string, any> = {};
+
+	if (model.selectFields) {
+		for (const selectField of model.selectFields) {
+			const url = `${BASE_API_URL}/${model.endpointUrl ?? URLModel}/${
+				selectField.detail ? params.id + '/' : ''
+			}${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: selectField.valueType === 'number' ? parseInt(key) : key
+					}))
+				);
+			} else {
+				console.error(`Failed to fetch data for ${selectField.field}: ${response.statusText}`);
+			}
+		}
+	}
+
+	model['selectOptions'] = selectOptions;
+
 	const foreignKeys: Record<string, any> = {};
 
 	for (const keyField of foreignKeyFields) {

From 414e1067fabcdc6a68cf98705ffad9d199a35138 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Fri, 6 Dec 2024 12:29:37 +0100
Subject: [PATCH 36/38] Fix choices for feared event gravity on create

---
 backend/ebios_rm/models.py                    |  4 +++
 backend/ebios_rm/views.py                     | 14 +++++++++
 frontend/src/lib/utils/schemas.ts             |  2 +-
 .../feared-events/+page.server.ts             | 29 ++++++++-----------
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/backend/ebios_rm/models.py b/backend/ebios_rm/models.py
index a2d050858..6617f0d98 100644
--- a/backend/ebios_rm/models.py
+++ b/backend/ebios_rm/models.py
@@ -101,6 +101,10 @@ class Meta:
         verbose_name_plural = _("Ebios RM Studies")
         ordering = ["created_at"]
 
+    @property
+    def parsed_matrix(self):
+        return self.risk_matrix.parse_json_translated()
+
 
 class FearedEvent(NameDescriptionMixin, FolderMixin):
     ebios_rm_study = models.ForeignKey(
diff --git a/backend/ebios_rm/views.py b/backend/ebios_rm/views.py
index 47cfac6b2..af0360603 100644
--- a/backend/ebios_rm/views.py
+++ b/backend/ebios_rm/views.py
@@ -32,6 +32,20 @@ class EbiosRMStudyViewSet(BaseModelViewSet):
     def status(self, request):
         return Response(dict(EbiosRMStudy.Status.choices))
 
+    @method_decorator(cache_page(60 * LONG_CACHE_TTL))
+    @action(detail=True, name="Get gravity choices")
+    def gravity(self, request, pk):
+        study: EbiosRMStudy = self.get_object()
+        undefined = dict([(-1, "--")])
+        _choices = dict(
+            zip(
+                list(range(0, 64)),
+                [x["name"] for x in study.parsed_matrix["impact"]],
+            )
+        )
+        choices = undefined | _choices
+        return Response(choices)
+
 
 class FearedEventViewSet(BaseModelViewSet):
     model = FearedEvent
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 16e2e136c..413d7c45c 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -405,7 +405,7 @@ export const ebiosRMSchema = z.object({
 export const fearedEventsSchema = z.object({
 	...NameDescriptionMixin,
 	ref_id: z.string().optional(),
-	gravity: z.number().optional(),
+	gravity: z.number().optional().default(-1),
 	is_selected: z.boolean().optional(),
 	justification: z.string().optional(),
 	ebios_rm_study: z.string(),
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts
index 12d667e74..852754409 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts
@@ -29,23 +29,18 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 
 	const selectOptions: Record<string, any> = {};
 
-	if (model.selectFields) {
-		for (const selectField of model.selectFields) {
-			const url = `${BASE_API_URL}/${model.endpointUrl ?? URLModel}/${
-				selectField.detail ? params.id + '/' : ''
-			}${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: selectField.valueType === 'number' ? parseInt(key) : key
-					}))
-				);
-			} else {
-				console.error(`Failed to fetch data for ${selectField.field}: ${response.statusText}`);
-			}
-		}
+	const gravityChoicesEndpoint = `${BASE_API_URL}/ebios-rm/studies/${params.id}/gravity/`;
+	const gravityChoicesResponse = await fetch(gravityChoicesEndpoint);
+
+	if (gravityChoicesResponse.ok) {
+		selectOptions['gravity'] = await gravityChoicesResponse.json().then((data) =>
+			Object.entries(data).map(([key, value]) => ({
+				label: value,
+				value: parseInt(key)
+			}))
+		);
+	} else {
+		console.error(`Failed to fetch data for gravity: ${gravityChoicesResponse.statusText}`);
 	}
 
 	model['selectOptions'] = selectOptions;

From 1263644162578f579bae59178b16e4d11106c4e8 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Fri, 6 Dec 2024 12:38:17 +0100
Subject: [PATCH 37/38] Serialize feared event gravity display

---
 backend/ebios_rm/models.py      | 14 ++++++++++++++
 backend/ebios_rm/serializers.py |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/backend/ebios_rm/models.py b/backend/ebios_rm/models.py
index 6617f0d98..30543cba9 100644
--- a/backend/ebios_rm/models.py
+++ b/backend/ebios_rm/models.py
@@ -149,6 +149,20 @@ def risk_matrix(self):
     def parsed_matrix(self):
         return self.risk_matrix.parse_json_translated()
 
+    def get_gravity_display(self):
+        if self.gravity < 0:
+            return {
+                "abbreviation": "--",
+                "name": "--",
+                "description": "not rated",
+                "value": -1,
+            }
+        risk_matrix = self.parsed_matrix
+        return {
+            **risk_matrix["impact"][self.gravity],
+            "value": self.gravity,
+        }
+
 
 class RoTo(AbstractBaseModel, FolderMixin):
     class RiskOrigin(models.TextChoices):
diff --git a/backend/ebios_rm/serializers.py b/backend/ebios_rm/serializers.py
index fceac647e..15da633fc 100644
--- a/backend/ebios_rm/serializers.py
+++ b/backend/ebios_rm/serializers.py
@@ -73,6 +73,8 @@ class Meta:
 class FearedEventReadSerializer(BaseModelSerializer):
     ebios_rm_study = FieldsRelatedField()
     qualifications = FieldsRelatedField(["name"], many=True)
+    assets = FieldsRelatedField(many=True)
+    gravity = serializers.JSONField(source="get_gravity_display")
     folder = FieldsRelatedField()
 
     class Meta:

From b6d92202f5536f28d53edb18f9837c063d9f9a82 Mon Sep 17 00:00:00 2001
From: Nassim Tabchiche <n.tabchiche2@gmail.com>
Date: Fri, 6 Dec 2024 12:38:24 +0100
Subject: [PATCH 38/38] Add translations

---
 frontend/messages/en.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 1f804a845..11b1f8bf3 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -933,5 +933,9 @@
 	"gravity": "Gravity",
 	"existingControlsHelper": "What do you currently have to manage this risk",
 	"extraControlsHelper": "What will you do to mitigate this risk",
-	"existingContextHelper": "Description of the existing mitigations (this field will be deprecated soon)"
+	"existingContextHelper": "Description of the existing mitigations (this field will be deprecated soon)",
+	"fearedEvent": "Feared event",
+	"fearedEvents": "Feared events",
+	"isSelected": "Is selected",
+	"ebiosRM": "Ebios RM"
 }