@adminforth/crud-approve-plugin 1.0.0 → 1.0.2

package/index.ts

@@ -54,7 +54,10 @@ export default class CRUDApprovePlugin extends AdminForthPlugin {
     }
   }
     
-  createApprovalRequest = async (resource: AdminForthResource, action: AllowedForReviewActionsEnum, data: Object, user: AdminUser, oldRecord?: Object, updates?: Object, extra?: HttpExtra) => {
+  createApprovalRequest = async (
+    {resource, action, data, user, oldRecord, updates, extra, record}:
+    {resource: AdminForthResource, action: AllowedForReviewActionsEnum, data: Object, user: AdminUser, record?: Object, oldRecord?: Object, updates?: Object, extra?: HttpExtra}
+  ) => {
     if (extra && extra.adminforth_plugin_crud_approve && extra.adminforth_plugin_crud_approve.callingFromApprovalPlugin) {
       return { ok: true, error: 'Approval request creation aborted to avoid infinite loop' };
     }
@@ -66,7 +69,7 @@ export default class CRUDApprovePlugin extends AdminForthPlugin {
     const connector = this.adminforth.connectors[resource.dataSource];
     if (action === AllowedForReviewActionsEnum.create) {
       oldRecord = {};
-      newRecord = updates;
+      newRecord = updates || record;
     } else if (action === AllowedForReviewActionsEnum.edit) {
       newRecord = await connector.getRecordByPrimaryKey(resource, recordId);
       for (const key in updates) { 
@@ -120,7 +123,7 @@ export default class CRUDApprovePlugin extends AdminForthPlugin {
     }
 
     const createdAt = dayjs.utc().format();
-    const record = {
+    const diffRecord = {
       [this.options.resourceColumns.idColumnName]: randomUUID(),
       [this.options.resourceColumns.resourceIdColumnName]: resource.resourceId,
       [this.options.resourceColumns.actionColumnName]: action,
@@ -132,7 +135,7 @@ export default class CRUDApprovePlugin extends AdminForthPlugin {
       [this.options.resourceColumns.extraColumnName]: extra || {},
     }
     const diffResource = this.adminforth.config.resources.find((r) => r.resourceId === this.diffResource.resourceId);
-    await this.adminforth.createResourceRecord({ resource: diffResource, record, adminUser: user});
+    await this.adminforth.createResourceRecord({ resource: diffResource, record: diffRecord, adminUser: user});
     return { ok: true, error: null };
   }
 
@@ -162,8 +165,6 @@ export default class CRUDApprovePlugin extends AdminForthPlugin {
       hooks = resource.hooks.delete.beforeSave;
     }
 
-    // mark that call is from approval plugin to avoid infinite loops
-    console.log('extra before save hooks:', extra);
     if (extra === undefined) {
       extra = {};
     }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@adminforth/crud-approve-plugin",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "publishConfig": {
     "access": "public"
   },
-  "description": "Adds manual approval for editing actions. Make your admins blame each other for their mistakes 😉",
+  "description": "Adds manual approval for actions which mutates state (standard edit&create/custom actions/custom rest apis). Allows your superadmins to prevent admins from misuse",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -21,7 +21,8 @@
   "license": "ISC",
   "dependencies": {
     "@adminforth/two-factors-auth": "^2.9.16",
-    "adminforth": "latest"
+    "dayjs": "^1.11.11",
+    "adminforth": "^2.13.0-next.51"
   },
   "peerDependencies": {
     "adminforth": "^2.13.0-next.51"