From 570a953de1aea8a29ec66333eb00f4fe0d57c4b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Tue, 7 Nov 2023 14:49:11 +0100
Subject: [PATCH] Prevent admin ui settings from loading before settings object
 available

---
 client/web/admin/src/views/UI/Index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/web/admin/src/views/UI/Index.vue b/client/web/admin/src/views/UI/Index.vue
index f26aa607b..ac3ff7a1e 100644
--- a/client/web/admin/src/views/UI/Index.vue
+++ b/client/web/admin/src/views/UI/Index.vue
@@ -7,11 +7,13 @@
     />
 
     <c-ui-logo-editor
+      v-if="settings"
       :settings="settings"
       :can-manage="canManage"
     />
 
     <c-ui-branding-editor
+      v-if="settings"
       :settings="settings"
       :processing="branding.processing"
       :success="branding.success"
@@ -20,6 +22,7 @@
     />
 
     <c-ui-custom-css
+      v-if="settings"
       :settings="settings"
       :processing="customCSS.processing"
       :success="customCSS.success"
@@ -29,6 +32,7 @@
     />
 
     <c-ui-topbar-settings
+      v-if="settings"
       :settings="settings"
       :processing="topbar.processing"
       :success="topbar.success"
@@ -68,7 +72,7 @@ export default {
 
   data () {
     return {
-      settings: {},
+      settings: undefined,
 
       topbar: {
         processing: false,
@@ -106,6 +110,8 @@ export default {
       this.incLoader()
       this.$SystemAPI.settingsList({ prefix: prefix })
         .then(settings => {
+          this.settings = {}
+
           settings.forEach(({ name, value }) => {
             this.$set(this.settings, name, value)
           })