@adminforth/crud-approve-plugin 1.0.19 → 1.0.21

package/build.log

@@ -11,5 +11,5 @@ custom/package.json
 custom/pnpm-lock.yaml
 custom/tsconfig.json
 
-sent 32,550 bytes  received 134 bytes  65,368.00 bytes/sec
-total size is 32,047  speedup is 0.98
+sent 32,790 bytes  received 134 bytes  65,848.00 bytes/sec
+total size is 32,287  speedup is 0.98

package/custom/ListPageDiffView.vue

@@ -15,6 +15,7 @@ const theme = computed(() => coreStore.theme);
 
 const oldContent = JSON.stringify(props.record[props.meta.resourceColumns.dataColumnName].oldRecord, null, 2)
 const newContent = JSON.stringify(props.record[props.meta.resourceColumns.dataColumnName].newRecord, null, 2)
+const hasChanges = oldContent !== newContent;
 
 const diffFile = ref();
 
@@ -53,7 +54,9 @@ function initDiffFile() {
   diffFile.value = file;
 }
 
-initDiffFile();
+if (hasChanges) {
+  initDiffFile();
+}
 
 watch([theme], ([t]) => {
   if (!diffFile.value) return;
@@ -65,6 +68,7 @@ watch([theme], ([t]) => {
 
 <template>
   <DiffView
+    v-if="hasChanges"
     :diff-file="diffFile"
     :diff-view-mode="DiffModeEnum.Unified"
     :diff-view-theme="theme === 'dark' ? 'dark' : 'light'"
@@ -72,6 +76,7 @@ watch([theme], ([t]) => {
     :diff-view-wrap="true"
     :diff-view-font-size="14"
   />
+  <div v-else>No changes</div>
   <div v-if="record[meta.resourceColumns.statusColumnName] === 1" style="margin-top: 16px; display: flex; gap: 8px;">
     <Button style="background-color: green; color: white;" @click="sendApproveRequest(true)" :loader="false" class="w-full">Approve</Button>
     <Button style="background-color: red; color: white;" @click="sendApproveRequest(false)" :loader="false" class="w-full">Reject</Button>

package/custom/ShowPageDiffView.vue

@@ -18,6 +18,7 @@ const mode = computed(() => isMobile.value ? DiffModeEnum.Unified : DiffModeEnum
 
 const oldContent = JSON.stringify(props.record[props.meta.resourceColumns.dataColumnName].oldRecord, null, 2)
 const newContent = JSON.stringify(props.record[props.meta.resourceColumns.dataColumnName].newRecord, null, 2)
+const hasChanges = oldContent !== newContent;
 
 const diffFile = ref();
 
@@ -58,7 +59,9 @@ function initDiffFile() {
   diffFile.value = file;
 }
 
-initDiffFile();
+if (hasChanges) {
+  initDiffFile();
+}
 
 watch([mode, theme], ([m, t]) => {
   if (!diffFile.value) return;
@@ -74,6 +77,7 @@ watch([mode, theme], ([m, t]) => {
 
 <template>
   <DiffView
+    v-if="hasChanges"
     :diff-file="diffFile"
     :diff-view-mode="mode"
     :diff-view-theme="theme === 'dark' ? 'dark' : 'light'"
@@ -81,9 +85,9 @@ watch([mode, theme], ([m, t]) => {
     :diff-view-wrap="true"
     :diff-view-font-size="14"
   />
+  <div v-else>No changes</div>
   <div v-if="record[meta.resourceColumns.statusColumnName] === 1" style="margin-top: 16px; display: flex; gap: 8px;">
     <Button style="background-color: green; color: white;" @click="sendApproveRequest(true)" :loader="false" class="w-full">Approve</Button>
     <Button style="background-color: red; color: white;" @click="sendApproveRequest(false)" :loader="false" class="w-full">Reject</Button>
   </div>
 </template>
-  

package/dist/custom/ListPageDiffView.vue

@@ -15,6 +15,7 @@ const theme = computed(() => coreStore.theme);
 
 const oldContent = JSON.stringify(props.record[props.meta.resourceColumns.dataColumnName].oldRecord, null, 2)
 const newContent = JSON.stringify(props.record[props.meta.resourceColumns.dataColumnName].newRecord, null, 2)
+const hasChanges = oldContent !== newContent;
 
 const diffFile = ref();
 
@@ -53,7 +54,9 @@ function initDiffFile() {
   diffFile.value = file;
 }
 
-initDiffFile();
+if (hasChanges) {
+  initDiffFile();
+}
 
 watch([theme], ([t]) => {
   if (!diffFile.value) return;
@@ -65,6 +68,7 @@ watch([theme], ([t]) => {
 
 <template>
   <DiffView
+    v-if="hasChanges"
     :diff-file="diffFile"
     :diff-view-mode="DiffModeEnum.Unified"
     :diff-view-theme="theme === 'dark' ? 'dark' : 'light'"
@@ -72,6 +76,7 @@ watch([theme], ([t]) => {
     :diff-view-wrap="true"
     :diff-view-font-size="14"
   />
+  <div v-else>No changes</div>
   <div v-if="record[meta.resourceColumns.statusColumnName] === 1" style="margin-top: 16px; display: flex; gap: 8px;">
     <Button style="background-color: green; color: white;" @click="sendApproveRequest(true)" :loader="false" class="w-full">Approve</Button>
     <Button style="background-color: red; color: white;" @click="sendApproveRequest(false)" :loader="false" class="w-full">Reject</Button>

package/dist/custom/ShowPageDiffView.vue

@@ -18,6 +18,7 @@ const mode = computed(() => isMobile.value ? DiffModeEnum.Unified : DiffModeEnum
 
 const oldContent = JSON.stringify(props.record[props.meta.resourceColumns.dataColumnName].oldRecord, null, 2)
 const newContent = JSON.stringify(props.record[props.meta.resourceColumns.dataColumnName].newRecord, null, 2)
+const hasChanges = oldContent !== newContent;
 
 const diffFile = ref();
 
@@ -58,7 +59,9 @@ function initDiffFile() {
   diffFile.value = file;
 }
 
-initDiffFile();
+if (hasChanges) {
+  initDiffFile();
+}
 
 watch([mode, theme], ([m, t]) => {
   if (!diffFile.value) return;
@@ -74,6 +77,7 @@ watch([mode, theme], ([m, t]) => {
 
 <template>
   <DiffView
+    v-if="hasChanges"
     :diff-file="diffFile"
     :diff-view-mode="mode"
     :diff-view-theme="theme === 'dark' ? 'dark' : 'light'"
@@ -81,9 +85,9 @@ watch([mode, theme], ([m, t]) => {
     :diff-view-wrap="true"
     :diff-view-font-size="14"
   />
+  <div v-else>No changes</div>
   <div v-if="record[meta.resourceColumns.statusColumnName] === 1" style="margin-top: 16px; display: flex; gap: 8px;">
     <Button style="background-color: green; color: white;" @click="sendApproveRequest(true)" :loader="false" class="w-full">Approve</Button>
     <Button style="background-color: red; color: white;" @click="sendApproveRequest(false)" :loader="false" class="w-full">Reject</Button>
   </div>
 </template>
-  

package/dist/index.js

@@ -119,25 +119,19 @@ export default class CRUDApprovePlugin extends AdminForthPlugin {
                 //@ts-ignore
             };
             for (const hook of hooks) {
-                const resp = yield hook({
-                    resource,
-                    record,
-                    adminUser,
-                    recordId,
-                    adminforth: this.adminforth,
-                    extra,
+                const resp = yield hook(Object.assign(Object.assign({ resource }, (action === AllowedActionsEnum.edit ? {} : { record })), { adminUser,
+                    recordId, adminforth: this.adminforth, extra,
                     updates,
-                    oldRecord,
-                });
-                if (!resp || (typeof resp.ok !== 'boolean' && (!resp.error && !resp.newRecordId))) {
-                    throw new Error(`Invalid return value from beforeSave hook. Expected: { ok: boolean, error?: string | null, newRecordId?: any }.\n` +
-                        `Note: Return { ok: false, error: null, newRecordId } to stop creation and redirect to an existing record.`);
+                    oldRecord }));
+                if (!resp || (typeof resp.ok !== 'boolean' && (!resp.error && !resp.redirectToRecordId))) {
+                    throw new Error(`Invalid return value from beforeSave hook. Expected: { ok: boolean, error?: string | null, redirectToRecordId?: any }.\n` +
+                        `Note: Return { ok: false, error: null, redirectToRecordId } to stop creation and redirect to an existing record.`);
                 }
                 if (resp.ok === false && !resp.error) {
-                    const { error, ok, newRecordId } = resp;
+                    const { error, redirectToRecordId } = resp;
                     return {
                         error: error !== null && error !== void 0 ? error : 'Operation aborted by hook',
-                        newRecordId: newRecordId
+                        redirectToRecordId,
                     };
                 }
                 if (resp.error) {
@@ -161,16 +155,10 @@ export default class CRUDApprovePlugin extends AdminForthPlugin {
                 hooks = resource.hooks.delete.afterSave;
             }
             for (const hook of hooks) {
-                const resp = yield hook({
-                    resource,
-                    record,
-                    adminUser,
-                    recordId,
-                    adminforth: this.adminforth,
-                    extra,
+                const resp = yield hook(Object.assign(Object.assign({ resource }, (action === AllowedActionsEnum.edit ? {} : { record })), { adminUser,
+                    recordId, adminforth: this.adminforth, extra,
                     updates,
-                    oldRecord,
-                });
+                    oldRecord }));
                 if (!resp || (!resp.ok && !resp.error)) {
                     throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
                 }

package/index.ts

@@ -176,9 +176,10 @@ export default class CRUDApprovePlugin extends AdminForthPlugin {
       //@ts-ignore
     }
     for (const hook of hooks) {
-      const resp = await hook({ 
-        resource, 
-        record, 
+      const resp = await hook({
+        resource,
+        // edit hooks get the changed fields only in updates, like in core
+        ...(action === AllowedActionsEnum.edit ? {} : { record }),
         adminUser,
         recordId,
         adminforth: this.adminforth,
@@ -186,17 +187,17 @@ export default class CRUDApprovePlugin extends AdminForthPlugin {
         updates,
         oldRecord,
       });
-      if (!resp || (typeof resp.ok !== 'boolean' && (!resp.error && !resp.newRecordId))) {
+      if (!resp || (typeof resp.ok !== 'boolean' && (!resp.error && !resp.redirectToRecordId))) {
         throw new Error(
-          `Invalid return value from beforeSave hook. Expected: { ok: boolean, error?: string | null, newRecordId?: any }.\n` +
-          `Note: Return { ok: false, error: null, newRecordId } to stop creation and redirect to an existing record.`
+          `Invalid return value from beforeSave hook. Expected: { ok: boolean, error?: string | null, redirectToRecordId?: any }.\n` +
+          `Note: Return { ok: false, error: null, redirectToRecordId } to stop creation and redirect to an existing record.`
         );
       }
       if (resp.ok === false && !resp.error) {
-        const { error, ok, newRecordId } = resp;
+        const { error, redirectToRecordId } = resp;
         return {
           error: error ?? 'Operation aborted by hook',
-          newRecordId: newRecordId
+          redirectToRecordId,
         };
       }
       if (resp.error) {
@@ -233,7 +234,7 @@ export default class CRUDApprovePlugin extends AdminForthPlugin {
     for (const hook of hooks) {
       const resp = await hook({
         resource,
-        record,
+        ...(action === AllowedActionsEnum.edit ? {} : { record }),
         adminUser,
         recordId,
         adminforth: this.adminforth,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/crud-approve-plugin",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.10.7",
-    "adminforth": "^3.1.2",
+    "adminforth": "^4.7.3",
     "semantic-release": "^24.2.1",
     "semantic-release-slack-bot": "^4.0.2",
     "typescript": "^5.7.3"