Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: use parent layout settings to avoid duplicate api calls
Kyle Mendellfb89650b37bb
diff --git a/frontend/src/routes/settings/+layout.ts b/frontend/src/routes/settings/+layout.tsnew file mode 100644index 000000000..120ae22d5--- /dev/null+++ b/frontend/src/routes/settings/+layout.ts@@ -0,0 +1,16 @@+import { settingsService } from '$lib/services/settings-service';++export const load = async ({ parent }) => {+ try {+ const { settings } = await parent();+ const oidcStatus = await settingsService.getOidcStatus();++ return {+ settings,+ oidcStatus+ };+ } catch (error) {+ console.error('Failed to load OIDC status:', error);+ throw error;+ }+};diff --git a/frontend/src/routes/settings/+page.ts b/frontend/src/routes/settings/+page.tsdeleted file mode 100644index 2ba02121f..000000000--- a/frontend/src/routes/settings/+page.ts+++ /dev/null@@ -1,16 +0,0 @@-import { settingsService } from '$lib/services/settings-service';-import type { PageLoad } from './$types';--export const load: PageLoad = async () => {- try {- const [settings, oidcStatus] = await Promise.all([settingsService.getSettings(), settingsService.getOidcStatus()]);-- return {- settings,- oidcStatus- };- } catch (error) {- console.error('Failed to load settings:', error);- throw error;- }-};diff --git a/frontend/src/routes/settings/docker/+page.svelte b/frontend/src/routes/settings/docker/+page.svelteindex bb46ea13e..cbca5aece 100644--- a/frontend/src/routes/settings/docker/+page.svelte+++ b/frontend/src/routes/settings/docker/+page.svelte@@ -21,7 +21,7 @@import { SettingsPageLayout } from '$lib/layouts';let { data } = $props();- let currentSettings = $state<Settings>(data.settings);+ let currentSettings = $state<Settings>(data.settings!);let hasChanges = $state(false);let isLoading = $state(false);diff --git a/frontend/src/routes/settings/docker/+page.ts b/frontend/src/routes/settings/docker/+page.tsindex 8889f2f4b..05b28acb1 100644--- a/frontend/src/routes/settings/docker/+page.ts+++ b/frontend/src/routes/settings/docker/+page.ts@@ -1,7 +1,5 @@-import { settingsService } from '$lib/services/settings-service';--export const load = async () => {- const settings = await settingsService.getSettings();+export const load = async ({ parent }) => {+ const { settings } = await parent();return {settingsdiff --git a/frontend/src/routes/settings/general/+page.svelte b/frontend/src/routes/settings/general/+page.svelteindex 508ea17e6..5e191c2c4 100644--- a/frontend/src/routes/settings/general/+page.svelte+++ b/frontend/src/routes/settings/general/+page.svelte@@ -19,10 +19,11 @@import { applyAccentColor } from '$lib/utils/accent-color-util';let { data } = $props();- let currentSettings = $state(data.settings);let hasChanges = $state(false);let isLoading = $state(false);+ const settings = $state(data.settings!);+const isReadOnly = $derived.by(() => $settingsStore.uiConfigDisabled);const formState = getContext('settingsFormState') as any;const formSchema = z.object({@@ -32,14 +33,15 @@accentColor: z.string()});- let { inputs: formInputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, currentSettings));+ // Create form once with initial data+ const { inputs: formInputs, ...form } = createForm<typeof formSchema>(formSchema, settings);const formHasChanges = $derived.by(() =>- $formInputs.projectsDirectory.value !== currentSettings.projectsDirectory ||- $formInputs.baseServerUrl.value !== currentSettings.baseServerUrl ||- $formInputs.enableGravatar.value !== currentSettings.enableGravatar ||- $formInputs.accentColor.value !== currentSettings.accentColor+ $formInputs.projectsDirectory.value !== settings.projectsDirectory ||+ $formInputs.baseServerUrl.value !== settings.baseServerUrl ||+ $formInputs.enableGravatar.value !== settings.enableGravatar ||+ $formInputs.accentColor.value !== settings.accentColor);$effect(() => {@@ -53,9 +55,7 @@async function updateSettingsConfig(updatedSettings: Partial<Settings>) {try {await settingsService.updateSettings(updatedSettings as any);- currentSettings = { ...currentSettings, ...updatedSettings };- settingsStore.set(currentSettings);- settingsStore.reload();+ settingsStore.set({ ...settings, ...updatedSettings } as Settings);} catch (error) {console.error('Error updating settings:', error);throw error;@@ -80,11 +80,11 @@}function resetForm() {- $formInputs.projectsDirectory.value = data.settings.projectsDirectory;- $formInputs.baseServerUrl.value = data.settings.baseServerUrl;- $formInputs.enableGravatar.value = data.settings.enableGravatar;- $formInputs.accentColor.value = data.settings.accentColor;- applyAccentColor(data.settings.accentColor);+ $formInputs.projectsDirectory.value = settings.projectsDirectory;+ $formInputs.baseServerUrl.value = settings.baseServerUrl;+ $formInputs.enableGravatar.value = settings.enableGravatar;+ $formInputs.accentColor.value = settings.accentColor;+ applyAccentColor(settings.accentColor);}onMount(() => {@@ -160,7 +160,7 @@<Card.Content class="px-3 py-4 sm:px-6"><div class="space-y-5"><AccentColorPicker- previousColor={currentSettings.accentColor}+ previousColor={settings.accentColor}bind:selectedColor={$formInputs.accentColor.value}disabled={isReadOnly}/>diff --git a/frontend/src/routes/settings/general/+page.ts b/frontend/src/routes/settings/general/+page.tsdeleted file mode 100644index 8889f2f4b..000000000--- a/frontend/src/routes/settings/general/+page.ts+++ /dev/null@@ -1,9 +0,0 @@-import { settingsService } from '$lib/services/settings-service';--export const load = async () => {- const settings = await settingsService.getSettings();-- return {- settings- };-};diff --git a/frontend/src/routes/settings/navigation/+page.svelte b/frontend/src/routes/settings/navigation/+page.svelteindex 5a2f53b84..36a806005 100644--- a/frontend/src/routes/settings/navigation/+page.svelte+++ b/frontend/src/routes/settings/navigation/+page.svelte@@ -18,7 +18,7 @@import { SettingsPageLayout } from '$lib/layouts';let { data } = $props();- let currentSettings = $state(data.settings);+ let currentSettings = $state(data.settings!);let hasChanges = $state(false);let isLoading = $state(false);diff --git a/frontend/src/routes/settings/navigation/+page.ts b/frontend/src/routes/settings/navigation/+page.tsdeleted file mode 100644index 2fb12b242..000000000--- a/frontend/src/routes/settings/navigation/+page.ts+++ /dev/null@@ -1,10 +0,0 @@-import type { PageLoad } from './$types';-import { settingsService } from '$lib/services/settings-service';--export const load: PageLoad = async () => {- const settings = await settingsService.getSettings();-- return {- settings- };-};diff --git a/frontend/src/routes/settings/security/+page.svelte b/frontend/src/routes/settings/security/+page.svelteindex 73b8e250f..bc8d53cd3 100644--- a/frontend/src/routes/settings/security/+page.svelte+++ b/frontend/src/routes/settings/security/+page.svelte@@ -20,7 +20,7 @@import { SettingsPageLayout } from '$lib/layouts';let { data }: { data: PageData } = $props();- let currentSettings = $state<Settings>(data.settings);+ let currentSettings = $state<Settings>(data.settings!);let hasChanges = $state(false);let isLoading = $state(false);diff --git a/frontend/src/routes/settings/security/+page.ts b/frontend/src/routes/settings/security/+page.tsdeleted file mode 100644index 9bb411200..000000000--- a/frontend/src/routes/settings/security/+page.ts+++ /dev/null@@ -1,16 +0,0 @@-import { settingsService } from '$lib/services/settings-service';--export const load = async () => {- const [settings, oidcStatus] = await Promise.all([- settingsService.getSettings(),- settingsService.getOidcStatus().catch(() => ({- envForced: false,- envConfigured: false- }))- ]);-- return {- settings,- oidcStatus- };-};diff --git a/frontend/src/routes/settings/users/+page.svelte b/frontend/src/routes/settings/users/+page.svelteindex edd1ad955..df42db602 100644--- a/frontend/src/routes/settings/users/+page.svelte+++ b/frontend/src/routes/settings/users/+page.svelte@@ -1,7 +1,5 @@<script lang="ts">import UsersIcon from '@lucide/svelte/icons/users';- import ShieldIcon from '@lucide/svelte/icons/shield';- import UserCheckIcon from '@lucide/svelte/icons/user-check';import { toast } from 'svelte-sonner';import { handleApiResultWithCallbacks } from '$lib/utils/api.util';import { tryCatch } from '$lib/utils/try-catch';@@ -12,7 +10,7 @@import type { CreateUser } from '$lib/types/user.type';import { m } from '$lib/paraglide/messages';import { userService } from '$lib/services/user-service';- import { SettingsPageLayout, type SettingsActionButton, type SettingsStatCard } from '$lib/layouts/index.js';+ import { SettingsPageLayout, type SettingsActionButton } from '$lib/layouts/index.js';let { data } = $props();@@ -33,10 +31,6 @@refresh: false});- const totalUsers = $derived(users.data.length);- const adminUsers = $derived(users.data.filter((u) => u.roles?.includes('admin')).length);- const regularUsers = $derived(users.data.filter((u) => !u.roles?.includes('admin')).length);-function openCreateDialog() {userToEdit = null;isDialogOpen.create = true;diff --git a/frontend/src/routes/settings/users/+page.ts b/frontend/src/routes/settings/users/+page.tsindex 4181e3043..803cd7dbf 100644--- a/frontend/src/routes/settings/users/+page.ts+++ b/frontend/src/routes/settings/users/+page.ts@@ -1,11 +1,8 @@-import { settingsService } from '$lib/services/settings-service';import { userService } from '$lib/services/user-service';import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';export const load = async () => {- const settings = await settingsService.getSettings();-const userRequestOptions = resolveInitialTableRequest('arcane-users-table', {pagination: {page: 1,@@ -20,7 +17,6 @@ export const load = async () => {const users = await userService.getUsers(userRequestOptions);return {- settings,users,userRequestOptions};