diff --git a/api/src/chat/controllers/block.controller.ts b/api/src/chat/controllers/block.controller.ts index a5fbe5d5..3d4d82e5 100644 --- a/api/src/chat/controllers/block.controller.ts +++ b/api/src/chat/controllers/block.controller.ts @@ -255,6 +255,28 @@ export class BlockController extends BaseController< return await this.blockService.create(block); } + /** + * Updates multiple blocks by their IDs. + * @param ids - IDs of blocks to be updated. + * @param payload - The data to update blocks with. + * @returns A Promise that resolves to the updates if successful. + */ + @CsrfCheck(true) + @Patch('bulk') + async updateMany(@Body() body: { ids: string[]; payload: BlockUpdateDto }) { + if (!body.ids || body.ids.length === 0) { + throw new BadRequestException('No IDs provided for ...'); + } + const updates = await this.blockService.updateMany( + { + _id: { $in: body.ids }, + }, + body.payload, + ); + + return updates; + } + /** * Updates a specific block by ID. * diff --git a/api/src/chat/repositories/block.repository.ts b/api/src/chat/repositories/block.repository.ts index 319878d6..804b7bdb 100644 --- a/api/src/chat/repositories/block.repository.ts +++ b/api/src/chat/repositories/block.repository.ts @@ -9,7 +9,7 @@ import { Injectable, Optional } from '@nestjs/common'; import { EventEmitter2 } from '@nestjs/event-emitter'; import { InjectModel } from '@nestjs/mongoose'; -import { +import mongoose, { Document, Model, Query, @@ -113,6 +113,88 @@ export class BlockRepository extends BaseRepository< this.checkDeprecatedAttachmentUrl(updates); } + /** + * Pre-processing logic for updating blocks. + * + * @param query - The query to update blocks. + * @param criteria - The filter criteria for the update query. + * @param updates - The update data. + */ + async preUpdateMany( + _query: Query< + Document, + Document, + unknown, + Block, + 'updateMany', + Record + >, + _criteria: TFilterQuery, + _updates: UpdateQuery>, + ): Promise { + const ids: string[] = _criteria._id?.$in || []; + const objIds = ids.map((b) => { + return new mongoose.Types.ObjectId(b); + }); + const category: string = _updates.$set.category; + const objCategory = new mongoose.Types.ObjectId(category); + const otherBlocks = await this.model.find({ + _id: { $nin: objIds }, + category: { $ne: objCategory }, + $or: [ + { attachedBlock: { $in: objIds } }, + { nextBlocks: { $in: objIds } }, + ], + }); + + for (const id of ids) { + const oldState = await this.model.findOne({ + _id: new mongoose.Types.ObjectId(id), + }); + if (oldState.category.toString() !== category) { + const updatedNextBlocks = oldState.nextBlocks.filter((nextBlock) => + ids.includes(nextBlock.toString()), + ); + + const updatedAttachedBlock = ids.includes( + oldState.attachedBlock?.toString() || '', + ) + ? oldState.attachedBlock + : null; + + await this.model.updateOne( + { _id: new mongoose.Types.ObjectId(id) }, + { + nextBlocks: updatedNextBlocks, + attachedBlock: updatedAttachedBlock, + }, + ); + } + } + + for (const block of otherBlocks) { + if (ids.includes(block.attachedBlock?.toString())) { + await this.model.updateOne( + { _id: block.id }, + { + attachedBlock: null, + }, + ); + } + if (block.nextBlocks.some((item) => ids.includes(item.toString()))) { + const updatedNextBlocks = block.nextBlocks.filter( + (nextBlock) => !ids.includes(nextBlock.toString()), + ); + await this.model.updateOne( + { _id: block.id }, + { + nextBlocks: updatedNextBlocks, + }, + ); + } + } + } + /** * Post-processing logic after deleting a block. * diff --git a/api/src/utils/generics/base-repository.ts b/api/src/utils/generics/base-repository.ts index 021b3fd2..af2499ad 100644 --- a/api/src/utils/generics/base-repository.ts +++ b/api/src/utils/generics/base-repository.ts @@ -38,10 +38,12 @@ export type DeleteResult = { export enum EHook { preCreate = 'preCreate', preUpdate = 'preUpdate', + preUpdateMany = 'preUpdateMany', preDelete = 'preDelete', preValidate = 'preValidate', postCreate = 'postCreate', postUpdate = 'postUpdate', + postUpdateMany = 'postUpdateMany', postDelete = 'postDelete', postValidate = 'postValidate', } @@ -157,6 +159,19 @@ export abstract class BaseRepository< ); }); + hooks?.updateMany.pre.execute(async function () { + const query = this as Query; + const criteria = query.getFilter(); + const updates = query.getUpdate(); + + await repository.preUpdateMany(query, criteria, updates); + repository.emitter.emit( + repository.getEventName(EHook.preUpdateMany), + criteria, + updates?.['$set'], + ); + }); + hooks?.findOneAndUpdate.post.execute(async function ( updated: HydratedDocument, ) { @@ -375,6 +390,14 @@ export abstract class BaseRepository< // Nothing ... } + async preUpdateMany( + _query: Query, + _criteria: TFilterQuery, + _updates: UpdateWithAggregationPipeline | UpdateQuery, + ) { + // Nothing ... + } + async postUpdate( _query: Query, _updated: T, diff --git a/api/src/utils/generics/lifecycle-hook-manager.ts b/api/src/utils/generics/lifecycle-hook-manager.ts index f518537d..983b2c02 100644 --- a/api/src/utils/generics/lifecycle-hook-manager.ts +++ b/api/src/utils/generics/lifecycle-hook-manager.ts @@ -17,7 +17,7 @@ enum LifecycleOperation { // InsertMany = 'insertMany', // Update = 'update', // UpdateOne = 'updateOne', - // UpdateMany = 'updateMany', + UpdateMany = 'updateMany', } type PreHook = (...args: any[]) => void; @@ -69,7 +69,7 @@ export class LifecycleHookManager { // insertMany: ['pre'], // update: ['pre', 'post'], // updateOne: ['pre', 'post'], - // updateMany: ['pre', 'post'], + updateMany: ['pre', 'post'], }; const lifecycleHooks: LifecycleHooks = {} as LifecycleHooks; diff --git a/frontend/src/components/visual-editor/v2/Diagrams.tsx b/frontend/src/components/visual-editor/v2/Diagrams.tsx index bdb0e8a9..381ce482 100644 --- a/frontend/src/components/visual-editor/v2/Diagrams.tsx +++ b/frontend/src/components/visual-editor/v2/Diagrams.tsx @@ -47,6 +47,7 @@ import { useDelete, useDeleteFromCache } from "@/hooks/crud/useDelete"; import { useFind } from "@/hooks/crud/useFind"; import { useGetFromCache } from "@/hooks/crud/useGet"; import { useUpdate, useUpdateCache } from "@/hooks/crud/useUpdate"; +import { useUpdateMany } from "@/hooks/crud/useUpdateMany"; import useDebouncedUpdate from "@/hooks/useDebouncedUpdate"; import { getDisplayDialogs, useDialog } from "@/hooks/useDialog"; import { useSearch } from "@/hooks/useSearch"; @@ -73,6 +74,7 @@ const Diagrams = () => { const deleteDialogCtl = useDialog(false); const moveDialogCtl = useDialog(false); const addCategoryDialogCtl = useDialog(false); + const { mutateAsync: updateBlocks } = useUpdateMany(EntityType.BLOCK); const { buildDiagram, setViewerZoom, @@ -451,38 +453,16 @@ const Diagrams = () => { const ids = moveDialogCtl?.data; - if (ids) { - for (const blockId of ids) { - const block = getBlockFromCache(blockId); - const updatedNextBlocks = block?.nextBlocks?.filter((nextBlockId) => - ids.includes(nextBlockId), - ); - const updatedAttachedBlock = ids.includes( - block?.attachedBlock as string, - ) - ? block?.attachedBlock - : null; + if (ids?.length && Array.isArray(ids)) { + await updateBlocks({ ids, payload: { category: newCategoryId } }); - await updateBlock({ - id: blockId, - params: { - category: newCategoryId, - nextBlocks: updatedNextBlocks, - attachedBlock: updatedAttachedBlock, - }, - }); - } - - queryClient.removeQueries({ + queryClient.invalidateQueries({ predicate: ({ queryKey }) => { - const [qType, qEntity, qId] = queryKey; + const [qType, qEntity] = queryKey; return ( - (qType === QueryType.collection && - isSameEntity(qEntity, EntityType.BLOCK) && - qId === selectedCategoryId) || - (isSameEntity(qEntity, EntityType.CATEGORY) && - qId === selectedCategoryId) + qType === QueryType.collection && + isSameEntity(qEntity, EntityType.BLOCK) ); }, }); diff --git a/frontend/src/hooks/crud/useUpdateMany.tsx b/frontend/src/hooks/crud/useUpdateMany.tsx new file mode 100644 index 00000000..d50a359f --- /dev/null +++ b/frontend/src/hooks/crud/useUpdateMany.tsx @@ -0,0 +1,83 @@ +/* + * Copyright © 2024 Hexastack. All rights reserved. + * + * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms: + * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission. + * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file). + */ + +import { useMutation, useQueryClient } from "react-query"; + +import { QueryType, TMutationOptions } from "@/services/types"; +import { IBaseSchema, IDynamicProps, TType } from "@/types/base.types"; + +import { useEntityApiClient } from "../useApiClient"; + +import { isSameEntity } from "./helpers"; + +export const useUpdateMany = < + TEntity extends IDynamicProps["entity"], + TAttr = TType["attributes"], + TBasic extends IBaseSchema = TType["basic"], + TFull extends IBaseSchema = TType["full"], +>( + entity: TEntity, + options?: Omit< + TMutationOptions< + string, + Error, + { + ids: string[]; + payload: Partial; + }, + TBasic + >, + "mutationFn" | "mutationKey" + > & { + invalidate?: boolean; + }, +) => { + const api = useEntityApiClient(entity); + const queryClient = useQueryClient(); + const { invalidate = true, ...otherOptions } = options || {}; + + return useMutation({ + mutationFn: async ({ + ids, + payload, + }: { + ids: string[]; + payload: Partial; + }) => { + const result = await api.UpdateMany(ids, payload); + + queryClient.removeQueries({ + predicate: ({ queryKey }) => { + const [qType, qEntity, qId] = queryKey; + + return ( + qType === QueryType.item && + isSameEntity(qEntity, entity) && + ids.includes(qId as string) + ); + }, + }); + + if (invalidate) { + queryClient.invalidateQueries({ + predicate: ({ queryKey }) => { + const [qType, qEntity] = queryKey; + + return ( + (qType === QueryType.count || qType === QueryType.collection) && + isSameEntity(qEntity, entity) + ); + }, + }); + } + + return result; + }, + ...otherOptions, + }); +}; diff --git a/frontend/src/services/api.class.ts b/frontend/src/services/api.class.ts index 4d7509d1..033f6e6b 100644 --- a/frontend/src/services/api.class.ts +++ b/frontend/src/services/api.class.ts @@ -342,6 +342,23 @@ export class EntityApiClient extends ApiClient { return data; } + /** + * Bulk Update entries. + */ + async UpdateMany(ids: string[], payload: Partial) { + const { _csrf } = await this.getCsrf(); + const { data } = await this.request.patch( + `${ROUTES[this.type]}/bulk`, + { + _csrf, + ids, + payload, + }, + ); + + return data; + } + /** * Delete an entry. */