fix(core): fix not receiving custom slug in plugin core

Author: shaadcode

src/collections/auditor.ts

@@ -4,7 +4,6 @@ import type { hookTypes } from 'src/pluginUtils/configHelpers.js'
 import type { AuditHookOperationType } from '../types/pluginOptions.js'
 
 import { defaultCollectionValues } from '../Constant/Constant.js'
-import { autoLogCleaner } from './hooks/beforeChange.js'
 
 export type AuditorLog = {
   action: AuditHookOperationType
@@ -71,9 +70,6 @@ const auditor: CollectionConfig = {
       required: true,
     },
   ],
-  hooks: {
-    beforeChange: [autoLogCleaner],
-  },
   labels: defaultCollectionValues.labels,
   timestamps: false,
 }

src/collections/hooks/beforeChange.ts

@@ -11,6 +11,7 @@ type AutoLogCleanerProps = {
 }
 
 export const autoLogCleaner: BeforeChangeHook<AutoLogCleanerProps> = async ({
+  context,
   data,
   operation,
   req,
@@ -21,7 +22,9 @@ export const autoLogCleaner: BeforeChangeHook<AutoLogCleanerProps> = async ({
     )
 
     const oldLogs = await req.payload.find({
-      collection: defaultCollectionValues.slug,
+      collection: context.pluginOptions.collection?.slug
+        ? context.pluginOptions.collection?.slug
+        : defaultCollectionValues.slug,
       limit: 1000,
       where: {
         createdAt: {
@@ -34,7 +37,9 @@ export const autoLogCleaner: BeforeChangeHook<AutoLogCleanerProps> = async ({
       const deletePromises = oldLogs.docs.map((log) =>
         req.payload.delete({
           id: log.id,
-          collection: defaultCollectionValues.slug,
+          collection: context.pluginOptions.collection?.slug
+            ? context.pluginOptions.collection?.slug
+            : defaultCollectionValues.slug,
         }),
       )
 

src/index.ts

@@ -32,6 +32,7 @@ export const auditorPlugin =
     // TODO: combine to attachCollectionConfig function
     const logsCollection = attachHooksToActivityLogsCollection(
       opts.autoDeleteInterval ?? defaultAutoDeleteLog,
+      opts,
     )
     // TODO: combine to attachCollectionConfig function
     config.collections = [...(config.collections || []), logsCollection]

src/pluginUtils/configHelpers.ts

@@ -48,14 +48,20 @@ export const hookTypes = [
 //   // }
 // }
 
-export const attachHooksToActivityLogsCollection = (autoDeleteInterval: Duration) => {
+export const attachHooksToActivityLogsCollection = (
+  autoDeleteInterval: Duration,
+  pluginOptions: PluginOptions,
+) => {
   auditor.hooks = {
     ...auditor.hooks,
     beforeChange: [
       ...(auditor.hooks?.beforeChange || []),
       (args) =>
         autoLogCleaner({
           ...args,
+          context: {
+            pluginOptions,
+          },
           data: {
             autoDeleteInterval,
           },
@@ -120,6 +126,10 @@ export const attachCollectionConfig = (
   }
 
   // Attaching Log Builders
+  // if (
+  //   pluginCollectionsConfig.trackCollections &&
+  //   pluginCollectionsConfig.trackCollections.length > 0
+  // ) {
   userCollectionsConfig = (userCollectionsConfig || []).map((collection) => {
     const tracked = pluginCollectionsConfig.trackCollections.find(
       (tc) => tc.slug === collection.slug,
@@ -149,6 +159,7 @@ export const attachCollectionConfig = (
 
     return collection
   })
+  // }
 
   // Attaching settings to plugin's internal collection hooks
   // ...

src/types/types.d.ts

@@ -1,10 +1,11 @@
 import type { RequestContext as OriginalRequestContext } from 'payload'
 
-import type { TrackedCollection } from './../types/pluginOptions.ts'
+import type { PluginOptions, TrackedCollection } from './../types/pluginOptions.ts'
 
 declare module 'payload' {
   // Create a new interface that merges your additional fields with the original one
   export interface RequestContext extends OriginalRequestContext {
+    pluginOptions: PluginOptions
     userHookConfig?: TrackedCollection
     // ...
   }