From c2df8b2f6a0a39bbe619678a1c5fd9d5c50d1299 Mon Sep 17 00:00:00 2001 From: Nassim Tabchiche Date: Mon, 12 Feb 2024 15:49:12 +0100 Subject: [PATCH] chore: Run formatter --- .../src/lib/components/SideBar/navData.ts | 17 +++--- .../[id=uuid]/TreeViewItemContent.svelte | 26 ++++----- .../(app)/evidences/[id=uuid]/+page.server.ts | 13 ++--- .../(app)/evidences/[id=uuid]/+page.svelte | 8 +-- .../src/routes/(app)/libraries/+page.svelte | 58 +++++++++---------- .../(app)/libraries/[id=urn]/+page.svelte | 11 ++-- .../first-connexion/+page.server.ts | 8 ++- frontend/tests/functional/nav.test.ts | 8 ++- 8 files changed, 80 insertions(+), 69 deletions(-) diff --git a/frontend/src/lib/components/SideBar/navData.ts b/frontend/src/lib/components/SideBar/navData.ts index 76c1bef704..3148d6c311 100644 --- a/frontend/src/lib/components/SideBar/navData.ts +++ b/frontend/src/lib/components/SideBar/navData.ts @@ -56,13 +56,12 @@ export const navData = { name: 'Assets', fa_icon: 'fa-solid fa-gem', href: '/assets' - }, + } ] }, { name: 'Governance', items: [ - { name: 'Policies', fa_icon: 'fa-solid fa-user', @@ -72,7 +71,7 @@ export const navData = { name: 'Risk matrices', fa_icon: 'fa-solid fa-table-cells-large', href: '/risk-matrices' - }, + } ] }, { @@ -116,10 +115,9 @@ export const navData = { } ] }, - { - name: 'Organisation', - items : [ - + { + name: 'Organisation', + items: [ { name: 'Domains', fa_icon: 'fa-solid fa-diagram-project', @@ -145,9 +143,8 @@ export const navData = { fa_icon: 'fa-solid fa-user-tag', href: '/role-assignments' } - ] - - }, + ] + }, { name: 'Extra', diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemContent.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemContent.svelte index 54ef38132f..e1ed2a83ce 100644 --- a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemContent.svelte +++ b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemContent.svelte @@ -155,20 +155,20 @@
{#each orderedStatusPercentages as sp} {#if complianceColorMap[sp.status] === '#000000'} -
- {sp.percentage.display}% -
+
+ {sp.percentage.display}% +
{:else} -
- {sp.percentage.display}% - -
+
+ {sp.percentage.display}% + +
{/if} {/each}
diff --git a/frontend/src/routes/(app)/evidences/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/evidences/[id=uuid]/+page.server.ts index 152b7abb25..7a5cb7da86 100644 --- a/frontend/src/routes/(app)/evidences/[id=uuid]/+page.server.ts +++ b/frontend/src/routes/(app)/evidences/[id=uuid]/+page.server.ts @@ -5,7 +5,7 @@ import { setError, superValidate } from 'sveltekit-superforms/server'; import { setFlash } from 'sveltekit-flash-message/server'; import type { PageServerLoad } from './$types'; -export const load: PageServerLoad = (async ({ fetch, params }) => { +export const load: PageServerLoad = async ({ fetch, params }) => { const URLModel = 'evidences'; const endpoint = `${BASE_API_URL}/${URLModel}/${params.id}/`; @@ -15,7 +15,7 @@ export const load: PageServerLoad = (async ({ fetch, params }) => { const object = await fetch(`${endpoint}object/`).then((res) => res.json()); return { URLModel, evidence, object }; -}) +}; export const actions: Actions = { deleteAttachment: async (event) => { @@ -40,11 +40,10 @@ export const actions: Actions = { if (response.non_field_errors) { setError(deleteAttachmentForm, 'non_field_errors', response.non_field_errors); } - setFlash({ type: "error", message: "An error has occured" }, event); + setFlash({ type: 'error', message: 'An error has occured' }, event); return fail(400, { form: deleteAttachmentForm }); } - setFlash({ type: "success", message: "Attachment successfully deleted" }, event); - throw redirect(302, `/${urlmodel}/${id}`) + setFlash({ type: 'success', message: 'Attachment successfully deleted' }, event); + throw redirect(302, `/${urlmodel}/${id}`); } - -} \ No newline at end of file +}; diff --git a/frontend/src/routes/(app)/evidences/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/evidences/[id=uuid]/+page.svelte index 4396d4c3d1..302a2d44c7 100644 --- a/frontend/src/routes/(app)/evidences/[id=uuid]/+page.svelte +++ b/frontend/src/routes/(app)/evidences/[id=uuid]/+page.svelte @@ -32,7 +32,7 @@ URLModel: getModelInfo('evidences').urlModel, formAction: action } - }; + }; const modal: ModalSettings = { type: 'component', component: modalComponent, @@ -135,9 +135,9 @@ on:click={(_) => { modalConfirm(data.evidence.id, data.evidence.attachment, '?/deleteAttachment'); }} - on:keydown={(_) => modalConfirm(data.evidence.id, data.evidence.attachment, '?/deleteAttachment')} - class="btn variant-filled-tertiary h-full" - > + modalConfirm(data.evidence.id, data.evidence.attachment, '?/deleteAttachment')} + class="btn variant-filled-tertiary h-full"> diff --git a/frontend/src/routes/(app)/libraries/+page.svelte b/frontend/src/routes/(app)/libraries/+page.svelte index a28641ad00..edd4146f74 100644 --- a/frontend/src/routes/(app)/libraries/+page.svelte +++ b/frontend/src/routes/(app)/libraries/+page.svelte @@ -47,35 +47,35 @@ {#if tabSet === 1}
- {#await superValidate(LibraryUploadSchema)} -

Loading the library upload button...

- {:then form} - - - - Loading the library upload button... + {:then form} + - - {:catch err} -

The following error occured while loading the library form : {err}

- {/await} + + + +
+ {:catch err} +

The following error occured while loading the library form : {err}

+ {/await}
{/if} diff --git a/frontend/src/routes/(app)/libraries/[id=urn]/+page.svelte b/frontend/src/routes/(app)/libraries/[id=urn]/+page.svelte index 0dfe99f499..e3e779472f 100644 --- a/frontend/src/routes/(app)/libraries/[id=urn]/+page.svelte +++ b/frontend/src/routes/(app)/libraries/[id=urn]/+page.svelte @@ -75,10 +75,13 @@

Provider: {library.provider}

Packager: {library.packager}

{#if library.dependencies} -

Dependendies: - {#each library.dependencies as dependency} -

  • {dependency}
  • - {/each} +

    + Dependendies: + {#each library.dependencies as dependency} +

  • + {dependency} +
  • + {/each}

    {/if} {#if library.copyright} diff --git a/frontend/src/routes/(authentication)/first-connexion/+page.server.ts b/frontend/src/routes/(authentication)/first-connexion/+page.server.ts index a606917b08..981eca7493 100644 --- a/frontend/src/routes/(authentication)/first-connexion/+page.server.ts +++ b/frontend/src/routes/(authentication)/first-connexion/+page.server.ts @@ -45,7 +45,13 @@ export const actions: Actions = { return fail(400, { form }); } - setFlash({ type: 'success', message: `Your password was successfully set. Welcome to CISO Assistant.` }, event); + setFlash( + { + type: 'success', + message: `Your password was successfully set. Welcome to CISO Assistant.` + }, + event + ); redirect(302, '/login'); } }; diff --git a/frontend/tests/functional/nav.test.ts b/frontend/tests/functional/nav.test.ts index eb1c396b27..c5d3c5d7f4 100644 --- a/frontend/tests/functional/nav.test.ts +++ b/frontend/tests/functional/nav.test.ts @@ -4,7 +4,13 @@ type StringMap = { [key: string]: string; }; -test('sidebar navigation tests', async ({ logedPage, analyticsPage: analyticsPage, layout, sideBar, page }) => { +test('sidebar navigation tests', async ({ + logedPage, + analyticsPage: analyticsPage, + layout, + sideBar, + page +}) => { await test.step('proper redirection to the analytics page after login', async () => { await analyticsPage.hasUrl(); await analyticsPage.hasTitle();