Merge branch 'CA-674-Step-1.4' of github.com:intuitem/ciso-assistant-…

…community into CA-674-Step-1.4
intuitem · Dec 6, 2024 · 76f84ef · 76f84ef
2 parents 1bfca6e + 4db984a
commit 76f84ef
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 22 deletions.
diff --git a/backend/ebios_rm/models.py b/backend/ebios_rm/models.py
@@ -137,6 +137,14 @@ 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
+
+    @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
@@ -1,3 +1,4 @@
+from core.serializers import RiskMatrixReadSerializer
 from core.views import BaseModelViewSet as AbstractBaseModelViewSet
 from .models import (
     EbiosRMStudy,
@@ -39,6 +40,25 @@ 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)
+
+    @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

diff --git 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"
 }
diff --git 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"

diff --git 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
@@ -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
@@ -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
@@ -65,15 +65,15 @@ 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);
 			if (response.ok) {
 				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
@@ -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]/+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/...d=uuid]/workshop-one/base/+page.server.ts → ...id]/workshop-one/baseline/+page.server.ts b/...d=uuid]/workshop-one/base/+page.server.ts → ...id]/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/.../[id=uuid]/workshop-one/base/+page.svelte → ...=uuid]/workshop-one/baseline/+page.svelte b/.../[id=uuid]/workshop-one/base/+page.svelte → ...=uuid]/workshop-one/baseline/+page.svelte
diff --git a/...rc/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/ebios-rm-study/+page.server.ts b/...rc/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../routes/(app)/(third-party)/[model=thirdparty_urlmodels]/[id=uuid]/edit/+layout.server.ts b/.../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
@@ -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/...end/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.server.ts b/...end/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
 					}));
 				}
 			})