From ff242fb807ed124674a4f6ba7f28b2abed1104f9 Mon Sep 17 00:00:00 2001
From: melinoix <titouan.ameline@gmail.com>
Date: Mon, 23 Sep 2024 17:40:09 +0200
Subject: [PATCH 1/3] split ModelForm component in multiple components

---
 .../src/lib/components/Forms/ModelForm.svelte | 1253 +----------------
 .../AppliedControlsPoliciesForm.svelte        |  119 ++
 .../Forms/ModelForm/AssetsForm.svelte         |   54 +
 .../ComplianceAssessmentsForm.svelte          |  134 ++
 .../Forms/ModelForm/EntitiesForm.svelte       |   42 +
 .../ModelForm/EntityAssessmentsForm.svelte    |  201 +++
 .../Forms/ModelForm/EvidencesForm.svelte      |   52 +
 .../Forms/ModelForm/FrameworksForm.svelte     |   29 +
 .../Forms/ModelForm/ProjectForm.svelte        |   42 +
 .../ModelForm/ReferenceControlsForm.svelte    |   65 +
 .../ModelForm/RepresentativesForm.svelte      |   64 +
 .../RequirementAssessmentsForm.svelte         |   42 +
 .../ModelForm/RiskAcceptancesForm.svelte      |   72 +
 .../Forms/ModelForm/RiskAssessmentForm.svelte |  106 ++
 .../Forms/ModelForm/RiskScenariosForm.svelte  |   42 +
 .../Forms/ModelForm/SolutionsForm.svelte      |   43 +
 .../Forms/ModelForm/SsoSettingsForm.svelte    |  308 ++++
 .../Forms/ModelForm/ThreatsForm.svelte        |   48 +
 .../Forms/ModelForm/UsersForm.svelte          |   55 +
 19 files changed, 1581 insertions(+), 1190 deletions(-)
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/AppliedControlsPoliciesForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/AssetsForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentsForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/EntitiesForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/EntityAssessmentsForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/EvidencesForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/FrameworksForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/ReferenceControlsForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/RepresentativesForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentsForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/RiskAcceptancesForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/RiskScenariosForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/SolutionsForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/SsoSettingsForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/ThreatsForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/UsersForm.svelte

diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index b3d18a1a0..b998acd9b 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -1,30 +1,43 @@
 <script lang="ts">
 	import { onDestroy } from 'svelte';
 
-	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
 	import SuperForm from '$lib/components/Forms/Form.svelte';
 	import TextArea from '$lib/components/Forms/TextArea.svelte';
 	import TextField from '$lib/components/Forms/TextField.svelte';
-	import NumberField from '$lib/components/Forms/NumberField.svelte';
+
+	import RiskAssessmentForm from './ModelForm/RiskAssessmentForm.svelte';
+	import ProjectForm from './ModelForm/ProjectForm.svelte';
+	import ThreatForm from './ModelForm/ThreatsForm.svelte';
+	import RiskScenarioForm from './ModelForm/RiskScenariosForm.svelte';
+	import AppliedControlsPoliciesForm from './ModelForm/AppliedControlsPoliciesForm.svelte';
+	import RiskAcceptancesForm from './ModelForm/RiskAcceptancesForm.svelte';
+	import ReferenceControlsForm from './ModelForm/ReferenceControlsForm.svelte';
+	import EvidencesForm from './ModelForm/EvidencesForm.svelte';
+	import ComplianceAssessmentsForm from './ModelForm/ComplianceAssessmentsForm.svelte';
+	import AssetsForm from './ModelForm/AssetsForm.svelte';
+	import RequirementAssessmentsForm from './ModelForm/RequirementAssessmentsForm.svelte';
+	import EntitiesForm from './ModelForm/EntitiesForm.svelte';
+	import EntityAssessmentForm from './ModelForm/EntityAssessmentsForm.svelte';
+	import SolutionsForm from './ModelForm/SolutionsForm.svelte';
+	import RepresentativesForm from './ModelForm/RepresentativesForm.svelte';
+	import FrameworksForm from './ModelForm/FrameworksForm.svelte';
+	import UsersForm from './ModelForm/UsersForm.svelte';
+	import SsoSettingsForm from './ModelForm/SsoSettingsForm.svelte';
 
 	import AutocompleteSelect from './AutocompleteSelect.svelte';
-	import Select from './Select.svelte';
 
 	import { getOptions } from '$lib/utils/crud';
 	import { modelSchema } from '$lib/utils/schemas';
 	import type { ModelInfo, urlModel, CacheLock } from '$lib/utils/types';
 	import type { SuperValidated } from 'sveltekit-superforms';
 	import type { AnyZodObject } from 'zod';
-	import HiddenInput from './HiddenInput.svelte';
-	import FileInput from './FileInput.svelte';
 	import { browser } from '$app/environment';
 	import { page } from '$app/stores';
 	import * as m from '$paraglide/messages.js';
 	import { zod } from 'sveltekit-superforms/adapters';
 	import { getSecureRedirect } from '$lib/utils/helpers';
-	import { Accordion, AccordionItem } from '@skeletonlabs/skeleton';
 	import { createModalCache } from '$lib/utils/stores';
-	import Score from './Score.svelte';
+
 	export let form: SuperValidated<AnyZodObject>;
 	export let invalidateAll = true; // set to false to keep form data using muliple forms on a page
 	export let model: ModelInfo;
@@ -161,1214 +174,74 @@
 		/>
 	{/if}
 	{#if URLModel === 'projects'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<TextField
-			{form}
-			field="internal_reference"
-			label={m.internalReference()}
-			cacheLock={cacheLocks['internal_reference']}
-			bind:cachedValue={formDataCache['internal_reference']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['lc_status']}
-			field="lc_status"
-			label={m.lcStatus()}
-			cacheLock={cacheLocks['lc_status']}
-			bind:cachedValue={formDataCache['lc_status']}
-		/>
+		<ProjectForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'risk-assessments' || URLModel === 'risk-assessment-duplicate'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['project'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="project"
-			cacheLock={cacheLocks['project']}
-			bind:cachedValue={formDataCache['project']}
-			label={m.project()}
-			hidden={initialData.project}
-		/>
-		<TextField
+		<RiskAssessmentForm
 			{form}
-			field="version"
-			label={m.version()}
-			cacheLock={cacheLocks['version']}
-			bind:cachedValue={formDataCache['version']}
+			{model}
+			{riskAssessmentDuplication}
+			{cacheLocks}
+			{formDataCache}
+			{initialData}
+			{object}
+			{context}
+			{updated_fields}
 		/>
-		{#if !riskAssessmentDuplication}
-			<Select
-				{form}
-				options={model.selectOptions['status']}
-				field="status"
-				hide
-				label={m.status()}
-				cacheLock={cacheLocks['status']}
-				bind:cachedValue={formDataCache['status']}
-			/>
-			<AutocompleteSelect
-				{form}
-				disabled={object.id}
-				options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
-				field="risk_matrix"
-				cacheLock={cacheLocks['risk_matrix']}
-				bind:cachedValue={formDataCache['risk_matrix']}
-				label={m.riskMatrix()}
-				helpText={m.riskAssessmentMatrixHelpText()}
-			/>
-			<AutocompleteSelect
-				{form}
-				multiple
-				options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-				field="authors"
-				cacheLock={cacheLocks['authors']}
-				bind:cachedValue={formDataCache['authors']}
-				label={m.authors()}
-			/>
-			<AutocompleteSelect
-				{form}
-				multiple
-				options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-				field="reviewers"
-				cacheLock={cacheLocks['reviewers']}
-				bind:cachedValue={formDataCache['reviewers']}
-				label={m.reviewers()}
-			/>
-			<TextField
-				type="date"
-				{form}
-				field="eta"
-				label={m.eta()}
-				helpText={m.etaHelpText()}
-				cacheLock={cacheLocks['eta']}
-				bind:cachedValue={formDataCache['eta']}
-			/>
-			<TextField
-				type="date"
-				{form}
-				field="due_date"
-				label={m.dueDate()}
-				helpText={m.dueDateHelpText()}
-				cacheLock={cacheLocks['due_date']}
-				bind:cachedValue={formDataCache['due_date']}
-			/>
-			<TextArea
-				{form}
-				field="observation"
-				label={m.observation()}
-				cacheLock={cacheLocks['observation']}
-				bind:cachedValue={formDataCache['observation']}
-			/>
-		{/if}
 	{:else if URLModel === 'threats'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<TextArea
-			{form}
-			field="annotation"
-			label={m.annotation()}
-			cacheLock={cacheLocks['annotation']}
-			bind:cachedValue={formDataCache['annotation']}
-		/>
-		<TextField
-			{form}
-			field="provider"
-			label={m.provider()}
-			cacheLock={cacheLocks['provider']}
-			bind:cachedValue={formDataCache['provider']}
-		/>
+		<ThreatForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'risk-scenarios'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['risk_assessment'],
-				label: 'str',
-				extra_fields: [['project', 'str']]
-			})}
-			field="risk_assessment"
-			cacheLock={cacheLocks['risk_assessment']}
-			bind:cachedValue={formDataCache['risk_assessment']}
-			label={m.riskAssessment()}
-			hidden={initialData.risk_assessment}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({
-				objects: model.foreignKeys['threats'],
-				extra_fields: [['folder', 'str']],
-				label: 'auto' // convention for automatic label calculation
-			})}
-			field="threats"
-			cacheLock={cacheLocks['threats']}
-			bind:cachedValue={formDataCache['threats']}
-			label={m.threats()}
-		/>
+		<RiskScenarioForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'applied-controls' || URLModel === 'policies'}
-		{#if schema.shape.category}
-			<Select
-				{form}
-				options={model.selectOptions['category']}
-				field="category"
-				label={m.category()}
-				cacheLock={cacheLocks['category']}
-				bind:cachedValue={formDataCache['category']}
-			/>
-		{/if}
-		<Select
-			{form}
-			options={model.selectOptions['csf_function']}
-			field="csf_function"
-			label={m.csfFunction()}
-			cacheLock={cacheLocks['csf_function']}
-			bind:cachedValue={formDataCache['csf_function']}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['owner'], label: 'email' })}
-			field="owner"
-			cacheLock={cacheLocks['owner']}
-			bind:cachedValue={formDataCache['owner']}
-			label={m.owner()}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({
-				objects: model.foreignKeys['evidences'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="evidences"
-			cacheLock={cacheLocks['evidences']}
-			bind:cachedValue={formDataCache['evidences']}
-			label={m.evidences()}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="eta"
-			label={m.eta()}
-			helpText={m.etaHelpText()}
-			cacheLock={cacheLocks['eta']}
-			bind:cachedValue={formDataCache['eta']}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="expiry_date"
-			label={m.expiryDate()}
-			helpText={m.expiryDateHelpText()}
-			cacheLock={cacheLocks['expiry_date']}
-			bind:cachedValue={formDataCache['expiry_date']}
-		/>
-		<TextField
-			{form}
-			field="link"
-			label={m.link()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['link']}
-			bind:cachedValue={formDataCache['link']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['effort']}
-			field="effort"
-			label={m.effort()}
-			helpText={m.effortHelpText()}
-			cacheLock={cacheLocks['effort']}
-			bind:cachedValue={formDataCache['effort']}
-		/>
-		<NumberField
-			{form}
-			field="cost"
-			label={m.cost()}
-			helpText={m.costHelpText()}
-			cacheLock={cacheLocks['cost']}
-			bind:cachedValue={formDataCache['cost']}
-		/>
-		<AutocompleteSelect
+		<AppliedControlsPoliciesForm
 			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
+			{model}
+			{cacheLocks}
+			{formDataCache}
+			{schema}
+			{initialData}
 		/>
 	{:else if URLModel === 'risk-acceptances'}
-		<TextField
-			{form}
-			type="date"
-			field="expiry_date"
-			label={m.expiryDate()}
-			helpText={m.expiryDateHelpText()}
-			cacheLock={cacheLocks['expiry_date']}
-			bind:cachedValue={formDataCache['expiry_date']}
-		/>
-		{#if object.id && $page.data.user.id === object.approver}
-			<TextArea
-				disabled={$page.data.user.id !== object.approver}
-				{form}
-				field="justification"
-				label={m.justification()}
-				helpText={m.riskAcceptanceJusitficationHelpText()}
-				cacheLock={cacheLocks['justification']}
-				bind:cachedValue={formDataCache['justification']}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<AutocompleteSelect
+		<RiskAcceptancesForm
 			{form}
-			options={getOptions({ objects: model.foreignKeys['approver'], label: 'email' })}
-			field="approver"
-			cacheLock={cacheLocks['approver']}
-			bind:cachedValue={formDataCache['approver']}
-			label={m.approver()}
-			helpText={m.approverHelpText()}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['risk_scenarios'],
-				extra_fields: [
-					['project', 'str'],
-					['risk_assessment', 'str']
-				]
-			})}
-			field="risk_scenarios"
-			cacheLock={cacheLocks['risk_scenarios']}
-			bind:cachedValue={formDataCache['risk_scenarios']}
-			label={m.riskScenarios()}
-			helpText={m.riskAcceptanceRiskScenariosHelpText()}
-			multiple
+			{model}
+			{cacheLocks}
+			{formDataCache}
+			{object}
+			{initialData}
+			{$page}
 		/>
 	{:else if URLModel === 'reference-controls'}
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['category']}
-			field="category"
-			label={m.category()}
-			cacheLock={cacheLocks['category']}
-			bind:cachedValue={formDataCache['category']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['csf_function']}
-			field="csf_function"
-			label={m.csfFunction()}
-			cacheLock={cacheLocks['csf_function']}
-			bind:cachedValue={formDataCache['csf_function']}
-		/>
-		<TextArea
-			{form}
-			field="annotation"
-			label={m.annotation()}
-			cacheLock={cacheLocks['annotation']}
-			bind:cachedValue={formDataCache['annotation']}
-		/>
-		<TextField
-			{form}
-			field="provider"
-			label={m.provider()}
-			cacheLock={cacheLocks['provider']}
-			bind:cachedValue={formDataCache['provider']}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
+		<ReferenceControlsForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'evidences'}
-		<HiddenInput {form} field="applied_controls" />
-		<HiddenInput {form} field="requirement_assessments" />
-		<FileInput
-			{form}
-			allowPaste={true}
-			helpText={object.attachment
-				? `${m.attachmentWarningText()}: ${object.attachment}`
-				: m.attachmentHelpText()}
-			field="attachment"
-			label={m.attachment()}
-		/>
-		{#if !(initialData.applied_controls || initialData.requirement_assessments)}
-			<AutocompleteSelect
-				{form}
-				options={getOptions({ objects: model.foreignKeys['folder'] })}
-				field="folder"
-				cacheLock={cacheLocks['folder']}
-				bind:cachedValue={formDataCache['folder']}
-				label={m.domain()}
-				hidden={initialData.applied_controls || initialData.requirement_assessments}
-			/>
-		{:else}
-			<HiddenInput {form} field="folder" />
-		{/if}
-		<TextField
-			{form}
-			field="link"
-			label={m.link()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['link']}
-			bind:cachedValue={formDataCache['link']}
-		/>
+		<EvidencesForm {form} {model} {cacheLocks} {formDataCache} {initialData} {object} />
 	{:else if URLModel === 'compliance-assessments'}
-		{#if context === 'fromBaseline' && initialData.baseline}
-			<AutocompleteSelect
-				{form}
-				field="baseline"
-				cacheLock={cacheLocks['baseline']}
-				bind:cachedValue={formDataCache['baseline']}
-				label={m.baseline()}
-				options={getOptions({ objects: model.foreignKeys['baseline'] })}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['project'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="project"
-			cacheLock={cacheLocks['project']}
-			bind:cachedValue={formDataCache['project']}
-			label={m.project()}
-			hidden={initialData.project}
-		/>
-		<TextField
-			{form}
-			field="version"
-			label={m.version()}
-			cacheLock={cacheLocks['version']}
-			bind:cachedValue={formDataCache['version']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<AutocompleteSelect
-			{form}
-			disabled={object.id}
-			options={getOptions({ objects: model.foreignKeys['framework'] })}
-			field="framework"
-			cacheLock={cacheLocks['framework']}
-			bind:cachedValue={formDataCache['framework']}
-			label={m.framework()}
-			on:change={async (e) => {
-				if (e.detail) {
-					await fetch(`/frameworks/${e.detail}`)
-						.then((r) => r.json())
-						.then((r) => {
-							const implementation_groups = r['implementation_groups_definition'] || [];
-							model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
-								(group) => ({ label: group.name, value: group.ref_id })
-							);
-						});
-				}
-			}}
-		/>
-		{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
-			<AutocompleteSelect
-				multiple
-				translateOptions={false}
-				{form}
-				options={model.selectOptions['selected_implementation_groups']}
-				field="selected_implementation_groups"
-				cacheLock={cacheLocks['selected_implementation_groups']}
-				bind:cachedValue={formDataCache['selected_implementation_groups']}
-				label={m.selectedImplementationGroups()}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-			field="authors"
-			cacheLock={cacheLocks['authors']}
-			bind:cachedValue={formDataCache['authors']}
-			label={m.authors()}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-			field="reviewers"
-			cacheLock={cacheLocks['reviewers']}
-			bind:cachedValue={formDataCache['reviewers']}
-			label={m.reviewers()}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="eta"
-			label={m.eta()}
-			helpText={m.etaHelpText()}
-			cacheLock={cacheLocks['eta']}
-			bind:cachedValue={formDataCache['eta']}
-		/>
-		<TextField
-			type="date"
+		<ComplianceAssessmentsForm
 			{form}
-			field="due_date"
-			label={m.dueDate()}
-			helpText={m.dueDateHelpText()}
-			cacheLock={cacheLocks['due_date']}
-			bind:cachedValue={formDataCache['due_date']}
-		/>
-		<TextArea
-			{form}
-			field="observation"
-			label={m.observation()}
-			cacheLock={cacheLocks['observation']}
-			bind:cachedValue={formDataCache['observation']}
+			{model}
+			{cacheLocks}
+			{formDataCache}
+			{initialData}
+			{object}
+			{context}
 		/>
 	{:else if URLModel === 'assets'}
-		<TextArea
-			{form}
-			field="business_value"
-			label={m.businessValue()}
-			cacheLock={cacheLocks['business_value']}
-			bind:cachedValue={formDataCache['business_value']}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['type']}
-			field="type"
-			label="Type"
-			cacheLock={cacheLocks['type']}
-			bind:cachedValue={formDataCache['type']}
-		/>
-		<AutocompleteSelect
-			disabled={data.type === 'PR'}
-			multiple
-			{form}
-			options={getOptions({ objects: model.foreignKeys['parent_assets'], self: object })}
-			field="parent_assets"
-			cacheLock={cacheLocks['parent_assets']}
-			bind:cachedValue={formDataCache['parent_assets']}
-			label={m.parentAssets()}
-		/>
+		<AssetsForm {form} {model} {cacheLocks} {formDataCache} {initialData} {object} {data} />
 	{:else if URLModel === 'requirement-assessments'}
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['result']}
-			field="result"
-			label={m.result()}
-			cacheLock={cacheLocks['result']}
-			bind:cachedValue={formDataCache['result']}
-		/>
-		<TextArea
-			{form}
-			field="observation"
-			label={m.observation()}
-			cacheLock={cacheLocks['observation']}
-			bind:cachedValue={formDataCache['observation']}
-		/>
-		<HiddenInput {form} field="folder" />
-		<HiddenInput {form} field="requirement" />
-		<HiddenInput {form} field="compliance_assessment" />
+		<RequirementAssessmentsForm {form} {model} {cacheLocks} {formDataCache} />
 	{:else if URLModel === 'entities'}
-		<TextArea
-			{form}
-			field="mission"
-			label={m.mission()}
-			cacheLock={cacheLocks['mission']}
-			bind:cachedValue={formDataCache['mission']}
-		/>
-		<TextField
-			{form}
-			field="reference_link"
-			label={m.referenceLink()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['reference_link']}
-			bind:cachedValue={formDataCache['reference_link']}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
+		<EntitiesForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'entity-assessments'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['project'] })}
-			field="project"
-			cacheLock={cacheLocks['project']}
-			bind:cachedValue={formDataCache['project']}
-			label={m.project()}
-			hidden={initialData.project}
-		/>
-		{#if !data.compliance_assessment}
-			<Checkbox
-				{form}
-				field="create_audit"
-				label={m.createAudit()}
-				helpText={m.createAuditHelpText()}
-			/>
-			<AutocompleteSelect
-				{form}
-				disabled={!data.create_audit}
-				mandatory
-				hidden={!data.create_audit}
-				options={getOptions({ objects: model.foreignKeys['framework'] })}
-				field="framework"
-				cacheLock={cacheLocks['framework']}
-				bind:cachedValue={formDataCache['framework']}
-				label={m.framework()}
-				on:change={async (e) => {
-					if (e.detail) {
-						await fetch(`/frameworks/${e.detail}`)
-							.then((r) => r.json())
-							.then((r) => {
-								const implementation_groups = r['implementation_groups_definition'] || [];
-								model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
-									(group) => ({ label: group.name, value: group.ref_id })
-								);
-							});
-					}
-				}}
-			/>
-			{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
-				<AutocompleteSelect
-					multiple
-					translateOptions={false}
-					{form}
-					options={model.selectOptions['selected_implementation_groups']}
-					field="selected_implementation_groups"
-					cacheLock={cacheLocks['selected_implementation_groups']}
-					bind:cachedValue={formDataCache['selected_implementation_groups']}
-					label={m.selectedImplementationGroups()}
-				/>
-			{/if}
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['entity'] })}
-			field="entity"
-			cacheLock={cacheLocks['entity']}
-			bind:cachedValue={formDataCache['entity']}
-			label={m.entity()}
-			hidden={initialData.entity}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['solutions'] })}
-			field="solutions"
-			cacheLock={cacheLocks['solutions']}
-			bind:cachedValue={formDataCache['solutions']}
-			label={m.solutions()}
-		/>
-		<Score
-			{form}
-			label={m.criticality()}
-			field="criticality"
-			always_enabled={true}
-			inversedColors
-			fullDonut
-			min_score={1}
-			max_score={4}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<TextField
-			{form}
-			field="version"
-			label={m.version()}
-			cacheLock={cacheLocks['version']}
-			bind:cachedValue={formDataCache['version']}
-		/>
-		<TextField
-			{form}
-			field="reference_link"
-			label={m.referenceLink()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['reference_link']}
-			bind:cachedValue={formDataCache['reference_link']}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="eta"
-			label={m.eta()}
-			helpText={m.etaHelpText()}
-			cacheLock={cacheLocks['eta']}
-			bind:cachedValue={formDataCache['eta']}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="due_date"
-			label={m.dueDate()}
-			helpText={m.dueDateHelpText()}
-			cacheLock={cacheLocks['due_date']}
-			bind:cachedValue={formDataCache['due_date']}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-			field="authors"
-			cacheLock={cacheLocks['authors']}
-			bind:cachedValue={formDataCache['authors']}
-			label={m.authors()}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-			field="reviewers"
-			cacheLock={cacheLocks['reviewers']}
-			bind:cachedValue={formDataCache['reviewers']}
-			label={m.reviewers()}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['compliance_assessment'] })}
-			field="compliance_assessment"
-			cacheLock={cacheLocks['compliance_assessment']}
-			bind:cachedValue={formDataCache['compliance_assessment']}
-			label={m.complianceAssessment()}
-			disabled={data.create_audit}
-			hidden={data.create_audit}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['evidence'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="evidence"
-			cacheLock={cacheLocks['evidence']}
-			bind:cachedValue={formDataCache['evidence']}
-			label={m.evidence()}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['conclusion']}
-			field="conclusion"
-			label={m.conclusion()}
-			cacheLock={cacheLocks['conclusion']}
-			bind:cachedValue={formDataCache['conclusion']}
-		/>
-		<TextArea
-			{form}
-			field="observation"
-			label={m.observation()}
-			cacheLock={cacheLocks['observation']}
-			bind:cachedValue={formDataCache['observation']}
-		/>
-		<!-- <Score {form} label={m.penetration()} field="penetration" always_enabled={true} inversedColors fullDonut max_score={5} />
-		<Score {form} label={m.dependency()} field="dependency" always_enabled={true} inversedColors fullDonut max_score={5} />
-		<Score {form} label={m.maturity()} field="maturity" always_enabled={true} inversedColors fullDonut max_score={5} />
-		<Score {form} label={m.trust()} field="trust" always_enabled={true} inversedColors fullDonut max_score={5} /> -->
+		<EntityAssessmentForm {form} {model} {cacheLocks} {formDataCache} {initialData} {data} />
 	{:else if URLModel === 'solutions'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['provider_entity'] })}
-			field="provider_entity"
-			cacheLock={cacheLocks['provider_entity']}
-			bind:cachedValue={formDataCache['provider_entity']}
-			label={m.providerEntity()}
-			hidden={initialData.provider_entity}
-		/>
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<Score
-			{form}
-			label={m.criticality()}
-			field="criticality"
-			always_enabled={true}
-			inversedColors
-			fullDonut
-			min_score={1}
-			max_score={4}
-		/>
+		<SolutionsForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'representatives'}
-		<TextField
-			{form}
-			field="email"
-			label={m.email()}
-			cacheLock={cacheLocks['email']}
-			bind:cachedValue={formDataCache['email']}
-			data-focusindex="2"
-		/>
-		{#if !data.user}
-			<Checkbox
-				{form}
-				field="create_user"
-				label={m.createUser()}
-				helpText={m.createUserHelpText()}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['entity'] })}
-			field="entity"
-			cacheLock={cacheLocks['entity']}
-			bind:cachedValue={formDataCache['entity']}
-			label={m.entity()}
-		/>
-		<TextField
-			{form}
-			field="first_name"
-			label={m.firstName()}
-			cacheLock={cacheLocks['first_name']}
-			bind:cachedValue={formDataCache['first_name']}
-		/>
-		<TextField
-			{form}
-			field="last_name"
-			label={m.lastName()}
-			cacheLock={cacheLocks['last_name']}
-			bind:cachedValue={formDataCache['last_name']}
-		/>
-		<TextField
-			{form}
-			field="phone"
-			label={m.phone()}
-			cacheLock={cacheLocks['phone']}
-			bind:cachedValue={formDataCache['phone']}
-		/>
-		<TextField
-			{form}
-			field="role"
-			label={m.role()}
-			cacheLock={cacheLocks['role']}
-			bind:cachedValue={formDataCache['role']}
-		/>
+		<RepresentativesForm {form} {model} {cacheLocks} {formDataCache} {data} />
 	{:else if URLModel === 'frameworks'}
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['category']}
-			field="category"
-			label={m.category()}
-			cacheLock={cacheLocks['category']}
-			bind:cachedValue={formDataCache['category']}
-		/>
+		<FrameworksForm {form} {model} {cacheLocks} {formDataCache} />
 	{:else if URLModel === 'users'}
-		<TextField
-			{form}
-			field="email"
-			label={m.email()}
-			cacheLock={cacheLocks['email']}
-			bind:cachedValue={formDataCache['email']}
-			data-focusindex="2"
-		/>
-		{#if shape.first_name && shape.last_name}
-			<TextField
-				{form}
-				field="first_name"
-				label={m.firstName()}
-				cacheLock={cacheLocks['first_name']}
-				bind:cachedValue={formDataCache['first_name']}
-			/>
-			<TextField
-				{form}
-				field="last_name"
-				label={m.lastName()}
-				cacheLock={cacheLocks['last_name']}
-				bind:cachedValue={formDataCache['last_name']}
-			/>
-		{/if}
-		{#if shape.user_groups}
-			<AutocompleteSelect
-				{form}
-				multiple
-				options={getOptions({ objects: model.foreignKeys['user_groups'] })}
-				field="user_groups"
-				cacheLock={cacheLocks['user_groups']}
-				bind:cachedValue={formDataCache['user_groups']}
-				label={m.userGroups()}
-			/>
-		{/if}
-		{#if shape.is_active}
-			<Checkbox {form} field="is_active" label={m.isActive()} helpText={m.isActiveHelpText()} />
-		{/if}
+		<UsersForm {form} {model} {cacheLocks} {formDataCache} {shape} />
 	{:else if URLModel === 'sso-settings'}
-		<Accordion>
-			<Checkbox {form} field="is_enabled" label={m.enableSSO()} />
-			<AutocompleteSelect
-				{form}
-				hidden={model.selectOptions['provider'].length < 2}
-				field="provider"
-				cacheLock={cacheLocks['provider']}
-				bind:cachedValue={formDataCache['provider']}
-				options={model.selectOptions['provider']}
-				label={m.provider()}
-				disabled={!data.is_enabled}
-			/>
-			{#if data.provider !== 'saml'}
-				<AccordionItem open>
-					<svelte:fragment slot="summary">{m.IdPConfiguration()}</svelte:fragment>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="provider_name"
-							label={m.name()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['provider_name']}
-							bind:cachedValue={formDataCache['provider_name']}
-						/>
-						<TextField
-							hidden
-							{form}
-							field="provider_id"
-							label={m.providerID()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['provider_id']}
-							bind:cachedValue={formDataCache['provider_id']}
-						/>
-						<TextField
-							{form}
-							field="client_id"
-							label={m.clientID()}
-							helpText={m.clientIDHelpText()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['client_id']}
-							bind:cachedValue={formDataCache['client_id']}
-						/>
-						{#if data.provider !== 'saml'}
-							<TextField
-								{form}
-								field="secret"
-								label={m.secret()}
-								helpText={m.secretHelpText()}
-								disabled={!data.is_enabled}
-								cacheLock={cacheLocks['secret']}
-								bind:cachedValue={formDataCache['secret']}
-							/>
-							<TextField
-								{form}
-								field="key"
-								label={m.key()}
-								disabled={!data.is_enabled}
-								cacheLock={cacheLocks['key']}
-								bind:cachedValue={formDataCache['key']}
-							/>
-						{/if}
-					</svelte:fragment>
-				</AccordionItem>
-			{/if}
-			{#if data.provider === 'saml'}
-				<AccordionItem open>
-					<svelte:fragment slot="summary"
-						><span class="font-semibold">{m.SAMLIdPConfiguration()}</span></svelte:fragment
-					>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="idp_entity_id"
-							label={m.IdPEntityID()}
-							required={data.provider === 'saml'}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['idp_entity_id']}
-							bind:cachedValue={formDataCache['idp_entity_id']}
-						/>
-						<p class="text-gray-600 text-sm">Option 1: Fill the metadata url</p>
-						<TextField
-							{form}
-							field="metadata_url"
-							label={m.metadataURL()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['metadata_url']}
-							bind:cachedValue={formDataCache['metadata_url']}
-						/>
-						<div class="flex items-center justify-center w-full space-x-2">
-							<hr class="w-1/2 items-center bg-gray-200 border-0" />
-							<span class="flex items-center text-gray-600 text-sm">{m.or()}</span>
-							<hr class="w-1/2 items-center bg-gray-200 border-0" />
-						</div>
-						<p class="text-gray-600 text-sm">Option 2: Fill the SSO URL, SLO URL and x509cert</p>
-						<TextField
-							{form}
-							field="sso_url"
-							label={m.SSOURL()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['sso_url']}
-							bind:cachedValue={formDataCache['sso_url']}
-						/>
-						<TextField
-							{form}
-							field="slo_url"
-							label={m.SLOURL()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['slo_url']}
-							bind:cachedValue={formDataCache['slo_url']}
-						/>
-						<TextArea
-							{form}
-							field="x509cert"
-							label={m.x509Cert()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['x509cert']}
-							bind:cachedValue={formDataCache['x509cert']}
-						/>
-					</svelte:fragment>
-				</AccordionItem>
-
-				<AccordionItem>
-					<svelte:fragment slot="summary"
-						><span class="font-semibold">{m.SPConfiguration()}</span></svelte:fragment
-					>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="sp_entity_id"
-							label={m.SPEntityID()}
-							required={data.provider === 'saml'}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['sp_entity_id']}
-							bind:cachedValue={formDataCache['sp_entity_id']}
-						/>
-					</svelte:fragment>
-				</AccordionItem>
-
-				<AccordionItem
-					><svelte:fragment slot="summary"
-						><span class="font-semibold">{m.advancedSettings()}</span></svelte:fragment
-					>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="attribute_mapping_uid"
-							label={m.attributeMappingUID()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['attribute_mapping_uid']}
-							bind:cachedValue={formDataCache['attribute_mapping_uid']}
-						/>
-						<TextField
-							{form}
-							field="attribute_mapping_email_verified"
-							label={m.attributeMappingEmailVerified()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['attribute_mapping_email_verified']}
-							bind:cachedValue={formDataCache['attribute_mapping_email_verified']}
-						/>
-						<TextField
-							{form}
-							field="attribute_mapping_email"
-							label={m.attributeMappingEmail()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['attribute_mapping_email']}
-							bind:cachedValue={formDataCache['attribute_mapping_email']}
-						/>
-
-						<Checkbox
-							{form}
-							field="allow_repeat_attribute_name"
-							label={m.allowRepeatAttributeName()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="allow_single_label_domains"
-							label={m.allowSingleLabelDomains()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="authn_request_signed"
-							hidden
-							label={m.authnRequestSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<TextField
-							{form}
-							field="digest_algorithm"
-							hidden
-							label={m.digestAlgorithm()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['digest_algorithm']}
-							bind:cachedValue={formDataCache['digest_algorithm']}
-						/>
-						<Checkbox
-							{form}
-							field="logout_request_signed"
-							hidden
-							label={m.logoutRequestSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="logout_response_signed"
-							hidden
-							label={m.logoutResponseSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="metadata_signed"
-							hidden
-							label={m.metadataSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="name_id_encrypted"
-							hidden
-							label={m.nameIDEncrypted()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							hidden
-							field="reject_deprecated_algorithm"
-							label={m.rejectDeprecatedAlgorithm()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="reject_idp_initiated_sso"
-							label={m.rejectIdPInitiatedSSO()}
-							disabled={!data.is_enabled}
-						/>
-						<TextField
-							{form}
-							field="signature_algorithm"
-							hidden
-							label={m.signatureAlgorithm()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['signature_algorithm']}
-							bind:cachedValue={formDataCache['signature_algorithm']}
-						/>
-						<Checkbox
-							{form}
-							field="want_assertion_encrypted"
-							hidden
-							label={m.wantAssertionEncrypted()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_assertion_signed"
-							hidden
-							label={m.wantAssertionSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_attribute_statement"
-							label={m.wantAttributeStatement()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_message_signed"
-							hidden
-							label={m.wantMessageSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_name_id"
-							label={m.wantNameID()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_name_id_encrypted"
-							hidden
-							label={m.wantNameIDEncrypted()}
-							disabled={!data.is_enabled}
-						/>
-					</svelte:fragment>
-				</AccordionItem>
-			{/if}
-		</Accordion>
+		<SsoSettingsForm {form} {model} {cacheLocks} {formDataCache} {data} />
 	{/if}
 	<div class="flex flex-row justify-between space-x-4">
 		{#if closeModal}
diff --git a/frontend/src/lib/components/Forms/ModelForm/AppliedControlsPoliciesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/AppliedControlsPoliciesForm.svelte
new file mode 100644
index 000000000..900246619
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/AppliedControlsPoliciesForm.svelte
@@ -0,0 +1,119 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import Select from '../Select.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import NumberField from '$lib/components/Forms/NumberField.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let schema: any = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+{#if model.urlModel === 'applied-controls' || model.urlModel === 'policies'}
+	{#if schema.shape.category}
+		<Select
+			{form}
+			options={model.selectOptions['category']}
+			field="category"
+			label={m.category()}
+			cacheLock={cacheLocks['category']}
+			bind:cachedValue={formDataCache['category']}
+		/>
+	{/if}
+	<Select
+		{form}
+		options={model.selectOptions['csf_function']}
+		field="csf_function"
+		label={m.csfFunction()}
+		cacheLock={cacheLocks['csf_function']}
+		bind:cachedValue={formDataCache['csf_function']}
+	/>
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['owner'], label: 'email' })}
+		field="owner"
+		cacheLock={cacheLocks['owner']}
+		bind:cachedValue={formDataCache['owner']}
+		label={m.owner()}
+	/>
+	<Select
+		{form}
+		options={model.selectOptions['status']}
+		field="status"
+		label={m.status()}
+		cacheLock={cacheLocks['status']}
+		bind:cachedValue={formDataCache['status']}
+	/>
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({
+			objects: model.foreignKeys['evidences'],
+			extra_fields: [['folder', 'str']]
+		})}
+		field="evidences"
+		cacheLock={cacheLocks['evidences']}
+		bind:cachedValue={formDataCache['evidences']}
+		label={m.evidences()}
+	/>
+	<TextField
+		type="date"
+		{form}
+		field="eta"
+		label={m.eta()}
+		helpText={m.etaHelpText()}
+		cacheLock={cacheLocks['eta']}
+		bind:cachedValue={formDataCache['eta']}
+	/>
+	<TextField
+		type="date"
+		{form}
+		field="expiry_date"
+		label={m.expiryDate()}
+		helpText={m.expiryDateHelpText()}
+		cacheLock={cacheLocks['expiry_date']}
+		bind:cachedValue={formDataCache['expiry_date']}
+	/>
+	<TextField
+		{form}
+		field="link"
+		label={m.link()}
+		helpText={m.linkHelpText()}
+		cacheLock={cacheLocks['link']}
+		bind:cachedValue={formDataCache['link']}
+	/>
+	<Select
+		{form}
+		options={model.selectOptions['effort']}
+		field="effort"
+		label={m.effort()}
+		helpText={m.effortHelpText()}
+		cacheLock={cacheLocks['effort']}
+		bind:cachedValue={formDataCache['effort']}
+	/>
+	<NumberField
+		{form}
+		field="cost"
+		label={m.cost()}
+		helpText={m.costHelpText()}
+		cacheLock={cacheLocks['cost']}
+		bind:cachedValue={formDataCache['cost']}
+	/>
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['folder'] })}
+		field="folder"
+		cacheLock={cacheLocks['folder']}
+		bind:cachedValue={formDataCache['folder']}
+		label={m.domain()}
+		hidden={initialData.folder}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/AssetsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/AssetsForm.svelte
new file mode 100644
index 000000000..95523f644
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/AssetsForm.svelte
@@ -0,0 +1,54 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import Select from '../Select.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let object: any = {};
+	export let data: any = {};
+</script>
+
+{#if model.urlModel === 'assets'}
+	<TextArea
+		{form}
+		field="business_value"
+		label={m.businessValue()}
+		cacheLock={cacheLocks['business_value']}
+		bind:cachedValue={formDataCache['business_value']}
+	/>
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['folder'] })}
+		field="folder"
+		cacheLock={cacheLocks['folder']}
+		bind:cachedValue={formDataCache['folder']}
+		label={m.domain()}
+		hidden={initialData.folder}
+	/>
+	<Select
+		{form}
+		options={model.selectOptions['type']}
+		field="type"
+		label="Type"
+		cacheLock={cacheLocks['type']}
+		bind:cachedValue={formDataCache['type']}
+	/>
+	<AutocompleteSelect
+		disabled={data.type === 'PR'}
+		multiple
+		{form}
+		options={getOptions({ objects: model.foreignKeys['parent_assets'], self: object })}
+		field="parent_assets"
+		cacheLock={cacheLocks['parent_assets']}
+		bind:cachedValue={formDataCache['parent_assets']}
+		label={m.parentAssets()}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentsForm.svelte
new file mode 100644
index 000000000..3a4d9e952
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentsForm.svelte
@@ -0,0 +1,134 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import Select from '../Select.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let object: any = {};
+	export let context: string;
+</script>
+
+{#if model.urlModel === 'compliance-assessments'}
+	{#if context === 'fromBaseline' && initialData.baseline}
+		<AutocompleteSelect
+			{form}
+			field="baseline"
+			cacheLock={cacheLocks['baseline']}
+			bind:cachedValue={formDataCache['baseline']}
+			label={m.baseline()}
+			options={getOptions({ objects: model.foreignKeys['baseline'] })}
+		/>
+	{/if}
+	<AutocompleteSelect
+		{form}
+		options={getOptions({
+			objects: model.foreignKeys['project'],
+			extra_fields: [['folder', 'str']]
+		})}
+		field="project"
+		cacheLock={cacheLocks['project']}
+		bind:cachedValue={formDataCache['project']}
+		label={m.project()}
+		hidden={initialData.project}
+	/>
+	<TextField
+		{form}
+		field="version"
+		label={m.version()}
+		cacheLock={cacheLocks['version']}
+		bind:cachedValue={formDataCache['version']}
+	/>
+	<Select
+		{form}
+		options={model.selectOptions['status']}
+		field="status"
+		label={m.status()}
+		cacheLock={cacheLocks['status']}
+		bind:cachedValue={formDataCache['status']}
+	/>
+	<AutocompleteSelect
+		{form}
+		disabled={object.id}
+		options={getOptions({ objects: model.foreignKeys['framework'] })}
+		field="framework"
+		cacheLock={cacheLocks['framework']}
+		bind:cachedValue={formDataCache['framework']}
+		label={m.framework()}
+		on:change={async (e) => {
+			if (e.detail) {
+				await fetch(`/frameworks/${e.detail}`)
+					.then((r) => r.json())
+					.then((r) => {
+						const implementation_groups = r['implementation_groups_definition'] || [];
+						model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
+							(group) => ({ label: group.name, value: group.ref_id })
+						);
+					});
+			}
+		}}
+	/>
+	{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
+		<AutocompleteSelect
+			multiple
+			translateOptions={false}
+			{form}
+			options={model.selectOptions['selected_implementation_groups']}
+			field="selected_implementation_groups"
+			cacheLock={cacheLocks['selected_implementation_groups']}
+			bind:cachedValue={formDataCache['selected_implementation_groups']}
+			label={m.selectedImplementationGroups()}
+		/>
+	{/if}
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
+		field="authors"
+		cacheLock={cacheLocks['authors']}
+		bind:cachedValue={formDataCache['authors']}
+		label={m.authors()}
+	/>
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
+		field="reviewers"
+		cacheLock={cacheLocks['reviewers']}
+		bind:cachedValue={formDataCache['reviewers']}
+		label={m.reviewers()}
+	/>
+	<TextField
+		type="date"
+		{form}
+		field="eta"
+		label={m.eta()}
+		helpText={m.etaHelpText()}
+		cacheLock={cacheLocks['eta']}
+		bind:cachedValue={formDataCache['eta']}
+	/>
+	<TextField
+		type="date"
+		{form}
+		field="due_date"
+		label={m.dueDate()}
+		helpText={m.dueDateHelpText()}
+		cacheLock={cacheLocks['due_date']}
+		bind:cachedValue={formDataCache['due_date']}
+	/>
+	<TextArea
+		{form}
+		field="observation"
+		label={m.observation()}
+		cacheLock={cacheLocks['observation']}
+		bind:cachedValue={formDataCache['observation']}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/EntitiesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EntitiesForm.svelte
new file mode 100644
index 000000000..d4416c05e
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/EntitiesForm.svelte
@@ -0,0 +1,42 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+{#if model.urlModel === 'entities'}
+	<TextArea
+		{form}
+		field="mission"
+		label={m.mission()}
+		cacheLock={cacheLocks['mission']}
+		bind:cachedValue={formDataCache['mission']}
+	/>
+	<TextField
+		{form}
+		field="reference_link"
+		label={m.referenceLink()}
+		helpText={m.linkHelpText()}
+		cacheLock={cacheLocks['reference_link']}
+		bind:cachedValue={formDataCache['reference_link']}
+	/>
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['folder'] })}
+		field="folder"
+		cacheLock={cacheLocks['folder']}
+		bind:cachedValue={formDataCache['folder']}
+		label={m.domain()}
+		hidden={initialData.folder}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentsForm.svelte
new file mode 100644
index 000000000..b8f17c86a
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentsForm.svelte
@@ -0,0 +1,201 @@
+<script lang="ts">
+	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import Select from '../Select.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import Score from '../Score.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let data: Record<string, any> = {};
+</script>
+
+{#if model.urlModel === 'entity-assessments'}
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['project'] })}
+		field="project"
+		cacheLock={cacheLocks['project']}
+		bind:cachedValue={formDataCache['project']}
+		label={m.project()}
+		hidden={initialData.project}
+	/>
+	{#if !data.compliance_assessment}
+		<Checkbox
+			{form}
+			field="create_audit"
+			label={m.createAudit()}
+			helpText={m.createAuditHelpText()}
+		/>
+		<AutocompleteSelect
+			{form}
+			disabled={!data.create_audit}
+			mandatory
+			hidden={!data.create_audit}
+			options={getOptions({ objects: model.foreignKeys['framework'] })}
+			field="framework"
+			cacheLock={cacheLocks['framework']}
+			bind:cachedValue={formDataCache['framework']}
+			label={m.framework()}
+			on:change={async (e) => {
+				if (e.detail) {
+					await fetch(`/frameworks/${e.detail}`)
+						.then((r) => r.json())
+						.then((r) => {
+							const implementation_groups = r['implementation_groups_definition'] || [];
+							model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
+								(group) => ({ label: group.name, value: group.ref_id })
+							);
+						});
+				}
+			}}
+		/>
+		{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
+			<AutocompleteSelect
+				multiple
+				translateOptions={false}
+				{form}
+				options={model.selectOptions['selected_implementation_groups']}
+				field="selected_implementation_groups"
+				cacheLock={cacheLocks['selected_implementation_groups']}
+				bind:cachedValue={formDataCache['selected_implementation_groups']}
+				label={m.selectedImplementationGroups()}
+			/>
+		{/if}
+	{/if}
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['entity'] })}
+		field="entity"
+		cacheLock={cacheLocks['entity']}
+		bind:cachedValue={formDataCache['entity']}
+		label={m.entity()}
+		hidden={initialData.entity}
+	/>
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['solutions'] })}
+		field="solutions"
+		cacheLock={cacheLocks['solutions']}
+		bind:cachedValue={formDataCache['solutions']}
+		label={m.solutions()}
+	/>
+	<Score
+		{form}
+		label={m.criticality()}
+		field="criticality"
+		always_enabled={true}
+		inversedColors
+		fullDonut
+		min_score={1}
+		max_score={4}
+	/>
+	<Select
+		{form}
+		options={model.selectOptions['status']}
+		field="status"
+		label={m.status()}
+		cacheLock={cacheLocks['status']}
+		bind:cachedValue={formDataCache['status']}
+	/>
+	<TextField
+		{form}
+		field="version"
+		label={m.version()}
+		cacheLock={cacheLocks['version']}
+		bind:cachedValue={formDataCache['version']}
+	/>
+	<TextField
+		{form}
+		field="reference_link"
+		label={m.referenceLink()}
+		helpText={m.linkHelpText()}
+		cacheLock={cacheLocks['reference_link']}
+		bind:cachedValue={formDataCache['reference_link']}
+	/>
+	<TextField
+		type="date"
+		{form}
+		field="eta"
+		label={m.eta()}
+		helpText={m.etaHelpText()}
+		cacheLock={cacheLocks['eta']}
+		bind:cachedValue={formDataCache['eta']}
+	/>
+	<TextField
+		type="date"
+		{form}
+		field="due_date"
+		label={m.dueDate()}
+		helpText={m.dueDateHelpText()}
+		cacheLock={cacheLocks['due_date']}
+		bind:cachedValue={formDataCache['due_date']}
+	/>
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
+		field="authors"
+		cacheLock={cacheLocks['authors']}
+		bind:cachedValue={formDataCache['authors']}
+		label={m.authors()}
+	/>
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
+		field="reviewers"
+		cacheLock={cacheLocks['reviewers']}
+		bind:cachedValue={formDataCache['reviewers']}
+		label={m.reviewers()}
+	/>
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['compliance_assessment'] })}
+		field="compliance_assessment"
+		cacheLock={cacheLocks['compliance_assessment']}
+		bind:cachedValue={formDataCache['compliance_assessment']}
+		label={m.complianceAssessment()}
+		disabled={data.create_audit}
+		hidden={data.create_audit}
+	/>
+	<AutocompleteSelect
+		{form}
+		options={getOptions({
+			objects: model.foreignKeys['evidence'],
+			extra_fields: [['folder', 'str']]
+		})}
+		field="evidence"
+		cacheLock={cacheLocks['evidence']}
+		bind:cachedValue={formDataCache['evidence']}
+		label={m.evidence()}
+	/>
+	<Select
+		{form}
+		options={model.selectOptions['conclusion']}
+		field="conclusion"
+		label={m.conclusion()}
+		cacheLock={cacheLocks['conclusion']}
+		bind:cachedValue={formDataCache['conclusion']}
+	/>
+	<TextArea
+		{form}
+		field="observation"
+		label={m.observation()}
+		cacheLock={cacheLocks['observation']}
+		bind:cachedValue={formDataCache['observation']}
+	/>
+	<!-- <Score {form} label={m.penetration()} field="penetration" always_enabled={true} inversedColors fullDonut max_score={5} />
+		<Score {form} label={m.dependency()} field="dependency" always_enabled={true} inversedColors fullDonut max_score={5} />
+		<Score {form} label={m.maturity()} field="maturity" always_enabled={true} inversedColors fullDonut max_score={5} />
+		<Score {form} label={m.trust()} field="trust" always_enabled={true} inversedColors fullDonut max_score={5} /> -->
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/EvidencesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EvidencesForm.svelte
new file mode 100644
index 000000000..2440e3d57
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/EvidencesForm.svelte
@@ -0,0 +1,52 @@
+<script lang="ts">
+	import HiddenInput from '../HiddenInput.svelte';
+	import FileInput from '../FileInput.svelte';
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let object: any = {};
+</script>
+
+{#if model.urlModel === 'evidences'}
+	<HiddenInput {form} field="applied_controls" />
+	<HiddenInput {form} field="requirement_assessments" />
+	<FileInput
+		{form}
+		allowPaste={true}
+		helpText={object.attachment
+			? `${m.attachmentWarningText()}: ${object.attachment}`
+			: m.attachmentHelpText()}
+		field="attachment"
+		label={m.attachment()}
+	/>
+	{#if !(initialData.applied_controls || initialData.requirement_assessments)}
+		<AutocompleteSelect
+			{form}
+			options={getOptions({ objects: model.foreignKeys['folder'] })}
+			field="folder"
+			cacheLock={cacheLocks['folder']}
+			bind:cachedValue={formDataCache['folder']}
+			label={m.domain()}
+			hidden={initialData.applied_controls || initialData.requirement_assessments}
+		/>
+	{:else}
+		<HiddenInput {form} field="folder" />
+	{/if}
+	<TextField
+		{form}
+		field="link"
+		label={m.link()}
+		helpText={m.linkHelpText()}
+		cacheLock={cacheLocks['link']}
+		bind:cachedValue={formDataCache['link']}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/FrameworksForm.svelte b/frontend/src/lib/components/Forms/ModelForm/FrameworksForm.svelte
new file mode 100644
index 000000000..3e448a24b
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/FrameworksForm.svelte
@@ -0,0 +1,29 @@
+<script lang="ts">
+	import Select from '../Select.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+</script>
+
+{#if model.urlModel === 'frameworks'}
+	<TextField
+		{form}
+		field="ref_id"
+		label={m.ref()}
+		cacheLock={cacheLocks['ref_id']}
+		bind:cachedValue={formDataCache['ref_id']}
+	/>
+	<Select
+		{form}
+		options={model.selectOptions['category']}
+		field="category"
+		label={m.category()}
+		cacheLock={cacheLocks['category']}
+		bind:cachedValue={formDataCache['category']}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte
new file mode 100644
index 000000000..917bc8eaf
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte
@@ -0,0 +1,42 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import Select from '../Select.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+{#if model.urlModel === 'projects'}
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['folder'] })}
+		field="folder"
+		cacheLock={cacheLocks['folder']}
+		bind:cachedValue={formDataCache['folder']}
+		label={m.domain()}
+		hidden={initialData.folder}
+	/>
+	<TextField
+		{form}
+		field="internal_reference"
+		label={m.internalReference()}
+		cacheLock={cacheLocks['internal_reference']}
+		bind:cachedValue={formDataCache['internal_reference']}
+	/>
+	<Select
+		{form}
+		options={model.selectOptions['lc_status']}
+		field="lc_status"
+		label={m.lcStatus()}
+		cacheLock={cacheLocks['lc_status']}
+		bind:cachedValue={formDataCache['lc_status']}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/ReferenceControlsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ReferenceControlsForm.svelte
new file mode 100644
index 000000000..643ffba63
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/ReferenceControlsForm.svelte
@@ -0,0 +1,65 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import Select from '../Select.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+{#if model.urlModel === 'reference-controls'}
+	<TextField
+		{form}
+		field="ref_id"
+		label={m.ref()}
+		cacheLock={cacheLocks['ref_id']}
+		bind:cachedValue={formDataCache['ref_id']}
+	/>
+	<Select
+		{form}
+		options={model.selectOptions['category']}
+		field="category"
+		label={m.category()}
+		cacheLock={cacheLocks['category']}
+		bind:cachedValue={formDataCache['category']}
+	/>
+	<Select
+		{form}
+		options={model.selectOptions['csf_function']}
+		field="csf_function"
+		label={m.csfFunction()}
+		cacheLock={cacheLocks['csf_function']}
+		bind:cachedValue={formDataCache['csf_function']}
+	/>
+	<TextArea
+		{form}
+		field="annotation"
+		label={m.annotation()}
+		cacheLock={cacheLocks['annotation']}
+		bind:cachedValue={formDataCache['annotation']}
+	/>
+	<TextField
+		{form}
+		field="provider"
+		label={m.provider()}
+		cacheLock={cacheLocks['provider']}
+		bind:cachedValue={formDataCache['provider']}
+	/>
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['folder'] })}
+		field="folder"
+		cacheLock={cacheLocks['folder']}
+		bind:cachedValue={formDataCache['folder']}
+		label={m.domain()}
+		hidden={initialData.folder}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/RepresentativesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RepresentativesForm.svelte
new file mode 100644
index 000000000..f96eefa65
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RepresentativesForm.svelte
@@ -0,0 +1,64 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let data: any = {};
+</script>
+
+{#if model.urlModel === 'representatives'}
+	<TextField
+		{form}
+		field="email"
+		label={m.email()}
+		cacheLock={cacheLocks['email']}
+		bind:cachedValue={formDataCache['email']}
+		data-focusindex="2"
+	/>
+	{#if !data.user}
+		<Checkbox {form} field="create_user" label={m.createUser()} helpText={m.createUserHelpText()} />
+	{/if}
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['entity'] })}
+		field="entity"
+		cacheLock={cacheLocks['entity']}
+		bind:cachedValue={formDataCache['entity']}
+		label={m.entity()}
+	/>
+	<TextField
+		{form}
+		field="first_name"
+		label={m.firstName()}
+		cacheLock={cacheLocks['first_name']}
+		bind:cachedValue={formDataCache['first_name']}
+	/>
+	<TextField
+		{form}
+		field="last_name"
+		label={m.lastName()}
+		cacheLock={cacheLocks['last_name']}
+		bind:cachedValue={formDataCache['last_name']}
+	/>
+	<TextField
+		{form}
+		field="phone"
+		label={m.phone()}
+		cacheLock={cacheLocks['phone']}
+		bind:cachedValue={formDataCache['phone']}
+	/>
+	<TextField
+		{form}
+		field="role"
+		label={m.role()}
+		cacheLock={cacheLocks['role']}
+		bind:cachedValue={formDataCache['role']}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentsForm.svelte
new file mode 100644
index 000000000..17b094818
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentsForm.svelte
@@ -0,0 +1,42 @@
+<script lang="ts">
+	import Select from '../Select.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import HiddenInput from '$lib/components/Forms/HiddenInput.svelte';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+</script>
+
+{#if model.urlModel === 'requirement-assessments'}
+	<Select
+		{form}
+		options={model.selectOptions['status']}
+		field="status"
+		label={m.status()}
+		cacheLock={cacheLocks['status']}
+		bind:cachedValue={formDataCache['status']}
+	/>
+	<Select
+		{form}
+		options={model.selectOptions['result']}
+		field="result"
+		label={m.result()}
+		cacheLock={cacheLocks['result']}
+		bind:cachedValue={formDataCache['result']}
+	/>
+	<TextArea
+		{form}
+		field="observation"
+		label={m.observation()}
+		cacheLock={cacheLocks['observation']}
+		bind:cachedValue={formDataCache['observation']}
+	/>
+	<HiddenInput {form} field="folder" />
+	<HiddenInput {form} field="requirement" />
+	<HiddenInput {form} field="compliance_assessment" />
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskAcceptancesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskAcceptancesForm.svelte
new file mode 100644
index 000000000..d2b019da6
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RiskAcceptancesForm.svelte
@@ -0,0 +1,72 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import { page } from '$app/stores';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let object: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+<TextField
+	{form}
+	type="date"
+	field="expiry_date"
+	label={m.expiryDate()}
+	helpText={m.expiryDateHelpText()}
+	cacheLock={cacheLocks['expiry_date']}
+	bind:cachedValue={formDataCache['expiry_date']}
+/>
+{#if object.id && $page.data.user.id === object.approver}
+	<TextArea
+		disabled={$page.data.user.id !== object.approver}
+		{form}
+		field="justification"
+		label={m.justification()}
+		helpText={m.riskAcceptanceJusitficationHelpText()}
+		cacheLock={cacheLocks['justification']}
+		bind:cachedValue={formDataCache['justification']}
+	/>
+{/if}
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['approver'], label: 'email' })}
+	field="approver"
+	cacheLock={cacheLocks['approver']}
+	bind:cachedValue={formDataCache['approver']}
+	label={m.approver()}
+	helpText={m.approverHelpText()}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['risk_scenarios'],
+		extra_fields: [
+			['project', 'str'],
+			['risk_assessment', 'str']
+		]
+	})}
+	field="risk_scenarios"
+	cacheLock={cacheLocks['risk_scenarios']}
+	bind:cachedValue={formDataCache['risk_scenarios']}
+	label={m.riskScenarios()}
+	helpText={m.riskAcceptanceRiskScenariosHelpText()}
+	multiple
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte
new file mode 100644
index 000000000..ec3811d83
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte
@@ -0,0 +1,106 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import Select from '../Select.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let riskAssessmentDuplication: boolean = false;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let object: Record<string, any> = {};
+	export let context: string = 'default';
+	export let updated_fields: Set<string> = new Set();
+</script>
+
+{#if model.urlModel === 'risk-assessments' || model.urlModel === 'risk-assessment-duplicate'}
+	<AutocompleteSelect
+		{form}
+		options={getOptions({
+			objects: model.foreignKeys['project'],
+			extra_fields: [['folder', 'str']]
+		})}
+		field="project"
+		cacheLock={cacheLocks['project']}
+		bind:cachedValue={formDataCache['project']}
+		label={m.project()}
+		hidden={initialData.project}
+	/>
+	<TextField
+		{form}
+		field="version"
+		label={m.version()}
+		cacheLock={cacheLocks['version']}
+		bind:cachedValue={formDataCache['version']}
+	/>
+	{#if !riskAssessmentDuplication}
+		<Select
+			{form}
+			options={model.selectOptions['status']}
+			field="status"
+			hide
+			label={m.status()}
+			cacheLock={cacheLocks['status']}
+			bind:cachedValue={formDataCache['status']}
+		/>
+		<AutocompleteSelect
+			{form}
+			disabled={object.id}
+			options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
+			field="risk_matrix"
+			cacheLock={cacheLocks['risk_matrix']}
+			bind:cachedValue={formDataCache['risk_matrix']}
+			label={m.riskMatrix()}
+			helpText={m.riskAssessmentMatrixHelpText()}
+		/>
+		<AutocompleteSelect
+			{form}
+			multiple
+			options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
+			field="authors"
+			cacheLock={cacheLocks['authors']}
+			bind:cachedValue={formDataCache['authors']}
+			label={m.authors()}
+		/>
+		<AutocompleteSelect
+			{form}
+			multiple
+			options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
+			field="reviewers"
+			cacheLock={cacheLocks['reviewers']}
+			bind:cachedValue={formDataCache['reviewers']}
+			label={m.reviewers()}
+		/>
+		<TextField
+			type="date"
+			{form}
+			field="eta"
+			label={m.eta()}
+			helpText={m.etaHelpText()}
+			cacheLock={cacheLocks['eta']}
+			bind:cachedValue={formDataCache['eta']}
+		/>
+		<TextField
+			type="date"
+			{form}
+			field="due_date"
+			label={m.dueDate()}
+			helpText={m.dueDateHelpText()}
+			cacheLock={cacheLocks['due_date']}
+			bind:cachedValue={formDataCache['due_date']}
+		/>
+		<TextArea
+			{form}
+			field="observation"
+			label={m.observation()}
+			cacheLock={cacheLocks['observation']}
+			bind:cachedValue={formDataCache['observation']}
+		/>
+	{/if}
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskScenariosForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskScenariosForm.svelte
new file mode 100644
index 000000000..8df82c607
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RiskScenariosForm.svelte
@@ -0,0 +1,42 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+{#if model.urlModel === 'risk-scenarios'}
+	<AutocompleteSelect
+		{form}
+		options={getOptions({
+			objects: model.foreignKeys['risk_assessment'],
+			label: 'str',
+			extra_fields: [['project', 'str']]
+		})}
+		field="risk_assessment"
+		cacheLock={cacheLocks['risk_assessment']}
+		bind:cachedValue={formDataCache['risk_assessment']}
+		label={m.riskAssessment()}
+		hidden={initialData.risk_assessment}
+	/>
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({
+			objects: model.foreignKeys['threats'],
+			extra_fields: [['folder', 'str']],
+			label: 'auto'
+		})}
+		field="threats"
+		cacheLock={cacheLocks['threats']}
+		bind:cachedValue={formDataCache['threats']}
+		label={m.threats()}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/SolutionsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/SolutionsForm.svelte
new file mode 100644
index 000000000..ecf0eb329
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/SolutionsForm.svelte
@@ -0,0 +1,43 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+	import Score from '../Score.svelte';
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+{#if model.urlModel === 'solutions'}
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['provider_entity'] })}
+		field="provider_entity"
+		cacheLock={cacheLocks['provider_entity']}
+		bind:cachedValue={formDataCache['provider_entity']}
+		label={m.providerEntity()}
+		hidden={initialData.provider_entity}
+	/>
+	<TextField
+		{form}
+		field="ref_id"
+		label={m.ref()}
+		cacheLock={cacheLocks['ref_id']}
+		bind:cachedValue={formDataCache['ref_id']}
+	/>
+	<Score
+		{form}
+		label={m.criticality()}
+		field="criticality"
+		always_enabled={true}
+		inversedColors
+		fullDonut
+		min_score={1}
+		max_score={4}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/SsoSettingsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/SsoSettingsForm.svelte
new file mode 100644
index 000000000..1f8cc11d4
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/SsoSettingsForm.svelte
@@ -0,0 +1,308 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
+	import { Accordion, AccordionItem } from '@skeletonlabs/skeleton';
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let data: any = {};
+</script>
+
+{#if model.urlModel === 'sso-settings'}
+	<Accordion>
+		<Checkbox {form} field="is_enabled" label={m.enableSSO()} />
+		<AutocompleteSelect
+			{form}
+			hidden={model.selectOptions['provider'].length < 2}
+			field="provider"
+			cacheLock={cacheLocks['provider']}
+			bind:cachedValue={formDataCache['provider']}
+			options={model.selectOptions['provider']}
+			label={m.provider()}
+			disabled={!data.is_enabled}
+		/>
+		{#if data.provider !== 'saml'}
+			<AccordionItem open>
+				<svelte:fragment slot="summary">{m.IdPConfiguration()}</svelte:fragment>
+				<svelte:fragment slot="content">
+					<TextField
+						{form}
+						field="provider_name"
+						label={m.name()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['provider_name']}
+						bind:cachedValue={formDataCache['provider_name']}
+					/>
+					<TextField
+						hidden
+						{form}
+						field="provider_id"
+						label={m.providerID()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['provider_id']}
+						bind:cachedValue={formDataCache['provider_id']}
+					/>
+					<TextField
+						{form}
+						field="client_id"
+						label={m.clientID()}
+						helpText={m.clientIDHelpText()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['client_id']}
+						bind:cachedValue={formDataCache['client_id']}
+					/>
+					{#if data.provider !== 'saml'}
+						<TextField
+							{form}
+							field="secret"
+							label={m.secret()}
+							helpText={m.secretHelpText()}
+							disabled={!data.is_enabled}
+							cacheLock={cacheLocks['secret']}
+							bind:cachedValue={formDataCache['secret']}
+						/>
+						<TextField
+							{form}
+							field="key"
+							label={m.key()}
+							disabled={!data.is_enabled}
+							cacheLock={cacheLocks['key']}
+							bind:cachedValue={formDataCache['key']}
+						/>
+					{/if}
+				</svelte:fragment>
+			</AccordionItem>
+		{/if}
+		{#if data.provider === 'saml'}
+			<AccordionItem open>
+				<svelte:fragment slot="summary"
+					><span class="font-semibold">{m.SAMLIdPConfiguration()}</span></svelte:fragment
+				>
+				<svelte:fragment slot="content">
+					<TextField
+						{form}
+						field="idp_entity_id"
+						label={m.IdPEntityID()}
+						required={data.provider === 'saml'}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['idp_entity_id']}
+						bind:cachedValue={formDataCache['idp_entity_id']}
+					/>
+					<p class="text-gray-600 text-sm">Option 1: Fill the metadata url</p>
+					<TextField
+						{form}
+						field="metadata_url"
+						label={m.metadataURL()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['metadata_url']}
+						bind:cachedValue={formDataCache['metadata_url']}
+					/>
+					<div class="flex items-center justify-center w-full space-x-2">
+						<hr class="w-1/2 items-center bg-gray-200 border-0" />
+						<span class="flex items-center text-gray-600 text-sm">{m.or()}</span>
+						<hr class="w-1/2 items-center bg-gray-200 border-0" />
+					</div>
+					<p class="text-gray-600 text-sm">Option 2: Fill the SSO URL, SLO URL and x509cert</p>
+					<TextField
+						{form}
+						field="sso_url"
+						label={m.SSOURL()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['sso_url']}
+						bind:cachedValue={formDataCache['sso_url']}
+					/>
+					<TextField
+						{form}
+						field="slo_url"
+						label={m.SLOURL()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['slo_url']}
+						bind:cachedValue={formDataCache['slo_url']}
+					/>
+					<TextArea
+						{form}
+						field="x509cert"
+						label={m.x509Cert()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['x509cert']}
+						bind:cachedValue={formDataCache['x509cert']}
+					/>
+				</svelte:fragment>
+			</AccordionItem>
+
+			<AccordionItem>
+				<svelte:fragment slot="summary"
+					><span class="font-semibold">{m.SPConfiguration()}</span></svelte:fragment
+				>
+				<svelte:fragment slot="content">
+					<TextField
+						{form}
+						field="sp_entity_id"
+						label={m.SPEntityID()}
+						required={data.provider === 'saml'}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['sp_entity_id']}
+						bind:cachedValue={formDataCache['sp_entity_id']}
+					/>
+				</svelte:fragment>
+			</AccordionItem>
+
+			<AccordionItem
+				><svelte:fragment slot="summary"
+					><span class="font-semibold">{m.advancedSettings()}</span></svelte:fragment
+				>
+				<svelte:fragment slot="content">
+					<TextField
+						{form}
+						field="attribute_mapping_uid"
+						label={m.attributeMappingUID()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['attribute_mapping_uid']}
+						bind:cachedValue={formDataCache['attribute_mapping_uid']}
+					/>
+					<TextField
+						{form}
+						field="attribute_mapping_email_verified"
+						label={m.attributeMappingEmailVerified()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['attribute_mapping_email_verified']}
+						bind:cachedValue={formDataCache['attribute_mapping_email_verified']}
+					/>
+					<TextField
+						{form}
+						field="attribute_mapping_email"
+						label={m.attributeMappingEmail()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['attribute_mapping_email']}
+						bind:cachedValue={formDataCache['attribute_mapping_email']}
+					/>
+
+					<Checkbox
+						{form}
+						field="allow_repeat_attribute_name"
+						label={m.allowRepeatAttributeName()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						field="allow_single_label_domains"
+						label={m.allowSingleLabelDomains()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						field="authn_request_signed"
+						hidden
+						label={m.authnRequestSigned()}
+						disabled={!data.is_enabled}
+					/>
+					<TextField
+						{form}
+						field="digest_algorithm"
+						hidden
+						label={m.digestAlgorithm()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['digest_algorithm']}
+						bind:cachedValue={formDataCache['digest_algorithm']}
+					/>
+					<Checkbox
+						{form}
+						field="logout_request_signed"
+						hidden
+						label={m.logoutRequestSigned()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						field="logout_response_signed"
+						hidden
+						label={m.logoutResponseSigned()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						field="metadata_signed"
+						hidden
+						label={m.metadataSigned()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						field="name_id_encrypted"
+						hidden
+						label={m.nameIDEncrypted()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						hidden
+						field="reject_deprecated_algorithm"
+						label={m.rejectDeprecatedAlgorithm()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						field="reject_idp_initiated_sso"
+						label={m.rejectIdPInitiatedSSO()}
+						disabled={!data.is_enabled}
+					/>
+					<TextField
+						{form}
+						field="signature_algorithm"
+						hidden
+						label={m.signatureAlgorithm()}
+						disabled={!data.is_enabled}
+						cacheLock={cacheLocks['signature_algorithm']}
+						bind:cachedValue={formDataCache['signature_algorithm']}
+					/>
+					<Checkbox
+						{form}
+						field="want_assertion_encrypted"
+						hidden
+						label={m.wantAssertionEncrypted()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						field="want_assertion_signed"
+						hidden
+						label={m.wantAssertionSigned()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						field="want_attribute_statement"
+						label={m.wantAttributeStatement()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						field="want_message_signed"
+						hidden
+						label={m.wantMessageSigned()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						field="want_name_id"
+						label={m.wantNameID()}
+						disabled={!data.is_enabled}
+					/>
+					<Checkbox
+						{form}
+						field="want_name_id_encrypted"
+						hidden
+						label={m.wantNameIDEncrypted()}
+						disabled={!data.is_enabled}
+					/>
+				</svelte:fragment>
+			</AccordionItem>
+		{/if}
+	</Accordion>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/ThreatsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ThreatsForm.svelte
new file mode 100644
index 000000000..0af87a99d
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/ThreatsForm.svelte
@@ -0,0 +1,48 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+{#if model.urlModel === 'threats'}
+	<AutocompleteSelect
+		{form}
+		options={getOptions({ objects: model.foreignKeys['folder'] })}
+		field="folder"
+		cacheLock={cacheLocks['folder']}
+		bind:cachedValue={formDataCache['folder']}
+		label={m.domain()}
+		hidden={initialData.folder}
+	/>
+	<TextField
+		{form}
+		field="ref_id"
+		label={m.ref()}
+		cacheLock={cacheLocks['ref_id']}
+		bind:cachedValue={formDataCache['ref_id']}
+	/>
+	<TextArea
+		{form}
+		field="annotation"
+		label={m.annotation()}
+		cacheLock={cacheLocks['annotation']}
+		bind:cachedValue={formDataCache['annotation']}
+	/>
+	<TextField
+		{form}
+		field="provider"
+		label={m.provider()}
+		cacheLock={cacheLocks['provider']}
+		bind:cachedValue={formDataCache['provider']}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/UsersForm.svelte b/frontend/src/lib/components/Forms/ModelForm/UsersForm.svelte
new file mode 100644
index 000000000..8804f9b8b
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/UsersForm.svelte
@@ -0,0 +1,55 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let shape: any = {};
+</script>
+
+{#if model.urlModel === 'users'}
+	<TextField
+		{form}
+		field="email"
+		label={m.email()}
+		cacheLock={cacheLocks['email']}
+		bind:cachedValue={formDataCache['email']}
+		data-focusindex="2"
+	/>
+	{#if shape.first_name && shape.last_name}
+		<TextField
+			{form}
+			field="first_name"
+			label={m.firstName()}
+			cacheLock={cacheLocks['first_name']}
+			bind:cachedValue={formDataCache['first_name']}
+		/>
+		<TextField
+			{form}
+			field="last_name"
+			label={m.lastName()}
+			cacheLock={cacheLocks['last_name']}
+			bind:cachedValue={formDataCache['last_name']}
+		/>
+	{/if}
+	{#if shape.user_groups}
+		<AutocompleteSelect
+			{form}
+			multiple
+			options={getOptions({ objects: model.foreignKeys['user_groups'] })}
+			field="user_groups"
+			cacheLock={cacheLocks['user_groups']}
+			bind:cachedValue={formDataCache['user_groups']}
+			label={m.userGroups()}
+		/>
+	{/if}
+	{#if shape.is_active}
+		<Checkbox {form} field="is_active" label={m.isActive()} helpText={m.isActiveHelpText()} />
+	{/if}
+{/if}

From 6500aa8b718bd62b0dee2f33ee1ad3fb5ba65dc2 Mon Sep 17 00:00:00 2001
From: melinoix <titouan.ameline@gmail.com>
Date: Tue, 24 Sep 2024 10:19:15 +0200
Subject: [PATCH 2/3] corrected file names & skipped duplicated tests

---
 .../src/lib/components/Forms/ModelForm.svelte |   4 +-
 .../AppliedControlsPoliciesForm.svelte        | 192 +++---
 .../Forms/ModelForm/AssetsForm.svelte         |  70 ++-
 .../ComplianceAssessmentsForm.svelte          | 212 ++++---
 .../Forms/ModelForm/EntitiesForm.svelte       |  50 +-
 .../ModelForm/EntityAssessmentsForm.svelte    | 340 ++++++-----
 .../Forms/ModelForm/EvidencesForm.svelte      |  60 +-
 .../Forms/ModelForm/FrameworksForm.svelte     |  32 +-
 .../Forms/ModelForm/ProjectForm.svelte        |  42 --
 .../Forms/ModelForm/ProjectsForm.svelte       |  40 ++
 .../ModelForm/ReferenceControlsForm.svelte    |  94 ++-
 .../ModelForm/RepresentativesForm.svelte      |  94 ++-
 .../RequirementAssessmentsForm.svelte         |  54 +-
 .../Forms/ModelForm/RiskAssessmentForm.svelte | 106 ----
 .../ModelForm/RiskAssessmentsForm.svelte      | 104 ++++
 .../Forms/ModelForm/RiskScenariosForm.svelte  |  54 +-
 .../Forms/ModelForm/SolutionsForm.svelte      |  54 +-
 .../Forms/ModelForm/SsoSettingsForm.svelte    | 555 +++++++++---------
 .../Forms/ModelForm/ThreatsForm.svelte        |  62 +-
 .../Forms/ModelForm/UsersForm.svelte          |  70 ++-
 20 files changed, 1125 insertions(+), 1164 deletions(-)
 delete mode 100644 frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/ProjectsForm.svelte
 delete mode 100644 frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/RiskAssessmentsForm.svelte

diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index b998acd9b..aa81e4379 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -5,8 +5,8 @@
 	import TextArea from '$lib/components/Forms/TextArea.svelte';
 	import TextField from '$lib/components/Forms/TextField.svelte';
 
-	import RiskAssessmentForm from './ModelForm/RiskAssessmentForm.svelte';
-	import ProjectForm from './ModelForm/ProjectForm.svelte';
+	import RiskAssessmentForm from './ModelForm/RiskAssessmentsForm.svelte';
+	import ProjectForm from './ModelForm/ProjectsForm.svelte';
 	import ThreatForm from './ModelForm/ThreatsForm.svelte';
 	import RiskScenarioForm from './ModelForm/RiskScenariosForm.svelte';
 	import AppliedControlsPoliciesForm from './ModelForm/AppliedControlsPoliciesForm.svelte';
diff --git a/frontend/src/lib/components/Forms/ModelForm/AppliedControlsPoliciesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/AppliedControlsPoliciesForm.svelte
index 900246619..6d278e6d1 100644
--- a/frontend/src/lib/components/Forms/ModelForm/AppliedControlsPoliciesForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/AppliedControlsPoliciesForm.svelte
@@ -16,104 +16,102 @@
 	export let initialData: Record<string, any> = {};
 </script>
 
-{#if model.urlModel === 'applied-controls' || model.urlModel === 'policies'}
-	{#if schema.shape.category}
-		<Select
-			{form}
-			options={model.selectOptions['category']}
-			field="category"
-			label={m.category()}
-			cacheLock={cacheLocks['category']}
-			bind:cachedValue={formDataCache['category']}
-		/>
-	{/if}
+{#if schema.shape.category}
 	<Select
 		{form}
-		options={model.selectOptions['csf_function']}
-		field="csf_function"
-		label={m.csfFunction()}
-		cacheLock={cacheLocks['csf_function']}
-		bind:cachedValue={formDataCache['csf_function']}
-	/>
-	<AutocompleteSelect
-		{form}
-		multiple
-		options={getOptions({ objects: model.foreignKeys['owner'], label: 'email' })}
-		field="owner"
-		cacheLock={cacheLocks['owner']}
-		bind:cachedValue={formDataCache['owner']}
-		label={m.owner()}
-	/>
-	<Select
-		{form}
-		options={model.selectOptions['status']}
-		field="status"
-		label={m.status()}
-		cacheLock={cacheLocks['status']}
-		bind:cachedValue={formDataCache['status']}
-	/>
-	<AutocompleteSelect
-		{form}
-		multiple
-		options={getOptions({
-			objects: model.foreignKeys['evidences'],
-			extra_fields: [['folder', 'str']]
-		})}
-		field="evidences"
-		cacheLock={cacheLocks['evidences']}
-		bind:cachedValue={formDataCache['evidences']}
-		label={m.evidences()}
-	/>
-	<TextField
-		type="date"
-		{form}
-		field="eta"
-		label={m.eta()}
-		helpText={m.etaHelpText()}
-		cacheLock={cacheLocks['eta']}
-		bind:cachedValue={formDataCache['eta']}
-	/>
-	<TextField
-		type="date"
-		{form}
-		field="expiry_date"
-		label={m.expiryDate()}
-		helpText={m.expiryDateHelpText()}
-		cacheLock={cacheLocks['expiry_date']}
-		bind:cachedValue={formDataCache['expiry_date']}
-	/>
-	<TextField
-		{form}
-		field="link"
-		label={m.link()}
-		helpText={m.linkHelpText()}
-		cacheLock={cacheLocks['link']}
-		bind:cachedValue={formDataCache['link']}
-	/>
-	<Select
-		{form}
-		options={model.selectOptions['effort']}
-		field="effort"
-		label={m.effort()}
-		helpText={m.effortHelpText()}
-		cacheLock={cacheLocks['effort']}
-		bind:cachedValue={formDataCache['effort']}
-	/>
-	<NumberField
-		{form}
-		field="cost"
-		label={m.cost()}
-		helpText={m.costHelpText()}
-		cacheLock={cacheLocks['cost']}
-		bind:cachedValue={formDataCache['cost']}
-	/>
-	<AutocompleteSelect
-		{form}
-		options={getOptions({ objects: model.foreignKeys['folder'] })}
-		field="folder"
-		cacheLock={cacheLocks['folder']}
-		bind:cachedValue={formDataCache['folder']}
-		label={m.domain()}
-		hidden={initialData.folder}
+		options={model.selectOptions['category']}
+		field="category"
+		label={m.category()}
+		cacheLock={cacheLocks['category']}
+		bind:cachedValue={formDataCache['category']}
 	/>
 {/if}
+<Select
+	{form}
+	options={model.selectOptions['csf_function']}
+	field="csf_function"
+	label={m.csfFunction()}
+	cacheLock={cacheLocks['csf_function']}
+	bind:cachedValue={formDataCache['csf_function']}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['owner'], label: 'email' })}
+	field="owner"
+	cacheLock={cacheLocks['owner']}
+	bind:cachedValue={formDataCache['owner']}
+	label={m.owner()}
+/>
+<Select
+	{form}
+	options={model.selectOptions['status']}
+	field="status"
+	label={m.status()}
+	cacheLock={cacheLocks['status']}
+	bind:cachedValue={formDataCache['status']}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({
+		objects: model.foreignKeys['evidences'],
+		extra_fields: [['folder', 'str']]
+	})}
+	field="evidences"
+	cacheLock={cacheLocks['evidences']}
+	bind:cachedValue={formDataCache['evidences']}
+	label={m.evidences()}
+/>
+<TextField
+	type="date"
+	{form}
+	field="eta"
+	label={m.eta()}
+	helpText={m.etaHelpText()}
+	cacheLock={cacheLocks['eta']}
+	bind:cachedValue={formDataCache['eta']}
+/>
+<TextField
+	type="date"
+	{form}
+	field="expiry_date"
+	label={m.expiryDate()}
+	helpText={m.expiryDateHelpText()}
+	cacheLock={cacheLocks['expiry_date']}
+	bind:cachedValue={formDataCache['expiry_date']}
+/>
+<TextField
+	{form}
+	field="link"
+	label={m.link()}
+	helpText={m.linkHelpText()}
+	cacheLock={cacheLocks['link']}
+	bind:cachedValue={formDataCache['link']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['effort']}
+	field="effort"
+	label={m.effort()}
+	helpText={m.effortHelpText()}
+	cacheLock={cacheLocks['effort']}
+	bind:cachedValue={formDataCache['effort']}
+/>
+<NumberField
+	{form}
+	field="cost"
+	label={m.cost()}
+	helpText={m.costHelpText()}
+	cacheLock={cacheLocks['cost']}
+	bind:cachedValue={formDataCache['cost']}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/AssetsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/AssetsForm.svelte
index 95523f644..18c652005 100644
--- a/frontend/src/lib/components/Forms/ModelForm/AssetsForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/AssetsForm.svelte
@@ -16,39 +16,37 @@
 	export let data: any = {};
 </script>
 
-{#if model.urlModel === 'assets'}
-	<TextArea
-		{form}
-		field="business_value"
-		label={m.businessValue()}
-		cacheLock={cacheLocks['business_value']}
-		bind:cachedValue={formDataCache['business_value']}
-	/>
-	<AutocompleteSelect
-		{form}
-		options={getOptions({ objects: model.foreignKeys['folder'] })}
-		field="folder"
-		cacheLock={cacheLocks['folder']}
-		bind:cachedValue={formDataCache['folder']}
-		label={m.domain()}
-		hidden={initialData.folder}
-	/>
-	<Select
-		{form}
-		options={model.selectOptions['type']}
-		field="type"
-		label="Type"
-		cacheLock={cacheLocks['type']}
-		bind:cachedValue={formDataCache['type']}
-	/>
-	<AutocompleteSelect
-		disabled={data.type === 'PR'}
-		multiple
-		{form}
-		options={getOptions({ objects: model.foreignKeys['parent_assets'], self: object })}
-		field="parent_assets"
-		cacheLock={cacheLocks['parent_assets']}
-		bind:cachedValue={formDataCache['parent_assets']}
-		label={m.parentAssets()}
-	/>
-{/if}
+<TextArea
+	{form}
+	field="business_value"
+	label={m.businessValue()}
+	cacheLock={cacheLocks['business_value']}
+	bind:cachedValue={formDataCache['business_value']}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
+<Select
+	{form}
+	options={model.selectOptions['type']}
+	field="type"
+	label="Type"
+	cacheLock={cacheLocks['type']}
+	bind:cachedValue={formDataCache['type']}
+/>
+<AutocompleteSelect
+	disabled={data.type === 'PR'}
+	multiple
+	{form}
+	options={getOptions({ objects: model.foreignKeys['parent_assets'], self: object })}
+	field="parent_assets"
+	cacheLock={cacheLocks['parent_assets']}
+	bind:cachedValue={formDataCache['parent_assets']}
+	label={m.parentAssets()}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentsForm.svelte
index 3a4d9e952..5d3fd22ae 100644
--- a/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentsForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentsForm.svelte
@@ -17,118 +17,116 @@
 	export let context: string;
 </script>
 
-{#if model.urlModel === 'compliance-assessments'}
-	{#if context === 'fromBaseline' && initialData.baseline}
-		<AutocompleteSelect
-			{form}
-			field="baseline"
-			cacheLock={cacheLocks['baseline']}
-			bind:cachedValue={formDataCache['baseline']}
-			label={m.baseline()}
-			options={getOptions({ objects: model.foreignKeys['baseline'] })}
-		/>
-	{/if}
+{#if context === 'fromBaseline' && initialData.baseline}
 	<AutocompleteSelect
 		{form}
-		options={getOptions({
-			objects: model.foreignKeys['project'],
-			extra_fields: [['folder', 'str']]
-		})}
-		field="project"
-		cacheLock={cacheLocks['project']}
-		bind:cachedValue={formDataCache['project']}
-		label={m.project()}
-		hidden={initialData.project}
-	/>
-	<TextField
-		{form}
-		field="version"
-		label={m.version()}
-		cacheLock={cacheLocks['version']}
-		bind:cachedValue={formDataCache['version']}
-	/>
-	<Select
-		{form}
-		options={model.selectOptions['status']}
-		field="status"
-		label={m.status()}
-		cacheLock={cacheLocks['status']}
-		bind:cachedValue={formDataCache['status']}
-	/>
-	<AutocompleteSelect
-		{form}
-		disabled={object.id}
-		options={getOptions({ objects: model.foreignKeys['framework'] })}
-		field="framework"
-		cacheLock={cacheLocks['framework']}
-		bind:cachedValue={formDataCache['framework']}
-		label={m.framework()}
-		on:change={async (e) => {
-			if (e.detail) {
-				await fetch(`/frameworks/${e.detail}`)
-					.then((r) => r.json())
-					.then((r) => {
-						const implementation_groups = r['implementation_groups_definition'] || [];
-						model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
-							(group) => ({ label: group.name, value: group.ref_id })
-						);
-					});
-			}
-		}}
-	/>
-	{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
-		<AutocompleteSelect
-			multiple
-			translateOptions={false}
-			{form}
-			options={model.selectOptions['selected_implementation_groups']}
-			field="selected_implementation_groups"
-			cacheLock={cacheLocks['selected_implementation_groups']}
-			bind:cachedValue={formDataCache['selected_implementation_groups']}
-			label={m.selectedImplementationGroups()}
-		/>
-	{/if}
-	<AutocompleteSelect
-		{form}
-		multiple
-		options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-		field="authors"
-		cacheLock={cacheLocks['authors']}
-		bind:cachedValue={formDataCache['authors']}
-		label={m.authors()}
+		field="baseline"
+		cacheLock={cacheLocks['baseline']}
+		bind:cachedValue={formDataCache['baseline']}
+		label={m.baseline()}
+		options={getOptions({ objects: model.foreignKeys['baseline'] })}
 	/>
+{/if}
+<AutocompleteSelect
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['project'],
+		extra_fields: [['folder', 'str']]
+	})}
+	field="project"
+	cacheLock={cacheLocks['project']}
+	bind:cachedValue={formDataCache['project']}
+	label={m.project()}
+	hidden={initialData.project}
+/>
+<TextField
+	{form}
+	field="version"
+	label={m.version()}
+	cacheLock={cacheLocks['version']}
+	bind:cachedValue={formDataCache['version']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['status']}
+	field="status"
+	label={m.status()}
+	cacheLock={cacheLocks['status']}
+	bind:cachedValue={formDataCache['status']}
+/>
+<AutocompleteSelect
+	{form}
+	disabled={object.id}
+	options={getOptions({ objects: model.foreignKeys['framework'] })}
+	field="framework"
+	cacheLock={cacheLocks['framework']}
+	bind:cachedValue={formDataCache['framework']}
+	label={m.framework()}
+	on:change={async (e) => {
+		if (e.detail) {
+			await fetch(`/frameworks/${e.detail}`)
+				.then((r) => r.json())
+				.then((r) => {
+					const implementation_groups = r['implementation_groups_definition'] || [];
+					model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
+						(group) => ({ label: group.name, value: group.ref_id })
+					);
+				});
+		}
+	}}
+/>
+{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
 	<AutocompleteSelect
-		{form}
 		multiple
-		options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-		field="reviewers"
-		cacheLock={cacheLocks['reviewers']}
-		bind:cachedValue={formDataCache['reviewers']}
-		label={m.reviewers()}
-	/>
-	<TextField
-		type="date"
-		{form}
-		field="eta"
-		label={m.eta()}
-		helpText={m.etaHelpText()}
-		cacheLock={cacheLocks['eta']}
-		bind:cachedValue={formDataCache['eta']}
-	/>
-	<TextField
-		type="date"
-		{form}
-		field="due_date"
-		label={m.dueDate()}
-		helpText={m.dueDateHelpText()}
-		cacheLock={cacheLocks['due_date']}
-		bind:cachedValue={formDataCache['due_date']}
-	/>
-	<TextArea
+		translateOptions={false}
 		{form}
-		field="observation"
-		label={m.observation()}
-		cacheLock={cacheLocks['observation']}
-		bind:cachedValue={formDataCache['observation']}
+		options={model.selectOptions['selected_implementation_groups']}
+		field="selected_implementation_groups"
+		cacheLock={cacheLocks['selected_implementation_groups']}
+		bind:cachedValue={formDataCache['selected_implementation_groups']}
+		label={m.selectedImplementationGroups()}
 	/>
 {/if}
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
+	field="authors"
+	cacheLock={cacheLocks['authors']}
+	bind:cachedValue={formDataCache['authors']}
+	label={m.authors()}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
+	field="reviewers"
+	cacheLock={cacheLocks['reviewers']}
+	bind:cachedValue={formDataCache['reviewers']}
+	label={m.reviewers()}
+/>
+<TextField
+	type="date"
+	{form}
+	field="eta"
+	label={m.eta()}
+	helpText={m.etaHelpText()}
+	cacheLock={cacheLocks['eta']}
+	bind:cachedValue={formDataCache['eta']}
+/>
+<TextField
+	type="date"
+	{form}
+	field="due_date"
+	label={m.dueDate()}
+	helpText={m.dueDateHelpText()}
+	cacheLock={cacheLocks['due_date']}
+	bind:cachedValue={formDataCache['due_date']}
+/>
+<TextArea
+	{form}
+	field="observation"
+	label={m.observation()}
+	cacheLock={cacheLocks['observation']}
+	bind:cachedValue={formDataCache['observation']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/EntitiesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EntitiesForm.svelte
index d4416c05e..5a90d9541 100644
--- a/frontend/src/lib/components/Forms/ModelForm/EntitiesForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/EntitiesForm.svelte
@@ -14,29 +14,27 @@
 	export let initialData: Record<string, any> = {};
 </script>
 
-{#if model.urlModel === 'entities'}
-	<TextArea
-		{form}
-		field="mission"
-		label={m.mission()}
-		cacheLock={cacheLocks['mission']}
-		bind:cachedValue={formDataCache['mission']}
-	/>
-	<TextField
-		{form}
-		field="reference_link"
-		label={m.referenceLink()}
-		helpText={m.linkHelpText()}
-		cacheLock={cacheLocks['reference_link']}
-		bind:cachedValue={formDataCache['reference_link']}
-	/>
-	<AutocompleteSelect
-		{form}
-		options={getOptions({ objects: model.foreignKeys['folder'] })}
-		field="folder"
-		cacheLock={cacheLocks['folder']}
-		bind:cachedValue={formDataCache['folder']}
-		label={m.domain()}
-		hidden={initialData.folder}
-	/>
-{/if}
+<TextArea
+	{form}
+	field="mission"
+	label={m.mission()}
+	cacheLock={cacheLocks['mission']}
+	bind:cachedValue={formDataCache['mission']}
+/>
+<TextField
+	{form}
+	field="reference_link"
+	label={m.referenceLink()}
+	helpText={m.linkHelpText()}
+	cacheLock={cacheLocks['reference_link']}
+	bind:cachedValue={formDataCache['reference_link']}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentsForm.svelte
index b8f17c86a..e4383a846 100644
--- a/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentsForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentsForm.svelte
@@ -18,184 +18,182 @@
 	export let data: Record<string, any> = {};
 </script>
 
-{#if model.urlModel === 'entity-assessments'}
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['project'] })}
+	field="project"
+	cacheLock={cacheLocks['project']}
+	bind:cachedValue={formDataCache['project']}
+	label={m.project()}
+	hidden={initialData.project}
+/>
+{#if !data.compliance_assessment}
+	<Checkbox
+		{form}
+		field="create_audit"
+		label={m.createAudit()}
+		helpText={m.createAuditHelpText()}
+	/>
 	<AutocompleteSelect
 		{form}
-		options={getOptions({ objects: model.foreignKeys['project'] })}
-		field="project"
-		cacheLock={cacheLocks['project']}
-		bind:cachedValue={formDataCache['project']}
-		label={m.project()}
-		hidden={initialData.project}
+		disabled={!data.create_audit}
+		mandatory
+		hidden={!data.create_audit}
+		options={getOptions({ objects: model.foreignKeys['framework'] })}
+		field="framework"
+		cacheLock={cacheLocks['framework']}
+		bind:cachedValue={formDataCache['framework']}
+		label={m.framework()}
+		on:change={async (e) => {
+			if (e.detail) {
+				await fetch(`/frameworks/${e.detail}`)
+					.then((r) => r.json())
+					.then((r) => {
+						const implementation_groups = r['implementation_groups_definition'] || [];
+						model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
+							(group) => ({ label: group.name, value: group.ref_id })
+						);
+					});
+			}
+		}}
 	/>
-	{#if !data.compliance_assessment}
-		<Checkbox
-			{form}
-			field="create_audit"
-			label={m.createAudit()}
-			helpText={m.createAuditHelpText()}
-		/>
+	{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
 		<AutocompleteSelect
+			multiple
+			translateOptions={false}
 			{form}
-			disabled={!data.create_audit}
-			mandatory
-			hidden={!data.create_audit}
-			options={getOptions({ objects: model.foreignKeys['framework'] })}
-			field="framework"
-			cacheLock={cacheLocks['framework']}
-			bind:cachedValue={formDataCache['framework']}
-			label={m.framework()}
-			on:change={async (e) => {
-				if (e.detail) {
-					await fetch(`/frameworks/${e.detail}`)
-						.then((r) => r.json())
-						.then((r) => {
-							const implementation_groups = r['implementation_groups_definition'] || [];
-							model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
-								(group) => ({ label: group.name, value: group.ref_id })
-							);
-						});
-				}
-			}}
+			options={model.selectOptions['selected_implementation_groups']}
+			field="selected_implementation_groups"
+			cacheLock={cacheLocks['selected_implementation_groups']}
+			bind:cachedValue={formDataCache['selected_implementation_groups']}
+			label={m.selectedImplementationGroups()}
 		/>
-		{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
-			<AutocompleteSelect
-				multiple
-				translateOptions={false}
-				{form}
-				options={model.selectOptions['selected_implementation_groups']}
-				field="selected_implementation_groups"
-				cacheLock={cacheLocks['selected_implementation_groups']}
-				bind:cachedValue={formDataCache['selected_implementation_groups']}
-				label={m.selectedImplementationGroups()}
-			/>
-		{/if}
 	{/if}
-	<AutocompleteSelect
-		{form}
-		options={getOptions({ objects: model.foreignKeys['entity'] })}
-		field="entity"
-		cacheLock={cacheLocks['entity']}
-		bind:cachedValue={formDataCache['entity']}
-		label={m.entity()}
-		hidden={initialData.entity}
-	/>
-	<AutocompleteSelect
-		{form}
-		multiple
-		options={getOptions({ objects: model.foreignKeys['solutions'] })}
-		field="solutions"
-		cacheLock={cacheLocks['solutions']}
-		bind:cachedValue={formDataCache['solutions']}
-		label={m.solutions()}
-	/>
-	<Score
-		{form}
-		label={m.criticality()}
-		field="criticality"
-		always_enabled={true}
-		inversedColors
-		fullDonut
-		min_score={1}
-		max_score={4}
-	/>
-	<Select
-		{form}
-		options={model.selectOptions['status']}
-		field="status"
-		label={m.status()}
-		cacheLock={cacheLocks['status']}
-		bind:cachedValue={formDataCache['status']}
-	/>
-	<TextField
-		{form}
-		field="version"
-		label={m.version()}
-		cacheLock={cacheLocks['version']}
-		bind:cachedValue={formDataCache['version']}
-	/>
-	<TextField
-		{form}
-		field="reference_link"
-		label={m.referenceLink()}
-		helpText={m.linkHelpText()}
-		cacheLock={cacheLocks['reference_link']}
-		bind:cachedValue={formDataCache['reference_link']}
-	/>
-	<TextField
-		type="date"
-		{form}
-		field="eta"
-		label={m.eta()}
-		helpText={m.etaHelpText()}
-		cacheLock={cacheLocks['eta']}
-		bind:cachedValue={formDataCache['eta']}
-	/>
-	<TextField
-		type="date"
-		{form}
-		field="due_date"
-		label={m.dueDate()}
-		helpText={m.dueDateHelpText()}
-		cacheLock={cacheLocks['due_date']}
-		bind:cachedValue={formDataCache['due_date']}
-	/>
-	<AutocompleteSelect
-		{form}
-		multiple
-		options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-		field="authors"
-		cacheLock={cacheLocks['authors']}
-		bind:cachedValue={formDataCache['authors']}
-		label={m.authors()}
-	/>
-	<AutocompleteSelect
-		{form}
-		multiple
-		options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-		field="reviewers"
-		cacheLock={cacheLocks['reviewers']}
-		bind:cachedValue={formDataCache['reviewers']}
-		label={m.reviewers()}
-	/>
-	<AutocompleteSelect
-		{form}
-		options={getOptions({ objects: model.foreignKeys['compliance_assessment'] })}
-		field="compliance_assessment"
-		cacheLock={cacheLocks['compliance_assessment']}
-		bind:cachedValue={formDataCache['compliance_assessment']}
-		label={m.complianceAssessment()}
-		disabled={data.create_audit}
-		hidden={data.create_audit}
-	/>
-	<AutocompleteSelect
-		{form}
-		options={getOptions({
-			objects: model.foreignKeys['evidence'],
-			extra_fields: [['folder', 'str']]
-		})}
-		field="evidence"
-		cacheLock={cacheLocks['evidence']}
-		bind:cachedValue={formDataCache['evidence']}
-		label={m.evidence()}
-	/>
-	<Select
-		{form}
-		options={model.selectOptions['conclusion']}
-		field="conclusion"
-		label={m.conclusion()}
-		cacheLock={cacheLocks['conclusion']}
-		bind:cachedValue={formDataCache['conclusion']}
-	/>
-	<TextArea
-		{form}
-		field="observation"
-		label={m.observation()}
-		cacheLock={cacheLocks['observation']}
-		bind:cachedValue={formDataCache['observation']}
-	/>
-	<!-- <Score {form} label={m.penetration()} field="penetration" always_enabled={true} inversedColors fullDonut max_score={5} />
+{/if}
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['entity'] })}
+	field="entity"
+	cacheLock={cacheLocks['entity']}
+	bind:cachedValue={formDataCache['entity']}
+	label={m.entity()}
+	hidden={initialData.entity}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['solutions'] })}
+	field="solutions"
+	cacheLock={cacheLocks['solutions']}
+	bind:cachedValue={formDataCache['solutions']}
+	label={m.solutions()}
+/>
+<Score
+	{form}
+	label={m.criticality()}
+	field="criticality"
+	always_enabled={true}
+	inversedColors
+	fullDonut
+	min_score={1}
+	max_score={4}
+/>
+<Select
+	{form}
+	options={model.selectOptions['status']}
+	field="status"
+	label={m.status()}
+	cacheLock={cacheLocks['status']}
+	bind:cachedValue={formDataCache['status']}
+/>
+<TextField
+	{form}
+	field="version"
+	label={m.version()}
+	cacheLock={cacheLocks['version']}
+	bind:cachedValue={formDataCache['version']}
+/>
+<TextField
+	{form}
+	field="reference_link"
+	label={m.referenceLink()}
+	helpText={m.linkHelpText()}
+	cacheLock={cacheLocks['reference_link']}
+	bind:cachedValue={formDataCache['reference_link']}
+/>
+<TextField
+	type="date"
+	{form}
+	field="eta"
+	label={m.eta()}
+	helpText={m.etaHelpText()}
+	cacheLock={cacheLocks['eta']}
+	bind:cachedValue={formDataCache['eta']}
+/>
+<TextField
+	type="date"
+	{form}
+	field="due_date"
+	label={m.dueDate()}
+	helpText={m.dueDateHelpText()}
+	cacheLock={cacheLocks['due_date']}
+	bind:cachedValue={formDataCache['due_date']}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
+	field="authors"
+	cacheLock={cacheLocks['authors']}
+	bind:cachedValue={formDataCache['authors']}
+	label={m.authors()}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
+	field="reviewers"
+	cacheLock={cacheLocks['reviewers']}
+	bind:cachedValue={formDataCache['reviewers']}
+	label={m.reviewers()}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['compliance_assessment'] })}
+	field="compliance_assessment"
+	cacheLock={cacheLocks['compliance_assessment']}
+	bind:cachedValue={formDataCache['compliance_assessment']}
+	label={m.complianceAssessment()}
+	disabled={data.create_audit}
+	hidden={data.create_audit}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['evidence'],
+		extra_fields: [['folder', 'str']]
+	})}
+	field="evidence"
+	cacheLock={cacheLocks['evidence']}
+	bind:cachedValue={formDataCache['evidence']}
+	label={m.evidence()}
+/>
+<Select
+	{form}
+	options={model.selectOptions['conclusion']}
+	field="conclusion"
+	label={m.conclusion()}
+	cacheLock={cacheLocks['conclusion']}
+	bind:cachedValue={formDataCache['conclusion']}
+/>
+<TextArea
+	{form}
+	field="observation"
+	label={m.observation()}
+	cacheLock={cacheLocks['observation']}
+	bind:cachedValue={formDataCache['observation']}
+/>
+<!-- <Score {form} label={m.penetration()} field="penetration" always_enabled={true} inversedColors fullDonut max_score={5} />
 		<Score {form} label={m.dependency()} field="dependency" always_enabled={true} inversedColors fullDonut max_score={5} />
 		<Score {form} label={m.maturity()} field="maturity" always_enabled={true} inversedColors fullDonut max_score={5} />
 		<Score {form} label={m.trust()} field="trust" always_enabled={true} inversedColors fullDonut max_score={5} /> -->
-{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/EvidencesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EvidencesForm.svelte
index 2440e3d57..cf42cab3e 100644
--- a/frontend/src/lib/components/Forms/ModelForm/EvidencesForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/EvidencesForm.svelte
@@ -16,37 +16,35 @@
 	export let object: any = {};
 </script>
 
-{#if model.urlModel === 'evidences'}
-	<HiddenInput {form} field="applied_controls" />
-	<HiddenInput {form} field="requirement_assessments" />
-	<FileInput
+<HiddenInput {form} field="applied_controls" />
+<HiddenInput {form} field="requirement_assessments" />
+<FileInput
+	{form}
+	allowPaste={true}
+	helpText={object.attachment
+		? `${m.attachmentWarningText()}: ${object.attachment}`
+		: m.attachmentHelpText()}
+	field="attachment"
+	label={m.attachment()}
+/>
+{#if !(initialData.applied_controls || initialData.requirement_assessments)}
+	<AutocompleteSelect
 		{form}
-		allowPaste={true}
-		helpText={object.attachment
-			? `${m.attachmentWarningText()}: ${object.attachment}`
-			: m.attachmentHelpText()}
-		field="attachment"
-		label={m.attachment()}
-	/>
-	{#if !(initialData.applied_controls || initialData.requirement_assessments)}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.applied_controls || initialData.requirement_assessments}
-		/>
-	{:else}
-		<HiddenInput {form} field="folder" />
-	{/if}
-	<TextField
-		{form}
-		field="link"
-		label={m.link()}
-		helpText={m.linkHelpText()}
-		cacheLock={cacheLocks['link']}
-		bind:cachedValue={formDataCache['link']}
+		options={getOptions({ objects: model.foreignKeys['folder'] })}
+		field="folder"
+		cacheLock={cacheLocks['folder']}
+		bind:cachedValue={formDataCache['folder']}
+		label={m.domain()}
+		hidden={initialData.applied_controls || initialData.requirement_assessments}
 	/>
+{:else}
+	<HiddenInput {form} field="folder" />
 {/if}
+<TextField
+	{form}
+	field="link"
+	label={m.link()}
+	helpText={m.linkHelpText()}
+	cacheLock={cacheLocks['link']}
+	bind:cachedValue={formDataCache['link']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/FrameworksForm.svelte b/frontend/src/lib/components/Forms/ModelForm/FrameworksForm.svelte
index 3e448a24b..a327b1d57 100644
--- a/frontend/src/lib/components/Forms/ModelForm/FrameworksForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/FrameworksForm.svelte
@@ -10,20 +10,18 @@
 	export let formDataCache: Record<string, any> = {};
 </script>
 
-{#if model.urlModel === 'frameworks'}
-	<TextField
-		{form}
-		field="ref_id"
-		label={m.ref()}
-		cacheLock={cacheLocks['ref_id']}
-		bind:cachedValue={formDataCache['ref_id']}
-	/>
-	<Select
-		{form}
-		options={model.selectOptions['category']}
-		field="category"
-		label={m.category()}
-		cacheLock={cacheLocks['category']}
-		bind:cachedValue={formDataCache['category']}
-	/>
-{/if}
+<TextField
+	{form}
+	field="ref_id"
+	label={m.ref()}
+	cacheLock={cacheLocks['ref_id']}
+	bind:cachedValue={formDataCache['ref_id']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['category']}
+	field="category"
+	label={m.category()}
+	cacheLock={cacheLocks['category']}
+	bind:cachedValue={formDataCache['category']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte
deleted file mode 100644
index 917bc8eaf..000000000
--- a/frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte
+++ /dev/null
@@ -1,42 +0,0 @@
-<script lang="ts">
-	import AutocompleteSelect from '../AutocompleteSelect.svelte';
-	import TextField from '$lib/components/Forms/TextField.svelte';
-	import Select from '../Select.svelte';
-	import { getOptions } from '$lib/utils/crud';
-	import type { SuperValidated } from 'sveltekit-superforms';
-	import type { ModelInfo, CacheLock } from '$lib/utils/types';
-	import * as m from '$paraglide/messages.js';
-
-	export let form: SuperValidated<any>;
-	export let model: ModelInfo;
-	export let cacheLocks: Record<string, CacheLock> = {};
-	export let formDataCache: Record<string, any> = {};
-	export let initialData: Record<string, any> = {};
-</script>
-
-{#if model.urlModel === 'projects'}
-	<AutocompleteSelect
-		{form}
-		options={getOptions({ objects: model.foreignKeys['folder'] })}
-		field="folder"
-		cacheLock={cacheLocks['folder']}
-		bind:cachedValue={formDataCache['folder']}
-		label={m.domain()}
-		hidden={initialData.folder}
-	/>
-	<TextField
-		{form}
-		field="internal_reference"
-		label={m.internalReference()}
-		cacheLock={cacheLocks['internal_reference']}
-		bind:cachedValue={formDataCache['internal_reference']}
-	/>
-	<Select
-		{form}
-		options={model.selectOptions['lc_status']}
-		field="lc_status"
-		label={m.lcStatus()}
-		cacheLock={cacheLocks['lc_status']}
-		bind:cachedValue={formDataCache['lc_status']}
-	/>
-{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/ProjectsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ProjectsForm.svelte
new file mode 100644
index 000000000..e4d9c86bf
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/ProjectsForm.svelte
@@ -0,0 +1,40 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import Select from '../Select.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
+<TextField
+	{form}
+	field="internal_reference"
+	label={m.internalReference()}
+	cacheLock={cacheLocks['internal_reference']}
+	bind:cachedValue={formDataCache['internal_reference']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['lc_status']}
+	field="lc_status"
+	label={m.lcStatus()}
+	cacheLock={cacheLocks['lc_status']}
+	bind:cachedValue={formDataCache['lc_status']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/ReferenceControlsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ReferenceControlsForm.svelte
index 643ffba63..0ec8dec7b 100644
--- a/frontend/src/lib/components/Forms/ModelForm/ReferenceControlsForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/ReferenceControlsForm.svelte
@@ -15,51 +15,49 @@
 	export let initialData: Record<string, any> = {};
 </script>
 
-{#if model.urlModel === 'reference-controls'}
-	<TextField
-		{form}
-		field="ref_id"
-		label={m.ref()}
-		cacheLock={cacheLocks['ref_id']}
-		bind:cachedValue={formDataCache['ref_id']}
-	/>
-	<Select
-		{form}
-		options={model.selectOptions['category']}
-		field="category"
-		label={m.category()}
-		cacheLock={cacheLocks['category']}
-		bind:cachedValue={formDataCache['category']}
-	/>
-	<Select
-		{form}
-		options={model.selectOptions['csf_function']}
-		field="csf_function"
-		label={m.csfFunction()}
-		cacheLock={cacheLocks['csf_function']}
-		bind:cachedValue={formDataCache['csf_function']}
-	/>
-	<TextArea
-		{form}
-		field="annotation"
-		label={m.annotation()}
-		cacheLock={cacheLocks['annotation']}
-		bind:cachedValue={formDataCache['annotation']}
-	/>
-	<TextField
-		{form}
-		field="provider"
-		label={m.provider()}
-		cacheLock={cacheLocks['provider']}
-		bind:cachedValue={formDataCache['provider']}
-	/>
-	<AutocompleteSelect
-		{form}
-		options={getOptions({ objects: model.foreignKeys['folder'] })}
-		field="folder"
-		cacheLock={cacheLocks['folder']}
-		bind:cachedValue={formDataCache['folder']}
-		label={m.domain()}
-		hidden={initialData.folder}
-	/>
-{/if}
+<TextField
+	{form}
+	field="ref_id"
+	label={m.ref()}
+	cacheLock={cacheLocks['ref_id']}
+	bind:cachedValue={formDataCache['ref_id']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['category']}
+	field="category"
+	label={m.category()}
+	cacheLock={cacheLocks['category']}
+	bind:cachedValue={formDataCache['category']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['csf_function']}
+	field="csf_function"
+	label={m.csfFunction()}
+	cacheLock={cacheLocks['csf_function']}
+	bind:cachedValue={formDataCache['csf_function']}
+/>
+<TextArea
+	{form}
+	field="annotation"
+	label={m.annotation()}
+	cacheLock={cacheLocks['annotation']}
+	bind:cachedValue={formDataCache['annotation']}
+/>
+<TextField
+	{form}
+	field="provider"
+	label={m.provider()}
+	cacheLock={cacheLocks['provider']}
+	bind:cachedValue={formDataCache['provider']}
+/>
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/RepresentativesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RepresentativesForm.svelte
index f96eefa65..fc2dcda95 100644
--- a/frontend/src/lib/components/Forms/ModelForm/RepresentativesForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/RepresentativesForm.svelte
@@ -13,52 +13,50 @@
 	export let data: any = {};
 </script>
 
-{#if model.urlModel === 'representatives'}
-	<TextField
-		{form}
-		field="email"
-		label={m.email()}
-		cacheLock={cacheLocks['email']}
-		bind:cachedValue={formDataCache['email']}
-		data-focusindex="2"
-	/>
-	{#if !data.user}
-		<Checkbox {form} field="create_user" label={m.createUser()} helpText={m.createUserHelpText()} />
-	{/if}
-	<AutocompleteSelect
-		{form}
-		options={getOptions({ objects: model.foreignKeys['entity'] })}
-		field="entity"
-		cacheLock={cacheLocks['entity']}
-		bind:cachedValue={formDataCache['entity']}
-		label={m.entity()}
-	/>
-	<TextField
-		{form}
-		field="first_name"
-		label={m.firstName()}
-		cacheLock={cacheLocks['first_name']}
-		bind:cachedValue={formDataCache['first_name']}
-	/>
-	<TextField
-		{form}
-		field="last_name"
-		label={m.lastName()}
-		cacheLock={cacheLocks['last_name']}
-		bind:cachedValue={formDataCache['last_name']}
-	/>
-	<TextField
-		{form}
-		field="phone"
-		label={m.phone()}
-		cacheLock={cacheLocks['phone']}
-		bind:cachedValue={formDataCache['phone']}
-	/>
-	<TextField
-		{form}
-		field="role"
-		label={m.role()}
-		cacheLock={cacheLocks['role']}
-		bind:cachedValue={formDataCache['role']}
-	/>
+<TextField
+	{form}
+	field="email"
+	label={m.email()}
+	cacheLock={cacheLocks['email']}
+	bind:cachedValue={formDataCache['email']}
+	data-focusindex="2"
+/>
+{#if !data.user}
+	<Checkbox {form} field="create_user" label={m.createUser()} helpText={m.createUserHelpText()} />
 {/if}
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['entity'] })}
+	field="entity"
+	cacheLock={cacheLocks['entity']}
+	bind:cachedValue={formDataCache['entity']}
+	label={m.entity()}
+/>
+<TextField
+	{form}
+	field="first_name"
+	label={m.firstName()}
+	cacheLock={cacheLocks['first_name']}
+	bind:cachedValue={formDataCache['first_name']}
+/>
+<TextField
+	{form}
+	field="last_name"
+	label={m.lastName()}
+	cacheLock={cacheLocks['last_name']}
+	bind:cachedValue={formDataCache['last_name']}
+/>
+<TextField
+	{form}
+	field="phone"
+	label={m.phone()}
+	cacheLock={cacheLocks['phone']}
+	bind:cachedValue={formDataCache['phone']}
+/>
+<TextField
+	{form}
+	field="role"
+	label={m.role()}
+	cacheLock={cacheLocks['role']}
+	bind:cachedValue={formDataCache['role']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentsForm.svelte
index 17b094818..567472744 100644
--- a/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentsForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentsForm.svelte
@@ -12,31 +12,29 @@
 	export let formDataCache: Record<string, any> = {};
 </script>
 
-{#if model.urlModel === 'requirement-assessments'}
-	<Select
-		{form}
-		options={model.selectOptions['status']}
-		field="status"
-		label={m.status()}
-		cacheLock={cacheLocks['status']}
-		bind:cachedValue={formDataCache['status']}
-	/>
-	<Select
-		{form}
-		options={model.selectOptions['result']}
-		field="result"
-		label={m.result()}
-		cacheLock={cacheLocks['result']}
-		bind:cachedValue={formDataCache['result']}
-	/>
-	<TextArea
-		{form}
-		field="observation"
-		label={m.observation()}
-		cacheLock={cacheLocks['observation']}
-		bind:cachedValue={formDataCache['observation']}
-	/>
-	<HiddenInput {form} field="folder" />
-	<HiddenInput {form} field="requirement" />
-	<HiddenInput {form} field="compliance_assessment" />
-{/if}
+<Select
+	{form}
+	options={model.selectOptions['status']}
+	field="status"
+	label={m.status()}
+	cacheLock={cacheLocks['status']}
+	bind:cachedValue={formDataCache['status']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['result']}
+	field="result"
+	label={m.result()}
+	cacheLock={cacheLocks['result']}
+	bind:cachedValue={formDataCache['result']}
+/>
+<TextArea
+	{form}
+	field="observation"
+	label={m.observation()}
+	cacheLock={cacheLocks['observation']}
+	bind:cachedValue={formDataCache['observation']}
+/>
+<HiddenInput {form} field="folder" />
+<HiddenInput {form} field="requirement" />
+<HiddenInput {form} field="compliance_assessment" />
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte
deleted file mode 100644
index ec3811d83..000000000
--- a/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte
+++ /dev/null
@@ -1,106 +0,0 @@
-<script lang="ts">
-	import AutocompleteSelect from '../AutocompleteSelect.svelte';
-	import TextField from '$lib/components/Forms/TextField.svelte';
-	import TextArea from '$lib/components/Forms/TextArea.svelte';
-	import Select from '../Select.svelte';
-	import { getOptions } from '$lib/utils/crud';
-	import type { SuperValidated } from 'sveltekit-superforms';
-	import type { ModelInfo, CacheLock } from '$lib/utils/types';
-	import * as m from '$paraglide/messages.js';
-
-	export let form: SuperValidated<any>;
-	export let model: ModelInfo;
-	export let riskAssessmentDuplication: boolean = false;
-	export let cacheLocks: Record<string, CacheLock> = {};
-	export let formDataCache: Record<string, any> = {};
-	export let initialData: Record<string, any> = {};
-	export let object: Record<string, any> = {};
-	export let context: string = 'default';
-	export let updated_fields: Set<string> = new Set();
-</script>
-
-{#if model.urlModel === 'risk-assessments' || model.urlModel === 'risk-assessment-duplicate'}
-	<AutocompleteSelect
-		{form}
-		options={getOptions({
-			objects: model.foreignKeys['project'],
-			extra_fields: [['folder', 'str']]
-		})}
-		field="project"
-		cacheLock={cacheLocks['project']}
-		bind:cachedValue={formDataCache['project']}
-		label={m.project()}
-		hidden={initialData.project}
-	/>
-	<TextField
-		{form}
-		field="version"
-		label={m.version()}
-		cacheLock={cacheLocks['version']}
-		bind:cachedValue={formDataCache['version']}
-	/>
-	{#if !riskAssessmentDuplication}
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			hide
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<AutocompleteSelect
-			{form}
-			disabled={object.id}
-			options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
-			field="risk_matrix"
-			cacheLock={cacheLocks['risk_matrix']}
-			bind:cachedValue={formDataCache['risk_matrix']}
-			label={m.riskMatrix()}
-			helpText={m.riskAssessmentMatrixHelpText()}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-			field="authors"
-			cacheLock={cacheLocks['authors']}
-			bind:cachedValue={formDataCache['authors']}
-			label={m.authors()}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-			field="reviewers"
-			cacheLock={cacheLocks['reviewers']}
-			bind:cachedValue={formDataCache['reviewers']}
-			label={m.reviewers()}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="eta"
-			label={m.eta()}
-			helpText={m.etaHelpText()}
-			cacheLock={cacheLocks['eta']}
-			bind:cachedValue={formDataCache['eta']}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="due_date"
-			label={m.dueDate()}
-			helpText={m.dueDateHelpText()}
-			cacheLock={cacheLocks['due_date']}
-			bind:cachedValue={formDataCache['due_date']}
-		/>
-		<TextArea
-			{form}
-			field="observation"
-			label={m.observation()}
-			cacheLock={cacheLocks['observation']}
-			bind:cachedValue={formDataCache['observation']}
-		/>
-	{/if}
-{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentsForm.svelte
new file mode 100644
index 000000000..ec016e9f6
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentsForm.svelte
@@ -0,0 +1,104 @@
+<script lang="ts">
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import TextArea from '$lib/components/Forms/TextArea.svelte';
+	import Select from '../Select.svelte';
+	import { getOptions } from '$lib/utils/crud';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let riskAssessmentDuplication: boolean = false;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+	export let object: Record<string, any> = {};
+	export let context: string = 'default';
+	export let updated_fields: Set<string> = new Set();
+</script>
+
+<AutocompleteSelect
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['project'],
+		extra_fields: [['folder', 'str']]
+	})}
+	field="project"
+	cacheLock={cacheLocks['project']}
+	bind:cachedValue={formDataCache['project']}
+	label={m.project()}
+	hidden={initialData.project}
+/>
+<TextField
+	{form}
+	field="version"
+	label={m.version()}
+	cacheLock={cacheLocks['version']}
+	bind:cachedValue={formDataCache['version']}
+/>
+{#if !riskAssessmentDuplication}
+	<Select
+		{form}
+		options={model.selectOptions['status']}
+		field="status"
+		hide
+		label={m.status()}
+		cacheLock={cacheLocks['status']}
+		bind:cachedValue={formDataCache['status']}
+	/>
+	<AutocompleteSelect
+		{form}
+		disabled={object.id}
+		options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
+		field="risk_matrix"
+		cacheLock={cacheLocks['risk_matrix']}
+		bind:cachedValue={formDataCache['risk_matrix']}
+		label={m.riskMatrix()}
+		helpText={m.riskAssessmentMatrixHelpText()}
+	/>
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
+		field="authors"
+		cacheLock={cacheLocks['authors']}
+		bind:cachedValue={formDataCache['authors']}
+		label={m.authors()}
+	/>
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
+		field="reviewers"
+		cacheLock={cacheLocks['reviewers']}
+		bind:cachedValue={formDataCache['reviewers']}
+		label={m.reviewers()}
+	/>
+	<TextField
+		type="date"
+		{form}
+		field="eta"
+		label={m.eta()}
+		helpText={m.etaHelpText()}
+		cacheLock={cacheLocks['eta']}
+		bind:cachedValue={formDataCache['eta']}
+	/>
+	<TextField
+		type="date"
+		{form}
+		field="due_date"
+		label={m.dueDate()}
+		helpText={m.dueDateHelpText()}
+		cacheLock={cacheLocks['due_date']}
+		bind:cachedValue={formDataCache['due_date']}
+	/>
+	<TextArea
+		{form}
+		field="observation"
+		label={m.observation()}
+		cacheLock={cacheLocks['observation']}
+		bind:cachedValue={formDataCache['observation']}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskScenariosForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskScenariosForm.svelte
index 8df82c607..b89866439 100644
--- a/frontend/src/lib/components/Forms/ModelForm/RiskScenariosForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/RiskScenariosForm.svelte
@@ -12,31 +12,29 @@
 	export let initialData: Record<string, any> = {};
 </script>
 
-{#if model.urlModel === 'risk-scenarios'}
-	<AutocompleteSelect
-		{form}
-		options={getOptions({
-			objects: model.foreignKeys['risk_assessment'],
-			label: 'str',
-			extra_fields: [['project', 'str']]
-		})}
-		field="risk_assessment"
-		cacheLock={cacheLocks['risk_assessment']}
-		bind:cachedValue={formDataCache['risk_assessment']}
-		label={m.riskAssessment()}
-		hidden={initialData.risk_assessment}
-	/>
-	<AutocompleteSelect
-		{form}
-		multiple
-		options={getOptions({
-			objects: model.foreignKeys['threats'],
-			extra_fields: [['folder', 'str']],
-			label: 'auto'
-		})}
-		field="threats"
-		cacheLock={cacheLocks['threats']}
-		bind:cachedValue={formDataCache['threats']}
-		label={m.threats()}
-	/>
-{/if}
+<AutocompleteSelect
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['risk_assessment'],
+		label: 'str',
+		extra_fields: [['project', 'str']]
+	})}
+	field="risk_assessment"
+	cacheLock={cacheLocks['risk_assessment']}
+	bind:cachedValue={formDataCache['risk_assessment']}
+	label={m.riskAssessment()}
+	hidden={initialData.risk_assessment}
+/>
+<AutocompleteSelect
+	{form}
+	multiple
+	options={getOptions({
+		objects: model.foreignKeys['threats'],
+		extra_fields: [['folder', 'str']],
+		label: 'auto'
+	})}
+	field="threats"
+	cacheLock={cacheLocks['threats']}
+	bind:cachedValue={formDataCache['threats']}
+	label={m.threats()}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/SolutionsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/SolutionsForm.svelte
index ecf0eb329..d496dcca7 100644
--- a/frontend/src/lib/components/Forms/ModelForm/SolutionsForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/SolutionsForm.svelte
@@ -13,31 +13,29 @@
 	export let initialData: Record<string, any> = {};
 </script>
 
-{#if model.urlModel === 'solutions'}
-	<AutocompleteSelect
-		{form}
-		options={getOptions({ objects: model.foreignKeys['provider_entity'] })}
-		field="provider_entity"
-		cacheLock={cacheLocks['provider_entity']}
-		bind:cachedValue={formDataCache['provider_entity']}
-		label={m.providerEntity()}
-		hidden={initialData.provider_entity}
-	/>
-	<TextField
-		{form}
-		field="ref_id"
-		label={m.ref()}
-		cacheLock={cacheLocks['ref_id']}
-		bind:cachedValue={formDataCache['ref_id']}
-	/>
-	<Score
-		{form}
-		label={m.criticality()}
-		field="criticality"
-		always_enabled={true}
-		inversedColors
-		fullDonut
-		min_score={1}
-		max_score={4}
-	/>
-{/if}
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['provider_entity'] })}
+	field="provider_entity"
+	cacheLock={cacheLocks['provider_entity']}
+	bind:cachedValue={formDataCache['provider_entity']}
+	label={m.providerEntity()}
+	hidden={initialData.provider_entity}
+/>
+<TextField
+	{form}
+	field="ref_id"
+	label={m.ref()}
+	cacheLock={cacheLocks['ref_id']}
+	bind:cachedValue={formDataCache['ref_id']}
+/>
+<Score
+	{form}
+	label={m.criticality()}
+	field="criticality"
+	always_enabled={true}
+	inversedColors
+	fullDonut
+	min_score={1}
+	max_score={4}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/SsoSettingsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/SsoSettingsForm.svelte
index 1f8cc11d4..66779c374 100644
--- a/frontend/src/lib/components/Forms/ModelForm/SsoSettingsForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/SsoSettingsForm.svelte
@@ -14,295 +14,288 @@
 	export let data: any = {};
 </script>
 
-{#if model.urlModel === 'sso-settings'}
-	<Accordion>
-		<Checkbox {form} field="is_enabled" label={m.enableSSO()} />
-		<AutocompleteSelect
-			{form}
-			hidden={model.selectOptions['provider'].length < 2}
-			field="provider"
-			cacheLock={cacheLocks['provider']}
-			bind:cachedValue={formDataCache['provider']}
-			options={model.selectOptions['provider']}
-			label={m.provider()}
-			disabled={!data.is_enabled}
-		/>
-		{#if data.provider !== 'saml'}
-			<AccordionItem open>
-				<svelte:fragment slot="summary">{m.IdPConfiguration()}</svelte:fragment>
-				<svelte:fragment slot="content">
+<Accordion>
+	<Checkbox {form} field="is_enabled" label={m.enableSSO()} />
+	<AutocompleteSelect
+		{form}
+		hidden={model.selectOptions['provider'].length < 2}
+		field="provider"
+		cacheLock={cacheLocks['provider']}
+		bind:cachedValue={formDataCache['provider']}
+		options={model.selectOptions['provider']}
+		label={m.provider()}
+		disabled={!data.is_enabled}
+	/>
+	{#if data.provider !== 'saml'}
+		<AccordionItem open>
+			<svelte:fragment slot="summary">{m.IdPConfiguration()}</svelte:fragment>
+			<svelte:fragment slot="content">
+				<TextField
+					{form}
+					field="provider_name"
+					label={m.name()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['provider_name']}
+					bind:cachedValue={formDataCache['provider_name']}
+				/>
+				<TextField
+					hidden
+					{form}
+					field="provider_id"
+					label={m.providerID()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['provider_id']}
+					bind:cachedValue={formDataCache['provider_id']}
+				/>
+				<TextField
+					{form}
+					field="client_id"
+					label={m.clientID()}
+					helpText={m.clientIDHelpText()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['client_id']}
+					bind:cachedValue={formDataCache['client_id']}
+				/>
+				{#if data.provider !== 'saml'}
 					<TextField
 						{form}
-						field="provider_name"
-						label={m.name()}
+						field="secret"
+						label={m.secret()}
+						helpText={m.secretHelpText()}
 						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['provider_name']}
-						bind:cachedValue={formDataCache['provider_name']}
+						cacheLock={cacheLocks['secret']}
+						bind:cachedValue={formDataCache['secret']}
 					/>
 					<TextField
-						hidden
 						{form}
-						field="provider_id"
-						label={m.providerID()}
+						field="key"
+						label={m.key()}
 						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['provider_id']}
-						bind:cachedValue={formDataCache['provider_id']}
+						cacheLock={cacheLocks['key']}
+						bind:cachedValue={formDataCache['key']}
 					/>
-					<TextField
-						{form}
-						field="client_id"
-						label={m.clientID()}
-						helpText={m.clientIDHelpText()}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['client_id']}
-						bind:cachedValue={formDataCache['client_id']}
-					/>
-					{#if data.provider !== 'saml'}
-						<TextField
-							{form}
-							field="secret"
-							label={m.secret()}
-							helpText={m.secretHelpText()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['secret']}
-							bind:cachedValue={formDataCache['secret']}
-						/>
-						<TextField
-							{form}
-							field="key"
-							label={m.key()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['key']}
-							bind:cachedValue={formDataCache['key']}
-						/>
-					{/if}
-				</svelte:fragment>
-			</AccordionItem>
-		{/if}
-		{#if data.provider === 'saml'}
-			<AccordionItem open>
-				<svelte:fragment slot="summary"
-					><span class="font-semibold">{m.SAMLIdPConfiguration()}</span></svelte:fragment
-				>
-				<svelte:fragment slot="content">
-					<TextField
-						{form}
-						field="idp_entity_id"
-						label={m.IdPEntityID()}
-						required={data.provider === 'saml'}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['idp_entity_id']}
-						bind:cachedValue={formDataCache['idp_entity_id']}
-					/>
-					<p class="text-gray-600 text-sm">Option 1: Fill the metadata url</p>
-					<TextField
-						{form}
-						field="metadata_url"
-						label={m.metadataURL()}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['metadata_url']}
-						bind:cachedValue={formDataCache['metadata_url']}
-					/>
-					<div class="flex items-center justify-center w-full space-x-2">
-						<hr class="w-1/2 items-center bg-gray-200 border-0" />
-						<span class="flex items-center text-gray-600 text-sm">{m.or()}</span>
-						<hr class="w-1/2 items-center bg-gray-200 border-0" />
-					</div>
-					<p class="text-gray-600 text-sm">Option 2: Fill the SSO URL, SLO URL and x509cert</p>
-					<TextField
-						{form}
-						field="sso_url"
-						label={m.SSOURL()}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['sso_url']}
-						bind:cachedValue={formDataCache['sso_url']}
-					/>
-					<TextField
-						{form}
-						field="slo_url"
-						label={m.SLOURL()}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['slo_url']}
-						bind:cachedValue={formDataCache['slo_url']}
-					/>
-					<TextArea
-						{form}
-						field="x509cert"
-						label={m.x509Cert()}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['x509cert']}
-						bind:cachedValue={formDataCache['x509cert']}
-					/>
-				</svelte:fragment>
-			</AccordionItem>
+				{/if}
+			</svelte:fragment>
+		</AccordionItem>
+	{/if}
+	{#if data.provider === 'saml'}
+		<AccordionItem open>
+			<svelte:fragment slot="summary"
+				><span class="font-semibold">{m.SAMLIdPConfiguration()}</span></svelte:fragment
+			>
+			<svelte:fragment slot="content">
+				<TextField
+					{form}
+					field="idp_entity_id"
+					label={m.IdPEntityID()}
+					required={data.provider === 'saml'}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['idp_entity_id']}
+					bind:cachedValue={formDataCache['idp_entity_id']}
+				/>
+				<p class="text-gray-600 text-sm">Option 1: Fill the metadata url</p>
+				<TextField
+					{form}
+					field="metadata_url"
+					label={m.metadataURL()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['metadata_url']}
+					bind:cachedValue={formDataCache['metadata_url']}
+				/>
+				<div class="flex items-center justify-center w-full space-x-2">
+					<hr class="w-1/2 items-center bg-gray-200 border-0" />
+					<span class="flex items-center text-gray-600 text-sm">{m.or()}</span>
+					<hr class="w-1/2 items-center bg-gray-200 border-0" />
+				</div>
+				<p class="text-gray-600 text-sm">Option 2: Fill the SSO URL, SLO URL and x509cert</p>
+				<TextField
+					{form}
+					field="sso_url"
+					label={m.SSOURL()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['sso_url']}
+					bind:cachedValue={formDataCache['sso_url']}
+				/>
+				<TextField
+					{form}
+					field="slo_url"
+					label={m.SLOURL()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['slo_url']}
+					bind:cachedValue={formDataCache['slo_url']}
+				/>
+				<TextArea
+					{form}
+					field="x509cert"
+					label={m.x509Cert()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['x509cert']}
+					bind:cachedValue={formDataCache['x509cert']}
+				/>
+			</svelte:fragment>
+		</AccordionItem>
 
-			<AccordionItem>
-				<svelte:fragment slot="summary"
-					><span class="font-semibold">{m.SPConfiguration()}</span></svelte:fragment
-				>
-				<svelte:fragment slot="content">
-					<TextField
-						{form}
-						field="sp_entity_id"
-						label={m.SPEntityID()}
-						required={data.provider === 'saml'}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['sp_entity_id']}
-						bind:cachedValue={formDataCache['sp_entity_id']}
-					/>
-				</svelte:fragment>
-			</AccordionItem>
+		<AccordionItem>
+			<svelte:fragment slot="summary"
+				><span class="font-semibold">{m.SPConfiguration()}</span></svelte:fragment
+			>
+			<svelte:fragment slot="content">
+				<TextField
+					{form}
+					field="sp_entity_id"
+					label={m.SPEntityID()}
+					required={data.provider === 'saml'}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['sp_entity_id']}
+					bind:cachedValue={formDataCache['sp_entity_id']}
+				/>
+			</svelte:fragment>
+		</AccordionItem>
 
-			<AccordionItem
-				><svelte:fragment slot="summary"
-					><span class="font-semibold">{m.advancedSettings()}</span></svelte:fragment
-				>
-				<svelte:fragment slot="content">
-					<TextField
-						{form}
-						field="attribute_mapping_uid"
-						label={m.attributeMappingUID()}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['attribute_mapping_uid']}
-						bind:cachedValue={formDataCache['attribute_mapping_uid']}
-					/>
-					<TextField
-						{form}
-						field="attribute_mapping_email_verified"
-						label={m.attributeMappingEmailVerified()}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['attribute_mapping_email_verified']}
-						bind:cachedValue={formDataCache['attribute_mapping_email_verified']}
-					/>
-					<TextField
-						{form}
-						field="attribute_mapping_email"
-						label={m.attributeMappingEmail()}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['attribute_mapping_email']}
-						bind:cachedValue={formDataCache['attribute_mapping_email']}
-					/>
+		<AccordionItem
+			><svelte:fragment slot="summary"
+				><span class="font-semibold">{m.advancedSettings()}</span></svelte:fragment
+			>
+			<svelte:fragment slot="content">
+				<TextField
+					{form}
+					field="attribute_mapping_uid"
+					label={m.attributeMappingUID()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['attribute_mapping_uid']}
+					bind:cachedValue={formDataCache['attribute_mapping_uid']}
+				/>
+				<TextField
+					{form}
+					field="attribute_mapping_email_verified"
+					label={m.attributeMappingEmailVerified()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['attribute_mapping_email_verified']}
+					bind:cachedValue={formDataCache['attribute_mapping_email_verified']}
+				/>
+				<TextField
+					{form}
+					field="attribute_mapping_email"
+					label={m.attributeMappingEmail()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['attribute_mapping_email']}
+					bind:cachedValue={formDataCache['attribute_mapping_email']}
+				/>
 
-					<Checkbox
-						{form}
-						field="allow_repeat_attribute_name"
-						label={m.allowRepeatAttributeName()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						field="allow_single_label_domains"
-						label={m.allowSingleLabelDomains()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						field="authn_request_signed"
-						hidden
-						label={m.authnRequestSigned()}
-						disabled={!data.is_enabled}
-					/>
-					<TextField
-						{form}
-						field="digest_algorithm"
-						hidden
-						label={m.digestAlgorithm()}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['digest_algorithm']}
-						bind:cachedValue={formDataCache['digest_algorithm']}
-					/>
-					<Checkbox
-						{form}
-						field="logout_request_signed"
-						hidden
-						label={m.logoutRequestSigned()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						field="logout_response_signed"
-						hidden
-						label={m.logoutResponseSigned()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						field="metadata_signed"
-						hidden
-						label={m.metadataSigned()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						field="name_id_encrypted"
-						hidden
-						label={m.nameIDEncrypted()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						hidden
-						field="reject_deprecated_algorithm"
-						label={m.rejectDeprecatedAlgorithm()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						field="reject_idp_initiated_sso"
-						label={m.rejectIdPInitiatedSSO()}
-						disabled={!data.is_enabled}
-					/>
-					<TextField
-						{form}
-						field="signature_algorithm"
-						hidden
-						label={m.signatureAlgorithm()}
-						disabled={!data.is_enabled}
-						cacheLock={cacheLocks['signature_algorithm']}
-						bind:cachedValue={formDataCache['signature_algorithm']}
-					/>
-					<Checkbox
-						{form}
-						field="want_assertion_encrypted"
-						hidden
-						label={m.wantAssertionEncrypted()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						field="want_assertion_signed"
-						hidden
-						label={m.wantAssertionSigned()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						field="want_attribute_statement"
-						label={m.wantAttributeStatement()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						field="want_message_signed"
-						hidden
-						label={m.wantMessageSigned()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						field="want_name_id"
-						label={m.wantNameID()}
-						disabled={!data.is_enabled}
-					/>
-					<Checkbox
-						{form}
-						field="want_name_id_encrypted"
-						hidden
-						label={m.wantNameIDEncrypted()}
-						disabled={!data.is_enabled}
-					/>
-				</svelte:fragment>
-			</AccordionItem>
-		{/if}
-	</Accordion>
-{/if}
+				<Checkbox
+					{form}
+					field="allow_repeat_attribute_name"
+					label={m.allowRepeatAttributeName()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="allow_single_label_domains"
+					label={m.allowSingleLabelDomains()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="authn_request_signed"
+					hidden
+					label={m.authnRequestSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<TextField
+					{form}
+					field="digest_algorithm"
+					hidden
+					label={m.digestAlgorithm()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['digest_algorithm']}
+					bind:cachedValue={formDataCache['digest_algorithm']}
+				/>
+				<Checkbox
+					{form}
+					field="logout_request_signed"
+					hidden
+					label={m.logoutRequestSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="logout_response_signed"
+					hidden
+					label={m.logoutResponseSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="metadata_signed"
+					hidden
+					label={m.metadataSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="name_id_encrypted"
+					hidden
+					label={m.nameIDEncrypted()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					hidden
+					field="reject_deprecated_algorithm"
+					label={m.rejectDeprecatedAlgorithm()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="reject_idp_initiated_sso"
+					label={m.rejectIdPInitiatedSSO()}
+					disabled={!data.is_enabled}
+				/>
+				<TextField
+					{form}
+					field="signature_algorithm"
+					hidden
+					label={m.signatureAlgorithm()}
+					disabled={!data.is_enabled}
+					cacheLock={cacheLocks['signature_algorithm']}
+					bind:cachedValue={formDataCache['signature_algorithm']}
+				/>
+				<Checkbox
+					{form}
+					field="want_assertion_encrypted"
+					hidden
+					label={m.wantAssertionEncrypted()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="want_assertion_signed"
+					hidden
+					label={m.wantAssertionSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="want_attribute_statement"
+					label={m.wantAttributeStatement()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox
+					{form}
+					field="want_message_signed"
+					hidden
+					label={m.wantMessageSigned()}
+					disabled={!data.is_enabled}
+				/>
+				<Checkbox {form} field="want_name_id" label={m.wantNameID()} disabled={!data.is_enabled} />
+				<Checkbox
+					{form}
+					field="want_name_id_encrypted"
+					hidden
+					label={m.wantNameIDEncrypted()}
+					disabled={!data.is_enabled}
+				/>
+			</svelte:fragment>
+		</AccordionItem>
+	{/if}
+</Accordion>
diff --git a/frontend/src/lib/components/Forms/ModelForm/ThreatsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ThreatsForm.svelte
index 0af87a99d..8189b9646 100644
--- a/frontend/src/lib/components/Forms/ModelForm/ThreatsForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/ThreatsForm.svelte
@@ -14,35 +14,33 @@
 	export let initialData: Record<string, any> = {};
 </script>
 
-{#if model.urlModel === 'threats'}
-	<AutocompleteSelect
-		{form}
-		options={getOptions({ objects: model.foreignKeys['folder'] })}
-		field="folder"
-		cacheLock={cacheLocks['folder']}
-		bind:cachedValue={formDataCache['folder']}
-		label={m.domain()}
-		hidden={initialData.folder}
-	/>
-	<TextField
-		{form}
-		field="ref_id"
-		label={m.ref()}
-		cacheLock={cacheLocks['ref_id']}
-		bind:cachedValue={formDataCache['ref_id']}
-	/>
-	<TextArea
-		{form}
-		field="annotation"
-		label={m.annotation()}
-		cacheLock={cacheLocks['annotation']}
-		bind:cachedValue={formDataCache['annotation']}
-	/>
-	<TextField
-		{form}
-		field="provider"
-		label={m.provider()}
-		cacheLock={cacheLocks['provider']}
-		bind:cachedValue={formDataCache['provider']}
-	/>
-{/if}
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['folder'] })}
+	field="folder"
+	cacheLock={cacheLocks['folder']}
+	bind:cachedValue={formDataCache['folder']}
+	label={m.domain()}
+	hidden={initialData.folder}
+/>
+<TextField
+	{form}
+	field="ref_id"
+	label={m.ref()}
+	cacheLock={cacheLocks['ref_id']}
+	bind:cachedValue={formDataCache['ref_id']}
+/>
+<TextArea
+	{form}
+	field="annotation"
+	label={m.annotation()}
+	cacheLock={cacheLocks['annotation']}
+	bind:cachedValue={formDataCache['annotation']}
+/>
+<TextField
+	{form}
+	field="provider"
+	label={m.provider()}
+	cacheLock={cacheLocks['provider']}
+	bind:cachedValue={formDataCache['provider']}
+/>
diff --git a/frontend/src/lib/components/Forms/ModelForm/UsersForm.svelte b/frontend/src/lib/components/Forms/ModelForm/UsersForm.svelte
index 8804f9b8b..fa9f885fb 100644
--- a/frontend/src/lib/components/Forms/ModelForm/UsersForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/UsersForm.svelte
@@ -13,43 +13,41 @@
 	export let shape: any = {};
 </script>
 
-{#if model.urlModel === 'users'}
+<TextField
+	{form}
+	field="email"
+	label={m.email()}
+	cacheLock={cacheLocks['email']}
+	bind:cachedValue={formDataCache['email']}
+	data-focusindex="2"
+/>
+{#if shape.first_name && shape.last_name}
 	<TextField
 		{form}
-		field="email"
-		label={m.email()}
-		cacheLock={cacheLocks['email']}
-		bind:cachedValue={formDataCache['email']}
-		data-focusindex="2"
+		field="first_name"
+		label={m.firstName()}
+		cacheLock={cacheLocks['first_name']}
+		bind:cachedValue={formDataCache['first_name']}
 	/>
-	{#if shape.first_name && shape.last_name}
-		<TextField
-			{form}
-			field="first_name"
-			label={m.firstName()}
-			cacheLock={cacheLocks['first_name']}
-			bind:cachedValue={formDataCache['first_name']}
-		/>
-		<TextField
-			{form}
-			field="last_name"
-			label={m.lastName()}
-			cacheLock={cacheLocks['last_name']}
-			bind:cachedValue={formDataCache['last_name']}
-		/>
-	{/if}
-	{#if shape.user_groups}
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['user_groups'] })}
-			field="user_groups"
-			cacheLock={cacheLocks['user_groups']}
-			bind:cachedValue={formDataCache['user_groups']}
-			label={m.userGroups()}
-		/>
-	{/if}
-	{#if shape.is_active}
-		<Checkbox {form} field="is_active" label={m.isActive()} helpText={m.isActiveHelpText()} />
-	{/if}
+	<TextField
+		{form}
+		field="last_name"
+		label={m.lastName()}
+		cacheLock={cacheLocks['last_name']}
+		bind:cachedValue={formDataCache['last_name']}
+	/>
+{/if}
+{#if shape.user_groups}
+	<AutocompleteSelect
+		{form}
+		multiple
+		options={getOptions({ objects: model.foreignKeys['user_groups'] })}
+		field="user_groups"
+		cacheLock={cacheLocks['user_groups']}
+		bind:cachedValue={formDataCache['user_groups']}
+		label={m.userGroups()}
+	/>
+{/if}
+{#if shape.is_active}
+	<Checkbox {form} field="is_active" label={m.isActive()} helpText={m.isActiveHelpText()} />
 {/if}

From 98b1e23ea3fd5fcf87bd3e89de4c8087b9608f0e Mon Sep 17 00:00:00 2001
From: melinoix <titouan.ameline@gmail.com>
Date: Tue, 24 Sep 2024 10:59:41 +0200
Subject: [PATCH 3/3] changed file names

---
 .../src/lib/components/Forms/ModelForm.svelte | 36 +++++++++----------
 ...svelte => AppliedControlPolicyForm.svelte} |  0
 .../{AssetsForm.svelte => AssetForm.svelte}   |  0
 ...svelte => ComplianceAssessmentForm.svelte} |  0
 ...orm.svelte => EntityAssessmentForm.svelte} |  0
 ...{EntitiesForm.svelte => EntityForm.svelte} |  0
 ...idencesForm.svelte => EvidenceForm.svelte} |  0
 ...eworksForm.svelte => FrameworkForm.svelte} |  0
 ...ProjectsForm.svelte => ProjectForm.svelte} |  0
 ...orm.svelte => ReferenceControlForm.svelte} |  0
 ...sForm.svelte => RepresentativeForm.svelte} |  0
 ...velte => RequirementAssessmentForm.svelte} |  0
 ...sForm.svelte => RiskAcceptanceForm.svelte} |  0
 ...sForm.svelte => RiskAssessmentForm.svelte} |  0
 ...iosForm.svelte => RiskScenarioForm.svelte} |  0
 ...lutionsForm.svelte => SolutionForm.svelte} |  0
 ...tingsForm.svelte => SsoSettingForm.svelte} |  0
 .../{ThreatsForm.svelte => ThreatForm.svelte} |  0
 .../{UsersForm.svelte => UserForm.svelte}     |  0
 19 files changed, 18 insertions(+), 18 deletions(-)
 rename frontend/src/lib/components/Forms/ModelForm/{AppliedControlsPoliciesForm.svelte => AppliedControlPolicyForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{AssetsForm.svelte => AssetForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{ComplianceAssessmentsForm.svelte => ComplianceAssessmentForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{EntityAssessmentsForm.svelte => EntityAssessmentForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{EntitiesForm.svelte => EntityForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{EvidencesForm.svelte => EvidenceForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{FrameworksForm.svelte => FrameworkForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{ProjectsForm.svelte => ProjectForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{ReferenceControlsForm.svelte => ReferenceControlForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{RepresentativesForm.svelte => RepresentativeForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{RequirementAssessmentsForm.svelte => RequirementAssessmentForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{RiskAcceptancesForm.svelte => RiskAcceptanceForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{RiskAssessmentsForm.svelte => RiskAssessmentForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{RiskScenariosForm.svelte => RiskScenarioForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{SolutionsForm.svelte => SolutionForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{SsoSettingsForm.svelte => SsoSettingForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{ThreatsForm.svelte => ThreatForm.svelte} (100%)
 rename frontend/src/lib/components/Forms/ModelForm/{UsersForm.svelte => UserForm.svelte} (100%)

diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index aa81e4379..458849090 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -5,24 +5,24 @@
 	import TextArea from '$lib/components/Forms/TextArea.svelte';
 	import TextField from '$lib/components/Forms/TextField.svelte';
 
-	import RiskAssessmentForm from './ModelForm/RiskAssessmentsForm.svelte';
-	import ProjectForm from './ModelForm/ProjectsForm.svelte';
-	import ThreatForm from './ModelForm/ThreatsForm.svelte';
-	import RiskScenarioForm from './ModelForm/RiskScenariosForm.svelte';
-	import AppliedControlsPoliciesForm from './ModelForm/AppliedControlsPoliciesForm.svelte';
-	import RiskAcceptancesForm from './ModelForm/RiskAcceptancesForm.svelte';
-	import ReferenceControlsForm from './ModelForm/ReferenceControlsForm.svelte';
-	import EvidencesForm from './ModelForm/EvidencesForm.svelte';
-	import ComplianceAssessmentsForm from './ModelForm/ComplianceAssessmentsForm.svelte';
-	import AssetsForm from './ModelForm/AssetsForm.svelte';
-	import RequirementAssessmentsForm from './ModelForm/RequirementAssessmentsForm.svelte';
-	import EntitiesForm from './ModelForm/EntitiesForm.svelte';
-	import EntityAssessmentForm from './ModelForm/EntityAssessmentsForm.svelte';
-	import SolutionsForm from './ModelForm/SolutionsForm.svelte';
-	import RepresentativesForm from './ModelForm/RepresentativesForm.svelte';
-	import FrameworksForm from './ModelForm/FrameworksForm.svelte';
-	import UsersForm from './ModelForm/UsersForm.svelte';
-	import SsoSettingsForm from './ModelForm/SsoSettingsForm.svelte';
+	import RiskAssessmentForm from './ModelForm/RiskAssessmentForm.svelte';
+	import ProjectForm from './ModelForm/ProjectForm.svelte';
+	import ThreatForm from './ModelForm/ThreatForm.svelte';
+	import RiskScenarioForm from './ModelForm/RiskScenarioForm.svelte';
+	import AppliedControlsPoliciesForm from './ModelForm/AppliedControlPolicyForm.svelte';
+	import RiskAcceptancesForm from './ModelForm/RiskAcceptanceForm.svelte';
+	import ReferenceControlsForm from './ModelForm/ReferenceControlForm.svelte';
+	import EvidencesForm from './ModelForm/EvidenceForm.svelte';
+	import ComplianceAssessmentsForm from './ModelForm/ComplianceAssessmentForm.svelte';
+	import AssetsForm from './ModelForm/AssetForm.svelte';
+	import RequirementAssessmentsForm from './ModelForm/RequirementAssessmentForm.svelte';
+	import EntitiesForm from './ModelForm/EntityForm.svelte';
+	import EntityAssessmentForm from './ModelForm/EntityAssessmentForm.svelte';
+	import SolutionsForm from './ModelForm/SolutionForm.svelte';
+	import RepresentativesForm from './ModelForm/RepresentativeForm.svelte';
+	import FrameworksForm from './ModelForm/FrameworkForm.svelte';
+	import UsersForm from './ModelForm/UserForm.svelte';
+	import SsoSettingsForm from './ModelForm/SsoSettingForm.svelte';
 
 	import AutocompleteSelect from './AutocompleteSelect.svelte';
 
diff --git a/frontend/src/lib/components/Forms/ModelForm/AppliedControlsPoliciesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/AppliedControlsPoliciesForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/AssetsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/AssetForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/AssetsForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/AssetForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentsForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EntityAssessmentForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/EntityAssessmentsForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/EntityAssessmentForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/EntitiesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EntityForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/EntitiesForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/EntityForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/EvidencesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EvidenceForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/EvidencesForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/EvidenceForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/FrameworksForm.svelte b/frontend/src/lib/components/Forms/ModelForm/FrameworkForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/FrameworksForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/FrameworkForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/ProjectsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/ProjectsForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/ProjectForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/ReferenceControlsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ReferenceControlForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/ReferenceControlsForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/ReferenceControlForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/RepresentativesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RepresentativeForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/RepresentativesForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/RepresentativeForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentsForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/RequirementAssessmentForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskAcceptancesForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskAcceptanceForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/RiskAcceptancesForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/RiskAcceptanceForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/RiskAssessmentsForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/RiskScenariosForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RiskScenarioForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/RiskScenariosForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/RiskScenarioForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/SolutionsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/SolutionForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/SolutionsForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/SolutionForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/SsoSettingsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/SsoSettingForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/SsoSettingsForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/SsoSettingForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/ThreatsForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ThreatForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/ThreatsForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/ThreatForm.svelte
diff --git a/frontend/src/lib/components/Forms/ModelForm/UsersForm.svelte b/frontend/src/lib/components/Forms/ModelForm/UserForm.svelte
similarity index 100%
rename from frontend/src/lib/components/Forms/ModelForm/UsersForm.svelte
rename to frontend/src/lib/components/Forms/ModelForm/UserForm.svelte