From d6dd0a160213d2f130351560040be394849f54f3 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 10 Nov 2025 12:06:34 +0100
Subject: [PATCH] Fixed loading

---
 pages/standardEntity/[type]/index.vue | 9 +++++----
 stores/temp.js                        | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/standardEntity/[type]/index.vue b/pages/standardEntity/[type]/index.vue
index 24bb5fb..5ef29a8 100644
--- a/pages/standardEntity/[type]/index.vue
+++ b/pages/standardEntity/[type]/index.vue
@@ -129,11 +129,11 @@ const setupPage = async () => {
   items.value = data
   itemsMeta.value = meta
   if(!initialSetupDone.value){
-    Object.keys(tempStore.filters[type]).forEach((column) => {
+    Object.keys(tempStore.filters[type] || {}).forEach((column) => {
       columnsToFilter.value[column] = tempStore.filters[type][column]
     })
 
-    Object.keys(itemsMeta.value.distinctValues).filter(i => !Object.keys(tempStore.filters[type]).includes(i)).forEach(distinctValue => {
+    Object.keys(itemsMeta.value.distinctValues).filter(i => !Object.keys(tempStore.filters[type] || {}).includes(i)).forEach(distinctValue => {
       columnsToFilter.value[distinctValue] = itemsMeta.value.distinctValues[distinctValue]
     })
   }
@@ -305,7 +305,7 @@ const handleFilterChange = async (action,column) => {
       sort-mode="manual"
       v-model:sort="sort"
       @update:sort="setupPage"
-      v-if="dataType && columns && items.length > 0"
+      v-if="dataType && columns && items.length > 0  && !loading"
       :rows="items"
       :columns="columns"
       class="w-full"
@@ -436,7 +436,7 @@ const handleFilterChange = async (action,column) => {
   </UTable>
   <UCard
       class="w-1/3 mx-auto mt-10"
-      v-else
+      v-else-if="!loading"
   >
     <div
       class="flex flex-col text-center"
@@ -450,6 +450,7 @@ const handleFilterChange = async (action,column) => {
 
 
   </UCard>
+  <UProgress v-else animation="carousel" class="w-3/4 mx-auto mt-5"></UProgress>
 </template>
 
 <style scoped>
diff --git a/stores/temp.js b/stores/temp.js
index 30a29b1..921157d 100644
--- a/stores/temp.js
+++ b/stores/temp.js
@@ -31,7 +31,7 @@ export const useTempStore = defineStore('temp', () => {
         columns.value = config.columns
         pages.value = config.pages
         settings.value = config.settings
-        filters.value = config.filters
+        filters.value = config.filters || {}
     }
 
     function modifySearchString(type,input) {