From b79ea80da1964fc35477a0805f3552eea9a81dc4 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Tue, 4 Mar 2025 16:31:26 +0100
Subject: [PATCH] put only valid project values into store

---
 .../ProjectBranding/ProjectBrandingForm.vue   |  2 +-
 .../resolver/ProjectBrandingResolver.ts       |  4 +-
 frontend/src/layouts/AuthLayout.vue           | 38 ++++++++++---------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/admin/src/components/ProjectBranding/ProjectBrandingForm.vue b/admin/src/components/ProjectBranding/ProjectBrandingForm.vue
index e48a2004e..236b5f44b 100644
--- a/admin/src/components/ProjectBranding/ProjectBrandingForm.vue
+++ b/admin/src/components/ProjectBranding/ProjectBrandingForm.vue
@@ -101,7 +101,7 @@ const newUserToSpace = computed(() => form.newUserToSpace)
 const logoUrl = computed(() => form.logoUrl)
 // show space
 const getSpace = gql`
-  query space($id: ID!) {
+  query ($id: ID!) {
     space(id: $id) {
       name
       description
diff --git a/backend/src/graphql/resolver/ProjectBrandingResolver.ts b/backend/src/graphql/resolver/ProjectBrandingResolver.ts
index 11361ab5c..33fb845c9 100644
--- a/backend/src/graphql/resolver/ProjectBrandingResolver.ts
+++ b/backend/src/graphql/resolver/ProjectBrandingResolver.ts
@@ -21,9 +21,9 @@ export class ProjectBrandingResolver {
     )
   }
 
-  @Query(() => ProjectBranding, { nullable: true })
+  @Query(() => ProjectBranding)
   @Authorized([RIGHTS.PROJECT_BRANDING_VIEW])
-  async projectBranding(@Arg('id', () => Int) id: number): Promise<ProjectBranding | null> {
+  async projectBranding(@Arg('id', () => Int) id: number): Promise<ProjectBranding> {
     const projectBrandingEntity = await DbProjectBranding.findOneBy({ id })
     if (!projectBrandingEntity) {
       throw new LogError(`Project Branding with id: ${id} not found`)
diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue
index 74d7abced..3a70d360a 100644
--- a/frontend/src/layouts/AuthLayout.vue
+++ b/frontend/src/layouts/AuthLayout.vue
@@ -103,8 +103,8 @@
 </template>
 
 <script setup>
-import { onMounted, computed } from 'vue'
-import { useLazyQuery } from '@vue/apollo-composable'
+import { onBeforeMount, computed, watchEffect } from 'vue'
+import { useQuery } from '@vue/apollo-composable'
 import AuthNavbar from '@/components/Auth/AuthNavbar'
 import AuthNavbarSmall from '@/components/Auth/AuthNavbarSmall'
 import AuthCarousel from '@/components/Auth/AuthCarousel'
@@ -115,33 +115,35 @@ import gql from 'graphql-tag'
 
 const communityName = CONFIG.COMMUNITY_NAME
 const store = useStore()
+const projectValue = computed(() => {
+  const urlParams = new URLSearchParams(window.location.search)
+  return urlParams.get('project')
+})
 
 const setTextSize = (size) => {
   document.querySelector('.page-font-size').style.fontSize = size + 'rem'
 }
 
-const project = computed(() => store.state.project)
-
-const {
-  result: projectBannerResult,
-  loading: projectBannerLoading,
-  load,
-} = useLazyQuery(
+const { result: projectBannerResult, loading: projectBannerLoading } = useQuery(
   gql`
     query ($project: String!) {
       projectBrandingBanner(alias: $project)
     }
   `,
-  { project },
+  {
+    project: projectValue.value,
+  },
+  { enabled: !!projectValue.value },
 )
-onMounted(async () => {
-  const urlParams = new URLSearchParams(window.location.search)
-  const projectValue = urlParams.get('project')
-  if (projectValue) {
-    load()
-    store.commit('project', projectValue)
-  } else {
-    store.commit('project', '')
+
+onBeforeMount(() => {
+  // clear state
+  store.commit('project', null)
+})
+
+watchEffect(() => {
+  if (projectBannerResult.value?.projectBrandingBanner) {
+    store.commit('project', projectValue.value)
   }
 })
 </script>