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

Model buttons improvement #963

Merged
merged 3 commits into from
Oct 21, 2024
Merged

Model buttons improvement #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d732945
Model buttons improvement
ab-smith Oct 19, 2024
b21dc23
third-party route model buttons improvement
Mohamed-Hacene Oct 21, 2024
9f2f220
Merge branch 'main' into buttons_improvement
Mohamed-Hacene Oct 21, 2024
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
4 changes: 1 addition & 3 deletions frontend/src/lib/components/TableRowActions/TableRowActions.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@
$: displayDelete = canDeleteObject && deleteForm !== undefined;
</script>

<span
class="space-x-2 whitespace-nowrap flex flex-row items-center text-xl text-surface-700 justify-end"
>
<span class="space-x-2 whitespace-nowrap flex flex-row items-center text-surface-700 justify-end">
<slot name="head" />
<slot name="body" />
{#if !hasBody}
Expand Down
63 changes: 37 additions & 26 deletions frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,35 +49,46 @@
{#key URLModel}
<ModelTable source={data.table} deleteForm={data.deleteForm} {URLModel}>
<div slot="addButton">
{#if !['risk-matrices', 'frameworks', 'requirement-mapping-sets', 'user-groups', 'role-assignments'].includes(URLModel)}
<button
class="btn variant-filled-primary self-end"
data-testid="add-button"
on:click={modalCreateForm}
><i class="fa-solid fa-plus mr-2" />
{safeTranslate('add-' + data.model.localName)}
</button>
{#if URLModel === 'applied-controls'}
<span class="inline-flex overflow-hidden rounded-md border bg-white shadow-sm">
{#if !['risk-matrices', 'frameworks', 'requirement-mapping-sets', 'user-groups', 'role-assignments'].includes(URLModel)}
<button
class="inline-block border-e p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
data-testid="add-button"
title={safeTranslate('add-' + data.model.localName)}
on:click={modalCreateForm}
><i class="fa-solid fa-file-circle-plus"></i>
</button>
{#if URLModel === 'applied-controls'}
<a
href="{URLModel}/export/"
class="inline-block p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
title={m.exportButton()}
data-testid="export-button"><i class="fa-solid fa-download mr-2" /></a
>
{/if}
{:else if URLModel === 'risk-matrices'}
<a
href="{URLModel}/export/"
class="btn variant-filled-surface"
data-testid="export-button"
><i class="fa-solid fa-download mr-2" />{m.exportButton()}</a
href="/libraries"
class="inline-block p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
data-testid="add-button"
title={m.importMatrices()}><i class="fa-solid fa-file-import mr-2" /></a
>
{:else if URLModel === 'frameworks'}
<a
href="/libraries"
class="inline-block p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
data-testid="add-button"
title={m.importFrameworks()}><i class="fa-solid fa-file-import mr-2" /></a
>
{:else if URLModel === 'requirement-mapping-sets'}
<a
href="/libraries"
class="inline-block p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
data-testid="add-button"
title={m.importMappings()}><i class="fa-solid fa-file-import mr-2" /></a
>
{/if}
{:else if URLModel === 'risk-matrices'}
<a href="/libraries" class="btn variant-filled-primary" data-testid="add-button"
><i class="fa-solid fa-file-import mr-2" />{m.importMatrices()}</a
>
{:else if URLModel === 'frameworks'}
<a href="/libraries" class="btn variant-filled-primary" data-testid="add-button"
><i class="fa-solid fa-file-import mr-2" />{m.importFrameworks()}</a
>
{:else if URLModel === 'requirement-mapping-sets'}
<a href="/libraries" class="btn variant-filled-primary" data-testid="add-button"
><i class="fa-solid fa-file-import mr-2" />{m.importMappings()}</a
>
{/if}
</span>
</div>
</ModelTable>
{/key}
Expand Down
59 changes: 37 additions & 22 deletions frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,31 +49,46 @@
{#key URLModel}
<ModelTable source={data.table} deleteForm={data.deleteForm} {URLModel}>
<div slot="addButton">
{#if !['risk-matrices', 'frameworks', 'user-groups', 'role-assignments'].includes(URLModel)}
<button
class="btn variant-filled-primary self-end"
data-testid="add-button"
on:click={modalCreateForm}
><i class="fa-solid fa-plus mr-2" />
{safeTranslate('add-' + data.model.localName)}
</button>
{#if URLModel === 'applied-controls'}
<span class="inline-flex overflow-hidden rounded-md border bg-white shadow-sm">
{#if !['risk-matrices', 'frameworks', 'requirement-mapping-sets', 'user-groups', 'role-assignments'].includes(URLModel)}
<button
class="inline-block border-e p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
data-testid="add-button"
title={safeTranslate('add-' + data.model.localName)}
on:click={modalCreateForm}
><i class="fa-solid fa-file-circle-plus"></i>
</button>
{#if URLModel === 'applied-controls'}
<a
href="{URLModel}/export/"
class="inline-block p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
title={m.exportButton()}
data-testid="export-button"><i class="fa-solid fa-download mr-2" /></a
>
{/if}
{:else if URLModel === 'risk-matrices'}
<a
href="{URLModel}/export/"
class="btn variant-filled-surface"
data-testid="export-button"
><i class="fa-solid fa-download mr-2" />{m.exportButton()}</a
href="/libraries"
class="inline-block p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
data-testid="add-button"
title={m.importMatrices()}><i class="fa-solid fa-file-import mr-2" /></a
>
{:else if URLModel === 'frameworks'}
<a
href="/libraries"
class="inline-block p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
data-testid="add-button"
title={m.importFrameworks()}><i class="fa-solid fa-file-import mr-2" /></a
>
{:else if URLModel === 'requirement-mapping-sets'}
<a
href="/libraries"
class="inline-block p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
data-testid="add-button"
title={m.importMappings()}><i class="fa-solid fa-file-import mr-2" /></a
>
{/if}
{:else if URLModel === 'risk-matrices'}
<a href="/libraries" class="btn variant-filled-primary" data-testid="add-button"
><i class="fa-solid fa-file-import mr-2" />{m.importMatrices()}</a
>
{:else if URLModel === 'frameworks'}
<a href="/libraries" class="btn variant-filled-primary" data-testid="add-button"
><i class="fa-solid fa-file-import mr-2" />{m.importFrameworks()}</a
>
{/if}
</span>
</div>
</ModelTable>
{/key}
Expand Down
Loading