fix: Library uuid replaced by name in matrix view

intuitem · Dec 16, 2024 · 585d429 · 585d429
1 parent e9a5f4e
commit 585d429
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/backend/core/serializers.py b/backend/core/serializers.py
@@ -119,6 +119,7 @@ class AssessmentReadSerializer(BaseModelSerializer):
 class RiskMatrixReadSerializer(ReferentialSerializer):
     folder = FieldsRelatedField()
     json_definition = serializers.JSONField(source="get_json_translated")
+    library = FieldsRelatedField(["name", "id"])
 
     class Meta:
         model = RiskMatrix

diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
@@ -177,7 +177,8 @@ export const URL_MODEL_MAP: ModelMap = {
 		verboseName: 'Risk matrix',
 		verboseNamePlural: 'Risk matrices',
 		foreignKeyFields: [
-			{ field: 'folder', urlModel: 'folders', urlParams: 'content_type=DO&content_type=GL' }
+			{ field: 'folder', urlModel: 'folders', urlParams: 'content_type=DO&content_type=GL' },
+			{ field: 'library', urlModel: 'libraries' }
 		]
 	},
 	'risk-assessments': {

diff --git a/frontend/src/routes/(app)/(internal)/risk-matrices/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-matrices/[id=uuid]/+page.svelte
@@ -38,12 +38,17 @@
 									{/each}
 								</ul>
 							{:else if value.id}
-								{@const itemHref = `/${
-									URL_MODEL_MAP['risk-matrices']['foreignKeyFields']?.find(
-										(item) => item.field === key
-									)?.urlModel
-								}/${value.id}`}
-								<a href={itemHref} class="anchor">{value.str}</a>
+								{#if key === 'library'}
+									{@const itemHref = `/libraries/${value.id}?loaded`}
+									<a href={itemHref} class="anchor">{value.name}</a>
+								{:else}
+									{@const itemHref = `/${
+										URL_MODEL_MAP['risk-matrices']['foreignKeyFields']?.find(
+											(item) => item.field === key
+										)?.urlModel
+									}/${value.id}`}
+									<a href={itemHref} class="anchor">{value.str}</a>
+								{/if}
 							{:else}
 								{value.str ?? value}
 							{/if}