adminforth 1.2.39 → 1.2.40

package/dist/spa/src/views/EditView.vue

@@ -1,24 +1,16 @@
 <template>
   <div class="relative">
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.edit?.beforeBreadcrumbs || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="editableRecord"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
 
     <BreadcrumbsWithButtons>
       <!-- save and cancle -->
       <button @click="$router.back()"
-        class="flex items-center py-1 px-3 me-2 text-sm font-medium text-gray-900  rounded-default focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
+        class="flex items-center py-1 px-3 me-2 mb-2 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
       >
         Cancel
       </button>
 
       <button  @click="saveRecord"
-        class="flex items-center py-1 px-3 text-sm font-medium  rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
+        class="flex items-center py-1 px-3 mb-2 text-sm font-medium text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
         :disabled="saving || (validating && !isValid)"
       >
         <IconFloppyDiskSolid class="w-4 h-4" />
@@ -27,53 +19,31 @@
 
     </BreadcrumbsWithButtons>
 
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.edit?.afterBreadcrumbs || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
-
     <SingleSkeletLoader v-if="loading"></SingleSkeletLoader>
 
     <ResourceForm 
       v-else
-      :record="editableRecord"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
+      :record="coreStore.record"
+      :resourceColumns="coreStore.resourceColumns"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
-      :customComponentsPerColumn="editComponentsPerColumn"
     >
     </ResourceForm>
-
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.edit?.bottom || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
-
   </div>
 </template>
 
 
 <script setup>
 
-import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import ResourceForm from '@/components/ResourceForm.vue';
-import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
+import { ref, computed, onMounted } from 'vue';  
+import { useRoute, useRouter } from 'vue-router';
 import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions } from '@/utils';
+import ResourceForm from '@/components/ResourceForm.vue';
+import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
-import { computed, onMounted, ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import { showErrorTost } from '@/composables/useFrontendApi';
+import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
+import { callAdminForthApi } from '@/utils';
 
 const coreStore = useCoreStore();
 
@@ -88,44 +58,23 @@ const loading = ref(false);
 const saving = ref(false);
 
 const record = ref({});
-let editComponentsPerColumn = {};
 
 async function onUpdateRecord(newRecord) {
   record.value = newRecord;
 }
 
-const editableRecord = computed(() => {
-  const newRecord = { ...coreStore.record };
-  if (!coreStore.resource) {
-    return {};
-  }
-  coreStore.resource.columns.forEach(column => {
-    if (column.foreignResource) {
-      newRecord[column.name] = newRecord[column.name]?.pk
-    }
-  });
-  return newRecord;
-})
 
 onMounted(async () => {
-
   loading.value = true;
 
-  await coreStore.fetchResourceFull({
+  await coreStore.fetchColumns({
     resourceId: route.params.resourceId
   });
   await coreStore.fetchRecord({
     resourceId: route.params.resourceId, 
     primaryKey: route.params.primaryKey,
   });
-  checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'edit');
-
-  editComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
-      if (column.components?.edit) {
-          acc[column.name] = getCustomComponent(column.components.edit);
-      }
-      return acc;
-    }, {});
+
   loading.value = false;
 });
 
@@ -138,26 +87,15 @@ async function saveRecord() {
   }
 
   saving.value = true;
-
-  const updates = {};
-  for (const key in record.value) {
-    if (record.value[key] !== coreStore.record[key]) {
-      updates[key] = record.value[key];
-    }
-  }
-
-  const resp = await callAdminForthApi({
+  await callAdminForthApi({
     method: 'POST',
     path: `/update_record`,
     body: {
       resourceId: route.params.resourceId,
       recordId: route.params.primaryKey,
-      record: updates,
+      record: record.value,
     },
   });
-  if (resp.error) {
-    showErrorTost(resp.error);
-  }
   saving.value = false;
   router.push({ name: 'resource-show', params: { resourceId: route.params.resourceId, primaryKey: coreStore.record[coreStore.primaryKey] } });
 }

package/dist/spa/src/views/HomeView.vue

@@ -0,0 +1,8 @@
+<script setup lang="ts">
+</script>
+
+<template>
+  <main>
+    123
+  </main>
+</template>