Merge pull request #878 from intuitem/hotfix/show-library

use uuid instead of urn
intuitem · Sep 29, 2024 · 1a96af8 · 1a96af8
2 parents a481f56 + ad8652e
commit 1a96af8
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 15 deletions.
diff --git a/backend/core/serializers.py b/backend/core/serializers.py
@@ -219,7 +219,7 @@ class Meta:
 
 class ReferenceControlReadSerializer(ReferentialSerializer):
     folder = FieldsRelatedField()
-    library = FieldsRelatedField(["name", "urn"])
+    library = FieldsRelatedField(["name", "id"])
 
     class Meta:
         model = ReferenceControl
@@ -249,7 +249,7 @@ class Meta:
 
 class ThreatReadSerializer(ReferentialSerializer):
     folder = FieldsRelatedField()
-    library = FieldsRelatedField(["name", "urn"])
+    library = FieldsRelatedField(["name", "id"])
 
     class Meta:
         model = Threat
@@ -478,7 +478,7 @@ class Meta:
 
 class FrameworkReadSerializer(ReferentialSerializer):
     folder = FieldsRelatedField()
-    library = FieldsRelatedField(["name", "urn"])
+    library = FieldsRelatedField(["name", "id"])
 
     class Meta:
         model = Framework
@@ -630,7 +630,7 @@ class Meta:
 class RequirementMappingSetReadSerializer(BaseModelSerializer):
     source_framework = FieldsRelatedField()
     target_framework = FieldsRelatedField()
-    library = FieldsRelatedField(["name", "urn"])
+    library = FieldsRelatedField(["name", "id"])
     folder = FieldsRelatedField()
 
     class Meta:

diff --git a/frontend/src/lib/components/DetailView/DetailView.svelte b/frontend/src/lib/components/DetailView/DetailView.svelte
@@ -207,7 +207,7 @@
 						>
 							{#if value !== null && value !== undefined && value !== ''}
 								{#if key === 'library'}
-									{@const itemHref = `/libraries/${value.urn}`}
+									{@const itemHref = `/libraries/${value.id}?loaded`}
 									<a href={itemHref} class="anchor">{value.name}</a>
 								{:else if Array.isArray(value)}
 									{#if Object.keys(value).length > 0}

diff --git a/frontend/src/lib/components/ModelTable/LibraryActions.svelte b/frontend/src/lib/components/ModelTable/LibraryActions.svelte
@@ -50,7 +50,7 @@
 		<span class="hover:text-primary-500">
 			<form
 				method="post"
-				action="/libraries/{library.urn}?/load"
+				action="/libraries/{library.id}?/load"
 				use:enhance={() => {
 					loading.form = true;
 					loading.library = library.urn;
@@ -99,7 +99,7 @@
 		<span class="hover:text-primary-500">
 			<form
 				method="post"
-				action="/libraries/{library.urn}?/update"
+				action="/libraries/{library.id}?/update"
 				use:enhance={() => {
 					loading.form = true;
 					loading.library = library.urn;

diff --git a/frontend/src/routes/(app)/(internal)/frameworks/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/frameworks/[id=uuid]/+page.svelte
@@ -58,7 +58,7 @@
 						<li class="text-gray-600 list-none">
 							{#if value}
 								{#if key === 'library'}
-									{@const itemHref = `/libraries/${value.urn}`}
+									{@const itemHref = `/libraries/${value.id}?loaded`}
 									<a href={itemHref} class="anchor">{value.str}</a>
 								{:else if key === 'scores_definition'}
 									{#each Object.entries(value) as [key, definition]}

diff --git a/...ernal)/libraries/[id=urn]/+page.server.ts → ...rnal)/libraries/[id=uuid]/+page.server.ts b/...ernal)/libraries/[id=urn]/+page.server.ts → ...rnal)/libraries/[id=uuid]/+page.server.ts
diff --git a/...internal)/libraries/[id=urn]/+page.svelte → ...nternal)/libraries/[id=uuid]/+page.svelte b/...internal)/libraries/[id=urn]/+page.svelte → ...nternal)/libraries/[id=uuid]/+page.svelte
@@ -15,7 +15,7 @@
 
 	const breadcrumb_library_data = {
 		...data.library,
-		id: data.library.urn
+		id: data.library.id
 	};
 	$: breadcrumbObject.set(breadcrumb_library_data);
 
@@ -110,7 +110,7 @@
 					{:else}
 						<form
 							method="post"
-							action="/libraries/{data.library.urn}?/load"
+							action="/libraries/{data.library.id}?/load"
 							use:enhance={() => {
 								loading.form = true;
 								loading.library = data.library.urn;
@@ -138,11 +138,7 @@
 				<p class="text-md leading-5 text-gray-700">
 					{m.dependencies()}:
 					{#each data.library.dependencies as dependency}
-						<li>
-							<a href="/libraries/{dependency.urn}" target="_parent" class="anchor"
-								>{dependency.name}</a
-							>
-						</li>
+						<li>{dependency.name}</li>
 					{/each}
 				</p>
 			{/if}

diff --git a/...p)/(internal)/libraries/[id=urn]/+page.ts → ...)/(internal)/libraries/[id=uuid]/+page.ts b/...p)/(internal)/libraries/[id=urn]/+page.ts → ...)/(internal)/libraries/[id=uuid]/+page.ts
diff --git a/.../(internal)/libraries/[id=urn]/+server.ts → ...(internal)/libraries/[id=uuid]/+server.ts b/.../(internal)/libraries/[id=urn]/+server.ts → ...(internal)/libraries/[id=uuid]/+server.ts
diff --git a/...ernal)/libraries/[id=urn]/tree/+server.ts → ...rnal)/libraries/[id=uuid]/tree/+server.ts b/...ernal)/libraries/[id=urn]/tree/+server.ts → ...rnal)/libraries/[id=uuid]/tree/+server.ts
diff --git a/frontend/tests/e2e-tests.sh b/frontend/tests/e2e-tests.sh
@@ -201,6 +201,7 @@ fi
 echo "=========================================================================================="
 
 if [[ " ${SCRIPT_SHORT_ARGS[@]} " =~ " -q " ]]; then
+	echo "| quick mode"
 	npx playwright test ./tests/functional/"${TEST_PATHS[@]}" -x --project=chromium "${SCRIPT_LONG_ARGS[@]}"
 else
 	npx playwright test ./tests/functional/"${TEST_PATHS[@]}" "${SCRIPT_LONG_ARGS[@]}"