Skip to content
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

feat(ui): cleaner look for applied controls and audit forms #1456

Merged
merged 8 commits into from
Feb 3, 2025
Merged

feat(ui): cleaner look for applied controls and audit forms #1456

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5520b59
starting point to rearange applied control form
ab-smith Jan 30, 2025
3c0a0de
Cleaner look for Applied controls forms
ab-smith Jan 30, 2025
346033d
Improve audit creation form
ab-smith Jan 30, 2025
526c5e9
Merge branch 'main' into forms_improvements
ab-smith Jan 31, 2025
273a155
Adjust tests for applied control
ab-smith Jan 31, 2025
5001717
fixup
ab-smith Jan 31, 2025
b6f2b3e
fixup
ab-smith Feb 1, 2025
ea62731
fixup
ab-smith Feb 1, 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
3 changes: 2 additions & 1 deletion frontend/messages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,5 +1144,6 @@
"redZoneRadius": "Red zone radius",
"progressField": "Progress",
"recap": "Recap",
"sectionMoved": "Section moved here"
"sectionMoved": "Section moved here",
"more": "More"
}
3 changes: 2 additions & 1 deletion frontend/messages/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,5 +1143,6 @@
"redZoneRadius": "Rayon de la zone rouge",
"progressField": "Progrès",
"recap": "Recap",
"sectionMoved": "Section déplacée ici"
"sectionMoved": "Section déplacée ici",
"more": "Plus"
}
191 changes: 97 additions & 94 deletions frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import Checkbox from '$lib/components/Forms/Checkbox.svelte';
import TextField from '$lib/components/Forms/TextField.svelte';
import NumberField from '$lib/components/Forms/NumberField.svelte';
import Dropdown from '$lib/components/Dropdown/Dropdown.svelte';
import Score from '$lib/components/Forms/Score.svelte';
import { getOptions } from '$lib/utils/crud';
import type { SuperValidated } from 'sveltekit-superforms';
Expand All @@ -26,39 +27,6 @@
</script>

{#if !duplicate}
<TextField
{form}
field="ref_id"
label={m.refId()}
cacheLock={cacheLocks['ref_id']}
bind:cachedValue={formDataCache['ref_id']}
/>
{#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']}
/>
<Select
{form}
options={model.selectOptions['priority']}
field="priority"
label={m.priority()}
cacheLock={cacheLocks['priority']}
bind:cachedValue={formDataCache['priority']}
/>
<AutocompleteSelect
{form}
multiple
Expand All @@ -76,26 +44,13 @@
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"
<Score
{form}
field="start_date"
label={m.startDate()}
helpText={m.startDateHelpText()}
cacheLock={cacheLocks['start_date']}
bind:cachedValue={formDataCache['start_date']}
label={m.progress()}
field="progress_field"
fullDonut
min_score={0}
max_score={100}
/>
<TextField
type="date"
Expand All @@ -106,48 +61,96 @@
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']}
/>
<Score
{form}
label={m.progress()}
field="progress_field"
fullDonut
min_score={0}
max_score={100}
/>
<Dropdown open={false} style="hover:text-primary-700" icon="fa-solid fa-list" header={m.more()}>
<TextField
{form}
field="ref_id"
label={m.refId()}
cacheLock={cacheLocks['ref_id']}
bind:cachedValue={formDataCache['ref_id']}
/>
<Select
{form}
options={model.selectOptions['priority']}
field="priority"
label={m.priority()}
cacheLock={cacheLocks['priority']}
bind:cachedValue={formDataCache['priority']}
/>
<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()}
/>
{#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']}
/>
<TextField
type="date"
{form}
field="start_date"
label={m.startDate()}
helpText={m.startDateHelpText()}
cacheLock={cacheLocks['start_date']}
bind:cachedValue={formDataCache['start_date']}
/>
<TextField
type="date"
{form}
field="expiry_date"
label={m.expiryDate()}
helpText={m.expiryDateHelpText()}
cacheLock={cacheLocks['expiry_date']}
bind:cachedValue={formDataCache['expiry_date']}
/>
<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']}
/>
<TextField
{form}
field="link"
label={m.link()}
helpText={m.linkHelpText()}
cacheLock={cacheLocks['link']}
bind:cachedValue={formDataCache['link']}
/>
</Dropdown>
{/if}

{#if duplicate}
Expand Down
Loading
Loading