Merge pull request #841 from intuitem/fix/scenario-control-tags

fix: add tags in applied control list inside scenarios page
intuitem · Sep 19, 2024 · 3d62228 · 3d62228
2 parents 915c43d + cff22a2
commit 3d62228
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/+page.server.ts
@@ -20,7 +20,7 @@ export const load = (async ({ fetch, params }) => {
 		if (response.ok) {
 			const data = await response.json().then((data) => data.results);
 
-			const metaData = tableSourceMapper(data, ['id']);
+			const metaData = tableSourceMapper(data, ['id', 'status']);
 
 			const bodyData = tableSourceMapper(data, listViewFields[key].body);
 

diff --git a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/+page.svelte
@@ -115,8 +115,8 @@
 			<ModelTable source={data.tables['assets']} hideFilters={true} URLModel="assets" />
 		</div>
 	</div>
-	<div class="flex flex-row space-x-4 card px-4 py-2 bg-white shadow-lg">
-		<div class="flex flex-col w-1/2">
+	<div class="flex flex-row space-x-4 card px-4 py-2 bg-white shadow-lg justify-between">
+		<div class="flex flex-col w-fit">
 			<h4 class="h4 font-semibold">{m.currentRisk()}</h4>
 			<p class="text-sm font-semibold text-gray-400">{m.existingControls()}</p>
 			{#if data.scenario.existing_controls}
@@ -127,7 +127,7 @@
 				<p class="text-gray-400 italic text-sm">{m.noExistingControls()}</p>
 			{/if}
 		</div>
-		<div class="flex flex-row space-x-4 my-auto items-center justify-center w-1/2 h-full">
+		<div class="flex flex-row space-x-4 my-auto items-center justify-center w-fit h-full">
 			<p class="flex flex-col">
 				<span class="text-sm font-semibold text-gray-400">{m.probability()}</span>
 				<span
@@ -157,7 +157,9 @@
 			</p>
 			<i class="fa-solid fa-equals mt-5" />
 			<p class="flex flex-col">
-				<span class="text-sm font-semibold text-gray-400">{m.currentRiskLevel()}</span>
+				<span class="text-sm font-semibold text-gray-400 whitespace-nowrap"
+					>{m.currentRiskLevel()}</span
+				>
 				<span
 					class="text-sm text-center font-semibold p-2 rounded-md w-20 {classesCellText(
 						data.scenario.current_level.hexcolor
@@ -173,8 +175,8 @@
 			</p>
 		</div>
 	</div>
-	<div class="flex flex-row space-x-4 card px-4 py-2 bg-white shadow-lg">
-		<div class="flex flex-col w-1/2">
+	<div class="flex flex-row space-x-4 card px-4 py-2 bg-white shadow-lg justify-between">
+		<div class="flex flex-col w-fit">
 			<h4 class="h4 font-semibold">{m.residualRisk()}</h4>
 			<p class="text-sm font-semibold text-gray-400">{m.appliedControls()}</p>
 			<ModelTable
@@ -183,7 +185,7 @@
 				URLModel="applied-controls"
 			/>
 		</div>
-		<div class="flex flex-row space-x-4 my-auto items-center justify-center w-1/2">
+		<div class="flex flex-row space-x-4 my-auto items-center justify-center w-fit">
 			<p class="flex flex-col">
 				<span class="text-sm font-semibold text-gray-400">{m.probability()}</span>
 				<span
@@ -213,7 +215,9 @@
 			</p>
 			<i class="fa-solid fa-equals mt-5" />
 			<p class="flex flex-col">
-				<span class="text-sm font-semibold text-gray-400">{m.residualRiskLevel()}</span>
+				<span class="text-sm font-semibold text-gray-400 whitespace-nowrap"
+					>{m.residualRiskLevel()}</span
+				>
 				<span
 					class="text-sm text-center font-semibold p-2 rounded-md w-20 {classesCellText(
 						data.scenario.residual_level.hexcolor

diff --git a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/+page.server.ts
@@ -51,7 +51,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 		if (response.ok) {
 			const data = await response.json().then((data) => data.results);
 
-			const metaData = tableSourceMapper(data, ['id']);
+			const metaData = tableSourceMapper(data, ['id', 'status']);
 
 			const bodyData = tableSourceMapper(data, listViewFields[key].body);