From 9743d05dafa972f0cdbf81f121b12cb96626f471 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 11 Feb 2025 07:49:02 +0100
Subject: [PATCH] chore: adapt security exceptions AutocompleteSelect forms

---
 .../Forms/ModelForm/AppliedControlPolicyForm.svelte       | 3 ++-
 .../src/lib/components/Forms/ModelForm/AssetForm.svelte   | 3 ++-
 .../Forms/ModelForm/SecurityExceptionForm.svelte          | 8 +++++---
 .../components/Forms/ModelForm/VulnerabilitiesForm.svelte | 3 ++-
 .../(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte | 3 ++-
 .../requirement-assessments/[id=uuid]/edit/+page.svelte   | 6 ++----
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte b/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
index de281524d..e140fdb38 100644
--- a/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
@@ -90,7 +90,8 @@
 		<AutocompleteSelect
 			{form}
 			multiple
-			options={getOptions({ objects: model.foreignKeys['security_exceptions'] })}
+			optionsEndpoint="security-exceptions"
+			optionsExtraFields={[['folder', 'str']]}
 			field="security_exceptions"
 			cacheLock={cacheLocks['security_exceptions']}
 			bind:cachedValue={formDataCache['security_exceptions']}
diff --git a/frontend/src/lib/components/Forms/ModelForm/AssetForm.svelte b/frontend/src/lib/components/Forms/ModelForm/AssetForm.svelte
index 0e7e21691..fec4f7e00 100644
--- a/frontend/src/lib/components/Forms/ModelForm/AssetForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/AssetForm.svelte
@@ -113,7 +113,8 @@
 <AutocompleteSelect
 	{form}
 	multiple
-	options={getOptions({ objects: model.foreignKeys['security_exceptions'] })}
+	optionsEndpoint="security-exceptions"
+	optionsExtraFields={[['folder', 'str']]}
 	field="security_exceptions"
 	cacheLock={cacheLocks['security_exceptions']}
 	bind:cachedValue={formDataCache['security_exceptions']}
diff --git a/frontend/src/lib/components/Forms/ModelForm/SecurityExceptionForm.svelte b/frontend/src/lib/components/Forms/ModelForm/SecurityExceptionForm.svelte
index 2c3a23012..7818f642d 100644
--- a/frontend/src/lib/components/Forms/ModelForm/SecurityExceptionForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/SecurityExceptionForm.svelte
@@ -18,7 +18,7 @@
 <HiddenInput {form} field="requirement_assessments" />
 <AutocompleteSelect
 	{form}
-	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	optionsEndpoint="folders?content_type=DO&content_type=GL"
 	field="folder"
 	cacheLock={cacheLocks['folder']}
 	bind:cachedValue={formDataCache['folder']}
@@ -35,7 +35,8 @@
 <AutocompleteSelect
 	{form}
 	multiple
-	options={getOptions({ objects: model.foreignKeys['owners'], label: 'email' })}
+	optionsEndpoint="users?is_third_party=false"
+	optionsLabelField="email"
 	field="owners"
 	cacheLock={cacheLocks['owners']}
 	bind:cachedValue={formDataCache['owners']}
@@ -43,7 +44,8 @@
 />
 <AutocompleteSelect
 	{form}
-	options={getOptions({ objects: model.foreignKeys['approver'], label: 'email' })}
+	optionsEndpoint="users?is_third_party=false"
+	optionsLabelField="email"
 	field="approver"
 	cacheLock={cacheLocks['approver']}
 	bind:cachedValue={formDataCache['approver']}
diff --git a/frontend/src/lib/components/Forms/ModelForm/VulnerabilitiesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/VulnerabilitiesForm.svelte
index 4bf1c276d..0f30970dc 100644
--- a/frontend/src/lib/components/Forms/ModelForm/VulnerabilitiesForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/VulnerabilitiesForm.svelte
@@ -57,7 +57,8 @@
 <AutocompleteSelect
 	{form}
 	multiple
-	options={getOptions({ objects: model.foreignKeys['security_exceptions'] })}
+	optionsEndpoint="security-exceptions"
+	optionsExtraFields={[['folder', 'str']]}
 	field="security_exceptions"
 	cacheLock={cacheLocks['security_exceptions']}
 	bind:cachedValue={formDataCache['security_exceptions']}
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 420483dbe..21a0e03fa 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -194,7 +194,8 @@
 					<AutocompleteSelect
 						multiple
 						form={_form}
-						options={getOptions({ objects: data.foreignKeys['security_exceptions'] })}
+						optionsEndpoint="security-exceptions"
+						optionsExtraFields={[['folder', 'str']]}
 						field="security_exceptions"
 						label={m.securityExceptions()}
 					/>
diff --git a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
index c4ebb4644..399d0b36f 100644
--- a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
@@ -493,10 +493,8 @@
 								<AutocompleteSelect
 									multiple
 									{form}
-									options={getOptions({
-										objects: $page.data.model.foreignKeys['security_exceptions'],
-										extra_fields: [['folder', 'str']]
-									})}
+									optionsEndpoint="security-exceptions"
+									optionsExtraFields={[['folder', 'str']]}
 									field="security_exceptions"
 								/>
 								<ModelTable