From 7e8e74f1279df680f03b4aa7194fdaf7057db8bd Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Thu, 7 Nov 2024 13:40:00 +0100
Subject: [PATCH 01/12] Step 1: cleaning up

---
 .../[id=uuid]/edit/+page.svelte               | 81 +++++++------------
 1 file changed, 30 insertions(+), 51 deletions(-)

diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 9253fb967..d76848e2a 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -122,6 +122,7 @@
 	const impactColorMap = data.riskMatrix.impact.map((impact) => impact.hexcolor);
 </script>
 
+{@debug data}
 <div>
 	<SuperForm
 		class="flex flex-col space-y-3"
@@ -133,37 +134,25 @@
 		{...$$restProps}
 	>
 		<div class="flex flex-row space-x-2">
-			<div class="card px-4 py-2 bg-white shadow-lg w-1/2">
-				<h4 class="h4 font-semibold">{m.scope()}</h4>
-				<div class="flex flex-row justify-between">
-					<span>
+			<div class="card p-2 bg-white shadow-lg w-1/2">
+				<div class="flex justify-between p-2">
+					<div>
 						<p class="text-sm font-semibold text-gray-400">{m.project()}</p>
 						<a class="anchor text-sm font-semibold" href="/projects/{data.scenario.project.id}"
 							>{data.scenario.project.str}</a
 						>
-					</span>
-					<AutocompleteSelect
-						{form}
-						options={getOptions({ objects: data.foreignKeys['risk_assessment'] })}
-						field="risk_assessment"
-						label={m.riskAssessment()}
-					/>
-					<span>
-						<p class="text-sm font-semibold text-gray-400">{m.version()}</p>
-						<p class="text-sm font-semibold">{data.scenario.version}</p>
-					</span>
+					</div>
+					<div>
+						<p class="text-sm font-semibold text-gray-400">{m.riskAssessment()}</p>
+						<a class="anchor text-sm font-semibold" href="/projects/{data.scenario.project.id}"
+							>{data.scenario.risk_assessment.name}</a
+						>
+					</div>
 				</div>
 			</div>
 			<div class="card px-4 py-2 bg-white shadow-lg w-1/2">
-				<h4 class="h4 font-semibold">{m.status()}</h4>
 				<div class="flex flex-row justify-between">
-					<div class="w-1/4">
-						<p class="text-sm font-semibold text-gray-400">{m.lastUpdate()}</p>
-						<p class="text-sm font-semibold">
-							{new Date(data.scenario.updated_at).toLocaleString(languageTag())}
-						</p>
-					</div>
-					<div class=" px-2 w-2/4">
+					<div class=" px-2 w-2/3">
 						<AutocompleteSelect
 							{form}
 							multiple
@@ -172,8 +161,9 @@
 							label={m.owner()}
 						/>
 					</div>
-					<div class=" w-1/4">
+					<div class="w-1/3">
 						<Select
+							class="h-14"
 							{form}
 							options={data.treatmentChoices}
 							field="treatment"
@@ -185,7 +175,11 @@
 		</div>
 
 		<div class="flex flex-row space-x-2">
-			<div class="card px-4 py-2 bg-white shadow-lg space-y-4 w-3/5">
+			<div class="card px-4 py-2 bg-white shadow-lg space-y-4 w-5/12">
+				<TextField {form} field="name" label={m.name()} />
+				<TextArea {form} field="description" label={m.description()} />
+			</div>
+			<div class="card px-4 py-2 bg-white shadow-lg w-7/12 max-h-96 overflow-y-scroll">
 				<AutocompleteSelect
 					{form}
 					multiple
@@ -197,10 +191,6 @@
 					field="threats"
 					label={m.threats()}
 				/>
-				<TextField {form} field="name" label={m.name()} />
-				<TextArea {form} field="description" label={m.description()} />
-			</div>
-			<div class="card px-4 py-2 bg-white shadow-lg w-2/5 max-h-96 overflow-y-scroll">
 				<AutocompleteSelect
 					multiple
 					{form}
@@ -213,25 +203,19 @@
 					label={m.assets()}
 					helpText={m.riskScenarioAssetHelpText()}
 				/>
-				<ModelTable source={data.tables['assets']} hideFilters={true} URLModel="assets" />
+				<AutocompleteSelect
+					multiple
+					{form}
+					options={getOptions({
+						objects: data.foreignKeys['vulnerabilities'],
+						extra_fields: [['folder', 'str']],
+						label: 'auto'
+					})}
+					field="vulnerabilities"
+					label={m.vulnerabilities()}
+				/>
 			</div>
 		</div>
-		<AutocompleteSelect
-			multiple
-			{form}
-			options={getOptions({
-				objects: data.foreignKeys['vulnerabilities'],
-				extra_fields: [['folder', 'str']],
-				label: 'auto'
-			})}
-			field="vulnerabilities"
-			label={m.vulnerabilities()}
-		/>
-		<ModelTable
-			source={data.tables['vulnerabilities']}
-			hideFilters={true}
-			URLModel="vulnerabilities"
-		/>
 		<input type="hidden" name="urlmodel" value={data.model.urlModel} />
 
 		<div class="card px-4 py-2 bg-white shadow-lg">
@@ -299,11 +283,6 @@
 						field="applied_controls"
 						label={m.appliedControls()}
 					/>
-					<ModelTable
-						source={data.tables['applied-controls']}
-						hideFilters={true}
-						URLModel="applied-controls"
-					/>
 				</div>
 				<div class="flex flex-col">
 					<h5 class="h5 font-medium">{m.targetAssessment()}</h5>

From 972a4155b71ac3662c4eff7d0238f9ba548a78fd Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Thu, 7 Nov 2024 14:47:55 +0100
Subject: [PATCH 02/12] Better flow for risk scores

---
 .../[id=uuid]/edit/+page.svelte               | 131 ++++++++++--------
 1 file changed, 72 insertions(+), 59 deletions(-)

diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index d76848e2a..ceb346dad 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -220,42 +220,49 @@
 
 		<div class="card px-4 py-2 bg-white shadow-lg">
 			<h4 class="h4 font-semibold">{m.currentRisk()}</h4>
-			<div class="flex flex-row space-x-4 justify-between">
-				<TextArea
-					{form}
-					field="existing_controls"
-					label={m.existingControls()}
-					helpText={m.riskScenarioMeasureHelpText()}
-					regionContainer="w-1/2"
-				/>
-				<div class="flex flex-col">
-					<h5 class="h5 font-medium">{m.currentAssessment()}</h5>
+			<div class="flex flex-row space-x-8 justify-between">
+				<div class="w-1/2">
+					<TextArea
+						{form}
+						field="existing_controls"
+						label={m.existingControls()}
+						helpText="Current controls to manage this risk"
+						regionContainer="w-1/2"
+					/>
+				</div>
+				<div class="flex w-1/2">
 					<div class="flex flex-row space-x-4 my-auto">
-						<Select
-							{form}
-							options={data.probabilityChoices}
-							color_map={probabilityColorMap}
-							field="current_proba"
-							label={m.currentProba()}
-						/>
+						<div class="min-w-36">
+							<Select
+								{form}
+								options={data.probabilityChoices}
+								color_map={probabilityColorMap}
+								field="current_proba"
+								label={m.currentProba()}
+							/>
+						</div>
 						<i class="fa-solid fa-xmark mt-8" />
-						<Select
-							{form}
-							options={data.impactChoices}
-							color_map={impactColorMap}
-							field="current_impact"
-							label={m.currentImpact()}
-						/>
+						<div class="min-w-36">
+							<Select
+								{form}
+								options={data.impactChoices}
+								color_map={impactColorMap}
+								field="current_impact"
+								label={m.currentImpact()}
+							/>
+						</div>
 						<i class="fa-solid fa-equals mt-8" />
-						<RiskLevel
-							{form}
-							field="current_risk_level"
-							label={m.currentRiskLevel()}
-							riskMatrix={data.riskMatrix}
-							probabilityField="current_proba"
-							impactField="current_impact"
-							helpText={m.currentRiskLevelHelpText()}
-						/>
+						<div class="min-w-38">
+							<RiskLevel
+								{form}
+								field="current_risk_level"
+								label={m.currentRiskLevel()}
+								riskMatrix={data.riskMatrix}
+								probabilityField="current_proba"
+								impactField="current_impact"
+								helpText={m.currentRiskLevelHelpText()}
+							/>
+						</div>
 					</div>
 				</div>
 			</div>
@@ -263,7 +270,7 @@
 
 		<div class="card px-4 py-2 bg-white shadow-lg">
 			<h4 class="h4 font-semibold">{m.residualRisk()}</h4>
-			<div class="flex flex-row space-x-4 justify-between">
+			<div class="flex flex-row space-x-8">
 				<div class="flex flex-col space-y-4 w-1/2">
 					<span class="flex flex-row justify-between items-center">
 						<h5 class="h5 font-medium">{m.associatedAppliedControls()}</h5>
@@ -282,36 +289,42 @@
 						})}
 						field="applied_controls"
 						label={m.appliedControls()}
+						helpText="Extra controls to mitigate this risk"
 					/>
 				</div>
-				<div class="flex flex-col">
-					<h5 class="h5 font-medium">{m.targetAssessment()}</h5>
+				<div class="flex w-1/2">
 					<div class="flex flex-row space-x-4 my-auto">
-						<Select
-							{form}
-							options={data.probabilityChoices}
-							color_map={probabilityColorMap}
-							field="residual_proba"
-							label={m.residualProba()}
-						/>
+						<div class="min-w-36">
+							<Select
+								{form}
+								options={data.probabilityChoices}
+								color_map={probabilityColorMap}
+								field="residual_proba"
+								label={m.residualProba()}
+							/>
+						</div>
 						<i class="fa-solid fa-xmark mt-8" />
-						<Select
-							{form}
-							options={data.impactChoices}
-							color_map={impactColorMap}
-							field="residual_impact"
-							label={m.residualImpact()}
-						/>
+						<div class="min-w-36">
+							<Select
+								{form}
+								options={data.impactChoices}
+								color_map={impactColorMap}
+								field="residual_impact"
+								label={m.residualImpact()}
+							/>
+						</div>
 						<i class="fa-solid fa-equals mt-8" />
-						<RiskLevel
-							{form}
-							field="current_risk_level"
-							label={m.residualRiskLevel()}
-							riskMatrix={data.riskMatrix}
-							probabilityField="residual_proba"
-							impactField="residual_impact"
-							helpText={m.residualRiskLevelHelpText()}
-						/>
+						<div class="min-w-38">
+							<RiskLevel
+								{form}
+								field="current_risk_level"
+								label={m.residualRiskLevel()}
+								riskMatrix={data.riskMatrix}
+								probabilityField="residual_proba"
+								impactField="residual_impact"
+								helpText={m.residualRiskLevelHelpText()}
+							/>
+						</div>
 					</div>
 				</div>
 			</div>

From f3a05e1b540e3aae3e9b6fbaf465aaa8c77868db Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Fri, 8 Nov 2024 20:11:18 +0100
Subject: [PATCH 03/12] Fix link, add version

---
 .../[id=uuid]/edit/+page.svelte               | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index ceb346dad..498edecc9 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -144,8 +144,10 @@
 					</div>
 					<div>
 						<p class="text-sm font-semibold text-gray-400">{m.riskAssessment()}</p>
-						<a class="anchor text-sm font-semibold" href="/projects/{data.scenario.project.id}"
-							>{data.scenario.risk_assessment.name}</a
+						<a
+							class="anchor text-sm font-semibold"
+							href="/risk-assessments/{data.scenario.risk_assessment.id}"
+							>{data.scenario.risk_assessment.name} {data.scenario.version}</a
 						>
 					</div>
 				</div>
@@ -330,19 +332,26 @@
 			</div>
 		</div>
 		<div class="card px-4 py-2 bg-white shadow-lg">
-			<AutocompleteSelect
-				{form}
-				options={data.qualificationChoices}
-				multiple={true}
-				field="qualifications"
-				label={m.qualification()}
-			/>
-			<Select
-				{form}
-				options={strengthOfKnowledgeFormChoices}
-				field="strength_of_knowledge"
-				label={m.strengthOfKnowledge()}
-			/>
+			<div class="flex space-x-4 mb-1">
+				<div class="w-1/2">
+					<AutocompleteSelect
+						{form}
+						options={data.qualificationChoices}
+						multiple={true}
+						field="qualifications"
+						label={m.qualification()}
+					/>
+				</div>
+				<div class="w-1/2">
+					<Select
+						{form}
+						options={strengthOfKnowledgeFormChoices}
+						field="strength_of_knowledge"
+						label={m.strengthOfKnowledge()}
+						class="h-14"
+					/>
+				</div>
+			</div>
 			<TextArea {form} field="justification" label={m.justification()} />
 		</div>
 		<div class="flex flex-row justify-between space-x-4">

From c48121ed97330b7351ff72258b3309741d011bc0 Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Sat, 9 Nov 2024 09:38:10 +0100
Subject: [PATCH 04/12] Add multi select for existing controls and adjust UI

---
 ..._riskscenario_existing_applied_controls.py | 22 ++++++++++
 backend/core/models.py                        |  6 +++
 backend/core/serializers.py                   |  1 +
 frontend/src/lib/utils/schemas.ts             |  1 +
 .../[id=uuid]/edit/+page.svelte               | 40 ++++++++++++++-----
 5 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 backend/core/migrations/0034_riskscenario_existing_applied_controls.py

diff --git a/backend/core/migrations/0034_riskscenario_existing_applied_controls.py b/backend/core/migrations/0034_riskscenario_existing_applied_controls.py
new file mode 100644
index 000000000..417f19785
--- /dev/null
+++ b/backend/core/migrations/0034_riskscenario_existing_applied_controls.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.1.1 on 2024-11-08 19:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0033_fix_mitre_lib_version"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="riskscenario",
+            name="existing_applied_controls",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="risk_scenarios_e",
+                to="core.appliedcontrol",
+                verbose_name="Existing Applied controls",
+            ),
+        ),
+    ]
diff --git a/backend/core/models.py b/backend/core/models.py
index 860c44a77..9f96e9177 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -1950,6 +1950,12 @@ class RiskScenario(NameDescriptionMixin):
         verbose_name=_("Existing controls"),
         blank=True,
     )
+    existing_applied_controls = models.ManyToManyField(
+        AppliedControl,
+        verbose_name=_("Existing Applied controls"),
+        blank=True,
+        related_name="risk_scenarios_e",
+    )
 
     owner = models.ManyToManyField(
         User,
diff --git a/backend/core/serializers.py b/backend/core/serializers.py
index 74ed904fe..56320a1d3 100644
--- a/backend/core/serializers.py
+++ b/backend/core/serializers.py
@@ -304,6 +304,7 @@ class RiskScenarioReadSerializer(RiskScenarioWriteSerializer):
     strength_of_knowledge = serializers.JSONField(source="get_strength_of_knowledge")
 
     applied_controls = FieldsRelatedField(many=True)
+    existing_applied_controls = FieldsRelatedField(many=True)
     rid = serializers.CharField()
 
     owner = FieldsRelatedField(many=True)
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index aac616d61..b84a05704 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -105,6 +105,7 @@ export const ThreatSchema = baseNamedObject({
 export const RiskScenarioSchema = baseNamedObject({
 	existing_controls: z.string().optional(),
 	applied_controls: z.string().uuid().optional().array().optional(),
+	existing_applied_controls: z.string().uuid().optional().array().optional(),
 	current_proba: z.number().optional(),
 	current_impact: z.number().optional(),
 	residual_proba: z.number().optional(),
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 498edecc9..45d3d4fa3 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -221,15 +221,34 @@
 		<input type="hidden" name="urlmodel" value={data.model.urlModel} />
 
 		<div class="card px-4 py-2 bg-white shadow-lg">
-			<h4 class="h4 font-semibold">{m.currentRisk()}</h4>
+			<h4 class="h4 font-black mb-2">{m.currentRisk()}</h4>
 			<div class="flex flex-row space-x-8 justify-between">
 				<div class="w-1/2">
+					<div class="flex flex-row-reverse -mb-4">
+						<button
+							class="btn variant-filled-secondary z-0"
+							on:click={modalMeasureCreateForm}
+							type="button"><i class="fa-solid fa-plus text-sm" /></button
+						>
+					</div>
+					<AutocompleteSelect
+						multiple
+						{form}
+						options={getOptions({
+							objects: data.foreignKeys['applied_controls'],
+							extra_fields: [['folder', 'str']]
+						})}
+						field="existing_applied_controls"
+						label="Existing controls"
+						helpText="Current measures to manage this risk"
+					/>
 					<TextArea
 						{form}
 						field="existing_controls"
-						label={m.existingControls()}
-						helpText="Current controls to manage this risk"
+						label="context"
+						helpText="Description of the existing mitigations ( ℹ️ this field will be deprecated soon)"
 						regionContainer="w-1/2"
+						rows={3}
 					/>
 				</div>
 				<div class="flex w-1/2">
@@ -271,17 +290,16 @@
 		</div>
 
 		<div class="card px-4 py-2 bg-white shadow-lg">
-			<h4 class="h4 font-semibold">{m.residualRisk()}</h4>
+			<h4 class="h4 font-black mb-2">{m.residualRisk()}</h4>
 			<div class="flex flex-row space-x-8">
 				<div class="flex flex-col space-y-4 w-1/2">
-					<span class="flex flex-row justify-between items-center">
-						<h5 class="h5 font-medium">{m.associatedAppliedControls()}</h5>
+					<div class="flex flex-row-reverse -mb-8">
 						<button
-							class="btn variant-filled-primary self-end"
+							class="btn variant-filled-secondary z-0"
 							on:click={modalMeasureCreateForm}
-							type="button"><i class="fa-solid fa-plus mr-2" />{m.addAppliedControl()}</button
+							type="button"><i class="fa-solid fa-plus text-sm" /></button
 						>
-					</span>
+					</div>
 					<AutocompleteSelect
 						multiple
 						{form}
@@ -290,8 +308,8 @@
 							extra_fields: [['folder', 'str']]
 						})}
 						field="applied_controls"
-						label={m.appliedControls()}
-						helpText="Extra controls to mitigate this risk"
+						label="Additional controls"
+						helpText="Extra measures needed to mitigate this risk"
 					/>
 				</div>
 				<div class="flex w-1/2">

From 150b4ea10fe513772fa4970c977976811c24491a Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Sat, 9 Nov 2024 09:50:55 +0100
Subject: [PATCH 05/12] fix migrations

---
 ...ols.py => 0035_riskscenario_existing_applied_controls.py} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename backend/core/migrations/{0034_riskscenario_existing_applied_controls.py => 0035_riskscenario_existing_applied_controls.py} (81%)

diff --git a/backend/core/migrations/0034_riskscenario_existing_applied_controls.py b/backend/core/migrations/0035_riskscenario_existing_applied_controls.py
similarity index 81%
rename from backend/core/migrations/0034_riskscenario_existing_applied_controls.py
rename to backend/core/migrations/0035_riskscenario_existing_applied_controls.py
index 417f19785..b61347503 100644
--- a/backend/core/migrations/0034_riskscenario_existing_applied_controls.py
+++ b/backend/core/migrations/0035_riskscenario_existing_applied_controls.py
@@ -1,11 +1,12 @@
-# Generated by Django 5.1.1 on 2024-11-08 19:37
+# Generated by Django 5.1.1 on 2024-11-09 08:49
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
-        ("core", "0033_fix_mitre_lib_version"),
+        ("core", "0034_fix_loaded_libraries_objects_meta"),
     ]
 
     operations = [

From 619f25ec59b99063a4f1d7075bffcf01a90c0b9d Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Sat, 9 Nov 2024 09:52:18 +0100
Subject: [PATCH 06/12] Formatter

---
 .../migrations/0035_riskscenario_existing_applied_controls.py    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/core/migrations/0035_riskscenario_existing_applied_controls.py b/backend/core/migrations/0035_riskscenario_existing_applied_controls.py
index b61347503..675d36503 100644
--- a/backend/core/migrations/0035_riskscenario_existing_applied_controls.py
+++ b/backend/core/migrations/0035_riskscenario_existing_applied_controls.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0034_fix_loaded_libraries_objects_meta"),
     ]

From 69ef70bee71ba45c8c64d92a292423e9aab5ce05 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 12 Nov 2024 15:37:53 +0100
Subject: [PATCH 07/12] feat: create applied controls from autocomplete in
 scenarios

---
 backend/core/helpers.py                       | 31 +++++++++++++++++++
 .../0036_alter_appliedcontrol_cost.py         | 18 +++++++++++
 backend/core/models.py                        |  1 +
 backend/core/views.py                         | 25 ++++++++++++---
 frontend/src/lib/utils/schemas.ts             |  4 +--
 .../[id=uuid]/edit/+page.svelte               |  2 ++
 6 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 backend/core/migrations/0036_alter_appliedcontrol_cost.py

diff --git a/backend/core/helpers.py b/backend/core/helpers.py
index 08d8dfdf2..5a40d4fe2 100644
--- a/backend/core/helpers.py
+++ b/backend/core/helpers.py
@@ -2,6 +2,7 @@
 from collections.abc import MutableMapping
 from datetime import date, timedelta
 from typing import Optional
+import uuid
 
 # from icecream import ic
 from django.core.exceptions import NON_FIELD_ERRORS as DJ_NON_FIELD_ERRORS
@@ -1280,3 +1281,33 @@ def duplicate_and_link_object(new_obj, duplicate_object, target_folder, field_na
             field_name,
             model_class,
         )
+
+def process_autocomplete_creation(items, object_class, attribute_name="name", base_object=None, id_version=4):
+    """
+    Creates an instance of `object_class` for each item in `items` if it is not a valid UUID.
+    Replaces the item with the ID of the newly created or existing object.
+
+    Parameters:
+    - items: list of strings to process
+    - object_class: the class to use for creating objects if items are not UUIDs
+    - attribute_name: the name of the attribute on `object_class` to set with the item's value
+    - id_version: the UUID version to check against (default is version 4)
+
+    Returns:
+    - List of UUID strings for the processed objects
+    """
+    new_ids = []
+    for item in items:
+        try:
+            # Check if the item is a valid UUID
+            uuid.UUID(item, version=id_version)
+            new_ids.append(item)
+        except ValueError:
+            # Create a new instance of `object_class` if item is not a valid UUID
+            new_object = object_class(**{attribute_name: item})
+            if base_object:
+                new_object.folder = Folder.get_folder(base_object)
+            new_object.full_clean()
+            new_object.save()
+            new_ids.append(str(new_object.id))
+    return new_ids
diff --git a/backend/core/migrations/0036_alter_appliedcontrol_cost.py b/backend/core/migrations/0036_alter_appliedcontrol_cost.py
new file mode 100644
index 000000000..e0768a055
--- /dev/null
+++ b/backend/core/migrations/0036_alter_appliedcontrol_cost.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-11-12 14:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0035_riskscenario_existing_applied_controls'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='appliedcontrol',
+            name='cost',
+            field=models.FloatField(blank=True, help_text='Cost of the measure (using globally-chosen currency)', null=True, verbose_name='Cost'),
+        ),
+    ]
diff --git a/backend/core/models.py b/backend/core/models.py
index 9f96e9177..f4bb1c20c 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -1374,6 +1374,7 @@ class Status(models.TextChoices):
     )
     cost = models.FloatField(
         null=True,
+        blank=True,
         help_text=_("Cost of the measure (using globally-chosen currency)"),
         verbose_name=_("Cost"),
     )
diff --git a/backend/core/views.py b/backend/core/views.py
index 74553cfe7..2cc9118d2 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -441,14 +441,18 @@ def _process_labels(self, labels):
         return new_labels
 
     def update(self, request: Request, *args, **kwargs) -> Response:
-        request.data["filtering_labels"] = self._process_labels(
-            request.data["filtering_labels"]
+        request.data["filtering_labels"] = process_autocomplete_creation(
+            items=request.data["filtering_labels"], 
+            object_class=FilteringLabel, 
+            attribute_name='label'
         )
         return super().update(request, *args, **kwargs)
 
     def create(self, request: Request, *args, **kwargs) -> Response:
-        request.data["filtering_labels"] = self._process_labels(
-            request.data["filtering_labels"]
+        request.data["filtering_labels"] = process_autocomplete_creation(
+            items=request.data["filtering_labels"], 
+            object_class=FilteringLabel, 
+            attribute_name='label'
         )
         return super().create(request, *args, **kwargs)
 
@@ -1140,6 +1144,19 @@ def count_per_level(self, request):
     @action(detail=False, name="Get risk scenarios count per status")
     def per_status(self, request):
         return Response({"results": risk_per_status(request.user)})
+    
+    def update(self, request: Request, *args, **kwargs) -> Response:
+        request.data["existing_applied_controls"] = process_autocomplete_creation(
+            items=request.data["existing_applied_controls"], 
+            object_class=AppliedControl,
+            base_object=self.get_object(),
+        )
+        request.data["applied_controls"] = process_autocomplete_creation(
+            items=request.data["applied_controls"], 
+            object_class=AppliedControl,
+            base_object=self.get_object(),
+        )
+        return super().update(request, *args, **kwargs)
 
 
 class RiskAcceptanceViewSet(BaseModelViewSet):
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index b84a05704..e32aac9af 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -104,8 +104,8 @@ export const ThreatSchema = baseNamedObject({
 
 export const RiskScenarioSchema = baseNamedObject({
 	existing_controls: z.string().optional(),
-	applied_controls: z.string().uuid().optional().array().optional(),
-	existing_applied_controls: z.string().uuid().optional().array().optional(),
+	applied_controls: z.string().optional().array().optional(),
+	existing_applied_controls: z.string().optional().array().optional(),
 	current_proba: z.number().optional(),
 	current_impact: z.number().optional(),
 	residual_proba: z.number().optional(),
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 45d3d4fa3..be8d0205e 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -238,6 +238,7 @@
 							objects: data.foreignKeys['applied_controls'],
 							extra_fields: [['folder', 'str']]
 						})}
+						createFromSelection={true}
 						field="existing_applied_controls"
 						label="Existing controls"
 						helpText="Current measures to manage this risk"
@@ -307,6 +308,7 @@
 							objects: data.foreignKeys['applied_controls'],
 							extra_fields: [['folder', 'str']]
 						})}
+						createFromSelection={true}
 						field="applied_controls"
 						label="Additional controls"
 						helpText="Extra measures needed to mitigate this risk"

From 4e17f0cac2e7115a713e24fc1d04bb1c40c31e79 Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Fri, 15 Nov 2024 09:43:36 +0100
Subject: [PATCH 08/12] Revert "feat: create applied controls from autocomplete
 in scenarios"

This reverts commit 69ef70bee71ba45c8c64d92a292423e9aab5ce05.
---
 backend/core/helpers.py                       | 31 -------------------
 .../0036_alter_appliedcontrol_cost.py         | 18 -----------
 backend/core/models.py                        |  1 -
 backend/core/views.py                         | 25 +++------------
 frontend/src/lib/utils/schemas.ts             |  4 +--
 .../[id=uuid]/edit/+page.svelte               |  2 --
 6 files changed, 6 insertions(+), 75 deletions(-)
 delete mode 100644 backend/core/migrations/0036_alter_appliedcontrol_cost.py

diff --git a/backend/core/helpers.py b/backend/core/helpers.py
index 5a40d4fe2..08d8dfdf2 100644
--- a/backend/core/helpers.py
+++ b/backend/core/helpers.py
@@ -2,7 +2,6 @@
 from collections.abc import MutableMapping
 from datetime import date, timedelta
 from typing import Optional
-import uuid
 
 # from icecream import ic
 from django.core.exceptions import NON_FIELD_ERRORS as DJ_NON_FIELD_ERRORS
@@ -1281,33 +1280,3 @@ def duplicate_and_link_object(new_obj, duplicate_object, target_folder, field_na
             field_name,
             model_class,
         )
-
-def process_autocomplete_creation(items, object_class, attribute_name="name", base_object=None, id_version=4):
-    """
-    Creates an instance of `object_class` for each item in `items` if it is not a valid UUID.
-    Replaces the item with the ID of the newly created or existing object.
-
-    Parameters:
-    - items: list of strings to process
-    - object_class: the class to use for creating objects if items are not UUIDs
-    - attribute_name: the name of the attribute on `object_class` to set with the item's value
-    - id_version: the UUID version to check against (default is version 4)
-
-    Returns:
-    - List of UUID strings for the processed objects
-    """
-    new_ids = []
-    for item in items:
-        try:
-            # Check if the item is a valid UUID
-            uuid.UUID(item, version=id_version)
-            new_ids.append(item)
-        except ValueError:
-            # Create a new instance of `object_class` if item is not a valid UUID
-            new_object = object_class(**{attribute_name: item})
-            if base_object:
-                new_object.folder = Folder.get_folder(base_object)
-            new_object.full_clean()
-            new_object.save()
-            new_ids.append(str(new_object.id))
-    return new_ids
diff --git a/backend/core/migrations/0036_alter_appliedcontrol_cost.py b/backend/core/migrations/0036_alter_appliedcontrol_cost.py
deleted file mode 100644
index e0768a055..000000000
--- a/backend/core/migrations/0036_alter_appliedcontrol_cost.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.1 on 2024-11-12 14:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0035_riskscenario_existing_applied_controls'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='appliedcontrol',
-            name='cost',
-            field=models.FloatField(blank=True, help_text='Cost of the measure (using globally-chosen currency)', null=True, verbose_name='Cost'),
-        ),
-    ]
diff --git a/backend/core/models.py b/backend/core/models.py
index f4bb1c20c..9f96e9177 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -1374,7 +1374,6 @@ class Status(models.TextChoices):
     )
     cost = models.FloatField(
         null=True,
-        blank=True,
         help_text=_("Cost of the measure (using globally-chosen currency)"),
         verbose_name=_("Cost"),
     )
diff --git a/backend/core/views.py b/backend/core/views.py
index 2cc9118d2..74553cfe7 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -441,18 +441,14 @@ def _process_labels(self, labels):
         return new_labels
 
     def update(self, request: Request, *args, **kwargs) -> Response:
-        request.data["filtering_labels"] = process_autocomplete_creation(
-            items=request.data["filtering_labels"], 
-            object_class=FilteringLabel, 
-            attribute_name='label'
+        request.data["filtering_labels"] = self._process_labels(
+            request.data["filtering_labels"]
         )
         return super().update(request, *args, **kwargs)
 
     def create(self, request: Request, *args, **kwargs) -> Response:
-        request.data["filtering_labels"] = process_autocomplete_creation(
-            items=request.data["filtering_labels"], 
-            object_class=FilteringLabel, 
-            attribute_name='label'
+        request.data["filtering_labels"] = self._process_labels(
+            request.data["filtering_labels"]
         )
         return super().create(request, *args, **kwargs)
 
@@ -1144,19 +1140,6 @@ def count_per_level(self, request):
     @action(detail=False, name="Get risk scenarios count per status")
     def per_status(self, request):
         return Response({"results": risk_per_status(request.user)})
-    
-    def update(self, request: Request, *args, **kwargs) -> Response:
-        request.data["existing_applied_controls"] = process_autocomplete_creation(
-            items=request.data["existing_applied_controls"], 
-            object_class=AppliedControl,
-            base_object=self.get_object(),
-        )
-        request.data["applied_controls"] = process_autocomplete_creation(
-            items=request.data["applied_controls"], 
-            object_class=AppliedControl,
-            base_object=self.get_object(),
-        )
-        return super().update(request, *args, **kwargs)
 
 
 class RiskAcceptanceViewSet(BaseModelViewSet):
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index e32aac9af..b84a05704 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -104,8 +104,8 @@ export const ThreatSchema = baseNamedObject({
 
 export const RiskScenarioSchema = baseNamedObject({
 	existing_controls: z.string().optional(),
-	applied_controls: z.string().optional().array().optional(),
-	existing_applied_controls: z.string().optional().array().optional(),
+	applied_controls: z.string().uuid().optional().array().optional(),
+	existing_applied_controls: z.string().uuid().optional().array().optional(),
 	current_proba: z.number().optional(),
 	current_impact: z.number().optional(),
 	residual_proba: z.number().optional(),
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index be8d0205e..45d3d4fa3 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -238,7 +238,6 @@
 							objects: data.foreignKeys['applied_controls'],
 							extra_fields: [['folder', 'str']]
 						})}
-						createFromSelection={true}
 						field="existing_applied_controls"
 						label="Existing controls"
 						helpText="Current measures to manage this risk"
@@ -308,7 +307,6 @@
 							objects: data.foreignKeys['applied_controls'],
 							extra_fields: [['folder', 'str']]
 						})}
-						createFromSelection={true}
 						field="applied_controls"
 						label="Additional controls"
 						helpText="Extra measures needed to mitigate this risk"

From 9fbea35526cc62eb317fe175acbe7f7b2cb02e4b Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Fri, 15 Nov 2024 12:11:35 +0100
Subject: [PATCH 09/12] adjust

---
 .../[id=uuid]/edit/+page.svelte               | 81 +++++++++++--------
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 45d3d4fa3..3aca3e826 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -224,24 +224,30 @@
 			<h4 class="h4 font-black mb-2">{m.currentRisk()}</h4>
 			<div class="flex flex-row space-x-8 justify-between">
 				<div class="w-1/2">
-					<div class="flex flex-row-reverse -mb-4">
-						<button
-							class="btn variant-filled-secondary z-0"
-							on:click={modalMeasureCreateForm}
-							type="button"><i class="fa-solid fa-plus text-sm" /></button
-						>
+					<div class="flex">
+						<div class="w-full mr-2">
+							<AutocompleteSelect
+								multiple
+								{form}
+								options={getOptions({
+									objects: data.foreignKeys['applied_controls'],
+									extra_fields: [['folder', 'str']]
+								})}
+								field="existing_applied_controls"
+								label="Existing controls"
+								helpText="Current measures to manage this risk"
+							/>
+						</div>
+						<div class="flex items-center justify-center">
+							<div class="">
+								<button
+									class="btn variant-filled-secondary z-0"
+									on:click={modalMeasureCreateForm}
+									type="button"><i class="fa-solid fa-plus text-sm" /></button
+								>
+							</div>
+						</div>
 					</div>
-					<AutocompleteSelect
-						multiple
-						{form}
-						options={getOptions({
-							objects: data.foreignKeys['applied_controls'],
-							extra_fields: [['folder', 'str']]
-						})}
-						field="existing_applied_controls"
-						label="Existing controls"
-						helpText="Current measures to manage this risk"
-					/>
 					<TextArea
 						{form}
 						field="existing_controls"
@@ -292,25 +298,29 @@
 		<div class="card px-4 py-2 bg-white shadow-lg">
 			<h4 class="h4 font-black mb-2">{m.residualRisk()}</h4>
 			<div class="flex flex-row space-x-8">
-				<div class="flex flex-col space-y-4 w-1/2">
-					<div class="flex flex-row-reverse -mb-8">
-						<button
-							class="btn variant-filled-secondary z-0"
-							on:click={modalMeasureCreateForm}
-							type="button"><i class="fa-solid fa-plus text-sm" /></button
-						>
+				<div class="flex w-1/2">
+					<div class="w-full mr-2">
+						<AutocompleteSelect
+							multiple
+							{form}
+							options={getOptions({
+								objects: data.foreignKeys['applied_controls'],
+								extra_fields: [['folder', 'str']]
+							})}
+							field="applied_controls"
+							label="Additional controls"
+							helpText="Extra measures needed to mitigate this risk"
+						/>
+					</div>
+					<div class="flex items-center justify-center">
+						<div class="">
+							<button
+								class="btn variant-filled-secondary z-0"
+								on:click={modalMeasureCreateForm}
+								type="button"><i class="fa-solid fa-plus text-sm" /></button
+							>
+						</div>
 					</div>
-					<AutocompleteSelect
-						multiple
-						{form}
-						options={getOptions({
-							objects: data.foreignKeys['applied_controls'],
-							extra_fields: [['folder', 'str']]
-						})}
-						field="applied_controls"
-						label="Additional controls"
-						helpText="Extra measures needed to mitigate this risk"
-					/>
 				</div>
 				<div class="flex w-1/2">
 					<div class="flex flex-row space-x-4 my-auto">
@@ -349,6 +359,7 @@
 				</div>
 			</div>
 		</div>
+
 		<div class="card px-4 py-2 bg-white shadow-lg">
 			<div class="flex space-x-4 mb-1">
 				<div class="w-1/2">

From 18f2ffde4873fbf2895db6933d99af79b3b709d5 Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Fri, 15 Nov 2024 12:29:22 +0100
Subject: [PATCH 10/12] better styling for the buttons

---
 .../[id=uuid]/edit/+page.svelte               | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 3aca3e826..73047f4af 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -224,7 +224,7 @@
 			<h4 class="h4 font-black mb-2">{m.currentRisk()}</h4>
 			<div class="flex flex-row space-x-8 justify-between">
 				<div class="w-1/2">
-					<div class="flex">
+					<div class="flex mb-2">
 						<div class="w-full mr-2">
 							<AutocompleteSelect
 								multiple
@@ -241,7 +241,7 @@
 						<div class="flex items-center justify-center">
 							<div class="">
 								<button
-									class="btn variant-filled-secondary z-0"
+									class="btn bg-gray-300 h-10 w-10"
 									on:click={modalMeasureCreateForm}
 									type="button"><i class="fa-solid fa-plus text-sm" /></button
 								>
@@ -298,27 +298,29 @@
 		<div class="card px-4 py-2 bg-white shadow-lg">
 			<h4 class="h4 font-black mb-2">{m.residualRisk()}</h4>
 			<div class="flex flex-row space-x-8">
-				<div class="flex w-1/2">
-					<div class="w-full mr-2">
-						<AutocompleteSelect
-							multiple
-							{form}
-							options={getOptions({
-								objects: data.foreignKeys['applied_controls'],
-								extra_fields: [['folder', 'str']]
-							})}
-							field="applied_controls"
-							label="Additional controls"
-							helpText="Extra measures needed to mitigate this risk"
-						/>
-					</div>
-					<div class="flex items-center justify-center">
-						<div class="">
-							<button
-								class="btn variant-filled-secondary z-0"
-								on:click={modalMeasureCreateForm}
-								type="button"><i class="fa-solid fa-plus text-sm" /></button
-							>
+				<div class="w-1/2">
+					<div class="flex">
+						<div class="w-full mr-2">
+							<AutocompleteSelect
+								multiple
+								{form}
+								options={getOptions({
+									objects: data.foreignKeys['applied_controls'],
+									extra_fields: [['folder', 'str']]
+								})}
+								field="applied_controls"
+								label="Additional controls"
+								helpText="Extra measures needed to mitigate this risk"
+							/>
+						</div>
+						<div class="flex items-center justify-center">
+							<div class="">
+								<button
+									class="btn bg-gray-300 h-10 w-10"
+									on:click={modalMeasureCreateForm}
+									type="button"><i class="fa-solid fa-plus text-sm" /></button
+								>
+							</div>
 						</div>
 					</div>
 				</div>

From 727ae7d2f13fd4db5337e1d3c182d3526a51d780 Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Sat, 16 Nov 2024 09:22:56 +0100
Subject: [PATCH 11/12] ui adjust

---
 .../[id=uuid]/edit/+page.svelte               | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 73047f4af..8ca4cb32e 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -176,34 +176,34 @@
 			</div>
 		</div>
 
-		<div class="flex flex-row space-x-2">
+		<div class="flex flex-row space-x-2 h-72">
 			<div class="card px-4 py-2 bg-white shadow-lg space-y-4 w-5/12">
 				<TextField {form} field="name" label={m.name()} />
-				<TextArea {form} field="description" label={m.description()} />
+				<TextArea {form} field="description" rows={6} label={m.description()} />
 			</div>
 			<div class="card px-4 py-2 bg-white shadow-lg w-7/12 max-h-96 overflow-y-scroll">
 				<AutocompleteSelect
-					{form}
 					multiple
+					{form}
 					options={getOptions({
-						objects: data.foreignKeys['threats'],
+						objects: data.foreignKeys['assets'],
 						extra_fields: [['folder', 'str']],
 						label: 'auto'
 					})}
-					field="threats"
-					label={m.threats()}
+					field="assets"
+					label={m.assets()}
+					helpText={m.riskScenarioAssetHelpText()}
 				/>
 				<AutocompleteSelect
-					multiple
 					{form}
+					multiple
 					options={getOptions({
-						objects: data.foreignKeys['assets'],
+						objects: data.foreignKeys['threats'],
 						extra_fields: [['folder', 'str']],
 						label: 'auto'
 					})}
-					field="assets"
-					label={m.assets()}
-					helpText={m.riskScenarioAssetHelpText()}
+					field="threats"
+					label={m.threats()}
 				/>
 				<AutocompleteSelect
 					multiple

From 1cb4ff1821451df9ab887139a22895adcf1b2b2e Mon Sep 17 00:00:00 2001
From: Abderrahmane Smimite <smimite@gmail.com>
Date: Sat, 16 Nov 2024 09:47:35 +0100
Subject: [PATCH 12/12] min height

---
 .../(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 8ca4cb32e..abc35cc86 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -176,7 +176,7 @@
 			</div>
 		</div>
 
-		<div class="flex flex-row space-x-2 h-72">
+		<div class="flex flex-row space-x-2 min-h-72">
 			<div class="card px-4 py-2 bg-white shadow-lg space-y-4 w-5/12">
 				<TextField {form} field="name" label={m.name()} />
 				<TextArea {form} field="description" rows={6} label={m.description()} />