From a1dd6f5ee5fd4fe0aab9b5e807c5aa18b66bc814 Mon Sep 17 00:00:00 2001 From: Yassine Sallemi Date: Mon, 17 Feb 2025 15:57:02 +0100 Subject: [PATCH 1/2] fix: appropriate toast message on category bulk delete --- api/src/chat/repositories/category.repository.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/api/src/chat/repositories/category.repository.ts b/api/src/chat/repositories/category.repository.ts index 3188352d..64b5fcec 100644 --- a/api/src/chat/repositories/category.repository.ts +++ b/api/src/chat/repositories/category.repository.ts @@ -54,7 +54,11 @@ export class CategoryRepository extends BaseRepository< criteria: TFilterQuery, ) { criteria = query.getQuery(); - const ids = Array.isArray(criteria._id) ? criteria._id : [criteria._id]; + const ids = Array.isArray(criteria._id?.$in) + ? criteria._id.$in + : Array.isArray(criteria._id) + ? criteria._id + : [criteria._id]; for (const id of ids) { const associatedBlocks = await this.blockService.findOne({ From 85d50f6facb4db27e538c69b3963866dbb98d5c0 Mon Sep 17 00:00:00 2001 From: Yassine Sallemi Date: Mon, 17 Feb 2025 16:07:42 +0100 Subject: [PATCH 2/2] fix: label instead of id --- api/src/chat/repositories/category.repository.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/chat/repositories/category.repository.ts b/api/src/chat/repositories/category.repository.ts index 64b5fcec..d3e6a213 100644 --- a/api/src/chat/repositories/category.repository.ts +++ b/api/src/chat/repositories/category.repository.ts @@ -65,8 +65,9 @@ export class CategoryRepository extends BaseRepository< category: id, }); if (associatedBlocks) { + const category = await this.findOne({ _id: id }); throw new ForbiddenException( - `Category ${id} has blocks associated with it`, + `Category ${category?.label || id} has blocks associated with it`, ); } }