Merge branch 'main' of github.com:devforth/adminforth-audit-log

Author: yaroslav8765

custom/RelatedLogsLink.vue

@@ -0,0 +1,56 @@
+<template>
+    <div class="pt-2 flex justify-end">
+        <RouterLink :to="to" class="text-lightPrimary hover:underline dark:text-darkPrimary break-all ">
+          <IconClockSolid class="inline w-4 h-4 me-1 mb-0.5"/>
+          Edits History
+        </RouterLink>
+    </div>
+</template>
+<script setup lang="ts">
+import { computed } from 'vue';
+import { IconClockSolid } from '@iconify-prerendered/vue-flowbite';
+
+const props = defineProps<{
+  column: any;
+  record: any;
+  meta: any;
+  resource: any;
+  adminUser: any;
+}>();
+
+const to = computed(() => {
+  try {
+    const resourceIdCol = props.meta.resourceColumns.resourceIdColumnName;
+    const recordIdCol = props.meta.resourceColumns.resourceRecordIdColumnName;
+
+    const auditResourceId = props.meta?.auditLogResourceId || 'audit_log';
+    const isAuditLogResource = props.resource?.resourceId === auditResourceId;
+
+    let resourceId: any;
+    let recordId: any;
+    if (isAuditLogResource) {
+      resourceId = props.record?.[resourceIdCol];
+      recordId = props.record?.[recordIdCol];
+    } else {
+      const pkColName = props.resource?.columns?.find((c: any) => c.primaryKey)?.name;
+      resourceId = props.resource?.resourceId;
+      recordId = pkColName ? props.record?.[pkColName] : undefined;
+    }
+
+    const query: Record<string, string> = {};
+    query['sort'] = `${props.meta.resourceColumns.resourceCreatedColumnName}__desc`;
+    if (recordId) query[`filter__${recordIdCol}__ilike`] = JSON.stringify(String(recordId));
+    if (resourceId) query[`filter__${resourceIdCol}__eq`] = JSON.stringify(String(resourceId));
+
+    return {
+      name: 'resource-list',
+      params: { resourceId: auditResourceId },
+      query,
+    } as any;
+  } catch (e) {
+    console.error('Error computing RelatedLogsLink to:', e);
+    return { name: 'resource-list', params: { resourceId: 'audit_log' } } as any;
+  }
+});
+</script>
+

index.ts

@@ -160,6 +160,21 @@ export default class AuditLogPlugin extends AdminForthPlugin {
         return;
       }
 
+      resource.options = resource.options || {} as any;
+      resource.options.pageInjections = resource.options.pageInjections || {} as any;
+      resource.options.pageInjections.show = resource.options.pageInjections.show || {} as any;
+      if (!resource.options.pageInjections.show.bottom) {
+        resource.options.pageInjections.show.bottom = [] as any[];
+      } else if (!Array.isArray(resource.options.pageInjections.show.bottom)) {
+        resource.options.pageInjections.show.bottom = [resource.options.pageInjections.show.bottom] as any[];
+      }
+      {
+        const bottom = resource.options.pageInjections.show.bottom as any[];
+        const compDecl = { file: this.componentPath('RelatedLogsLink.vue'), meta: { ...this.options, pluginInstanceId: this.pluginInstanceId, auditLogResourceId: this.auditLogResource, ADMIN_BASE_URL: (this.adminforth as any)?.config?.baseUrlSlashed || '' } } as any;
+        const already = bottom.some((d: any) => d?.file === compDecl.file);
+        if (!already) bottom.push(compDecl);
+      }
+
       if (this.auditLogResource === resource.resourceId) {
         let diffColumn = resource.columns.find((c) => c.name === this.options.resourceColumns.resourceDataColumnName); 
         if (!diffColumn) {
@@ -189,6 +204,19 @@ export default class AuditLogPlugin extends AdminForthPlugin {
             columnName: this.options.resourceColumns.resourceCreatedColumnName,
             direction: AdminForthSortDirections.desc
         }
+
+        resource.options = resource.options || {} as any;
+        resource.options.pageInjections = resource.options.pageInjections || {} as any;
+        resource.options.pageInjections.show = resource.options.pageInjections.show || {} as any;
+        if (!resource.options.pageInjections.show.bottom) {
+          resource.options.pageInjections.show.bottom = [] as any[];
+        } else if (!Array.isArray(resource.options.pageInjections.show.bottom)) {
+          resource.options.pageInjections.show.bottom = [resource.options.pageInjections.show.bottom] as any[];
+        }
+        const bottom = resource.options.pageInjections.show.bottom as any[];
+        const compDecl = { file: this.componentPath('RelatedLogsLink.vue'), meta: { ...this.options, pluginInstanceId: this.pluginInstanceId, auditLogResourceId: this.auditLogResource, ADMIN_BASE_URL: (this.adminforth as any)?.config?.baseUrlSlashed || '' } } as any;
+        const already = bottom.some((d: any) => d?.file === compDecl.file);
+        if (!already) bottom.push(compDecl);
         return;
       };
 

package-lock.json

@@ -20,7 +20,7 @@
   "author": "devforth",
   "license": "ISC",
   "dependencies": {
-    "adminforth": "^2.9.5",
+    "adminforth": "^2.12.0",
     "dayjs": "^1.11.11"
   },
   "release": {