From f05c222c424678c5309e482d35f0f8373cb058a5 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Thu, 2 Oct 2025 19:23:42 +0200
Subject: [PATCH] Fixed Product Creation Error

---
 components/EntityEdit.vue            |  4 +++-
 components/StandardEntityModal.vue   |  4 ++--
 pages/createDocument/edit/[[id]].vue | 15 +++++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index d9c87f7..ecae0f4 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -205,12 +205,14 @@ const createItem = async () => {
   let ret = null
 
   if(props.inModal) {
-    ret = await dataStore.createNewItem(type,item.value,true)
+    ret =  await useEntities(type).create(item.value, true)
+
   } else {
     ret = await useEntities(type).create(item.value)//dataStore.createNewItem(type,item.value)
   }
 
   emit('returnData', ret)
+  modal.close()
 }
 
 const updateItem = async () => {
diff --git a/components/StandardEntityModal.vue b/components/StandardEntityModal.vue
index f405e2f..9b4bc83 100644
--- a/components/StandardEntityModal.vue
+++ b/components/StandardEntityModal.vue
@@ -35,7 +35,7 @@ const item = ref({})
 const setupPage = async () => {
   if(props.mode === "show") {
     //Load Data for Show
-    item.value = await useSupabaseSelectSingle(props.type, props.id, dataType.supabaseSelectWithInformation || "*")
+    item.value = await useEntities(props.type).selectSingle(props.id, dataType.supabaseSelectWithInformation || "*")
   } else if(props.mode === "edit") {
     //Load Data for Edit
     const data = JSON.stringify((await supabase.from(props.type).select().eq("id", props.id).single()).data)
@@ -48,7 +48,7 @@ const setupPage = async () => {
 
   } else if(props.mode === "list") {
     //Load Data for List
-    items.value = await useSupabaseSelect(props.type, dataType.supabaseSelectWithInformation || "*", dataType.supabaseSortColumn,dataType.supabaseSortAscending || false)
+    items.value = await useEntities(props.type).select(dataType.supabaseSelectWithInformation || "*", dataType.supabaseSortColumn,dataType.supabaseSortAscending || false)
   }
 
   loaded.value = true
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index ae889d1..6a59c7f 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -77,11 +77,7 @@ const texttemplates = ref([])
 const units = ref([])
 const tenantUsers = ref([])
 
-
-const loaded = ref(false)
-const setupPage = async () => {
-
-
+const setupData = async () => {
   letterheads.value = (await useEntities("letterheads").select("*")).filter(i => i.documentTypes.length === 0 || i.documentTypes.includes(itemInfo.value.type))
   createddocuments.value = await useEntities("createddocuments").select("*")
   projects.value = await useEntities("projects").select("*")
@@ -97,6 +93,13 @@ const setupPage = async () => {
   tenantUsers.value = (await useNuxtApp().$api(`/api/tenant/users`, {
     method: "GET"
   })).users
+}
+
+const loaded = ref(false)
+const setupPage = async () => {
+
+  await setupData()
+
   if (productcategories.value.length > 0) selectedProductcategorie.value = productcategories.value[0].id
   if (servicecategories.value.length > 0) selectedServicecategorie.value = servicecategories.value[0].id
 
@@ -1474,7 +1477,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
 
   if (product && product.id) {
     row.product = product.id
-    product.value = await useEntities("products").select("*")
+    products.value = await useEntities("products").select("*")
   }
 
   if (row.service) {