Merge branch 'next' of github.com:devforth/adminforth into next

Author: ivictbor

README.md

@@ -61,44 +61,50 @@ npx adminforth create-app
 
 The most convenient way to add new features or fixes is using `dev-demo`. It imports the source code of the repository and plugins so you can edit them and see changes on the fly.
 
-Fork repo, pull it and do next:
+To run dev demo:
+```sh
+cd dev-demo
 
+npm run setup-dev-demo
+npm run migrate:all
 
-```sh
-cd adminforth
-npm ci
-npm run build
+npm start
 ```
 
-To run dev demo:
-```sh
-cd dev-demo
-cp .env.sample .env
+## Adding columns to a database in dev-demo
 
-# this will install all official plugins and link adminforth package, if plugin installed it will git pull and npm ci
-npm run install-plugins
+Open `./migrations` folder. There is prisma migration folder for the sqlite, postgres and mysql and `clickhouse_migrations` folder for the clickhouse:
 
-# same for official adapters
-npm run install-adapters
+### Migrations for the MySQL, SQLite and Postgres
+To make migration add to the .prisma file in folder with database you need and add new tables or columns. Then run:
 
-npm ci
 
-./run_inventory.sh
+```
+npm run makemigration:sqlite -- --name init
+```
+
+and 
 
-npm run migrate:local
-npm start
+```
+npm run migrate:sqlite
 ```
 
-## Adding columns to a database in dev-demo
+to apply migration
+
+> use :sqlite, :mysql or :postgres for you case
+
+### Migrations for the clickhouse
 
-Open `.prisma` file, modify it, and run:
+In order to make migration for the clickhouse, go to the `./migrations/clickhouse_migrations` folder and add migration file to the folder.
 
+Then run
 ```
-npm run namemigration -- --name desctiption_of_changes
+npm run migrate:clickhouse
 ```
 
+to apply the migration.
 
-### Testing CLI commands during development
+## Testing CLI commands during development
 
 
 Make sure you have not `adminforth` globally installed. If you have it, remove it:

adminforth/basePlugin.ts

@@ -36,7 +36,7 @@ export default class AdminForthPlugin implements IAdminForthPlugin {
     return 'non-uniquely-identified';
   }
 
-  modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
+  modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource, allPluginInstances?: {pi: AdminForthPlugin, resource: AdminForthResource}[]) {
     this.resourceConfig = resourceConfig;
     const uniqueness = this.instanceUniqueRepresentation(this.pluginOptions);
 

adminforth/documentation/docs/tutorial/03-Customization/04-hooks.md

@@ -189,21 +189,29 @@ Let's limit it:
 ```ts title='./resources/apartments.ts'
 {
   ...
-  hooks: {
-    dropdownList: {
-      beforeDatasourceRequest: async ({ adminUser, query }: { adminUser: AdminUser, query: any }) => {
-        if (adminUser.dbUser.role !== "superadmin") {
-          query.filtersTools.replaceOrAddTopFilter(Filters.EQ("id", adminUser.dbUser.id));
-        };
-        return {
-          "ok": true,
-        };
-      }
+
+  foreignResource: { 
+    
+    ...
+
+    hooks: {
+      dropdownList: {
+        beforeDatasourceRequest: async ({ adminUser, query }: { adminUser: AdminUser, query: any }) => {
+          if (adminUser.dbUser.role !== "superadmin") {
+            query.filtersTools.replaceOrAddTopFilter(Filters.EQ("id", adminUser.dbUser.id));
+          };
+          return {
+            "ok": true,
+          };
+        }
+      },
     },
-  },
+  }
 }
 ```
 
+> ☝️☝️☝️ This hooks should be written only inside column. If you'll add it in resource hooks - it won't work
+
 In our case we limit the dropdown list to show only the current user, however you can use same sample to list only objects who are related to the current user in case if you will have relation configurations which require to show related objects which belongs to the current user.
 
 Flow diagram for dropdown list:

adminforth/documentation/docs/tutorial/07-Plugins/05-upload.md

@@ -524,7 +524,7 @@ To do this add avatar column to the user resource:
     role          String
     created_at    DateTime
     //diff-add
-    avatar        ?String
+    avatar        String?
   }
 ```
 

adminforth/documentation/docs/tutorial/08-Advanced/02-working-without-direct-database-connection.md

@@ -0,0 +1,21 @@
+# Working without direct database connection
+
+Out of the box, AdminForth connects directly to your database using one of the supported drivers (PostgreSQL, MySQL, ClickHouse, MongoDB) and executes queries against it.
+
+In some cases, you may not want to expose a direct database connection to AdminForth. Instead, you may prefer to allow AdminForth to access and modify data through your own APIs (for example, REST, GraphQL, or JSON-RPC).
+
+With this approach, AdminForth never connects to the database and never even knows its URL. All read and write operations go through your API layer.
+
+Why do this?
+
+- Your API may enforce additional constraints or validation rules.
+
+- You can precisely log all operations using your own logging or audit systems. (The built-in AuditLog tracks data modifications only and does not log read operations.)
+
+- Your API may contain custom logic, such as distributed workflows or complex data-modification rules.
+
+To implement this, you need to extend the data connector class and implement a small set of methods responsible for data access and mutations.
+
+This example demonstrates how to do this using GraphQL, but the same approach can be adapted to REST or any other protocol. The code comments include detailed guidance for these cases.
+
+Another reason to create a custom data source adapter is to support a database that AdminForth does not yet support. In that case, you are welcome to submit a pull request to AdminForth to add native support for that database.

adminforth/index.ts

@@ -216,24 +216,29 @@ class AdminForth implements IAdminForth {
     let activationLoopCounter = 0;
     while (true) {
       activationLoopCounter++;
-      if (activationLoopCounter > 1000) {
-        throw new Error('Plugin activation loop exceeded 1000 iterations, possible infinite loop (some plugin tries to activate himself in a loop)');
+      if (activationLoopCounter > 10) {
+        throw new Error('Plugin activation loop exceeded 10 iterations, possible infinite loop (some plugin tries to activate himself in a loop)');
       }
-      const allPluginsAreActivated = allPluginInstances.length === this.activatePlugins.length;
+      process.env.HEAVY_DEBUG && console.log(`🔌 Plugin activation loop iteration: ${activationLoopCounter}`);
+      process.env.HEAVY_DEBUG && console.log(`🔌 Activated plugins count: ${this.activatedPlugins.length}/${allPluginInstances.length}`);
+      const allPluginsAreActivated = allPluginInstances.length === this.activatedPlugins.length;
       if (allPluginsAreActivated) {
         break;
       }
-
+    
       const unactivatedPlugins = allPluginInstances.filter(({pi: pluginInstance}) => 
         !this.activatedPlugins.find((p) => p.pluginInstanceId === pluginInstance.pluginInstanceId)
       );
+
+      process.env.HEAVY_DEBUG && console.log(`🔌 Unactivated plugins remaining: ${unactivatedPlugins.length}`);
 
       process.env.HEAVY_DEBUG && console.log(`🔌 Unactivated plugins count: ${unactivatedPlugins.length}`);
 
       unactivatedPlugins.sort(({pi: a}, {pi: b}) => a.activationOrder - b.activationOrder);
-      
+      process.env.HEAVY_DEBUG && console.log(`🔌 Activating plugins in order:`, unactivatedPlugins.map(({pi}) => pi.constructor.name));
       unactivatedPlugins.forEach(
         ({pi: pluginInstance, resource}, index) => {
+          process.env.HEAVY_DEBUG && console.log("Activating plugin:",pluginInstance.constructor.name)
           process.env.HEAVY_DEBUG && console.log(`🔌 Activating plugin ${index + 1}/${allPluginInstances.length}: ${pluginInstance.constructor.name} for resource ${resource.resourceId}`);
           pluginInstance.modifyResourceConfig(this, resource, allPluginInstances);
           process.env.HEAVY_DEBUG && console.log(`🔌 Plugin ${pluginInstance.constructor.name} modifyResourceConfig completed`);
@@ -249,6 +254,7 @@ class AdminForth implements IAdminForth {
           process.env.HEAVY_DEBUG && console.log(`🔌 Plugin ${pluginInstance.constructor.name} activated successfully`);
         }
       );
+      process.env.HEAVY_DEBUG && console.log(`🔌activated plugins:`, this.activatedPlugins.map((pi) => pi.constructor.name));
     }
     process.env.HEAVY_DEBUG && console.log('🔌 All plugins activation completed');
   }

adminforth/modules/configValidator.ts

@@ -575,7 +575,7 @@ export default class ConfigValidator implements IConfigValidator {
         }
 
         // check suggestOnCreate types
-        if (inCol.suggestOnCreate !== undefined) {
+        if (inCol.suggestOnCreate !== undefined && typeof inCol.suggestOnCreate !== 'function') {
           if (!col.showIn.create) {
             errors.push(`Resource "${res.resourceId}" column "${col.name}" suggestOnCreate is present, while column is hidden on create page`);
           }

adminforth/modules/restApi.ts

@@ -635,6 +635,9 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
                     if (col.foreignResource?.unsetLabel) {
                       col.foreignResource.unsetLabel = await tr(col.foreignResource.unsetLabel, `resource.${resource.resourceId}.foreignResource.unsetLabel`);
                     }
+                    if (inCol.suggestOnCreate && typeof inCol.suggestOnCreate === 'function') {
+                      col.suggestOnCreate = await inCol.suggestOnCreate(adminUser);
+                    }
 
                     return {
                       ...col,

adminforth/spa/src/components/ResourceForm.vue

@@ -322,7 +322,7 @@ async function searchOptions(columnName: string, searchTerm: string) {
 
 
 const editableColumns = computed(() => {
-  return props.resource?.columns?.filter(column => column.showIn?.[mode.value] && (currentValues.value ? checkShowIf(column, currentValues.value) : true));
+  return props.resource?.columns?.filter(column => column.showIn?.[mode.value] && (currentValues.value ? checkShowIf(column, currentValues.value, props.resource.columns) : true));
 });
 
 const isValid = computed(() => {

adminforth/spa/src/components/ShowTable.vue

@@ -24,14 +24,14 @@
               dark:bg-darkShowTablesBodyBackground dark:border-darkShowTableBodyBorder block md:table-row"
           >
             <component
-                v-if="column.components?.showRow && checkShowIf(column, record)"
+                v-if="column.components?.showRow && checkShowIf(column, record, resource?.columns || [])"
                   :is="getCustomComponent(column.components.showRow)"
                   :meta="column.components.showRow.meta"
                   :column="column"
                   :resource="coreStore.resource"
                   :record="coreStore.record"
               />
-            <template v-else-if="checkShowIf(column, record)">
+            <template v-else-if="checkShowIf(column, record, resource?.columns || [])">
               <td class="px-6 py-4 relative block md:table-cell font-bold md:font-normal pb-0 md:pb-4">
                 {{ column.label }}
               </td>