adminforth 1.2.36 → 1.2.38

package/basePlugin.ts

@@ -3,7 +3,10 @@ import { getComponentNameFromPath } from './modules/utils.js';
 import { currentFileDir } from './modules/utils.js';
 import path from 'path';
 import fs from 'fs';
-import { v4 as uuidv4 } from 'uuid';
+
+// @ts-ignore
+import sha256 from 'crypto-js/sha256';
+
 
 export default class AdminForthPlugin implements IAdminForthPlugin {
 
@@ -12,19 +15,28 @@ export default class AdminForthPlugin implements IAdminForthPlugin {
   customFolderName: string = 'custom';
   pluginInstanceId: string;
   customFolderPath: string;
+  pluginOptions: any;
 
   constructor(pluginOptions: any, metaUrl: string) {
     // set up plugin here
     this.pluginDir = currentFileDir(metaUrl);
-    this.pluginInstanceId = uuidv4();
     this.customFolderPath = path.join(this.pluginDir, this.customFolderName);
+    this.pluginOptions = pluginOptions;
   }
 
   setupEndpoints(server: any) {
     
   }
 
+  instanceUniqueRepresentation(pluginOptions: any) : string {
+    return 'non-uniquely-identified';
+  }
+
   modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
+    this.pluginInstanceId = sha256(
+      `af_pl_${this.constructor.name}_${resourceConfig.resourceId}_${this.instanceUniqueRepresentation(this.pluginOptions)}`
+    ).toString();
+    console.log(`5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣ Plugin instance id: ${this.pluginInstanceId}`);
     this.adminforth = adminforth;
   }
 

package/dist/basePlugin.js

@@ -2,18 +2,24 @@ import { getComponentNameFromPath } from './modules/utils.js';
 import { currentFileDir } from './modules/utils.js';
 import path from 'path';
 import fs from 'fs';
-import { v4 as uuidv4 } from 'uuid';
+// @ts-ignore
+import sha256 from 'crypto-js/sha256';
 export default class AdminForthPlugin {
     constructor(pluginOptions, metaUrl) {
         this.customFolderName = 'custom';
         // set up plugin here
         this.pluginDir = currentFileDir(metaUrl);
-        this.pluginInstanceId = uuidv4();
         this.customFolderPath = path.join(this.pluginDir, this.customFolderName);
+        this.pluginOptions = pluginOptions;
     }
     setupEndpoints(server) {
     }
+    instanceUniqueRepresentation(pluginOptions) {
+        return 'non-uniquely-identified';
+    }
     modifyResourceConfig(adminforth, resourceConfig) {
+        this.pluginInstanceId = sha256(`af_pl_${this.constructor.name}_${resourceConfig.resourceId}_${this.instanceUniqueRepresentation(this.pluginOptions)}`).toString();
+        console.log(`5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣5️⃣ Plugin instance id: ${this.pluginInstanceId}`);
         this.adminforth = adminforth;
     }
     componentPath(componentFile) {

package/dist/modules/configValidator.js

@@ -11,7 +11,8 @@ import { AdminForthResourcePages, AllowedActionsEnum, } from "../types/AdminFort
 import fs from 'fs';
 import path from 'path';
 import { guessLabelFromName } from './utils.js';
-import { v4 as uuid } from 'uuid';
+// @ts-ignore
+import sha256 from 'crypto-js/sha256';
 export default class ConfigValidator {
     constructor(adminforth, config) {
         this.adminforth = adminforth;
@@ -248,6 +249,7 @@ export default class ConfigValidator {
                         allowed: (_b) => __awaiter(this, [_b], void 0, function* ({ resource, adminUser, allowedActions }) { return allowedActions.delete; }),
                         action: (_c) => __awaiter(this, [_c], void 0, function* ({ selectedIds, adminUser }) {
                             const connector = this.adminforth.connectors[res.dataSource];
+                            // for now if at least one error, stop and return error
                             let error = null;
                             yield Promise.all(selectedIds.map((recordId) => __awaiter(this, void 0, void 0, function* () {
                                 const record = yield connector.getRecordByPrimaryKey(res, recordId);
@@ -257,6 +259,9 @@ export default class ConfigValidator {
                                         error = resp.error;
                                     }
                                 })));
+                                if (error) {
+                                    return;
+                                }
                                 yield connector.deleteRecord({ resource: res, recordId });
                                 // call afterDelete hook
                                 yield Promise.all(res.hooks.delete.afterSave.map((hook) => __awaiter(this, void 0, void 0, function* () {
@@ -270,10 +275,12 @@ export default class ConfigValidator {
                         })
                     });
                 }
-                const newBulkActions = bulkActions.map((action) => {
-                    return Object.assign(action, { id: uuid() });
+                bulkActions.map((action) => {
+                    if (!action.id) {
+                        action.id = sha256(action.label).toString();
+                    }
                 });
-                res.options.bulkActions = newBulkActions;
+                res.options.bulkActions = bulkActions;
                 // if pageInjection is a string, make array with one element. Also check file exists
                 const possibleInjections = ['beforeBreadcrumbs', 'afterBreadcrumbs', 'bottom'];
                 if (res.options.pageInjections) {

package/dist/modules/restApi.js

@@ -200,9 +200,9 @@ export default class AdminForthRestAPI {
         function interpretResource(adminUser, resource, meta, source) {
             return __awaiter(this, void 0, void 0, function* () {
                 var _a;
-                if (process.env.HEAVY_DEBUG) {
-                    console.log('🪲Interpreting resource', resource.resourceId, source, 'adminUser', adminUser);
-                }
+                // if (process.env.HEAVY_DEBUG) {
+                //   console.log('🪲Interpreting resource', resource.resourceId, source, 'adminUser', adminUser);
+                // }
                 const allowedActions = {};
                 yield Promise.all(Object.entries(((_a = resource.options) === null || _a === void 0 ? void 0 : _a.allowedActions) || {}).map((_b) => __awaiter(this, [_b], void 0, function* ([key, value]) {
                     if (process.env.HEAVY_DEBUG) {
@@ -246,7 +246,6 @@ export default class AdminForthRestAPI {
                 yield Promise.all(resource.options.bulkActions.map((action) => __awaiter(this, void 0, void 0, function* () {
                     if (action.allowed) {
                         const res = yield action.allowed({ adminUser, resource, allowedActions });
-                        console.log('🪲🪲🪲🪲checking for allowedActions', allowedActions, 'res', res);
                         if (res) {
                             allowedBulkActions.push(action);
                         }
@@ -622,13 +621,10 @@ export default class AdminForthRestAPI {
                 if (!execAllowed) {
                     return { error: `Action '${actionId}' is not allowed` };
                 }
-                yield action.action({ selectedIds: recordIds, adminUser, resource });
-                return {
-                    actionId,
+                const response = yield action.action({ selectedIds: recordIds, adminUser, resource });
+                return Object.assign({ actionId,
                     recordIds,
-                    resourceId,
-                    status: 'success'
-                };
+                    resourceId }, response);
             })
         });
         // setup endpoints for all plugins

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

@@ -41,7 +41,7 @@
                         :value="currentValues[column.name]"
                         @update:value="setCurrentValue(column.name, $event)"
                         :meta="column.components[props.source].meta"
-                        :record="props.record"
+                        :record="currentValues"
                         @update:inValidity="customComponentsInValidity[column.name] = $event"
                         @update:emptiness="customComponentsEmptiness[column.name] = $event"
                       />
@@ -238,6 +238,8 @@ const setCurrentValue = (key, value) => {
   } else {
     currentValues.value[key] = value;
   }
+  currentValues.value = { ...currentValues.value };
+  console.log('3️⃣ setCurrentValue', key, value);
   emit('update:record', currentValues.value);
 };
 

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

@@ -228,7 +228,7 @@ import { callAdminForthApi, getIcon } from '@/utils';
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
 import { useCoreStore } from '@/stores/core';
-import { showSuccesTost } from '@/composables/useFrontendApi';
+import { showSuccesTost, showErrorTost } from '@/composables/useFrontendApi';
 import SkeleteLoader from '@/components/SkeleteLoader.vue';
 
 import {
@@ -368,22 +368,24 @@ async function deleteRecord(row) {
   if (data) {
     try {
       const res = await callAdminForthApi({
-      path: '/delete_record',
-      method: 'POST',
-      body: {
-        resourceId: props.resource.resourceId,
-        primaryKey: row._primaryKeyValue,
-      }});
+        path: '/delete_record',
+        method: 'POST',
+        body: {
+          resourceId: props.resource.resourceId,
+          primaryKey: row._primaryKeyValue,
+        }
+      });
       if (!res.error){
         emits('update:records', true)
         showSuccesTost('Record deleted successfully')
       } else {
-        console.error(res.error)
+        showErrorTost(res.error)
       }
 
     } catch (e) {
+      showErrorTost(`Something went wrong, please try again later`);
       console.error(e);
-      };
-    }
+    };
+  }
 }
 </script>

package/dist/spa/spa/src/utils.ts

@@ -42,7 +42,6 @@ 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, '');
-  console.log('resolving name', name);
   return resolveComponent(name);
 }
 

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

@@ -124,11 +124,7 @@ import { getCustomComponent } from '@/utils';
 
 import {
   IconBanOutline,
-  IconEyeSolid,
   IconFilterOutline,
-  IconPenSolid,
-  IconTrashBinSolid,
-  IconInboxOutline,
   IconPlusOutline
 } from '@iconify-prerendered/vue-flowbite';
 
@@ -137,13 +133,11 @@ import Filters from '@/components/Filters.vue';
 const filtersShow = ref(false);
 
 const coreStore = useCoreStore();
-const modalStore = useModalStore();
 const filtersStore = useFiltersStore();
 
 const route = useRoute();
 
 const page = ref(1);
-const filters = filtersStore.filters;
 const columnsMinMax = ref({});
 const sort = ref([]);
 
@@ -200,11 +194,6 @@ async function getList() {
   totalRows.value = data.total;
 }
 
-
-
-
-
-
 async function startBulkAction(actionId) {
   const data = await callAdminForthApi({
     path: '/start_bulk_action',
@@ -216,10 +205,13 @@ async function startBulkAction(actionId) {
 
     }
   });
-  if (data?.status === 'success') {
+  if (data?.ok) {
     checkboxes.value = [];
+    await getList();
+  }
+  if (data?.error) {
+    showErrorTost(data.error);
   }
-  await getList();
 }
 
 

package/modules/configValidator.ts

@@ -11,7 +11,9 @@ import {
 import fs from 'fs';
 import path from 'path';
 import { guessLabelFromName } from './utils.js';
-import { v4 as uuid } from 'uuid';
+
+// @ts-ignore
+import sha256 from 'crypto-js/sha256';
 
 export default class ConfigValidator implements IConfigValidator {
 
@@ -269,6 +271,8 @@ export default class ConfigValidator implements IConfigValidator {
             allowed: async ({ resource, adminUser, allowedActions }) => { return allowedActions.delete },
             action: async ({ selectedIds, adminUser }) => {
               const connector = this.adminforth.connectors[res.dataSource];
+
+              // for now if at least one error, stop and return error
               let error = null;
 
               await Promise.all(
@@ -285,6 +289,10 @@ export default class ConfigValidator implements IConfigValidator {
                       }
                     )
                   )
+
+                  if (error) {
+                    return;
+                  }
                   
                   await connector.deleteRecord({ resource: res, recordId });
                   // call afterDelete hook
@@ -307,10 +315,12 @@ export default class ConfigValidator implements IConfigValidator {
           });
         }
 
-        const newBulkActions = bulkActions.map((action) => {
-          return Object.assign(action, { id: uuid() });
+        bulkActions.map((action) => {
+          if (!action.id) {
+            action.id = sha256(action.label).toString();
+          }
         });
-        res.options.bulkActions = newBulkActions;
+        res.options.bulkActions = bulkActions;
 
         // if pageInjection is a string, make array with one element. Also check file exists
         const possibleInjections = ['beforeBreadcrumbs', 'afterBreadcrumbs', 'bottom'];

package/modules/restApi.ts

@@ -225,9 +225,9 @@ export default class AdminForthRestAPI {
     });
 
     async function interpretResource(adminUser: AdminUser, resource: AdminForthResource, meta: any, source: ActionCheckSource): Promise<{allowedActions: AllowedActionsResolved}> {
-      if (process.env.HEAVY_DEBUG) {
-        console.log('🪲Interpreting resource', resource.resourceId, source, 'adminUser', adminUser);
-      }
+      // if (process.env.HEAVY_DEBUG) {
+      //   console.log('🪲Interpreting resource', resource.resourceId, source, 'adminUser', adminUser);
+      // }
       const allowedActions = {};
 
       await Promise.all(
@@ -281,7 +281,6 @@ export default class AdminForthRestAPI {
           resource.options.bulkActions.map(async (action) => {
             if (action.allowed) {
               const res = await action.allowed({ adminUser, resource, allowedActions });
-              console.log('🪲🪲🪲🪲checking for allowedActions', allowedActions, 'res', res);
               if (res) {
                 allowedBulkActions.push(action);
               }
@@ -712,13 +711,13 @@ export default class AdminForthRestAPI {
             if (!execAllowed) {
               return { error: `Action '${actionId}' is not allowed` };
             }
-            await action.action({selectedIds: recordIds, adminUser, resource});
+            const response = await action.action({selectedIds: recordIds, adminUser, resource});
             
             return {
               actionId,
               recordIds,
               resourceId,
-              status: 'success'
+              ...response
             }
         }
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.2.36",
+  "version": "1.2.38",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,6 +18,7 @@
     "@clickhouse/client": "^1.4.0",
     "better-sqlite3": "^10.0.0",
     "crypto": "^1.0.1",
+    "crypto-js": "^4.2.0",
     "dayjs": "^1.11.11",
     "express": "^4.19.2",
     "filewatcher": "^3.0.1",

package/spa/src/components/ResourceForm.vue

@@ -41,7 +41,7 @@
                         :value="currentValues[column.name]"
                         @update:value="setCurrentValue(column.name, $event)"
                         :meta="column.components[props.source].meta"
-                        :record="props.record"
+                        :record="currentValues"
                         @update:inValidity="customComponentsInValidity[column.name] = $event"
                         @update:emptiness="customComponentsEmptiness[column.name] = $event"
                       />
@@ -238,6 +238,8 @@ const setCurrentValue = (key, value) => {
   } else {
     currentValues.value[key] = value;
   }
+  currentValues.value = { ...currentValues.value };
+  console.log('3️⃣ setCurrentValue', key, value);
   emit('update:record', currentValues.value);
 };
 

package/spa/src/components/ResourceListTable.vue

@@ -228,7 +228,7 @@ import { callAdminForthApi, getIcon } from '@/utils';
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
 import { useCoreStore } from '@/stores/core';
-import { showSuccesTost } from '@/composables/useFrontendApi';
+import { showSuccesTost, showErrorTost } from '@/composables/useFrontendApi';
 import SkeleteLoader from '@/components/SkeleteLoader.vue';
 
 import {
@@ -368,22 +368,24 @@ async function deleteRecord(row) {
   if (data) {
     try {
       const res = await callAdminForthApi({
-      path: '/delete_record',
-      method: 'POST',
-      body: {
-        resourceId: props.resource.resourceId,
-        primaryKey: row._primaryKeyValue,
-      }});
+        path: '/delete_record',
+        method: 'POST',
+        body: {
+          resourceId: props.resource.resourceId,
+          primaryKey: row._primaryKeyValue,
+        }
+      });
       if (!res.error){
         emits('update:records', true)
         showSuccesTost('Record deleted successfully')
       } else {
-        console.error(res.error)
+        showErrorTost(res.error)
       }
 
     } catch (e) {
+      showErrorTost(`Something went wrong, please try again later`);
       console.error(e);
-      };
-    }
+    };
+  }
 }
 </script>

package/spa/src/utils.ts

@@ -42,7 +42,6 @@ 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, '');
-  console.log('resolving name', name);
   return resolveComponent(name);
 }
 

package/spa/src/views/ListView.vue

@@ -124,11 +124,7 @@ import { getCustomComponent } from '@/utils';
 
 import {
   IconBanOutline,
-  IconEyeSolid,
   IconFilterOutline,
-  IconPenSolid,
-  IconTrashBinSolid,
-  IconInboxOutline,
   IconPlusOutline
 } from '@iconify-prerendered/vue-flowbite';
 
@@ -137,13 +133,11 @@ import Filters from '@/components/Filters.vue';
 const filtersShow = ref(false);
 
 const coreStore = useCoreStore();
-const modalStore = useModalStore();
 const filtersStore = useFiltersStore();
 
 const route = useRoute();
 
 const page = ref(1);
-const filters = filtersStore.filters;
 const columnsMinMax = ref({});
 const sort = ref([]);
 
@@ -200,11 +194,6 @@ async function getList() {
   totalRows.value = data.total;
 }
 
-
-
-
-
-
 async function startBulkAction(actionId) {
   const data = await callAdminForthApi({
     path: '/start_bulk_action',
@@ -216,10 +205,13 @@ async function startBulkAction(actionId) {
 
     }
   });
-  if (data?.status === 'success') {
+  if (data?.ok) {
     checkboxes.value = [];
+    await getList();
+  }
+  if (data?.error) {
+    showErrorTost(data.error);
   }
-  await getList();
 }
 
 

package/types/AdminForthConfig.ts

@@ -276,6 +276,7 @@ export interface IAdminForthPlugin {
   customFolderName: string;
   pluginInstanceId: string;
   customFolderPath: string;
+  pluginOptions: any;
 
   /**
    * AdminForth plugins concept is based on modification of full AdminForth configuration
@@ -289,6 +290,17 @@ export interface IAdminForthPlugin {
   modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource): void;
   componentPath(componentFile: string): string;
 
+  /**
+   * If plugin should support multiple installations per one resource, this function that should return unique string for each instance of plugin.
+   * For example if plugin is installed for one column and this column defined as
+   * `targetColumn` in plugin options, then this method should return `${pluginOptions.targetColumn}`.
+   * 
+   * If plugin should support only one installation per resource, option can return  'single'
+   * @param pluginOptions - options of plugin
+   */
+  instanceUniqueRepresentation(pluginOptions: any) : string;
+
+
   /**
    * Optional method which will be called after AdminForth discovers all resources and their columns.
    * Can be used to validate types of columns, check if some columns are missing, etc.