Merge branch 'feat/files-events' into enhancements-6

t7tran · Feb 16, 2024 · 1e8c725 · 1e8c725
2 parents 08f5586 + f21e678
commit 1e8c725
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/api/src/services/files.ts b/api/src/services/files.ts
@@ -76,10 +76,11 @@ export class FilesService extends ItemsService {
 
 		// Is this file a replacement? if the file data already exists and we have a primary key
 		const isReplacement = existingFile !== null && primaryKey !== undefined;
+		const emitFilterOpts: MutationOptions & Record<string, any> = { emitEvents: false, emitFilters: true };
 
 		// If this is a new file upload, we need to generate a new primary key and DB record
 		if (isReplacement === false || primaryKey === undefined) {
-			primaryKey = await this.createOne(payload, { emitEvents: false });
+			primaryKey = await this.createOne(payload, emitFilterOpts);
 		}
 
 		const fileExtension =
@@ -201,7 +202,7 @@ export class FilesService extends ItemsService {
 			schema: this.schema,
 		});
 
-		await sudoService.updateOne(primaryKey, payload, { emitEvents: false });
+		await sudoService.updateOne(primaryKey, payload, emitFilterOpts);
 
 		if (opts?.emitEvents !== false) {
 			emitter.emitAction(

diff --git a/api/src/services/items.ts b/api/src/services/items.ts
@@ -136,7 +136,7 @@ export class ItemsService<Item extends AnyItem = AnyItem> implements AbstractSer
 			// Run all hooks that are attached to this event so the end user has the chance to augment the
 			// item that is about to be saved
 			const payloadAfterHooks =
-				opts.emitEvents !== false
+				(opts.emitEvents !== false || (opts as any).emitFilters !== false)
 					? await emitter.emitFilter(
 							this.eventScope === 'items'
 								? ['items.create', `${this.collection}.items.create`]
@@ -616,7 +616,7 @@ export class ItemsService<Item extends AnyItem = AnyItem> implements AbstractSer
 		// Run all hooks that are attached to this event so the end user has the chance to augment the
 		// item that is about to be saved
 		const payloadAfterHooks =
-			opts.emitEvents !== false
+			(opts.emitEvents !== false || (opts as any).emitFilters !== false)
 				? await emitter.emitFilter(
 						this.eventScope === 'items'
 							? ['items.update', `${this.collection}.items.update`]