From 2f0740291a10019ea1beb605da551df9b6a13f6a Mon Sep 17 00:00:00 2001 From: mertmit Date: Mon, 29 Aug 2022 18:47:49 +0300 Subject: [PATCH] fix: set theme on project load Signed-off-by: mertmit --- packages/nc-gui-v2/composables/useProject.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/nc-gui-v2/composables/useProject.ts b/packages/nc-gui-v2/composables/useProject.ts index fbfc443ef2..98657f9772 100644 --- a/packages/nc-gui-v2/composables/useProject.ts +++ b/packages/nc-gui-v2/composables/useProject.ts @@ -84,6 +84,7 @@ const [setup, use] = useInjectionState((_projectId?: MaybeRef) => { } await loadProjectRoles() await loadTables() + setTheme(projectMeta.value?.theme) } async function updateProject(data: Partial) { @@ -104,10 +105,6 @@ const [setup, use] = useInjectionState((_projectId?: MaybeRef) => { setTheme(theme) } - watch(project, () => { - setTheme(projectMeta.value?.theme || {}) - }) - watch( () => route.params, (v) => { @@ -117,6 +114,7 @@ const [setup, use] = useInjectionState((_projectId?: MaybeRef) => { }, ) + // TODO useProject should only called inside a project for now this doesn't work onScopeDispose(() => { project.value = {} tables.value = []