Merge pull request #848 from intuitem/hotfix/null-answer-in-requireme…

…nt-assessment hotfix: null answer in requirement assessment
intuitem · Sep 19, 2024 · 3845808 · 3845808
2 parents 9ffb7a7 + 431b653
commit 3845808
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/table-mode/+page.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/table-mode/+page.svelte
@@ -240,7 +240,7 @@
 								</div>
 							</div>
 						{/if}
-						{#if Object.keys(requirementAssessment.answer).length !== 0}
+						{#if requirementAssessment.answer != null && Object.keys(requirementAssessment.answer).length !== 0}
 							<div class="flex flex-col w-full space-y-2">
 								{#each requirementAssessment.answer.questions as question}
 									<li class="flex flex-col space-y-2 rounded-xl">

diff --git a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte
@@ -256,7 +256,7 @@
 			</svelte:fragment>
 		</TabGroup>
 	</div>
-	{#if Object.keys(data.requirementAssessment.answer).length !== 0}
+	{#if data.requirementAssessment.answer != null && Object.keys(data.requirementAssessment.answer).length !== 0}
 		<h1 class="font-semibold text-sm">{m.question()}</h1>
 		{#each data.requirementAssessment.answer.questions as question}
 			<li class="flex justify-between items-center border rounded-xl p-2 disabled">

diff --git a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/edit/+page.svelte
@@ -394,7 +394,7 @@
 			<HiddenInput {form} field="requirement" />
 			<HiddenInput {form} field="compliance_assessment" />
 			<div class="flex flex-col my-8 space-y-6">
-				{#if Object.keys(data.requirementAssessment.answer).length !== 0}
+				{#if data.requirementAssessment.answer != null && Object.keys(data.requirementAssessment.answer).length !== 0}
 					<Question {form} field="answer" label={m.question()} />
 				{/if}
 				<Select