From 3bd7c6805c13973ff3e74ffb36cbffec50af43d4 Mon Sep 17 00:00:00 2001 From: Nassim Tabchiche Date: Fri, 20 Dec 2024 23:34:22 +0100 Subject: [PATCH] Explicitly define page title --- .../(app)/(internal)/backup-restore/+page.server.ts | 5 +++++ frontend/src/routes/(app)/(internal)/my-profile/+page.ts | 6 ++++++ .../(app)/(internal)/my-profile/settings/+page.server.ts | 2 +- .../operational-scenarios/[id=uuid]/+page.server.ts | 2 +- .../risk-assessments/[id=uuid]/+layout.server.ts | 3 ++- .../(internal)/risk-matrices/[id=uuid]/+layout.server.ts | 2 +- .../risk-scenarios/[id=uuid]/edit/+page.server.ts | 3 ++- .../(internal)/ro-to/[id=uuid]/edit/+page.server.ts | 3 ++- .../(app)/(internal)/scoring-assistant/+page.server.ts | 5 +++-- .../src/routes/(app)/(internal)/settings/+page.server.ts | 3 ++- .../stakeholders/[id=uuid]/edit/+page.server.ts | 3 ++- .../(internal)/users/[id=uuid]/edit/+page.server.ts | 2 +- .../users/[id=uuid]/edit/set-password/+page.server.ts | 2 +- .../src/routes/(app)/(internal)/x-rays/+page.server.ts | 4 ++-- .../(app)/(internal)/x-rays/inspect/+page.server.ts | 4 ++-- .../[id=uuid]/table-mode/+page.server.ts | 3 ++- .../requirement-assessments/[id=uuid]/+page.server.ts | 9 ++++++++- 17 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 frontend/src/routes/(app)/(internal)/my-profile/+page.ts diff --git a/frontend/src/routes/(app)/(internal)/backup-restore/+page.server.ts b/frontend/src/routes/(app)/(internal)/backup-restore/+page.server.ts index f3d29908bb..53029e6022 100644 --- a/frontend/src/routes/(app)/(internal)/backup-restore/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/backup-restore/+page.server.ts @@ -3,6 +3,11 @@ import type { Actions } from '@sveltejs/kit'; import { fail } from 'assert'; import { setFlash } from 'sveltekit-flash-message/server'; import * as m from '$paraglide/messages'; +import type { PageServerLoad } from './$types'; + +export const load: PageServerLoad = async (event) => { + return { title: m.backupRestore() }; +}; export const actions: Actions = { default: async (event) => { diff --git a/frontend/src/routes/(app)/(internal)/my-profile/+page.ts b/frontend/src/routes/(app)/(internal)/my-profile/+page.ts new file mode 100644 index 0000000000..75072742b0 --- /dev/null +++ b/frontend/src/routes/(app)/(internal)/my-profile/+page.ts @@ -0,0 +1,6 @@ +import type { PageLoad } from './$types'; +import * as m from '$paraglide/messages'; + +export const load: PageLoad = async () => { + return { title: m.myProfile() }; +}; diff --git a/frontend/src/routes/(app)/(internal)/my-profile/settings/+page.server.ts b/frontend/src/routes/(app)/(internal)/my-profile/settings/+page.server.ts index 371410895d..89e0a0e905 100644 --- a/frontend/src/routes/(app)/(internal)/my-profile/settings/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/my-profile/settings/+page.server.ts @@ -39,7 +39,7 @@ export const load: PageServerLoad = async (event) => { const activateTOTPForm = await superValidate(zod(activateTOTPSchema)); - return { authenticators, totp, activateTOTPForm, recoveryCodes }; + return { authenticators, totp, activateTOTPForm, recoveryCodes, title: m.settings() }; }; export const actions: Actions = { diff --git a/frontend/src/routes/(app)/(internal)/operational-scenarios/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/(internal)/operational-scenarios/[id=uuid]/+page.server.ts index 890f34279c..2d52914d7c 100644 --- a/frontend/src/routes/(app)/(internal)/operational-scenarios/[id=uuid]/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/operational-scenarios/[id=uuid]/+page.server.ts @@ -33,5 +33,5 @@ export const load: PageServerLoad = async (event) => { meta: revData }; - return { data, table }; + return { data, table, title: data.name }; }; diff --git a/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+layout.server.ts b/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+layout.server.ts index 80f149cec1..0ac05d2694 100644 --- a/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+layout.server.ts +++ b/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+layout.server.ts @@ -145,6 +145,7 @@ export const load: LayoutServerLoad = async ({ fetch, params }) => { scenarioDeleteForm, scenarioCreateForm, riskAssessmentDuplicateForm, - riskAssessmentModel + riskAssessmentModel, + title: risk_assessment.name }; }; diff --git a/frontend/src/routes/(app)/(internal)/risk-matrices/[id=uuid]/+layout.server.ts b/frontend/src/routes/(app)/(internal)/risk-matrices/[id=uuid]/+layout.server.ts index 36d5cfa306..dfe1782048 100644 --- a/frontend/src/routes/(app)/(internal)/risk-matrices/[id=uuid]/+layout.server.ts +++ b/frontend/src/routes/(app)/(internal)/risk-matrices/[id=uuid]/+layout.server.ts @@ -91,5 +91,5 @@ export const load: LayoutServerLoad = async ({ fetch, params }) => { }) ); } - return { data, relatedModels }; + return { data, relatedModels, title: data.name }; }; diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts index 3e79e183ad..f49c2eb315 100644 --- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts @@ -194,7 +194,8 @@ export const load: PageServerLoad = async ({ params, fetch }) => { strengthOfKnowledgeChoices: strengthOfKnowledgeChoices, tables, measureModel, - measureCreateForm + measureCreateForm, + title: m.edit() }; }; diff --git a/frontend/src/routes/(app)/(internal)/ro-to/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/(internal)/ro-to/[id=uuid]/edit/+page.server.ts index 0c9e15c11c..639278a4be 100644 --- a/frontend/src/routes/(app)/(internal)/ro-to/[id=uuid]/edit/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/ro-to/[id=uuid]/edit/+page.server.ts @@ -5,6 +5,7 @@ import { superValidate } from 'sveltekit-superforms'; import { zod } from 'sveltekit-superforms/adapters'; import type { PageServerLoad, Actions } from '../$types'; import { defaultWriteFormAction } from '$lib/utils/actions'; +import * as m from '$paraglide/messages'; export const load: PageServerLoad = async (event) => { const URLModel = 'ro-to'; @@ -57,7 +58,7 @@ export const load: PageServerLoad = async (event) => { } model.foreignKeys = foreignKeys; model.selectOptions = selectOptions; - return { form, model, object, foreignKeys, selectOptions, URLModel }; + return { form, model, object, foreignKeys, selectOptions, URLModel, title: m.edit() }; }; export const actions: Actions = { diff --git a/frontend/src/routes/(app)/(internal)/scoring-assistant/+page.server.ts b/frontend/src/routes/(app)/(internal)/scoring-assistant/+page.server.ts index 3e9516d943..26c1a47eb8 100644 --- a/frontend/src/routes/(app)/(internal)/scoring-assistant/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/scoring-assistant/+page.server.ts @@ -1,7 +1,7 @@ import { BASE_API_URL } from '$lib/utils/constants'; import type { RiskMatrix, RiskMatrixJsonDefinition } from '$lib/utils/types'; import type { PageServerLoad } from './$types'; -import { error } from '@sveltejs/kit'; +import * as m from '$paraglide/messages'; export const load: PageServerLoad = async ({ fetch }) => { const req = await fetch(`${BASE_API_URL}/risk-matrices/`); @@ -15,6 +15,7 @@ export const load: PageServerLoad = async ({ fetch }) => { ); return { - risk_matrices + risk_matrices, + title: m.scoringAssistant() }; }; diff --git a/frontend/src/routes/(app)/(internal)/settings/+page.server.ts b/frontend/src/routes/(app)/(internal)/settings/+page.server.ts index cc2dba5b97..54b02ea42c 100644 --- a/frontend/src/routes/(app)/(internal)/settings/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/settings/+page.server.ts @@ -69,7 +69,8 @@ export const load: PageServerLoad = async ({ fetch }) => { ssoModel, generalSettings, generalSettingForm, - generalSettingModel + generalSettingModel, + title: m.settings() }; }; diff --git a/frontend/src/routes/(app)/(internal)/stakeholders/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/(internal)/stakeholders/[id=uuid]/edit/+page.server.ts index 414fe61866..2e1209ef8f 100644 --- a/frontend/src/routes/(app)/(internal)/stakeholders/[id=uuid]/edit/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/stakeholders/[id=uuid]/edit/+page.server.ts @@ -143,7 +143,8 @@ export const load: LayoutServerLoad = async (event) => { selectOptions, URLModel, measureCreateForm, - measureModel + measureModel, + title: m.edit() }; }; diff --git a/frontend/src/routes/(app)/(internal)/users/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/(internal)/users/[id=uuid]/edit/+page.server.ts index 9ebbc8b5be..421ab2f18c 100644 --- a/frontend/src/routes/(app)/(internal)/users/[id=uuid]/edit/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/users/[id=uuid]/edit/+page.server.ts @@ -36,7 +36,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => { model.foreignKeys = foreignKeys; - return { form, model, object }; + return { form, model, object, title: m.edit() }; }; export const actions: Actions = { diff --git a/frontend/src/routes/(app)/(internal)/users/[id=uuid]/edit/set-password/+page.server.ts b/frontend/src/routes/(app)/(internal)/users/[id=uuid]/edit/set-password/+page.server.ts index e1944e7807..e808d79a89 100644 --- a/frontend/src/routes/(app)/(internal)/users/[id=uuid]/edit/set-password/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/users/[id=uuid]/edit/set-password/+page.server.ts @@ -10,7 +10,7 @@ import { zod } from 'sveltekit-superforms/adapters'; export const load: PageServerLoad = async (event) => { const form = await superValidate(event.request, zod(SetPasswordSchema)); - return { form }; + return { form, title: m.setPassword() }; }; export const actions: Actions = { diff --git a/frontend/src/routes/(app)/(internal)/x-rays/+page.server.ts b/frontend/src/routes/(app)/(internal)/x-rays/+page.server.ts index 1e18ef193d..f408a41bab 100644 --- a/frontend/src/routes/(app)/(internal)/x-rays/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/x-rays/+page.server.ts @@ -1,5 +1,5 @@ import { BASE_API_URL } from '$lib/utils/constants'; - +import * as m from '$paraglide/messages'; import type { PageServerLoad } from './$types'; export const load = (async ({ fetch }) => { @@ -8,5 +8,5 @@ export const load = (async ({ fetch }) => { const res = await fetch(endpoint); const data = await res.json().then((res) => res.results); - return { data }; + return { data, title: m.xRays() }; }) satisfies PageServerLoad; diff --git a/frontend/src/routes/(app)/(internal)/x-rays/inspect/+page.server.ts b/frontend/src/routes/(app)/(internal)/x-rays/inspect/+page.server.ts index 473426eba5..945ee96834 100644 --- a/frontend/src/routes/(app)/(internal)/x-rays/inspect/+page.server.ts +++ b/frontend/src/routes/(app)/(internal)/x-rays/inspect/+page.server.ts @@ -1,5 +1,5 @@ import { BASE_API_URL } from '$lib/utils/constants'; - +import * as m from '$paraglide/messages'; import type { PageServerLoad } from './$types'; export const load = (async ({ fetch }) => { @@ -8,5 +8,5 @@ export const load = (async ({ fetch }) => { const res = await fetch(endpoint); const data = await res.json(); - return { data }; + return { data, title: m.inspect() }; }) satisfies PageServerLoad; diff --git a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.server.ts b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.server.ts index 9fe409d9a3..08ea753870 100644 --- a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.server.ts +++ b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.server.ts @@ -69,7 +69,8 @@ export const load = (async ({ fetch, params }) => { requirement_assessments, requirements, evidenceModel, - deleteForm + deleteForm, + title: m.tableMode() }; }) satisfies PageServerLoad; diff --git a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/+page.server.ts index 177c5ff37b..a75bcc8e26 100644 --- a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/+page.server.ts +++ b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/+page.server.ts @@ -36,5 +36,12 @@ export const load = (async ({ fetch, params }) => { } } - return { requirementAssessment, complianceAssessmentScore, requirement, parent, tables }; + return { + requirementAssessment, + complianceAssessmentScore, + requirement, + parent, + tables, + title: requirementAssessment.name + }; }) satisfies PageServerLoad;