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

Author: ivictbor

adminforth/dataConnectors/clickhouse.ts

@@ -499,6 +499,21 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
       return res;
     }
 
+    async deleteMany({ resource, recordIds }: { resource: AdminForthResource; recordIds: string[] }): Promise<number> {
+      const pkColumn = resource.dataSourceColumns.find((col) => col.primaryKey);
+      if (!pkColumn || !recordIds || recordIds.length === 0) {
+         return 0;
+       }
+      const paramNames = recordIds.map((_, idx) => `id${idx}`);
+      const conditions = paramNames.map((name) => `${pkColumn.name} = {${name}:${pkColumn._underlineType}}`).join(' OR ');
+      const queryParams = paramNames.reduce((acc, name, idx) => {acc[name] = recordIds[idx]; return acc;}, {} as Record<string, any>);
+      await this.client.command({
+        query: `ALTER TABLE ${this.dbName}.${resource.table} DELETE WHERE ${conditions}`,
+        query_params: queryParams,
+      });
+      return recordIds.length;
+    }
+
     close() {
       this.client.disconnect();
     }

adminforth/dataConnectors/mongo.ts

@@ -397,6 +397,15 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
         return res.deletedCount > 0;
     }
 
+    async deleteMany({ resource, recordIds }: { resource: AdminForthResource; recordIds: string[] }): Promise<number> {
+        if (!recordIds || recordIds.length === 0) {
+            return 0;
+        }
+        const collection = this.client.db().collection(resource.table);
+        const res = await collection.deleteMany({[this.getPrimaryKey(resource)]: { $in: recordIds }});
+        return res.deletedCount ?? 0;
+    }
+
     async close() {
         await this.client.close()
     }

adminforth/dataConnectors/mysql.ts

@@ -420,6 +420,17 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
     return res.rowCount > 0;
   }
 
+  async deleteMany({ resource, recordIds }: { resource: AdminForthResource; recordIds: string[] }): Promise<number> {
+    if (!recordIds || recordIds.length === 0) {
+      return 0;
+    }
+    const placeholders = recordIds.map(() => '?').join(',');
+    const query = `DELETE FROM ${resource.table} WHERE ${this.getPrimaryKey(resource)} IN (${placeholders})`;
+    dbLogger.trace(`🪲📜 MySQL Q: ${query} values: ${JSON.stringify([recordIds])}`);
+    const [result] = await this.client.execute(query, recordIds);
+    return result.affectedRows ?? 0;
+  }
+
   async close() {
     await this.client.end();
   }

adminforth/dataConnectors/postgres.ts

@@ -455,6 +455,17 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
         return res.rowCount > 0;
     }
 
+    async deleteMany({ resource, recordIds }: { resource: AdminForthResource; recordIds: string[]}): Promise<number> {
+        if (!recordIds || recordIds.length === 0) {
+            return 0;
+        }
+        const placeholders = recordIds.map((_, idx) => `$${idx + 1}`).join(', ');
+        const query = `DELETE FROM "${resource.table}" WHERE "${this.getPrimaryKey(resource)}" IN (${placeholders})`;
+        dbLogger.trace(`🪲📜 PG Q: ${query}, values: ${JSON.stringify([recordIds])}`);
+        const res = await this.client.query(query, recordIds);
+        return res.rowCount ?? 0;
+    }
+
     async close() {
         await this.client.end();
     }

adminforth/dataConnectors/sqlite.ts

@@ -382,6 +382,17 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
       return res.changes > 0;
     }
 
+    async deleteMany({ resource, recordIds }: { resource: AdminForthResource, recordIds: string[] }): Promise<number> {
+      if (!recordIds || recordIds.length === 0) {
+        return 0;
+      }
+      const placeholders = recordIds.map(() => '?').join(',');
+      const q = this.client.prepare(`DELETE FROM ${resource.table} WHERE ${this.getPrimaryKey(resource)} IN (${placeholders})`);
+      dbLogger.trace(`🪲📜 SQLITE Q: ${q}, params: ${JSON.stringify(recordIds)}`);
+      const res = await q.run(...recordIds);
+      return res.changes ?? 0;
+    }
+
     close() {
       this.client.close();
     }

adminforth/modules/codeInjector.ts

@@ -724,11 +724,16 @@ class CodeInjector implements ICodeInjector {
 
 
     /* hash checking */
-    // Here we use pnpm-lock.yaml, because this file will be anywat, even if user doesn't use it
-    const spaPnpmLockPath = path.join(this.spaTmpPath(), 'pnpm-lock.yaml');
-    const spaPnpmLock = yaml.parse(await fs.promises.readFile(spaPnpmLockPath, 'utf-8'));
-    const spaLockHash = hashify(spaPnpmLock);
-
+    let spaLockHash = '';
+    if (await this.doesUserHasPnpmLockFile(this.adminforth.config.customization.customComponentsDir)) {
+      const spaPnpmLockPath = path.join(this.spaTmpPath(), 'pnpm-lock.yaml');
+      const spaPnpmLock = yaml.parse(await fs.promises.readFile(spaPnpmLockPath, 'utf-8'));
+      spaLockHash = hashify(spaPnpmLock);
+    } else {
+      const spaNpmLockPath = path.join(this.spaTmpPath(), 'package-lock.json');
+      const spaNpmLock = JSON.parse(await fs.promises.readFile(spaNpmLockPath, 'utf-8'));
+      spaLockHash = hashify(spaNpmLock);
+    }
     /* customPackageLock */
     let usersLockHash: string = '';
     let usersPackages: string[] = [];
@@ -946,7 +951,9 @@ class CodeInjector implements ICodeInjector {
 
         // 🚫 Skip big files or files which might be dynamic
         if (file.name === 'node_modules' || file.name === 'dist' ||
-            file.name === 'i18n-messages.json' || file.name === 'i18n-empty.json' || file.name === 'hashes.json') {
+            file.name === 'i18n-messages.json' || file.name === 'i18n-empty.json' || 
+            file.name === 'hashes.json' || file.name === 'package.json' || 
+            file.name === 'pnpm-lock.yaml' || file.name === 'package-lock.json') {
           return '';
         }
 
@@ -974,7 +981,9 @@ class CodeInjector implements ICodeInjector {
 
         // 🚫 Skip big/dynamic folders or files
         if (file.name === 'node_modules' || file.name === 'dist' ||
-            file.name === 'i18n-messages.json' || file.name === 'i18n-empty.json' || file.name === 'hashes.json') {
+            file.name === 'i18n-messages.json' || file.name === 'i18n-empty.json' || 
+            file.name === 'hashes.json' || file.name === 'package.json' || 
+            file.name === 'pnpm-lock.yaml' || file.name === 'package-lock.json') {
           return;
         }
 
@@ -1041,9 +1050,7 @@ class CodeInjector implements ICodeInjector {
     const skipBuild = buildHash === sourcesHash;
     const skipExtract = messagesHash === sourcesHash;
 
-    afLogger.trace(`🪲 SPA build hash: ${buildHash}`);
     afLogger.trace(`🪲 SPA messages hash: ${messagesHash}`);
-    afLogger.trace(`🪲 SPA sources hash: ${sourcesHash}`);
 
     if (!skipBuild) {
       // remove serveDir if exists

adminforth/types/Back.ts

@@ -1760,6 +1760,8 @@ export interface IOperationalResource {
   update: (primaryKey: any, record: any) => Promise<any>;
 
   delete: (primaryKey: any) => Promise<boolean>;
+  
+  deleteMany?(recordIds: any[]): Promise<number>;
 
   dataConnector: IAdminForthDataSourceConnectorBase;
 }

dev-demo/Taskfile.yaml

@@ -30,6 +30,7 @@ vars:
     - "adminforth-quick-filters"
     - "adminforth-many2many"
     - "adminforth-background-jobs"
+    - "adminforth-auto-remove"
 
   ADAPTERS:
     - "adminforth-completion-adapter-open-ai-chat-gpt"