Skip to content

fix: autocomplete options consistency #2311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix: autocomplete options consistency #2311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70e7da7
fix: autocomplete options consistency
nas-tabchiche Jul 21, 2025
8d3ccae
Revert "fix: autocomplete options consistency"
nas-tabchiche Jul 22, 2025
b1a2a75
pass scope folder through ebios rm edit and risk assessment detail
nas-tabchiche Jul 22, 2025
bbaefb9
chore: remove debug logs
nas-tabchiche Jul 22, 2025
8585c6d
Merge branch 'main' into fix/temporarily-remove-scope_folder_id
nas-tabchiche Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
202 changes: 164 additions & 38 deletions frontend/src/lib/components/Forms/ModelForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@
{formDataCache}
{initialData}
{object}
{...rest}
/>
{:else if URLModel === 'risk-assessments'}
<RiskAssessmentForm
Expand All @@ -306,11 +307,12 @@
{object}
{context}
{updated_fields}
{...rest}
/>
{:else if URLModel === 'threats'}
<ThreatForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
<ThreatForm {form} {model} {cacheLocks} {formDataCache} {initialData} {...rest} />
{:else if URLModel === 'risk-scenarios'}
<RiskScenarioForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
<RiskScenarioForm {form} {model} {cacheLocks} {formDataCache} {initialData} {...rest} />
{:else if URLModel === 'applied-controls' || URLModel === 'policies'}
<AppliedControlsPoliciesForm
{form}
Expand All @@ -320,9 +322,10 @@
{formDataCache}
{schema}
{initialData}
{...rest}
/>
{:else if URLModel === 'vulnerabilities'}
<VulnerabilitiesForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
<VulnerabilitiesForm {form} {model} {cacheLocks} {formDataCache} {initialData} {...rest} />
{:else if URLModel === 'risk-acceptances'}
<RiskAcceptancesForm
{form}
Expand All @@ -332,11 +335,12 @@
{object}
{initialData}
{$page}
{...rest}
/>
{:else if URLModel === 'reference-controls'}
<ReferenceControlsForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
<ReferenceControlsForm {form} {model} {cacheLocks} {formDataCache} {initialData} {...rest} />
{:else if URLModel === 'evidences'}
<EvidencesForm {form} {model} {cacheLocks} {formDataCache} {initialData} {object} />
<EvidencesForm {form} {model} {cacheLocks} {formDataCache} {initialData} {object} {...rest} />
{:else if URLModel === 'compliance-assessments'}
<ComplianceAssessmentsForm
{form}
Expand All @@ -346,33 +350,60 @@
{initialData}
{object}
{context}
{...rest}
/>
{:else if URLModel === 'campaigns'}
<CampaignForm {form} {model} {cacheLocks} {formDataCache} {initialData} {object} {context} />
<CampaignForm
{form}
{model}
{cacheLocks}
{formDataCache}
{initialData}
{object}
{context}
{...rest}
/>
{:else if URLModel === 'assets'}
<AssetsForm {form} {model} {cacheLocks} {formDataCache} {initialData} {object} {data} />
<AssetsForm
{form}
{model}
{cacheLocks}
{formDataCache}
{initialData}
{object}
{data}
{...rest}
/>
{:else if URLModel === 'requirement-assessments'}
<RequirementAssessmentsForm {form} {model} {cacheLocks} {formDataCache} {context} />
<RequirementAssessmentsForm {form} {model} {cacheLocks} {formDataCache} {context} {...rest} />
{:else if URLModel === 'entities'}
<EntitiesForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
<EntitiesForm {form} {model} {cacheLocks} {formDataCache} {initialData} {...rest} />
{:else if URLModel === 'entity-assessments'}
<EntityAssessmentForm {form} {model} {cacheLocks} {formDataCache} {initialData} {data} />
<EntityAssessmentForm
{form}
{model}
{cacheLocks}
{formDataCache}
{initialData}
{data}
{...rest}
/>
{:else if URLModel === 'solutions'}
<SolutionsForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
<SolutionsForm {form} {model} {cacheLocks} {formDataCache} {initialData} {...rest} />
{:else if URLModel === 'representatives'}
<RepresentativesForm {form} {model} {cacheLocks} {formDataCache} {data} />
<RepresentativesForm {form} {model} {cacheLocks} {formDataCache} {data} {...rest} />
{:else if URLModel === 'frameworks'}
<FrameworksForm {form} {model} {cacheLocks} {formDataCache} />
<FrameworksForm {form} {model} {cacheLocks} {formDataCache} {...rest} />
{:else if URLModel === 'users'}
<UsersForm {form} {model} {cacheLocks} {formDataCache} {shape} {context} />
<UsersForm {form} {model} {cacheLocks} {formDataCache} {shape} {context} {...rest} />
{:else if URLModel === 'sso-settings'}
<SsoSettingsForm {form} {model} {cacheLocks} {formDataCache} {data} />
<SsoSettingsForm {form} {model} {cacheLocks} {formDataCache} {data} {...rest} />
{:else if URLModel === 'general-settings'}
<GeneralSettingsForm {form} {model} {cacheLocks} {formDataCache} {data} />
<GeneralSettingsForm {form} {model} {cacheLocks} {formDataCache} {data} {...rest} />
{:else if URLModel === 'feature-flags'}
<FeatureFlagsSettingForm {form} {model} {cacheLocks} {formDataCache} {data} />
<FeatureFlagsSettingForm {form} {model} {cacheLocks} {formDataCache} {data} {...rest} />
{:else if URLModel === 'filtering-labels'}
<FilteringLabelForm {form} {model} {cacheLocks} {formDataCache} />
<FilteringLabelForm {form} {model} {cacheLocks} {formDataCache} {...rest} />
{:else if URLModel === 'business-impact-analysis'}
<BusinessImpactAnalysisForm
{form}
Expand All @@ -384,9 +415,18 @@
{object}
{context}
{updated_fields}
{...rest}
/>
{:else if URLModel === 'asset-assessments'}
<AssetAssessmentForm {form} {model} {cacheLocks} {formDataCache} {context} {initialData} />
<AssetAssessmentForm
{form}
{model}
{cacheLocks}
{formDataCache}
{context}
{initialData}
{...rest}
/>
{:else if URLModel === 'escalation-thresholds'}
<EscalationThresholdForm
{form}
Expand All @@ -395,31 +435,80 @@
{formDataCache}
{context}
{initialData}
{...rest}
/>
{:else if URLModel === 'processings'}
<ProcessingForm {form} {model} {cacheLocks} {formDataCache} {context} />
<ProcessingForm {form} {model} {cacheLocks} {formDataCache} {context} {...rest} />
{:else if URLModel === 'purposes'}
<PurposeForm {form} {model} {cacheLocks} {formDataCache} {context} {initialData} />
<PurposeForm {form} {model} {cacheLocks} {formDataCache} {context} {initialData} {...rest} />
{:else if URLModel === 'personal-data'}
<PersonalDataForm {form} {model} {cacheLocks} {formDataCache} {context} {initialData} />
<PersonalDataForm
{form}
{model}
{cacheLocks}
{formDataCache}
{context}
{initialData}
{...rest}
/>
{:else if URLModel === 'data-subjects'}
<DataSubjectForm {form} {model} {cacheLocks} {formDataCache} {context} {initialData} />
<DataSubjectForm
{form}
{model}
{cacheLocks}
{formDataCache}
{context}
{initialData}
{...rest}
/>
{:else if URLModel === 'data-recipients'}
<DataRecipientForm {form} {model} {cacheLocks} {formDataCache} {context} {initialData} />
<DataRecipientForm
{form}
{model}
{cacheLocks}
{formDataCache}
{context}
{initialData}
{...rest}
/>
{:else if URLModel === 'data-contractors'}
<DataContractorForm {form} {model} {cacheLocks} {formDataCache} {context} {initialData} />
<DataContractorForm
{form}
{model}
{cacheLocks}
{formDataCache}
{context}
{initialData}
{...rest}
/>
{:else if URLModel === 'data-transfers'}
<DataTransferForm {form} {model} {cacheLocks} {formDataCache} {context} {initialData} />
<DataTransferForm
{form}
{model}
{cacheLocks}
{formDataCache}
{context}
{initialData}
{...rest}
/>
{:else if URLModel === 'ebios-rm'}
<EbiosRmForm {form} {model} {cacheLocks} {formDataCache} {context} />
<EbiosRmForm {form} {model} {cacheLocks} {formDataCache} {context} {...rest} />
{:else if URLModel === 'feared-events'}
<FearedEventForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
<FearedEventForm {form} {model} {cacheLocks} {formDataCache} {initialData} {...rest} />
{:else if URLModel === 'ro-to'}
<RoToForm {form} {model} {cacheLocks} {formDataCache} {initialData} {context} />
<RoToForm {form} {model} {cacheLocks} {formDataCache} {initialData} {context} {...rest} />
{:else if URLModel === 'stakeholders'}
<StakeholderForm {form} {model} {cacheLocks} {formDataCache} {context} />
<StakeholderForm {form} {model} {cacheLocks} {formDataCache} {context} {...rest} />
{:else if URLModel === 'strategic-scenarios'}
<StrategicScenarioForm {form} {model} {cacheLocks} {formDataCache} {initialData} {context} />
<StrategicScenarioForm
{form}
{model}
{cacheLocks}
{formDataCache}
{initialData}
{context}
{...rest}
/>
{:else if URLModel === 'attack-paths'}
<AttackPathForm
{form}
Expand All @@ -428,6 +517,7 @@
{formDataCache}
{initialData}
{additionalInitialData}
{...rest}
/>
{:else if URLModel === 'operational-scenarios'}
<OperationalScenarioForm
Expand All @@ -438,15 +528,32 @@
{initialData}
{context}
{object}
{...rest}
/>
{:else if URLModel === 'security-exceptions'}
<SecurityExceptionForm {form} {model} {cacheLocks} {formDataCache} {initialData} {context} />
<SecurityExceptionForm
{form}
{model}
{cacheLocks}
{formDataCache}
{initialData}
{context}
{...rest}
/>
{:else if URLModel === 'findings'}
<FindingForm {form} {model} {cacheLocks} {formDataCache} {initialData} {context} />
<FindingForm {form} {model} {cacheLocks} {formDataCache} {initialData} {context} {...rest} />
{:else if URLModel === 'findings-assessments'}
<FindingsAssessmentForm {form} {model} {cacheLocks} {formDataCache} {initialData} {context} />
<FindingsAssessmentForm
{form}
{model}
{cacheLocks}
{formDataCache}
{initialData}
{context}
{...rest}
/>
{:else if URLModel === 'incidents'}
<IncidentForm {form} {model} {cacheLocks} {formDataCache} {initialData} {context} />
<IncidentForm {form} {model} {cacheLocks} {formDataCache} {initialData} {context} {...rest} />
{:else if URLModel === 'timeline-entries'}
<TimelineEntryForm
{form}
Expand All @@ -455,13 +562,30 @@
{formDataCache}
initialData={model.initialData}
{context}
{...rest}
/>
{:else if URLModel === 'task-templates'}
<TaskTemplateForm {form} {model} {cacheLocks} {formDataCache} {initialData} {context} />
<TaskTemplateForm
{form}
{model}
{cacheLocks}
{formDataCache}
{initialData}
{context}
{...rest}
/>
{:else if URLModel === 'task-nodes'}
<TaskNodeForm {form} {model} {cacheLocks} {formDataCache} {context} />
<TaskNodeForm {form} {model} {cacheLocks} {formDataCache} {context} {...rest} />
{:else if URLModel === 'elementary-actions'}
<ElementaryActionForm {form} {model} {cacheLocks} {formDataCache} {initialData} {context} />
<ElementaryActionForm
{form}
{model}
{cacheLocks}
{formDataCache}
{initialData}
{context}
{...rest}
/>
{:else if URLModel === 'operating-modes'}
<OperatingModeForm
{form}
Expand All @@ -470,6 +594,7 @@
{formDataCache}
initialData={model.initialData}
{context}
{...rest}
/>
{:else if URLModel === 'kill-chains'}
<KillChainForm
Expand All @@ -479,6 +604,7 @@
{formDataCache}
initialData={model.initialData}
{context}
{...rest}
/>
{/if}
<div class="flex flex-row justify-between space-x-4">
Expand Down
10 changes: 9 additions & 1 deletion frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
formDataCache?: Record<string, any>;
initialData?: Record<string, any>;
context: string;
[key: string]: any;
}

let {
Expand All @@ -23,7 +24,8 @@
cacheLocks = {},
formDataCache = $bindable({}),
initialData = {},
context
context,
...rest
}: Props = $props();

let activeActivity: string | null = $state(null);
Expand Down Expand Up @@ -163,6 +165,9 @@
optionsEndpoint="assets"
optionsLabelField="auto"
optionsExtraFields={[['folder', 'str']]}
optionsDetailedUrlParameters={[
rest?.scopeFolder?.id ? ['scope_folder_id', rest.scopeFolder.id] : ['', undefined]
]}
optionsInfoFields={{
fields: [
{
Expand Down Expand Up @@ -201,6 +206,9 @@
{form}
optionsEndpoint="assets"
optionsExtraFields={[['folder', 'str']]}
optionsDetailedUrlParameters={[
rest?.scopeFolder?.id ? ['scope_folder_id', rest.scopeFolder.id] : ['', undefined]
]}
optionsInfoFields={{
fields: [
{
Expand Down
Loading
Loading