adminforth 1.0.62 → 1.0.63

package/dist/index.js

@@ -24,6 +24,7 @@ import { v1 as uuid } from 'uuid';
 import fs from 'fs';
 import { ADMINFORTH_VERSION } from './modules/utils.js';
 import { AdminForthFilterOperators, AdminForthTypes } from './types.js';
+import { getFunctionList } from './modules/utils.js';
 const AVAILABLE_SHOW_IN = ['list', 'edit', 'create', 'filter', 'show'];
 const DEFAULT_ALLOWED_ACTIONS = { create: true, edit: true, show: true, delete: true };
 class AdminForth {
@@ -159,7 +160,7 @@ class AdminForth {
                         errors.push(`Resource "${res.resourceId}" bulkActions must be an array`);
                         bulkActions = [];
                     }
-                    if ((_c = res.options) === null || _c === void 0 ? void 0 : _c.allowDelete) {
+                    if (((_c = res.options) === null || _c === void 0 ? void 0 : _c.allowDelete) && !bulkActions.find((action) => action.label === 'Delete checked')) {
                         bulkActions.push({
                             label: `Delete checked`,
                             state: 'danger',
@@ -389,6 +390,7 @@ class AdminForth {
             method: 'GET',
             path: '/get_public_config',
             handler: (_d) => __awaiter(this, [_d], void 0, function* ({ body }) {
+                var _e;
                 // find resource
                 if (!this.config.auth) {
                     throw new Error('No config.auth defined');
@@ -400,14 +402,15 @@ class AdminForth {
                     brandName: this.config.brandName,
                     usernameFieldName: usernameColumn.label,
                     loginBackgroundImage: this.config.auth.loginBackgroundImage,
+                    title: (_e = this.config) === null || _e === void 0 ? void 0 : _e.title,
                 };
             }),
         });
         server.endpoint({
             method: 'GET',
             path: '/get_base_config',
-            handler: (_e) => __awaiter(this, [_e], void 0, function* ({ input, adminUser, cookies }) {
-                var _f;
+            handler: (_f) => __awaiter(this, [_f], void 0, function* ({ input, adminUser, cookies }) {
+                var _g;
                 const cookieParsed = this.auth.verify(cookies['adminforth_jwt']);
                 let username = '';
                 let userFullName = '';
@@ -448,7 +451,7 @@ class AdminForth {
                         deleteConfirmation: this.config.deleteConfirmation,
                         auth: this.config.auth,
                         usernameField: this.config.auth.usernameField,
-                        title: (_f = this.config) === null || _f === void 0 ? void 0 : _f.title,
+                        title: (_g = this.config) === null || _g === void 0 ? void 0 : _g.title,
                     },
                     adminUser,
                     version: ADMINFORTH_VERSION,
@@ -458,7 +461,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_columns',
-            handler: (_g) => __awaiter(this, [_g], void 0, function* ({ body }) {
+            handler: (_h) => __awaiter(this, [_h], void 0, function* ({ body }) {
                 const { resourceId } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -477,8 +480,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_data',
-            handler: (_h) => __awaiter(this, [_h], void 0, function* ({ body, adminUser }) {
-                var _j, _k, _l, _m, _o, _p, _q, _r;
+            handler: (_j) => __awaiter(this, [_j], void 0, function* ({ body, adminUser }) {
+                var _k, _l, _m, _o;
                 const { resourceId, source } = body;
                 if (['show', 'list'].includes(source) === false) {
                     return { error: 'Invalid source, should be list or show' };
@@ -493,8 +496,8 @@ class AdminForth {
                 if (!resource) {
                     return { error: `Resource ${resourceId} not found` };
                 }
-                if ((_k = (_j = resource.hooks) === null || _j === void 0 ? void 0 : _j[source]) === null || _k === void 0 ? void 0 : _k.beforeDatasourceRequest) {
-                    const resp = yield ((_m = (_l = resource.hooks) === null || _l === void 0 ? void 0 : _l[source]) === null || _m === void 0 ? void 0 : _m.beforeDatasourceRequest({ resource, query: body, adminUser }));
+                for (const hook of getFunctionList((_l = (_k = resource.hooks) === null || _k === void 0 ? void 0 : _k[source]) === null || _l === void 0 ? void 0 : _l.beforeDatasourceRequest)) {
+                    const resp = yield hook({ resource, query: body, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
                     }
@@ -563,8 +566,8 @@ class AdminForth {
                 data.data.forEach((item) => {
                     item._label = resource.itemLabel(item);
                 });
-                if ((_p = (_o = resource.hooks) === null || _o === void 0 ? void 0 : _o[source]) === null || _p === void 0 ? void 0 : _p.afterDatasourceResponse) {
-                    const resp = yield ((_r = (_q = resource.hooks) === null || _q === void 0 ? void 0 : _q[source]) === null || _r === void 0 ? void 0 : _r.afterDatasourceResponse({ resource, response: data.data, adminUser }));
+                for (const hook of getFunctionList((_o = (_m = resource.hooks) === null || _m === void 0 ? void 0 : _m[source]) === null || _o === void 0 ? void 0 : _o.afterDatasourceResponse)) {
+                    const resp = yield hook({ resource, response: data.data, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
                     }
@@ -586,8 +589,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_foreign_data',
-            handler: (_s) => __awaiter(this, [_s], void 0, function* ({ body, adminUser }) {
-                var _t, _u, _v, _w;
+            handler: (_p) => __awaiter(this, [_p], void 0, function* ({ body, adminUser }) {
+                var _q, _r;
                 const { resourceId, column } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -608,8 +611,8 @@ class AdminForth {
                 }
                 const targetResourceId = columnConfig.foreignResource.resourceId;
                 const targetResource = this.config.resources.find((res) => res.resourceId == targetResourceId);
-                if ((_t = columnConfig.foreignResource.hooks) === null || _t === void 0 ? void 0 : _t.beforeDatasourceRequest) {
-                    const resp = yield ((_u = column.foreignResource.hooks) === null || _u === void 0 ? void 0 : _u.beforeDatasourceRequest({ query: body, adminUser }));
+                for (const hook of getFunctionList((_q = columnConfig.foreignResource.hooks) === null || _q === void 0 ? void 0 : _q.beforeDatasourceRequest)) {
+                    const resp = yield hook({ query: body, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
                     }
@@ -637,8 +640,8 @@ class AdminForth {
                 const response = {
                     items
                 };
-                if ((_v = columnConfig.foreignResource.hooks) === null || _v === void 0 ? void 0 : _v.afterDatasourceResponse) {
-                    const resp = yield ((_w = column.foreignResource.hooks) === null || _w === void 0 ? void 0 : _w.afterDatasourceResponse({ response, adminUser }));
+                for (const hook of getFunctionList((_r = columnConfig.foreignResource.hooks) === null || _r === void 0 ? void 0 : _r.afterDatasourceResponse)) {
+                    const resp = yield hook({ response, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
                     }
@@ -652,7 +655,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_min_max_for_columns',
-            handler: (_x) => __awaiter(this, [_x], void 0, function* ({ body }) {
+            handler: (_s) => __awaiter(this, [_s], void 0, function* ({ body }) {
                 const { resourceId } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -681,8 +684,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/create_record',
-            handler: (_y) => __awaiter(this, [_y], void 0, function* ({ body, adminUser }) {
-                var _z, _0, _1, _2, _3, _4, _5, _6, _7;
+            handler: (_t) => __awaiter(this, [_t], void 0, function* ({ body, adminUser }) {
+                var _u, _v, _w, _x, _y;
                 console.log('create_record', body, this.config.resources);
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
@@ -690,8 +693,8 @@ class AdminForth {
                 }
                 const record = body['record'];
                 // execute hook if needed
-                if ((_0 = (_z = resource.hooks) === null || _z === void 0 ? void 0 : _z.create) === null || _0 === void 0 ? void 0 : _0.beforeSave) {
-                    const resp = yield ((_2 = (_1 = resource.hooks) === null || _1 === void 0 ? void 0 : _1.create) === null || _2 === void 0 ? void 0 : _2.beforeSave({ resource, record, adminUser }));
+                for (const hook of getFunctionList((_v = (_u = resource.hooks) === null || _u === void 0 ? void 0 : _u.create) === null || _v === void 0 ? void 0 : _v.beforeSave)) {
+                    const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
                     }
@@ -707,7 +710,7 @@ class AdminForth {
                             });
                         }
                     }
-                    if (((_3 = column.required) === null || _3 === void 0 ? void 0 : _3.create) && body['record'][column.name] === undefined) {
+                    if (((_w = column.required) === null || _w === void 0 ? void 0 : _w.create) && body['record'][column.name] === undefined) {
                         return { error: `Column '${column.name}' is required` };
                     }
                     if (column.isUnique) {
@@ -732,8 +735,8 @@ class AdminForth {
                 const connector = this.connectors[resource.dataSource];
                 yield connector.createRecord({ resource, record });
                 // execute hook if needed
-                if ((_5 = (_4 = resource.hooks) === null || _4 === void 0 ? void 0 : _4.create) === null || _5 === void 0 ? void 0 : _5.afterSave) {
-                    const resp = yield ((_7 = (_6 = resource.hooks) === null || _6 === void 0 ? void 0 : _6.create) === null || _7 === void 0 ? void 0 : _7.afterSave({ resource, record, adminUser }));
+                for (const hook of getFunctionList((_y = (_x = resource.hooks) === null || _x === void 0 ? void 0 : _x.create) === null || _y === void 0 ? void 0 : _y.afterSave)) {
+                    const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
                     }
@@ -749,8 +752,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/update_record',
-            handler: (_8) => __awaiter(this, [_8], void 0, function* ({ body, adminUser }) {
-                var _9, _10, _11, _12, _13, _14, _15, _16;
+            handler: (_z) => __awaiter(this, [_z], void 0, function* ({ body, adminUser }) {
+                var _0, _1, _2, _3;
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
@@ -764,8 +767,8 @@ class AdminForth {
                 }
                 const record = body['record'];
                 // execute hook if needed
-                if ((_10 = (_9 = resource.hooks) === null || _9 === void 0 ? void 0 : _9.edit) === null || _10 === void 0 ? void 0 : _10.beforeSave) {
-                    const resp = yield ((_12 = (_11 = resource.hooks) === null || _11 === void 0 ? void 0 : _11.edit) === null || _12 === void 0 ? void 0 : _12.beforeSave({ resource, record, adminUser }));
+                for (const hook of getFunctionList((_1 = (_0 = resource.hooks) === null || _0 === void 0 ? void 0 : _0.edit) === null || _1 === void 0 ? void 0 : _1.beforeSave)) {
+                    const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
                     }
@@ -790,8 +793,8 @@ class AdminForth {
                     yield connector.updateRecord({ resource, recordId, record, newValues });
                 }
                 // execute hook if needed
-                if ((_14 = (_13 = resource.hooks) === null || _13 === void 0 ? void 0 : _13.edit) === null || _14 === void 0 ? void 0 : _14.afterSave) {
-                    const resp = yield ((_16 = (_15 = resource.hooks) === null || _15 === void 0 ? void 0 : _15.edit) === null || _16 === void 0 ? void 0 : _16.afterSave({ resource, record, adminUser }));
+                for (const hook of getFunctionList((_3 = (_2 = resource.hooks) === null || _2 === void 0 ? void 0 : _2.edit) === null || _3 === void 0 ? void 0 : _3.afterSave)) {
+                    const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
                     }
@@ -807,16 +810,16 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/delete_record',
-            handler: (_17) => __awaiter(this, [_17], void 0, function* ({ body, adminUser }) {
-                var _18, _19, _20, _21, _22, _23, _24, _25;
+            handler: (_4) => __awaiter(this, [_4], void 0, function* ({ body, adminUser }) {
+                var _5, _6, _7, _8;
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 const record = yield this.connectors[resource.dataSource].getRecordByPrimaryKey(resource, body['primaryKey']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
                 }
                 // execute hook if needed
-                if ((_19 = (_18 = resource.hooks) === null || _18 === void 0 ? void 0 : _18.delete) === null || _19 === void 0 ? void 0 : _19.beforeSave) {
-                    const resp = yield ((_21 = (_20 = resource.hooks) === null || _20 === void 0 ? void 0 : _20.delete) === null || _21 === void 0 ? void 0 : _21.beforeSave({ resource, record, adminUser }));
+                for (const hook of getFunctionList((_6 = (_5 = resource.hooks) === null || _5 === void 0 ? void 0 : _5.delete) === null || _6 === void 0 ? void 0 : _6.beforeSave)) {
+                    const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
                     }
@@ -827,8 +830,8 @@ class AdminForth {
                 const connector = this.connectors[resource.dataSource];
                 yield connector.deleteRecord({ resource, recordId: body['primaryKey'] });
                 // execute hook if needed
-                if ((_23 = (_22 = resource.hooks) === null || _22 === void 0 ? void 0 : _22.delete) === null || _23 === void 0 ? void 0 : _23.afterSave) {
-                    const resp = yield ((_25 = (_24 = resource.hooks) === null || _24 === void 0 ? void 0 : _24.delete) === null || _25 === void 0 ? void 0 : _25.afterSave({ resource, record, adminUser }));
+                for (const hook of getFunctionList((_8 = (_7 = resource.hooks) === null || _7 === void 0 ? void 0 : _7.delete) === null || _8 === void 0 ? void 0 : _8.afterSave)) {
+                    const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
                     }
@@ -844,7 +847,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/start_bulk_action',
-            handler: (_26) => __awaiter(this, [_26], void 0, function* ({ body }) {
+            handler: (_9) => __awaiter(this, [_9], void 0, function* ({ body }) {
                 const { resourceId, actionId, recordIds } = body;
                 const resource = this.config.resources.find((res) => res.resourceId == resourceId);
                 if (!resource) {

package/dist/modules/utils.js

@@ -28,3 +28,16 @@ export const ADMINFORTH_VERSION = package_json.version;
 export function getComponentNameFromPath(filePath) {
     return filePath.replace(/@/g, '').replace(/\./g, '').replace(/\//g, '');
 }
+export function getFunctionList(param) {
+    if (param) {
+        if (Array.isArray(param)) {
+            return param;
+        }
+        else {
+            return [param];
+        }
+    }
+    else {
+        return [];
+    }
+}

package/dist/plugins/ForeignInlineListPlugin/index.js

@@ -17,7 +17,7 @@ export default class ForeignInlineListPlugin extends AdminForthPlugin {
             virtual: true,
             showIn: ['show'],
             component: {
-                show: this.componentPath('InlineList.vue'),
+                showRow: this.componentPath('InlineList.vue'),
             },
         });
     }

package/dist/spa/spa/src/App.vue

@@ -113,7 +113,8 @@
   </div>
   <div v-else class="flex items-center justify-center h-screen">
     <div class="text-3xl text-gray-400 animate-bounce">
-      ▶️
+      <svg aria-hidden="true" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/><path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/></svg>
+      <span class="sr-only">Loading...</span>
     </div>
   </div>
   <AcceptModal />
@@ -191,10 +192,12 @@ async function initRouter() {
 // initialize components based on data attribute selectors
 onMounted(async () => {
   initRouter();
-  initFlowbite();
+    setTimeout(() => {
+      initFlowbite();
+    }, 100); 
   await coreStore.fetchMenuAndResource();
   loginRedirectCheckIsReady.value = true;
-  title.value = coreStore.config.title || 'Admin Forth';
+  title.value = coreStore.config?.title || 'AdminForth';
   useHead({
   title: title.value,
   link: [

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

@@ -528,10 +528,7 @@ async function init() {
 }
 
 onMounted(async () => {
-  if (!coreStore.flowBitIsInitialised){
-     initFlowbite();
-     coreStore.flowBitIsInitialised = true;
-  }
+  
  
   await init();
 

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

@@ -45,10 +45,28 @@
                 class="bg-form-view-bg odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
             >
               <component
-                  :is="showComponentsPerColumn[column.name] || ShowTableItem"
+                v-if="showRowComponentsPerColumn[column.name]"
+                  :is="showRowComponentsPerColumn[column.name]"
                   :column="column"
                   :row="coreStore.record"
               />
+              <template v-else>
+                <td class="px-6 py-4 whitespace-nowrap">
+                  {{ column.label }}
+                </td>
+                <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
+                  <component
+                    v-if="showComponentsPerColumn[column.name]"
+                    :is="showComponentsPerColumn[column.name]"
+                    :column="column"
+                    :row="coreStore.record"
+                  />
+                  <ValueRenderer v-else 
+                    :column="column" 
+                    :row="coreStore.record"
+                  />
+                </td>
+              </template>
             </tr>
         </tbody>
     </table>
@@ -76,6 +94,7 @@ const item = ref(null);
 const route = useRoute();
 const loading = ref(false);
 let showComponentsPerColumn = {};
+let showRowComponentsPerColumn = {};
 
 const coreStore = useCoreStore();
 
@@ -93,7 +112,14 @@ onMounted(async () => {
           acc[column.name] = getCustomComponent(column.component.show);
       }
       return acc;
-    }, {});
+  }, {});
+  showRowComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+      if (column.component?.showRow) {
+          acc[column.name] = getCustomComponent(column.component.showRow);
+      }
+      return acc;
+  }, {});
+
   loading.value = false;
 });
 

package/dist/spa/spa/tailwind.config.js

@@ -1,6 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content:  ["./src/**/*.{vue, js}","./src/*.{vue, js}", "./index.html", "./node_modules/flowbite/**/*.js"],
+  content:  ["./src/**/*.{vue, js, ts, tsx}","./src/*.{vue, js, ts, tsx}", "./index.html", "./node_modules/flowbite/**/*.js"],
   theme: {
     extend: {
       /* IMPORTANT:ADMINFORTH TAILWIND STYLES */

package/index.ts

@@ -11,6 +11,7 @@ import fs from 'fs';
 import { ADMINFORTH_VERSION } from './modules/utils.js';
 import { AdminForthFilterOperators, AdminForthTypes, AdminForthTypesValues } from './types.js';
 import { AdminForthConfig } from './types/AdminForthConfig.js';
+import { getFunctionList } from './modules/utils.js';
 
 const AVAILABLE_SHOW_IN = ['list', 'edit', 'create', 'filter', 'show'];
 const DEFAULT_ALLOWED_ACTIONS = {create: true, edit: true, show: true, delete: true};
@@ -196,7 +197,7 @@ class AdminForth {
             errors.push(`Resource "${res.resourceId}" bulkActions must be an array`);
             bulkActions = [];
           }
-          if(res.options?.allowDelete){
+          if(res.options?.allowDelete && !bulkActions.find((action) => action.label === 'Delete checked')){
             bulkActions.push({
               label: `Delete checked`,
               state: 'danger',
@@ -471,6 +472,7 @@ class AdminForth {
           brandName: this.config.brandName,
           usernameFieldName: usernameColumn.label,
           loginBackgroundImage: this.config.auth.loginBackgroundImage,
+          title: this.config?.title,
         };
       },
     });
@@ -565,8 +567,8 @@ class AdminForth {
           return { error: `Resource ${resourceId} not found` };
         }
 
-        if (resource.hooks?.[source]?.beforeDatasourceRequest) {
-          const resp = await resource.hooks?.[source]?.beforeDatasourceRequest({ resource, query: body, adminUser });
+        for (const hook of getFunctionList(resource.hooks?.[source]?.beforeDatasourceRequest)) {
+          const resp = await hook({ resource, query: body, adminUser });
           if (!resp || (!resp.ok && !resp.error)) {
             throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
           }
@@ -645,8 +647,8 @@ class AdminForth {
           item._label = resource.itemLabel(item);
         })
 
-        if (resource.hooks?.[source]?.afterDatasourceResponse) {
-          const resp = await resource.hooks?.[source]?.afterDatasourceResponse({ resource, response: data.data, adminUser });
+        for (const hook of getFunctionList(resource.hooks?.[source]?.afterDatasourceResponse)) {
+          const resp = await hook({ resource, response: data.data, adminUser });
           if (!resp || (!resp.ok && !resp.error)) {
             throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
           }
@@ -695,8 +697,9 @@ class AdminForth {
         }
         const targetResourceId = columnConfig.foreignResource.resourceId;
         const targetResource = this.config.resources.find((res) => res.resourceId == targetResourceId);
-        if (columnConfig.foreignResource.hooks?.beforeDatasourceRequest) {
-          const resp = await column.foreignResource.hooks?.beforeDatasourceRequest({ query: body, adminUser });
+
+        for (const hook of getFunctionList(columnConfig.foreignResource.hooks?.beforeDatasourceRequest)) {
+          const resp = await hook({ query: body, adminUser });
           if (!resp || (!resp.ok && !resp.error)) {
             throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
           }
@@ -725,8 +728,9 @@ class AdminForth {
         const response = {
           items
         };
-        if (columnConfig.foreignResource.hooks?.afterDatasourceResponse) {
-          const resp = await column.foreignResource.hooks?.afterDatasourceResponse({ response, adminUser });
+
+        for (const hook of getFunctionList(columnConfig.foreignResource.hooks?.afterDatasourceResponse)) {
+          const resp = await hook({ response, adminUser });
           if (!resp || (!resp.ok && !resp.error)) {
             throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
           }
@@ -735,7 +739,7 @@ class AdminForth {
             return { error: resp.error };
           }
         }
-        
+       
         return response;
       },
     });
@@ -782,15 +786,15 @@ class AdminForth {
             
             const record = body['record'];
             // execute hook if needed
-            if (resource.hooks?.create?.beforeSave) {
-                const resp = await resource.hooks?.create?.beforeSave({ resource, record, adminUser });
-                if (!resp || (!resp.ok && !resp.error)) {
-                  throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
-                }
-  
-                if (resp.error) {
-                  return { error: resp.error };
-                }
+            for (const hook of getFunctionList(resource.hooks?.create?.beforeSave)) {
+              const resp = await hook({ resource, record, adminUser });
+              if (!resp || (!resp.ok && !resp.error)) {
+                throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
+              }
+
+              if (resp.error) {
+                return { error: resp.error };
+              }
             }
 
             for (const column of resource.columns) {
@@ -828,15 +832,15 @@ class AdminForth {
             const connector = this.connectors[resource.dataSource];
             await connector.createRecord({ resource, record });
             // execute hook if needed
-            if (resource.hooks?.create?.afterSave) {
-                const resp = await resource.hooks?.create?.afterSave({ resource, record, adminUser });
-                if (!resp || (!resp.ok && !resp.error)) {
-                  throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
-                }
-  
-                if (resp.error) {
-                  return { error: resp.error };
-                }
+            for (const hook of getFunctionList(resource.hooks?.create?.afterSave)) {
+              const resp = await hook({ resource, record, adminUser });
+              if (!resp || (!resp.ok && !resp.error)) {
+                throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
+              }
+
+              if (resp.error) {
+                return { error: resp.error };
+              }
             }
 
             return {
@@ -863,17 +867,16 @@ class AdminForth {
             const record = body['record'];
 
             // execute hook if needed
-            if (resource.hooks?.edit?.beforeSave) {
-                const resp = await resource.hooks?.edit?.beforeSave({ resource, record, adminUser });
-                if (!resp || (!resp.ok && !resp.error)) {
-                  throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
-                }
-  
-                if (resp.error) {
-                  return { error: resp.error };
-                }
-            }
+            for (const hook of getFunctionList(resource.hooks?.edit?.beforeSave)) {
+              const resp = await hook({ resource, record, adminUser });
+              if (!resp || (!resp.ok && !resp.error)) {
+                throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
+              }
 
+              if (resp.error) {
+                return { error: resp.error };
+              }
+            }
             const newValues = {};
 
             for (const recordField in record) {
@@ -893,15 +896,15 @@ class AdminForth {
             }
             
             // execute hook if needed
-            if (resource.hooks?.edit?.afterSave) {
-                const resp = await resource.hooks?.edit?.afterSave({ resource, record, adminUser });
-                if (!resp || (!resp.ok && !resp.error)) {
-                  throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
-                }
-  
-                if (resp.error) {
-                  return { error: resp.error };
-                }
+            for (const hook of getFunctionList(resource.hooks?.edit?.afterSave)) {
+              const resp = await hook({ resource, record, adminUser });
+              if (!resp || (!resp.ok && !resp.error)) {
+                throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
+              }
+
+              if (resp.error) {
+                return { error: resp.error };
+              }
             }
 
             return {
@@ -920,30 +923,30 @@ class AdminForth {
             }
 
             // execute hook if needed
-            if (resource.hooks?.delete?.beforeSave) {
-                const resp = await resource.hooks?.delete?.beforeSave({ resource, record, adminUser });
-                if (!resp || (!resp.ok && !resp.error)) {
-                  throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
-                }
-  
-                if (resp.error) {
-                  return { error: resp.error };
-                }
+            for (const hook of getFunctionList(resource.hooks?.delete?.beforeSave)) {
+              const resp = await hook({ resource, record, adminUser });
+              if (!resp || (!resp.ok && !resp.error)) {
+                throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
+              }
+
+              if (resp.error) {
+                return { error: resp.error };
+              }
             }
 
             const connector = this.connectors[resource.dataSource];
             await connector.deleteRecord({ resource, recordId: body['primaryKey']});
 
             // execute hook if needed
-            if (resource.hooks?.delete?.afterSave) {
-                const resp = await resource.hooks?.delete?.afterSave({ resource, record, adminUser });
-                if (!resp || (!resp.ok && !resp.error)) {
-                  throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
-                }
-  
-                if (resp.error) {
-                  return { error: resp.error };
-                }
+            for (const hook of getFunctionList(resource.hooks?.delete?.afterSave)) {
+              const resp = await hook({ resource, record, adminUser });
+              if (!resp || (!resp.ok && !resp.error)) {
+                throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
+              }
+
+              if (resp.error) {
+                return { error: resp.error };
+              }
             }
             return {
               recordId: body['primaryKey']

package/modules/utils.ts

@@ -14,7 +14,6 @@ export function guessLabelFromName(name) {
   }
 }
 
-
 export const currentFileDir = (metaUrl) => {
   const __filename = fileURLToPath(metaUrl);
   let __dirname = path.dirname(__filename);
@@ -33,4 +32,16 @@ export const ADMINFORTH_VERSION: string = package_json.version;
 
 export function getComponentNameFromPath(filePath) {
   return filePath.replace(/@/g, '').replace(/\./g, '').replace(/\//g, '');
+}
+
+export function getFunctionList(param?: Function | Array<Function>) {
+  if (param) {
+    if (Array.isArray(param)) {
+      return param;
+    } else {
+      return [param];
+    }
+  } else {
+    return [];
+  }
 }

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "adminforth",
-  "version": "1.0.62",
+  "version": "1.0.63",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "tsc",
-    "rollout": "tsc && cp -r spa dist/spa && npm version patch  && npm publish"
+    "rollout": "tsc && cp -r spa dist/spa && npm version patch  && npm publish",
+    "docs": "typedoc --out docs index.ts"
   },
   "author": "devforth.io",
   "license": "ISC",
@@ -26,6 +27,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.14.2",
+    "typedoc": "^0.25.13",
     "typescript": "^5.4.5"
   }
 }

package/plugins/ForeignInlineListPlugin/index.ts

@@ -32,7 +32,7 @@ export default class ForeignInlineListPlugin extends AdminForthPlugin {
       virtual: true,
       showIn: ['show'],
       component: {
-        show: this.componentPath('InlineList.vue'),
+        showRow: this.componentPath('InlineList.vue'),
       },
     });
   }

package/spa/src/App.vue

@@ -113,7 +113,8 @@
   </div>
   <div v-else class="flex items-center justify-center h-screen">
     <div class="text-3xl text-gray-400 animate-bounce">
-      ▶️
+      <svg aria-hidden="true" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/><path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/></svg>
+      <span class="sr-only">Loading...</span>
     </div>
   </div>
   <AcceptModal />
@@ -191,10 +192,12 @@ async function initRouter() {
 // initialize components based on data attribute selectors
 onMounted(async () => {
   initRouter();
-  initFlowbite();
+    setTimeout(() => {
+      initFlowbite();
+    }, 100); 
   await coreStore.fetchMenuAndResource();
   loginRedirectCheckIsReady.value = true;
-  title.value = coreStore.config.title || 'Admin Forth';
+  title.value = coreStore.config?.title || 'AdminForth';
   useHead({
   title: title.value,
   link: [

package/spa/src/views/ListView.vue

@@ -528,10 +528,7 @@ async function init() {
 }
 
 onMounted(async () => {
-  if (!coreStore.flowBitIsInitialised){
-     initFlowbite();
-     coreStore.flowBitIsInitialised = true;
-  }
+  
  
   await init();
 

package/spa/src/views/ShowView.vue

@@ -45,10 +45,28 @@
                 class="bg-form-view-bg odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
             >
               <component
-                  :is="showComponentsPerColumn[column.name] || ShowTableItem"
+                v-if="showRowComponentsPerColumn[column.name]"
+                  :is="showRowComponentsPerColumn[column.name]"
                   :column="column"
                   :row="coreStore.record"
               />
+              <template v-else>
+                <td class="px-6 py-4 whitespace-nowrap">
+                  {{ column.label }}
+                </td>
+                <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
+                  <component
+                    v-if="showComponentsPerColumn[column.name]"
+                    :is="showComponentsPerColumn[column.name]"
+                    :column="column"
+                    :row="coreStore.record"
+                  />
+                  <ValueRenderer v-else 
+                    :column="column" 
+                    :row="coreStore.record"
+                  />
+                </td>
+              </template>
             </tr>
         </tbody>
     </table>
@@ -76,6 +94,7 @@ const item = ref(null);
 const route = useRoute();
 const loading = ref(false);
 let showComponentsPerColumn = {};
+let showRowComponentsPerColumn = {};
 
 const coreStore = useCoreStore();
 
@@ -93,7 +112,14 @@ onMounted(async () => {
           acc[column.name] = getCustomComponent(column.component.show);
       }
       return acc;
-    }, {});
+  }, {});
+  showRowComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+      if (column.component?.showRow) {
+          acc[column.name] = getCustomComponent(column.component.showRow);
+      }
+      return acc;
+  }, {});
+
   loading.value = false;
 });
 

package/spa/tailwind.config.js

@@ -1,6 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content:  ["./src/**/*.{vue, js}","./src/*.{vue, js}", "./index.html", "./node_modules/flowbite/**/*.js"],
+  content:  ["./src/**/*.{vue, js, ts, tsx}","./src/*.{vue, js, ts, tsx}", "./index.html", "./node_modules/flowbite/**/*.js"],
   theme: {
     extend: {
       /* IMPORTANT:ADMINFORTH TAILWIND STYLES */

package/types/AdminForthConfig.ts

@@ -49,24 +49,24 @@ export type AdminForthResource = {
     plugins?: Array<AdminForthPlugin>,
     hooks?: {
       show?: {
-        beforeDatasourceRequest?: Function,
-        afterDatasourceResponse?: Function,
+        beforeDatasourceRequest?: Function | Array<Function>,
+        afterDatasourceResponse?: Function | Array<Function>,
       },
       list?: {
-        beforeDatasourceRequest?: Function,
-        afterDatasourceResponse?: Function,
+        beforeDatasourceRequest?: Function | Array<Function>,
+        afterDatasourceResponse?: Function | Array<Function>,
       },
       create?: {
-        beforeSave?: Function,
-        afterSave?: Function,
+        beforeSave?: Function | Array<Function>,
+        afterSave?: Function | Array<Function>,
       },
       edit?: {
-        beforeSave?: Function,
-        afterSave?: Function,
+        beforeSave?: Function | Array<Function>,
+        afterSave?: Function | Array<Function>,
       },
       delete?: {
-        beforeSave?: Function,
-        afterSave?: Function,
+        beforeSave?: Function | Array<Function>,
+        afterSave?: Function | Array<Function>,
       },
     },
     options?: {
@@ -134,9 +134,11 @@ export type DataSource = {
 }
 
 export type AdminForthResourceColumnComponent = {
-    show?: string,
+    show?: string,    // rewrite value in show
+    showRow?: string,  // rewrite full view table row (both <td> tags)
     create?: string,
     edit?: string,
+    list?: string,
 }
 
 

package/spa/src/components/ShowTableItem.vue

@@ -1,14 +0,0 @@
-<template>
-  <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="row" />
-  </td>
-</template>
-
-<script setup>
-import ValueRenderer from '@/components/ValueRenderer.vue';
-
-defineProps(['column', 'row']);
-</script>