adminforth 1.2.36 → 1.2.37

package/dist/modules/configValidator.js

@@ -248,6 +248,7 @@ 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];
+                            // for now if at least one error, stop and return error
                             let error = null;
                             yield Promise.all(selectedIds.map((recordId) => __awaiter(this, void 0, void 0, function* () {
                                 const record = yield connector.getRecordByPrimaryKey(res, recordId);
@@ -257,6 +258,9 @@ export default class ConfigValidator {
                                         error = resp.error;
                                     }
                                 })));
+                                if (error) {
+                                    return;
+                                }
                                 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* () {

package/dist/modules/restApi.js

@@ -622,13 +622,10 @@ export default class AdminForthRestAPI {
                 if (!execAllowed) {
                     return { error: `Action '${actionId}' is not allowed` };
                 }
-                yield action.action({ selectedIds: recordIds, adminUser, resource });
-                return {
-                    actionId,
+                const response = yield action.action({ selectedIds: recordIds, adminUser, resource });
+                return Object.assign({ actionId,
                     recordIds,
-                    resourceId,
-                    status: 'success'
-                };
+                    resourceId }, response);
             })
         });
         // setup endpoints for all plugins

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

@@ -228,7 +228,7 @@ import { callAdminForthApi, getIcon } from '@/utils';
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
 import { useCoreStore } from '@/stores/core';
-import { showSuccesTost } from '@/composables/useFrontendApi';
+import { showSuccesTost, showErrorTost } from '@/composables/useFrontendApi';
 import SkeleteLoader from '@/components/SkeleteLoader.vue';
 
 import {
@@ -368,22 +368,24 @@ async function deleteRecord(row) {
   if (data) {
     try {
       const res = await callAdminForthApi({
-      path: '/delete_record',
-      method: 'POST',
-      body: {
-        resourceId: props.resource.resourceId,
-        primaryKey: row._primaryKeyValue,
-      }});
+        path: '/delete_record',
+        method: 'POST',
+        body: {
+          resourceId: props.resource.resourceId,
+          primaryKey: row._primaryKeyValue,
+        }
+      });
       if (!res.error){
         emits('update:records', true)
         showSuccesTost('Record deleted successfully')
       } else {
-        console.error(res.error)
+        showErrorTost(res.error)
       }
 
     } catch (e) {
+      showErrorTost(`Something went wrong, please try again later`);
       console.error(e);
-      };
-    }
+    };
+  }
 }
 </script>

package/dist/spa/spa/src/views/ListView.vue

@@ -200,11 +200,6 @@ async function getList() {
   totalRows.value = data.total;
 }
 
-
-
-
-
-
 async function startBulkAction(actionId) {
   const data = await callAdminForthApi({
     path: '/start_bulk_action',
@@ -216,10 +211,13 @@ async function startBulkAction(actionId) {
 
     }
   });
-  if (data?.status === 'success') {
+  if (data?.ok) {
     checkboxes.value = [];
+    await getList();
+  }
+  if (data?.error) {
+    showErrorTost(data.error);
   }
-  await getList();
 }
 
 

package/modules/configValidator.ts

@@ -269,6 +269,8 @@ 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];
+
+              // for now if at least one error, stop and return error
               let error = null;
 
               await Promise.all(
@@ -285,6 +287,10 @@ export default class ConfigValidator implements IConfigValidator {
                       }
                     )
                   )
+
+                  if (error) {
+                    return;
+                  }
                   
                   await connector.deleteRecord({ resource: res, recordId });
                   // call afterDelete hook

package/modules/restApi.ts

@@ -712,13 +712,13 @@ export default class AdminForthRestAPI {
             if (!execAllowed) {
               return { error: `Action '${actionId}' is not allowed` };
             }
-            await action.action({selectedIds: recordIds, adminUser, resource});
+            const response = await action.action({selectedIds: recordIds, adminUser, resource});
             
             return {
               actionId,
               recordIds,
               resourceId,
-              status: 'success'
+              ...response
             }
         }
     })

package/package.json

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

package/spa/src/components/ResourceListTable.vue

@@ -228,7 +228,7 @@ import { callAdminForthApi, getIcon } from '@/utils';
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
 import { useCoreStore } from '@/stores/core';
-import { showSuccesTost } from '@/composables/useFrontendApi';
+import { showSuccesTost, showErrorTost } from '@/composables/useFrontendApi';
 import SkeleteLoader from '@/components/SkeleteLoader.vue';
 
 import {
@@ -368,22 +368,24 @@ async function deleteRecord(row) {
   if (data) {
     try {
       const res = await callAdminForthApi({
-      path: '/delete_record',
-      method: 'POST',
-      body: {
-        resourceId: props.resource.resourceId,
-        primaryKey: row._primaryKeyValue,
-      }});
+        path: '/delete_record',
+        method: 'POST',
+        body: {
+          resourceId: props.resource.resourceId,
+          primaryKey: row._primaryKeyValue,
+        }
+      });
       if (!res.error){
         emits('update:records', true)
         showSuccesTost('Record deleted successfully')
       } else {
-        console.error(res.error)
+        showErrorTost(res.error)
       }
 
     } catch (e) {
+      showErrorTost(`Something went wrong, please try again later`);
       console.error(e);
-      };
-    }
+    };
+  }
 }
 </script>

package/spa/src/views/ListView.vue

@@ -200,11 +200,6 @@ async function getList() {
   totalRows.value = data.total;
 }
 
-
-
-
-
-
 async function startBulkAction(actionId) {
   const data = await callAdminForthApi({
     path: '/start_bulk_action',
@@ -216,10 +211,13 @@ async function startBulkAction(actionId) {
 
     }
   });
-  if (data?.status === 'success') {
+  if (data?.ok) {
     checkboxes.value = [];
+    await getList();
+  }
+  if (data?.error) {
+    showErrorTost(data.error);
   }
-  await getList();
 }