adminforth 1.2.33 → 1.2.34

package/dist/modules/configValidator.js

@@ -248,14 +248,25 @@ 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];
+                            let error = null;
                             yield Promise.all(selectedIds.map((recordId) => __awaiter(this, void 0, void 0, function* () {
                                 const record = yield connector.getRecordByPrimaryKey(res, recordId);
+                                yield Promise.all(res.hooks.delete.beforeSave.map((hook) => __awaiter(this, void 0, void 0, function* () {
+                                    const resp = yield hook({ resource: res, record, adminUser });
+                                    if (!error && resp.error) {
+                                        error = resp.error;
+                                    }
+                                })));
                                 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* () {
                                     yield hook({ resource: res, record, adminUser });
                                 })));
                             })));
+                            if (error) {
+                                return { error, ok: false };
+                            }
+                            return { ok: true };
                         })
                     });
                 }

package/modules/configValidator.ts

@@ -269,20 +269,40 @@ 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];
-              await Promise.all(selectedIds.map(async (recordId) => {
-                const record = await connector.getRecordByPrimaryKey(res, recordId);
-
-                await connector.deleteRecord({ resource: res, recordId });
-                // call afterDelete hook
-                await Promise.all(
-                  (res.hooks.delete.afterSave as AfterSaveFunction[]).map(
-                    async (hook) => {
-                      await hook({ resource: res, record, adminUser }); 
-                    }
+              let error = null;
+
+              await Promise.all(
+                selectedIds.map(async (recordId) => {
+                  const record = await connector.getRecordByPrimaryKey(res, recordId);
+
+                  await Promise.all(
+                    (res.hooks.delete.beforeSave as AfterSaveFunction[]).map(
+                      async (hook) => {
+                        const resp = await hook({ resource: res, record, adminUser }); 
+                        if (!error && resp.error) {
+                          error = resp.error;
+                        }
+                      }
+                    )
                   )
-                )
-                
-              }));
+                  
+                  await connector.deleteRecord({ resource: res, recordId });
+                  // call afterDelete hook
+                  await Promise.all(
+                    (res.hooks.delete.afterSave as AfterSaveFunction[]).map(
+                      async (hook) => {
+                        await hook({ resource: res, record, adminUser }); 
+                      }
+                    )
+                  )
+                  
+                })
+              );
+
+              if (error) {
+                return { error, ok: false };
+              }
+              return { ok: true };
             }
           });
         }

package/package.json

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

package/types/AdminForthConfig.ts

@@ -680,7 +680,7 @@ export type AdminForthBulkAction = {
    * Callback which will be called on backend when user clicks on action button.
    * It should return Promise which will be resolved when action is done.
    */
-  action: ({ resource, selectedIds, adminUser }: { resource: AdminForthResource, selectedIds: Array<any>, adminUser: AdminUser }) => Promise<void>,
+  action: ({ resource, selectedIds, adminUser }: { resource: AdminForthResource, selectedIds: Array<any>, adminUser: AdminUser }) => Promise<{ ok: boolean, error?: string }>,
 
   /**
    * Confirmation message which will be displayed to user before action is executed.