adminforth 1.0.55 → 1.0.57

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

@@ -1,6 +1,22 @@
 import { ref, computed } from 'vue'
 import { defineStore } from 'pinia'
 import { callAdminForthApi } from '@/utils';
+import router from '@/router';
+
+async function findHomepage(menu) {
+  for (const item of menu) {
+    if (item.homepage) {
+      return item;
+    }
+    if (item.children) {
+      const res = findHomepage(item.children);
+      if (res) {
+        return res;
+      }
+    }
+  }
+  return null;
+}
 
 export const useCoreStore = defineStore('core', () => {
   const resourceById = ref([]);
@@ -24,40 +40,35 @@ export const useCoreStore = defineStore('core', () => {
     }, {});
     config.value = resp.config;
     user.value = resp.user;
-    console.log('🌍 AdminForth v', resp.version);
 
     // find homepage:true in menu recuresively
-    
+    if (import.meta.env.DEV){
+      return
+    } else {
+      const homepage = await findHomepage(menu.value);
+      if (homepage) {
+        if (homepage.resourceId) {
+          // redirect to homepage
+          router.push({ name: 'resource-list', params: { resourceId: homepage.resourceId } });
+        } else {
+          // redirect to path
+          router.push(homepage.path);
+        }
+      }
+    }
   }
 
   async function fetchRecord({ resourceId, primaryKey }) {
     record.value = null;
-    
-    if (!resourceColumns.value) {
-      throw new Error('Columns not fetched yet');
-    }
 
-    const respData = await callAdminForthApi({
-      path: '/get_resource_data',
+    record.value = await callAdminForthApi({
+      path: '/get_record',
       method: 'POST',
       body: {
-        source: 'show',
         resourceId: resourceId,
-        filters: [
-          {
-            field: resourceColumns.value.find((col) => col.primaryKey).name,
-            operator: 'eq',
-            value: primaryKey
-          }
-        ],
-        sort: [],
-        limit: 1,
-        offset: 0
+        primaryKey: primaryKey,
       }
     });
-
-    console.log('📦 record', respData);
-    record.value = respData.data[0];
   }
 
   async function fetchColumns({ resourceId }) {

package/dist/spa/src/utils.ts

@@ -29,11 +29,9 @@ export async function callAdminForthApi({ path, method, body=undefined }) {
   }
 }
 
-export function getCustomComponent(filePath: string) {
-  const name = filePath.replace(/@/g, '').replace(/\./g, '').replace(/\//g, '');
-  console.log('resolving name', name);
-  return resolveComponent(name);
-}
+
+
+
 
 export function getIcon(icon: string) {
   // icon format is "feather:icon-name". We need to get IconName in pascal case

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

@@ -31,7 +31,6 @@
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
-      :customComponentsPerColumn="createComponentsPerColumn"
     >
     </ResourceForm>
 
@@ -41,14 +40,14 @@
 
 <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 } from '@/utils';
+import { callAdminForthApi } from '@/utils';
+import ResourceForm from '@/components/ResourceForm.vue';
+import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
-import { onMounted, ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
 
 const isValid = ref(false);
 const validating = ref(false);
@@ -60,7 +59,6 @@ const route = useRoute();
 const router = useRouter();
 
 const record = ref({});
-let createComponentsPerColumn = {};
 
 const coreStore = useCoreStore();
 
@@ -71,15 +69,9 @@ async function onUpdateRecord(newRecord) {
 
 onMounted(async () => {
   loading.value = true;
-  await coreStore.fetchColumns({
+  coreStore.fetchColumns({
     resourceId: route.params.resourceId
   });
-  createComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
-      if (column.component?.create) {
-          acc[column.name] = getCustomComponent(column.component.create);
-      }
-      return acc;
-    }, {});
   loading.value = false;
 });
 

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

@@ -23,12 +23,11 @@
 
     <ResourceForm 
       v-else
-      :record="editableRecord"
+      :record="coreStore.record"
       :resourceColumns="coreStore.resourceColumns"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
-      :customComponentsPerColumn="editComponentsPerColumn"
     >
     </ResourceForm>
   </div>
@@ -37,14 +36,14 @@
 
 <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 } 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 SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
+import { callAdminForthApi } from '@/utils';
 
 const coreStore = useCoreStore();
 
@@ -59,24 +58,11 @@ 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.resourceColumns) {
-    return {};
-  }
-  coreStore.resourceColumns.forEach(column => {
-    if (column.foreignResource) {
-      newRecord[column.name] = newRecord[column.name]?.pk
-    }
-  });
-  return newRecord;
-})
 
 onMounted(async () => {
   loading.value = true;
@@ -89,12 +75,6 @@ onMounted(async () => {
     primaryKey: route.params.primaryKey,
   });
 
-  editComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
-      if (column.component?.edit) {
-          acc[column.name] = getCustomComponent(column.component.edit);
-      }
-      return acc;
-    }, {});
   loading.value = false;
 });
 
@@ -107,21 +87,13 @@ 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];
-    }
-  }
-
   await callAdminForthApi({
     method: 'POST',
     path: `/update_record`,
     body: {
       resourceId: route.params.resourceId,
       recordId: route.params.primaryKey,
-      record: updates,
+      record: record.value,
     },
   });
   saving.value = false;

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

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

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

@@ -65,7 +65,7 @@
     </BreadcrumbsWithButtons>
 
     <!-- table -->
-    <div class="relative overflow-x-auto shadow-list-table-shadow dark:shadow-black	  dark:s">
+    <div class="relative overflow-x-auto shadow-md sm:rounded-lg dark:shadow-2xl">
 
 
       <!-- skelet loader -->
@@ -90,7 +90,7 @@
       </div>
 
       <table v-else class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
-        <thead class="text-xs text-view-table-heading-text bg-list-view-table-heading dark:bg-gray-700 dark:text-gray-400">
+        <thead class="text-xs text-gray-700 bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
         <tr>
           <th scope="col" class="p-4">
             <div v-if="rows && rows.length" class="flex items-center">
@@ -127,7 +127,7 @@
         </tr>
         </thead>
         <tbody>
-        <tr v-if="!rows" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
+        <tr v-if="!rows" class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
           <td :colspan="coreStore.resourceColumns.length + 2">
 
             <div role="status"
@@ -171,7 +171,7 @@
             </div>
           </td>
         </tr>
-        <tr v-else-if="rows.length === 0" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
+        <tr v-else-if="rows.length === 0" class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
           <td :colspan="coreStore.resourceColumns.length + 2">
 
             <div id="toast-simple"
@@ -185,7 +185,7 @@
         </tr>
 
         <tr v-else v-for="(row, rowI) in rows" :key="row.id"
-            class="bg-list-view-table-bg border-b dark:bg-gray-800 border-list-view-border-color dark:border-gray-700 hover:bg-list-view-table-row-hover dark:hover:bg-gray-600">
+            class="bg-white border-b dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600">
           <td class="w-4 p-4">
             <div class="flex items center">
               <input
@@ -198,12 +198,7 @@
             </div>
           </td>
           <td v-for="c in columnsListed" class="px-6 py-4">
-            <!-- if c.name in listComponentsPerColumn, render it. If not, render ValueRenderer -->
-            <component
-              :is="listComponentsPerColumn[c.name] || ValueRenderer"
-              :column="c"
-              :row="row"
-            />
+            <ValueRenderer :column="c" :row="row"/>
           </td>
           <td class="flex items-center px-6 py-4">
 
@@ -315,28 +310,29 @@
 </template>
 
 <script setup>
+import {ref, onMounted, watch, computed} from 'vue';
+import {callAdminForthApi, getIcon} from '@/utils';
+import {useRoute} from 'vue-router';
+import {useCoreStore} from '@/stores/core';
+import {useModalStore} from '@/stores/modal';
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import { useCoreStore } from '@/stores/core';
-import { useModalStore } from '@/stores/modal';
-import { callAdminForthApi, getIcon } from '@/utils';
-import { initFlowbite } from 'flowbite';
-import { computed, onMounted, ref, watch } from 'vue';
-import { useRoute } from 'vue-router';
+import {initFlowbite} from 'flowbite'
 
 import ValueRenderer from '@/components/ValueRenderer.vue';
-import { getCustomComponent } from '@/utils';
 
 import {
-IconInboxOutline,
-IconPlusOutline
+  IconChevronDoubleLeftOutline,
+  IconChevronDoubleRightOutline,
+  IconInboxFullSolid,
+  IconInboxOutline,
+  IconPlusOutline
 } from '@iconify-prerendered/vue-flowbite';
 
 import {
-IconBanOutline,
-IconEyeSolid,
-IconFilterOutline,
-IconPenSolid,
-IconTrashBinSolid
+  IconEyeSolid,
+  IconTrashBinSolid,
+  IconPenSolid,
+  IconFilterOutline, IconBanOutline
 } from '@iconify-prerendered/vue-flowbite';
 
 import Filters from '@/components/Filters.vue';
@@ -361,6 +357,7 @@ const totalRows = ref(0);
 const allCheckedActions = ref([]);
 const allowedActions = ref({});
 
+
 const DEFAULT_PAGE_SIZE = 10;
 
 const columnsListed = computed(() => coreStore.resourceColumns?.filter(c => c.showIn.includes('list')));
@@ -379,7 +376,6 @@ async function selectAll(value) {
 
 const pageSize = computed(() => coreStore.resourceById[route.params.resourceId]?.pageSize || DEFAULT_PAGE_SIZE);
 const totalPages = computed(() => Math.ceil(totalRows.value / pageSize.value));
-let listComponentsPerColumn = {};
 const allFromThisPageChecked = computed(() => {
   if (!rows.value) return false;
   return rows.value.every((r) => checkboxes.value.includes(r.id));
@@ -423,7 +419,6 @@ async function getList() {
     path: '/get_resource_data',
     method: 'POST',
     body: {
-      source: 'list',
       resourceId: route.params.resourceId,
       limit: pageSize.value,
       offset: (page.value - 1) * pageSize.value,
@@ -431,14 +426,7 @@ async function getList() {
       sort: sort.value,
     }
   });
-  listComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
-      if (column.component?.list) {
-          acc[column.name] = getCustomComponent(column.component.list);
-      }
-      return acc;
-    }, {});
-
-fetchStatus.value.pending = false;
+  fetchStatus.value.pending = false;
   rows.value = data.data?.map(row => {
     row._primaryKeyValue = row[coreStore.resourceColumns.find(c => c.primaryKey).name];
     return row;

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

@@ -11,7 +11,7 @@
     <div id="authentication-modal" tabindex="-1" class=" overflow-y-auto overflow-x-hidden z-50 min-w-[400px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-w-md max-h-full">
             <!-- Modal content -->
-            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700 dark:shadow-black" >
+            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
                 <!-- Modal header -->
                 <div class="flex items-center justify-between p-4 md:p-5 border-b rounded-t dark:border-gray-600">
                     <h3 class="text-xl font-semibold text-gray-900 dark:text-white">

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

@@ -1,5 +1,5 @@
 <template>
-  <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`">
+  <div>
     <RouterView/>
   </div>
 </template>

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

@@ -27,10 +27,10 @@
     </div>
     <div 
       v-else
-      class="relative overflow-x-auto shadow-resourse-form-shadow "
+      class="relative overflow-x-auto shadow-md sm:rounded-lg"
     >
      <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
-        <thead class="text-xs text-gray-700 uppercase bg-form-view-heading dark:bg-gray-700 dark:text-gray-400">
+        <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
             <tr>
                 <th scope="col" class="px-6 py-3">
                     Field
@@ -42,17 +42,13 @@
         </thead>
         <tbody>
             <tr v-for="column in coreStore.resourceColumns?.filter(c => c.showIn.includes('show'))" :key="column.name"
-                class="bg-form-view-bg odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
+                class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 border-b dark:border-gray-700"
             >
                 <td class="px-6 py-4 whitespace-nowrap">
                     {{ column.label }}
                 </td>
                 <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
-                    <component
-                        :is="showComponentsPerColumn[column.name] || ValueRenderer"
-                        :column="column"
-                        :row="coreStore.record"
-                    />
+                    <ValueRenderer :column="column" :row="coreStore.record" />
                 </td>
             </tr>
             
@@ -67,19 +63,18 @@
 
 <script setup>
 
+import { ref, computed, onMounted } from 'vue';  
+import { useRoute } from 'vue-router';
+import { callAdminForthApi } from '@/utils';
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import ValueRenderer from '@/components/ValueRenderer.vue';
-import { useCoreStore } from '@/stores/core';
-import { getCustomComponent } from '@/utils';
 import { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbite';
-import { onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
+import { useCoreStore } from '@/stores/core';
+import ValueRenderer from '@/components/ValueRenderer.vue';
 
 
 const item = ref(null);
 const route = useRoute();
 const loading = ref(false);
-let showComponentsPerColumn = {};
 
 const coreStore = useCoreStore();
 
@@ -92,12 +87,6 @@ onMounted(async () => {
     resourceId: route.params.resourceId, 
     primaryKey: route.params.primaryKey,
   });
-  showComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
-      if (column.component?.show) {
-          acc[column.name] = getCustomComponent(column.component.show);
-      }
-      return acc;
-    }, {});
   loading.value = false;
 });
 

package/dist/spa/tailwind.config.js

@@ -1,12 +1,9 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content:  ["./src/**/*.{vue, js}","./src/*.{vue, js}", "./index.html", "./node_modules/flowbite/**/*.js"],
+  content:  ["./src/**/*.{vue, js}", "./node_modules/flowbite/**/*.js"],
   theme: {
-    extend: {
-      /* IMPORTANT:ADMINFORTH TAILWIND STYLES */
-  }
+    extend: {},
   },
-
   darkMode: 'class',
   plugins: [
     require('flowbite/plugin'),

package/modules/codeInjector.ts

@@ -100,7 +100,7 @@ class CodeInjector {
           routes += `{
             path: '${item.path}',
             name: '${item.path}',
-            component: import('${item.component}'),
+            component: () => import('${item.component}'),
           },\n`
         }
         if (item.children) {
@@ -175,26 +175,27 @@ class CodeInjector {
 
     // for each custom component generate import statement
     const customComponentsDir = this.adminforth.config.customization?.customComponentsDir;
-    let customComponentsImports = '';
-    if (customComponentsDir) {
-        // if file - return, if dir - go recursively
-        const customComponents = await fs.promises.readdir(customComponentsDir);
-        for (const filePath of customComponents) {
-            if (!filePath.endsWith('.vue')) {
-              continue;
+
+    const customResourceComponents = [];
+    this.adminforth.config.resources.forEach((resource) => {
+      resource.columns.forEach((field) => {
+        if (field.component) {
+          Object.values(field.component).forEach((filePath) => {
+            if (!customResourceComponents.includes(filePath)) {
+              customResourceComponents.push(filePath);
             }
-            fs.stat(`${customComponentsDir}/${filePath}`, (err, data) => {
-                if (err) {
-                    console.log(err);
-                    return;
-                }
-                if (data.isFile()) {
-                    const componentName = getComponentNameFromPath(filePath);
-                    customComponentsImports += `import ${componentName} from '@/custom/${filePath}';\n`;
-                }
-            })
+          });
         }
-    }
+      });
+    });
+
+    let customComponentsImports = '';
+    customResourceComponents.forEach((filePath) => {
+      const componentName = getComponentNameFromPath(filePath);
+      customComponentsImports += `import ${componentName} from '${filePath}';\n`;
+    });
+
+
 
     // Generate Vue.component statements for each icon
     const iconComponents = uniqueIcons.map((icon) => {
@@ -207,24 +208,10 @@ class CodeInjector {
 
     // Generate Vue.component statements for each custom component
     let customComponentsComponents = '';
-    if (customComponentsDir) {
-        const customComponents = await fs.promises.readdir(customComponentsDir);
-        for (const filePath of customComponents) {
-          if (!filePath.endsWith('.vue')) {
-            continue;
-          }
-          fs.stat(`${customComponentsDir}/${filePath}`, (err, data) => {
-            if (err) {
-              console.log('Custom components importing error: ', err);
-              return;
-            }
-            if (data.isFile()) {
-              const componentName = getComponentNameFromPath(filePath);
-              customComponentsComponents += `app.component('${componentName}', ${componentName});\n`;
-            }
-          })
-        }
-    }
+    customResourceComponents.forEach((filePath) => {
+      const componentName = getComponentNameFromPath(filePath);
+      customComponentsComponents += `app.component('${componentName}', ${componentName});\n`;
+    })
     
 
     let imports = iconImports + '\n';
@@ -257,7 +244,7 @@ class CodeInjector {
 
 
 
-    /* generate custom rotes */
+    /* generate custom routes */
     const homepageMenuItem = this.adminforth.config.menu.find((mi)=>mi.homepage);
     let childrenHomePageMenuItem = this.adminforth.config.menu.find((mi)=>mi.children && mi.children?.find((mi)=>mi.homepage));
     let childrenHomepage = childrenHomePageMenuItem?.children?.find((mi)=>mi.homepage)
@@ -266,10 +253,6 @@ class CodeInjector {
       homePagePath=this.adminforth.config.menu.filter((mi)=>mi.path)[0]?.path || `/resource/${this.adminforth.config.menu.filter((mi)=>mi.children)[0]?.resourceId}` ;
     }
 
-    
-    
-      
-
     routes += `{
       path: '/',
       name: 'home',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.0.55",
+  "version": "1.0.57",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/spa/src/router/index.ts

@@ -1,20 +1,9 @@
 import { createRouter, createWebHistory } from 'vue-router'
 import ResourceParent from '@/views/ResourceParent.vue'
-import ListView from '@/views/ListView.vue'
-import ShowView from '@/views/ShowView.vue'
-import EditView from '@/views/EditView.vue'
-import CreateView from '@/views/CreateView.vue'
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
   routes: [
-    {
-      path: '/',
-      name: 'home',
-      //redirect to login 
-      /* IMPORTANT:ADMINFORTH REDIRECT */
-
-    },
     {
       path: '/login',
       name: 'login',
@@ -27,22 +16,22 @@ const router = createRouter({
       children: [
         {
           path: '',
-          component: ListView,
+          component: () => import('@/views/ListView.vue'),
           name: 'resource-list'
         },
         {
           path: 'show/:primaryKey',
-          component: ShowView,
+          component: () => import('@/views/ShowView.vue'),
           name: 'resource-show'
         },
         {
           path: 'edit/:primaryKey',
-          component: EditView,
+          component: () => import('@/views/EditView.vue'),
           name: 'resource-edit'
         },
         {
           path: 'create',
-          component: CreateView,
+          component: () => import('@/views/CreateView.vue'),
           name: 'resource-create'
         },
       ]