From 0f64c1579bd251652c06967127a30fef276feb42 Mon Sep 17 00:00:00 2001 From: TZGyn Date: Sun, 31 Dec 2023 21:09:16 +0800 Subject: [PATCH] improve project selection in links page --- frontend/src/routes/(app)/links/+page.server.ts | 10 +++++++++- frontend/src/routes/(app)/links/+page.svelte | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/src/routes/(app)/links/+page.server.ts b/frontend/src/routes/(app)/links/+page.server.ts index cc3c75d..c4b3da1 100644 --- a/frontend/src/routes/(app)/links/+page.server.ts +++ b/frontend/src/routes/(app)/links/+page.server.ts @@ -7,6 +7,10 @@ export const load = (async (event) => { const project_uuid = event.url.searchParams.get('project') let project_id: number | undefined + let selected_project: { value: null | string; label: string } = { + value: null, + label: 'None', + } if (project_uuid) { try { @@ -14,6 +18,10 @@ export const load = (async (event) => { where: (project, { eq }) => eq(project.uuid, project_uuid), }) project_id = project?.id + if (project?.name) { + selected_project.label = project.name + selected_project.value = project.uuid + } } catch (error) { project_id = undefined } @@ -37,5 +45,5 @@ export const load = (async (event) => { where: (project, { eq }) => eq(project.userId, user.id), }) - return { shorteners, projects } + return { shorteners, projects, selected_project } }) satisfies PageServerLoad diff --git a/frontend/src/routes/(app)/links/+page.svelte b/frontend/src/routes/(app)/links/+page.svelte index 0d5ac2b..6a78d09 100644 --- a/frontend/src/routes/(app)/links/+page.svelte +++ b/frontend/src/routes/(app)/links/+page.svelte @@ -21,7 +21,7 @@ export let data: PageData - let selectedProject: any = undefined + let selectedProject: any = data.selected_project let dialogOpen = false let inputLink = ''