adminforth 1.1.59 → 1.1.60

package/dist/spa/src/stores/modal.ts

@@ -1,12 +1,6 @@
 import { ref } from 'vue'
 import { defineStore } from 'pinia'
-
- type ModalContentType = {
-  title?: string;
-  content?: string;
-  acceptText?: string;
-  cancelText?: string;
- }
+import { callAdminForthApi } from '@/utils';
 
 
 export const useModalStore = defineStore('modal', () => {
@@ -18,17 +12,13 @@ export const useModalStore = defineStore('modal', () => {
   });  
   const isOpened = ref(false);
   const onAcceptFunction: any = ref(()=>{});
-  const onCancelFunction: any = ref(()=>{});
   function togleModal() {
     isOpened.value = !isOpened.value;
   }
   function setOnAcceptFunction(func: Function) {
     onAcceptFunction.value = func;
   }
-  function setOnCancelFunction(func: Function) {
-    onCancelFunction.value = func;
-  }
-  function setModalContent(content: ModalContentType) {
+  function setModalContent(content: string) {
     modalContent.value = content;
   }
   function resetmodalState() {
@@ -43,6 +33,6 @@ export const useModalStore = defineStore('modal', () => {
 
   }
     
-  return {isOpened, setModalContent,onCancelFunction, togleModal,modalContent, setOnAcceptFunction, onAcceptFunction,resetmodalState,setOnCancelFunction} 
+  return {isOpened, setModalContent, togleModal,modalContent, setOnAcceptFunction, onAcceptFunction,resetmodalState} 
    
 })

package/dist/spa/src/utils.ts

@@ -1,10 +1,6 @@
 import { onMounted, ref, resolveComponent } from 'vue';
-import type {  CoreConfig } from './spa_types/core';
 
 import router from "./router";
-import { useRouter } from 'vue-router';
-import { useCoreStore } from './stores/core';
-import { useUserStore } from './stores/user';
 
 export async function callApi({path, method, body=undefined} ) {
   const options = {
@@ -17,18 +13,14 @@ export async function callApi({path, method, body=undefined} ) {
   const fullPath = `${import.meta.env.VITE_ADMINFORTH_PUBLIC_PATH || ''}${path}`;
   const r = await fetch(fullPath, options);
   if (r.status == 401) {
-    useUserStore().unauthorize();
-    router.push({ name: 'login' });
+    console.log('router', router);
+    router.push({name: 'login'});
     return null;
-  } 
+  }
   return await r.json();
 }
 
-export async function callAdminForthApi({ path, method, body=undefined }: {
-  path: string,
-  method: 'GET' | 'POST' | 'PUT' | 'DELETE',
-  body?: any
-}) {
+export async function callAdminForthApi({ path, method, body=undefined }) {
   try {
     return callApi({path: `/adminapi/v1${path}`, method, body} );
   } catch (e) {
@@ -37,8 +29,8 @@ export async function callAdminForthApi({ path, method, body=undefined }: {
   }
 }
 
-export function getCustomComponent({ file, meta }: { file: string, meta: any }) {
-  const name = file.replace(/@/g, '').replace(/\./g, '').replace(/\//g, '');
+export function getCustomComponent(filePath: string) {
+  const name = filePath.replace(/@/g, '').replace(/\./g, '').replace(/\//g, '');
   console.log('resolving name', name);
   return resolveComponent(name);
 }
@@ -51,51 +43,4 @@ export function getIcon(icon: string) {
   const [iconSet, iconName] = icon.split(':');
   const compName = 'Icon' + iconName.split('-').map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join('');
   return resolveComponent(compName);
-}
-
-export const loadFile = (file: string) => {
-  if (file.startsWith('http')) {
-    return file;
-  }
-  let path;
-  let baseUrl = '';
-  if (file.startsWith('@/')) {
-    path = file.replace('@/', '');
-    baseUrl = new URL(`./${path}`, import.meta.url).href;
-  } else if (file.startsWith('@@/')) {
-    path = file.replace('@@/', '');
-    baseUrl = new URL(`./custom/${path}`, import.meta.url).href;
-  } else {
-    baseUrl = new URL(`./${file}`, import.meta.url).href;
-  }
-  return baseUrl;
-}
-
-export function checkEmptyValues(value: any, viewType:'show' | 'list' ) {
-  const config: CoreConfig | {} = useCoreStore().config;
-  let emptyFieldPlaceholder = '';
-  if (config.emptyFieldPlaceholder) {
-    if(typeof config.emptyFieldPlaceholder === 'string') {
-      emptyFieldPlaceholder = config.emptyFieldPlaceholder;
-    } else {
-       emptyFieldPlaceholder = config.emptyFieldPlaceholder?.[viewType] || '';
-    }
-    if (value === null || value === undefined || value === '') {
-      return emptyFieldPlaceholder;
-    }
-  }
-  return value;
-}
-
-export function checkAcessByAllowedActions(allowedActions:any, action:any ) {
-  if (!allowedActions) {
-    console.warn('allowedActions not set');
-    return;
-  }
-  if(allowedActions[action] === false) {
-    console.warn(`Action ${action} is not allowed`);
-    router.back();
-  }
-}
-
-
+}

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

@@ -1,25 +1,16 @@
 <template>
   <div class="relative">
 
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.create?.beforeBreadcrumbs || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :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 rounded-default 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"
+        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 disabled:opacity-50"
+        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:opacity-50"
         :disabled="saving || (validating && !isValid)"
       > 
         <svg v-if="saving" x
@@ -31,22 +22,12 @@
 
     </BreadcrumbsWithButtons>
 
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.create?.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="record"
-      :resource="coreStore.resource"
+      :record="{}"
+      :resourceColumns="coreStore.resourceColumns"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
@@ -54,15 +35,6 @@
     >
     </ResourceForm>
 
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.create?.bottom || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
-
   </div>
 </template>
 
@@ -73,13 +45,10 @@ import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
 import ResourceForm from '@/components/ResourceForm.vue';
 import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
 import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions } from '@/utils';
+import { callAdminForthApi, getCustomComponent } from '@/utils';
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
-import { onMounted, ref, watch } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { computed } from 'vue';
-import { showErrorTost } from '@/composables/useFrontendApi';
-
 
 const isValid = ref(false);
 const validating = ref(false);
@@ -95,15 +64,6 @@ let createComponentsPerColumn = {};
 
 const coreStore = useCoreStore();
 
-const initalValues = computed(() => {
-  if (!route.query.values) {
-    return {};
-  }
-  return JSON.parse(decodeURIComponent(route.query.values));
-});
-
-
-
 async function onUpdateRecord(newRecord) {
   console.log('newRecord', newRecord);
   record.value = newRecord;
@@ -111,18 +71,16 @@ async function onUpdateRecord(newRecord) {
 
 onMounted(async () => {
   loading.value = true;
-  record.value = initalValues.value;
-  await coreStore.fetchResourceFull({
+  await coreStore.fetchColumns({
     resourceId: route.params.resourceId
   });
-  createComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
-      if (column.components?.create) {
-          acc[column.name] = getCustomComponent(column.components.create);
+  createComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+      if (column.component?.create) {
+          acc[column.name] = getCustomComponent(column.component.create);
       }
       return acc;
     }, {});
   loading.value = false;
-  checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'create');
 });
 
 async function saveRecord() {
@@ -141,22 +99,12 @@ async function saveRecord() {
       record: record.value,
     },
   });
-  if (response.error) {
-    showErrorTost(response.error);
-    
-  }
   saving.value = false;
-  if (route.query.returnTo) {
-    router.push(route.query.returnTo);
-  } else {
-    router.push({ 
-      name: 'resource-show', 
-      params: { 
-        resourceId: route.params.resourceId, 
-        primaryKey: response.newRecordId
-      } 
-    });
-  }
+  router.push({ name: 'resource-show', params: { 
+    resourceId: route.params.resourceId, 
+    primaryKey: response.newRecordId
+  
+  } });
 }
 
 

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,38 +19,18 @@
 
     </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"
+      :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>
 
@@ -69,11 +41,10 @@ import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
 import ResourceForm from '@/components/ResourceForm.vue';
 import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
 import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions } from '@/utils';
+import { callAdminForthApi, getCustomComponent } from '@/utils';
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
 import { computed, onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { showErrorTost } from '@/composables/useFrontendApi';
 
 const coreStore = useCoreStore();
 
@@ -96,10 +67,10 @@ async function onUpdateRecord(newRecord) {
 
 const editableRecord = computed(() => {
   const newRecord = { ...coreStore.record };
-  if (!coreStore.resource) {
+  if (!coreStore.resourceColumns) {
     return {};
   }
-  coreStore.resource.columns.forEach(column => {
+  coreStore.resourceColumns.forEach(column => {
     if (column.foreignResource) {
       newRecord[column.name] = newRecord[column.name]?.pk
     }
@@ -108,21 +79,19 @@ const editableRecord = computed(() => {
 })
 
 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);
+  editComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+      if (column.component?.edit) {
+          acc[column.name] = getCustomComponent(column.component.edit);
       }
       return acc;
     }, {});
@@ -146,7 +115,7 @@ async function saveRecord() {
     }
   }
 
-  const resp = await callAdminForthApi({
+  await callAdminForthApi({
     method: 'POST',
     path: `/update_record`,
     body: {
@@ -155,9 +124,6 @@ async function saveRecord() {
       record: updates,
     },
   });
-  if (resp.error) {
-    showErrorTost(resp.error);
-  }
   saving.value = false;
   router.push({ name: 'resource-show', params: { resourceId: route.params.resourceId, primaryKey: coreStore.record[coreStore.primaryKey] } });
 }