adminforth 1.1.19 → 1.1.20

package/dist/spa/src/components/ValueRenderer.vue

@@ -1,6 +1,16 @@
 <template>
   <div>
-    <span v-if="column.type === 'boolean'">
+    <span v-if="column.foreignResource">
+      <RouterLink v-if="row[column.name]" class="font-medium text-blue-600 dark:text-blue-500 hover:brightness-110"
+        :to="{ name: 'resource-show', params: { resourceId: column.foreignResource.resourceId, primaryKey: row[column.name].pk } }">
+        {{ row[column.name].label }}
+      </RouterLink>
+      <div v-else>
+        <span class="text-gray-400">-</span>
+      </div>
+    </span>
+        
+    <span v-else-if="column.type === 'boolean'">
       <span v-if="row[column.name]" class="bg-green-100 text-green-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-green-400 border border-green-400">Yes</span>
       <span v-else class="bg-red-100 text-red-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400">No</span>
     </span>

package/dist/spa/src/router/index.ts

@@ -1,5 +1,4 @@
 import { createRouter, createWebHistory } from 'vue-router'
-import HomeView from '../views/HomeView.vue'
 import ResourceParent from '@/views/ResourceParent.vue'
 import ListView from '@/views/ListView.vue'
 import ShowView from '@/views/ShowView.vue'
@@ -12,7 +11,9 @@ const router = createRouter({
     {
       path: '/',
       name: 'home',
-      component: HomeView
+      //redirect to login 
+      /* IMPORTANT:ADMINFORTH REDIRECT */
+
     },
     {
       path: '/login',

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

@@ -1,22 +1,6 @@
 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([]);
@@ -40,35 +24,40 @@ 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');
+    }
 
-    record.value = await callAdminForthApi({
-      path: '/get_record',
+    const respData = await callAdminForthApi({
+      path: '/get_resource_data',
       method: 'POST',
       body: {
+        source: 'show',
         resourceId: resourceId,
-        primaryKey: primaryKey,
+        filters: [
+          {
+            field: resourceColumns.value.find((col) => col.primaryKey).name,
+            operator: 'eq',
+            value: primaryKey
+          }
+        ],
+        sort: [],
+        limit: 1,
+        offset: 0
       }
     });
+
+    console.log('📦 record', respData);
+    record.value = respData.data[0];
   }
 
   async function fetchColumns({ resourceId }) {

package/dist/spa/src/utils.ts

@@ -29,9 +29,11 @@ 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,6 +31,7 @@
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
+      :customComponentsPerColumn="createComponentsPerColumn"
     >
     </ResourceForm>
 
@@ -40,14 +41,14 @@
 
 <script setup>
 
-import { ref, computed, onMounted } from 'vue';  
-import { useRoute, useRouter } from 'vue-router';
-import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi } from '@/utils';
-import ResourceForm from '@/components/ResourceForm.vue';
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
+import ResourceForm from '@/components/ResourceForm.vue';
 import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
+import { useCoreStore } from '@/stores/core';
+import { callAdminForthApi, getCustomComponent } from '@/utils';
+import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
+import { onMounted, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 
 const isValid = ref(false);
 const validating = ref(false);
@@ -59,6 +60,7 @@ const route = useRoute();
 const router = useRouter();
 
 const record = ref({});
+let createComponentsPerColumn = {};
 
 const coreStore = useCoreStore();
 
@@ -69,9 +71,15 @@ async function onUpdateRecord(newRecord) {
 
 onMounted(async () => {
   loading.value = true;
-  coreStore.fetchColumns({
+  await 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,11 +23,12 @@
 
     <ResourceForm 
       v-else
-      :record="coreStore.record"
+      :record="editableRecord"
       :resourceColumns="coreStore.resourceColumns"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
+      :customComponentsPerColumn="editComponentsPerColumn"
     >
     </ResourceForm>
   </div>
@@ -36,14 +37,14 @@
 
 <script setup>
 
-import { ref, computed, onMounted } from 'vue';  
-import { useRoute, useRouter } from 'vue-router';
-import { useCoreStore } from '@/stores/core';
-import ResourceForm from '@/components/ResourceForm.vue';
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
+import ResourceForm from '@/components/ResourceForm.vue';
 import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
-import { callAdminForthApi } from '@/utils';
+import { useCoreStore } from '@/stores/core';
+import { callAdminForthApi, getCustomComponent } from '@/utils';
+import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
+import { computed, onMounted, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 
 const coreStore = useCoreStore();
 
@@ -58,11 +59,24 @@ 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;
@@ -75,6 +89,12 @@ 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;
 });
 
@@ -87,13 +107,21 @@ 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: record.value,
+      record: updates,
     },
   });
   saving.value = false;

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

@@ -65,7 +65,7 @@
     </BreadcrumbsWithButtons>
 
     <!-- table -->
-    <div class="relative overflow-x-auto shadow-md sm:rounded-lg dark:shadow-2xl">
+    <div class="relative overflow-x-auto shadow-list-table-shadow dark:shadow-black	  dark:s">
 
 
       <!-- 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-gray-700 bg-gray-50 dark:bg-gray-700 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">
         <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-white border-b dark:bg-gray-800 dark:border-gray-700">
+        <tr v-if="!rows" class="bg-list-view-table-bg 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-white border-b dark:bg-gray-800 dark:border-gray-700">
+        <tr v-else-if="rows.length === 0" class="bg-list-view-table-bg 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-white border-b dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600">
+            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">
           <td class="w-4 p-4">
             <div class="flex items center">
               <input
@@ -198,7 +198,12 @@
             </div>
           </td>
           <td v-for="c in columnsListed" class="px-6 py-4">
-            <ValueRenderer :column="c" :row="row"/>
+            <!-- if c.name in listComponentsPerColumn, render it. If not, render ValueRenderer -->
+            <component
+              :is="listComponentsPerColumn[c.name] || ValueRenderer"
+              :column="c"
+              :row="row"
+            />
           </td>
           <td class="flex items-center px-6 py-4">
 
@@ -310,29 +315,28 @@
 </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 {initFlowbite} from 'flowbite'
+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 ValueRenderer from '@/components/ValueRenderer.vue';
+import { getCustomComponent } from '@/utils';
 
 import {
-  IconChevronDoubleLeftOutline,
-  IconChevronDoubleRightOutline,
-  IconInboxFullSolid,
-  IconInboxOutline,
-  IconPlusOutline
+IconInboxOutline,
+IconPlusOutline
 } from '@iconify-prerendered/vue-flowbite';
 
 import {
-  IconEyeSolid,
-  IconTrashBinSolid,
-  IconPenSolid,
-  IconFilterOutline, IconBanOutline
+IconBanOutline,
+IconEyeSolid,
+IconFilterOutline,
+IconPenSolid,
+IconTrashBinSolid
 } from '@iconify-prerendered/vue-flowbite';
 
 import Filters from '@/components/Filters.vue';
@@ -357,7 +361,6 @@ 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')));
@@ -376,6 +379,7 @@ 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));
@@ -419,6 +423,7 @@ 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,
@@ -426,7 +431,14 @@ async function getList() {
       sort: sort.value,
     }
   });
-  fetchStatus.value.pending = false;
+  listComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+      if (column.component?.list) {
+          acc[column.name] = getCustomComponent(column.component.list);
+      }
+      return acc;
+    }, {});
+
+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">
+            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700 dark:shadow-black" >
                 <!-- 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>
+  <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`">
     <RouterView/>
   </div>
 </template>

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

@@ -27,10 +27,10 @@
     </div>
     <div 
       v-else
-      class="relative overflow-x-auto shadow-md sm:rounded-lg"
+      class="relative overflow-x-auto shadow-resourse-form-shadow "
     >
      <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-gray-50 dark:bg-gray-700 dark:text-gray-400">
+        <thead class="text-xs text-gray-700 uppercase bg-form-view-heading dark:bg-gray-700 dark:text-gray-400">
             <tr>
                 <th scope="col" class="px-6 py-3">
                     Field
@@ -42,13 +42,17 @@
         </thead>
         <tbody>
             <tr v-for="column in coreStore.resourceColumns?.filter(c => c.showIn.includes('show'))" :key="column.name"
-                class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 border-b dark:border-gray-700"
+                class="bg-form-view-bg odd:dark:bg-gray-900  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">
-                    <ValueRenderer :column="column" :row="coreStore.record" />
+                    <component
+                        :is="showComponentsPerColumn[column.name] || ValueRenderer"
+                        :column="column"
+                        :row="coreStore.record"
+                    />
                 </td>
             </tr>
             
@@ -63,18 +67,19 @@
 
 <script setup>
 
-import { ref, computed, onMounted } from 'vue';  
-import { useRoute } from 'vue-router';
-import { callAdminForthApi } from '@/utils';
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbite';
-import { useCoreStore } from '@/stores/core';
 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';
 
 
 const item = ref(null);
 const route = useRoute();
 const loading = ref(false);
+let showComponentsPerColumn = {};
 
 const coreStore = useCoreStore();
 
@@ -87,6 +92,12 @@ 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,9 +1,12 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content:  ["./src/**/*.{vue, js}", "./node_modules/flowbite/**/*.js"],
+  content:  ["./src/**/*.{vue, js}","./src/*.{vue, js}", "./index.html", "./node_modules/flowbite/**/*.js"],
   theme: {
-    extend: {},
+    extend: {
+      /* IMPORTANT:ADMINFORTH TAILWIND STYLES */
+  }
   },
+
   darkMode: 'class',
   plugins: [
     require('flowbite/plugin'),

package/index.ts

@@ -648,13 +648,49 @@ class AdminForth implements AdminForthClass {
             [this.config.auth.usernameField]: username,
             [this.config.auth.userFullNameField]: userFullName
         };
+        const checkIsMenuItemVisible = (menuItem) => {
+          if (typeof menuItem.visible === 'function') {
+            const toReturn = menuItem.visible( adminUser );
+            if (typeof toReturn !== 'boolean') {
+              throw new Error(`'visible' function of ${menuItem.label || menuItem.type }  must return boolean value`);
+            }
+            return toReturn;
+          }}
+        let newMenu = []
+        for (let menuItem of this.config.menu) {
+          let newMenuItem = {...menuItem,}
+          if (menuItem.visible){
+            if (!checkIsMenuItemVisible(menuItem)){
+              continue
+            }
+          }
+          if (menuItem.children){
+            let newChildren = []
+            for (let child of menuItem.children){
+              let newChild = {...child,}
+              if (child.visible){
+                if (!checkIsMenuItemVisible(child)){
+                  continue
+                }
+              }
+              newChildren.push(newChild)
+            }
+            newMenuItem = {...newMenuItem, children: newChildren}
+          }
+          newMenu.push(newMenuItem)
+        }
+         
+          
+
+
+
         return {
           user: userData,
           resources: this.config.resources.map((res) => ({
             resourceId: res.resourceId,
             label: res.label,
           })),
-          menu: this.config.menu,
+          menu: newMenu,
           config: { 
             brandName: this.config.customization.brandName,
             brandLogo: this.config.customization.brandLogo,

package/modules/codeInjector.ts

@@ -149,7 +149,7 @@ class CodeInjector implements CodeInjectorType {
               routes += `{
                 path: '${item.path}',
                 name: '${item.path}',
-                component: () => import('${item.component}'),}
+                component: () => import('${item.component}'),
                 meta: { title: '${item?.meta?.title}'
               },\n` 
               

package/package.json

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

package/plugins/AccessControl/types.ts

@@ -7,9 +7,9 @@ export type PluginOptions = {
    * Called to check if user has access to a page
    * Should return `true` if user has access. If user has no access, return `false` or a string with an error message
    * @param user - The user object
-   * @param action - The {@link AllowedActionsEnum} action
+   * @param page - The page to check access for
    * @param meta - The meta object containing query for list/show or record for save/edit
    * @returns {boolean | string} - 
    */
-  hasAccess: (user: AdminUser, action: AllowedActionsEnum, meta: any) => Promise<boolean | string>;
+  hasAccess: (user: AdminUser, page: AllowedActionsEnum, meta: any) => Promise<boolean | string>;
 }

package/spa/src/components/ResourceListTable.vue

@@ -358,9 +358,11 @@ async function selectAll(value) {
 const totalPages = computed(() => Math.ceil(props.totalRows / props.pageSize));
 
 
+
+
 const allFromThisPageChecked = computed(() => {
-  if (!props.rows.value) return false;
-  return props.rows.value.every((r) => checkboxes.value.includes(r.id));
+  if (!props.rows) return false;
+  return props.rows.every((r) => props.checkboxes.includes(r.id));
 });
 const ascArr = computed(() => sort.value.filter((s) => s.direction === 'asc').map((s) => s.field));
 const descArr = computed(() => sort.value.filter((s) => s.direction === 'desc').map((s) => s.field));