adminforth 1.2.82 → 1.2.84

package/basePlugin.ts

@@ -15,6 +15,9 @@ export default class AdminForthPlugin implements IAdminForthPlugin {
   pluginInstanceId: string;
   customFolderPath: string;
   pluginOptions: any;
+  resourceConfig: AdminForthResource;
+
+  activationOrder: number = 0;
 
   constructor(pluginOptions: any, metaUrl: string) {
     // set up plugin here
@@ -32,7 +35,7 @@ export default class AdminForthPlugin implements IAdminForthPlugin {
   }
 
   modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
-
+    this.resourceConfig = resourceConfig;
     const uniqueness = this.instanceUniqueRepresentation(this.pluginOptions);
 
     const seed = `af_pl_${this.constructor.name}_${resourceConfig.resourceId}_${uniqueness}`;

package/dist/basePlugin.js

@@ -6,6 +6,7 @@ import crypto from 'crypto';
 export default class AdminForthPlugin {
     constructor(pluginOptions, metaUrl) {
         this.customFolderName = 'custom';
+        this.activationOrder = 0;
         // set up plugin here
         this.pluginDir = currentFileDir(metaUrl);
         this.customFolderPath = path.join(this.pluginDir, this.customFolderName);
@@ -17,6 +18,7 @@ export default class AdminForthPlugin {
         return 'non-uniquely-identified';
     }
     modifyResourceConfig(adminforth, resourceConfig) {
+        this.resourceConfig = resourceConfig;
         const uniqueness = this.instanceUniqueRepresentation(this.pluginOptions);
         const seed = `af_pl_${this.constructor.name}_${resourceConfig.resourceId}_${uniqueness}`;
         this.pluginInstanceId = crypto.createHash('sha256').update(seed).digest('hex');

package/dist/index.js

@@ -51,19 +51,24 @@ class AdminForth {
     }
     activatePlugins() {
         process.env.HEAVY_DEBUG && console.log('🔌🔌🔌 Activating plugins');
+        const allPluginInstances = [];
         for (let resource of this.config.resources) {
             for (let pluginInstance of resource.plugins || []) {
-                pluginInstance.modifyResourceConfig(this, resource);
-                const plugin = this.activatedPlugins.find((p) => p.pluginInstanceId === pluginInstance.pluginInstanceId);
-                if (plugin) {
-                    process.env.HEAVY_DEBUG && console.log(`Current plugin pluginInstance.pluginInstanceId ${pluginInstance.pluginInstanceId}`);
-                    throw new Error(`Attempt to activate Plugin ${pluginInstance.constructor.name} second time for same resource, but plugin does not support it. 
-            To support multiple plugin instance pre one resource, plugin should return unique string values for each installation from instanceUniqueRepresentation`);
-                }
-                this.activatedPlugins.push(pluginInstance);
+                allPluginInstances.push({ pi: pluginInstance, resource });
             }
         }
-        ;
+        allPluginInstances.sort(({ pi: a }, { pi: b }) => a.activationOrder - b.activationOrder);
+        console.log('🔌🔌🔌 Activating plugins', allPluginInstances.map(({ pi }) => pi.activationOrder));
+        allPluginInstances.forEach(({ pi: pluginInstance, resource }) => {
+            pluginInstance.modifyResourceConfig(this, resource);
+            const plugin = this.activatedPlugins.find((p) => p.pluginInstanceId === pluginInstance.pluginInstanceId);
+            if (plugin) {
+                process.env.HEAVY_DEBUG && console.log(`Current plugin pluginInstance.pluginInstanceId ${pluginInstance.pluginInstanceId}`);
+                throw new Error(`Attempt to activate Plugin ${pluginInstance.constructor.name} second time for same resource, but plugin does not support it. 
+            To support multiple plugin instance pre one resource, plugin should return unique string values for each installation from instanceUniqueRepresentation`);
+            }
+            this.activatedPlugins.push(pluginInstance);
+        });
     }
     discoverDatabases() {
         return __awaiter(this, void 0, void 0, function* () {

package/index.ts

@@ -20,6 +20,7 @@ import AdminForthPlugin from './basePlugin.js';
 import ConfigValidator from './modules/configValidator.js';
 import AdminForthRestAPI from './modules/restApi.js';
 import ClickhouseConnector from './dataConnectors/clickhouse.js';
+import { pid } from 'process';
 
 // exports
 export * from './types/AdminForthConfig.js'; 
@@ -79,8 +80,16 @@ class AdminForth implements IAdminForth {
 
   activatePlugins() {
     process.env.HEAVY_DEBUG && console.log('🔌🔌🔌 Activating plugins');
+    const allPluginInstances = [];
     for (let resource of this.config.resources) {
       for (let pluginInstance of resource.plugins || []) {
+        allPluginInstances.push({pi: pluginInstance, resource});
+      }
+    }
+    allPluginInstances.sort(({pi: a}, {pi: b}) => a.activationOrder - b.activationOrder);
+    console.log('🔌🔌🔌 Activating plugins', allPluginInstances.map(({pi}) => pi.activationOrder));
+    allPluginInstances.forEach(
+      ({pi: pluginInstance, resource}) => {
         pluginInstance.modifyResourceConfig(this, resource);
         const plugin = this.activatedPlugins.find((p) => p.pluginInstanceId === pluginInstance.pluginInstanceId);
         if (plugin) {
@@ -91,7 +100,7 @@ class AdminForth implements IAdminForth {
         }
         this.activatedPlugins.push(pluginInstance);
       }
-    };
+    );
   }
 
   async discoverDatabases() {

package/package.json

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

package/spa/src/App.vue

@@ -108,11 +108,10 @@
 
 
         <div id="dropdown-cta" class="p-4 mt-6 rounded-lg bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
-          fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent text-sm
-        " role="alert"
+          fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent text-sm" role="alert"
           v-if="ctaBadge"
         >
-          <div class="flex items-center mb-3">
+          <div class="flex items-center mb-3" :class="!ctaBadge.title ? 'float-right' : ''">
             <!-- <span class="bg-lightPrimaryOpacity dark:bg-darkPrimaryOpacity  text-sm font-semibold me-2 px-2.5 py-0.5 rounded "
               v-if="ctaBadge.title"
             > -->
@@ -121,6 +120,7 @@
             </span>
             <button type="button" 
               class="ms-auto -mx-1.5 -my-1.5 bg-lightPrimaryOpacity dark:bg-darkPrimaryOpacity inline-flex justify-center items-center w-6 h-6  rounded-lg  p-1 hover:brightness-110" 
+              
               data-dismiss-target="#dropdown-cta" aria-label="Close"
               v-if="ctaBadge?.closable" @click="closeCTA"
             >

package/spa/src/components/ResourceForm.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="rounded-default">
     <div 
-      class="relative overflow-hidden shadow-resourseFormShadow dark:shadow-darkResourseFormShadow sm:rounded-lg dark:shadow-2xl  rounded-default"
+      class="relative shadow-resourseFormShadow dark:shadow-darkResourseFormShadow sm:rounded-lg dark:shadow-2xl  rounded-default"
     >
       <form autocomplete="off" @submit.prevent>
         <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 ">

package/types/AdminForthConfig.ts

@@ -277,6 +277,14 @@ export interface IAdminForthPlugin {
   pluginInstanceId: string;
   customFolderPath: string;
   pluginOptions: any;
+  resourceConfig: AdminForthResource;
+
+  /**
+   * Before activating all plugins are sorted by this number and then activated in order.
+   * If you want to make sure that your plugin is activated after some other plugin, set this number to higher value. (default is 0)
+   */
+  activationOrder: number;
+
 
   /**
    * AdminForth plugins concept is based on modification of full AdminForth configuration