adminforth 1.2.23 → 1.2.25

package/dataConnectors/mongo.ts

@@ -1,11 +1,13 @@
 import dayjs from 'dayjs';
 import { MongoClient } from 'mongodb';
 import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, IAdminForthDataSourceConnector } from '../types/AdminForthConfig.js';
+import AdminForthBaseConnector from './baseConnector.js';
 
-class MongoConnector implements IAdminForthDataSourceConnector {
+class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataSourceConnector {
     db: MongoClient
 
     constructor({ url }: { url: string }) {
+        super();
         this.db = new MongoClient(url);
         (async () => {
             try {

package/dist/dataConnectors/mongo.js

@@ -10,8 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import dayjs from 'dayjs';
 import { MongoClient } from 'mongodb';
 import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
-class MongoConnector {
+import AdminForthBaseConnector from './baseConnector.js';
+class MongoConnector extends AdminForthBaseConnector {
     constructor({ url }) {
+        super();
         this.OperatorsMap = {
             [AdminForthFilterOperators.EQ]: (value) => value,
             [AdminForthFilterOperators.NE]: (value) => ({ $ne: value }),

package/dist/modules/codeInjector.js

@@ -404,6 +404,7 @@ class CodeInjector {
             const pluginPackages = [];
             // for every installed plugin generate packages
             for (const plugin of this.adminforth.activatedPlugins) {
+                console.log('🔧 Checking packages for plugin', plugin.customFolderPath);
                 const [lockHash, packages] = yield this.packagesFromNpm(plugin.customFolderPath);
                 if (packages.length) {
                     pluginPackages.push({

package/dist/modules/configValidator.js

@@ -405,5 +405,10 @@ export default class ConfigValidator {
             }
         });
         resource.dataSourceColumns = resource.columns.filter((col) => !col.virtual);
+        (resource.plugins || []).forEach((plugin) => {
+            if (plugin.validateConfigAfterDiscover) {
+                plugin.validateConfigAfterDiscover(this.adminforth, resource);
+            }
+        });
     }
 }

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

@@ -95,7 +95,7 @@
                           @input="setCurrentValue(column.name, $event.target.value)"
                       />
                       <textarea
-                          v-else-if="['text'].includes(column.type)"
+                          v-else-if="['text', 'richtext'].includes(column.type)"
                           class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
                           placeholder="Text"
                           :value="currentValues[column.name]"

package/modules/codeInjector.ts

@@ -462,6 +462,7 @@ class CodeInjector implements ICodeInjector {
 
     // for every installed plugin generate packages
     for (const plugin of this.adminforth.activatedPlugins) {
+      console.log('🔧 Checking packages for plugin', plugin.customFolderPath);
       const [lockHash, packages] = await this.packagesFromNpm(plugin.customFolderPath);
       if (packages.length) {
         pluginPackages.push({

package/modules/configValidator.ts

@@ -449,5 +449,10 @@ export default class ConfigValidator implements IConfigValidator {
       }
     })
     resource.dataSourceColumns = resource.columns.filter((col) => !col.virtual);
+    (resource.plugins || []).forEach((plugin) => {
+      if (plugin.validateConfigAfterDiscover) {
+        plugin.validateConfigAfterDiscover(this.adminforth, resource);
+      }
+    });
   }
 }

package/package.json

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

package/spa/src/components/ResourceForm.vue

@@ -95,7 +95,7 @@
                           @input="setCurrentValue(column.name, $event.target.value)"
                       />
                       <textarea
-                          v-else-if="['text'].includes(column.type)"
+                          v-else-if="['text', 'richtext'].includes(column.type)"
                           class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
                           placeholder="Text"
                           :value="currentValues[column.name]"

package/types/AdminForthConfig.ts

@@ -285,6 +285,12 @@ export interface IAdminForthPlugin {
   modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource): void;
   componentPath(componentFile: string): 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.
+   */
+  validateConfigAfterDiscover?(adminforth: IAdminForth, resourceConfig: AdminForthResource): void;
+
   /**
    * Here you can register custom endpoints for your plugin.
    *