UniqAI/hexabot
1
0
Fork 0
mirror of https://github.com/hexastack/hexabot synced 2024-11-24 04:53:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: use deleteMany for multiple blocks removal

Browse Source
This commit is contained in:
hexastack 2024-10-29 17:51:56 +01:00 committed by abdou6666
parent 3c34c7fecc
commit 55fe415fd8
2 changed files with 124 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api/src/chat/controllers/block.controller.ts
View File

@ -323,4 +323,29 @@ export class BlockController extends BaseController<
}
return result;
}
/**
* Deletes multiple blocks by their IDs.
* @param ids - IDs of blocks to be deleted.
* @returns A Promise that resolves to the deletion result.
*/
@CsrfCheck(true)
@Delete('')
@HttpCode(204)
async deleteMany(@Body('ids') ids: string[]): Promise<DeleteResult> {
if (!ids || ids.length === 0) {
throw new BadRequestException('No IDs provided for deletion.');
}
const deleteResult = await this.blockService.deleteMany({
_id: { $in: ids },
});
if (deleteResult.deletedCount === 0) {
this.logger.warn(`Unable to delete blocks with provided IDs: ${ids}`);
throw new NotFoundException('Blocks with provided IDs not found');
}
this.logger.log(`Successfully deleted blocks with IDs: ${ids}`);
return deleteResult;
}
}

205
frontend/src/components/visual-editor/v2/Diagrams.tsx
View File

@ -43,6 +43,7 @@ import { MoveDialog } from "@/app-components/dialogs/MoveDialog";
import { CategoryDialog } from "@/components/categories/CategoryDialog";
import { isSameEntity } from "@/hooks/crud/helpers";
import { useDelete, useDeleteFromCache } from "@/hooks/crud/useDelete";
import { useDeleteMany } from "@/hooks/crud/useDeleteMany";
import { useFind } from "@/hooks/crud/useFind";
import { useGetFromCache } from "@/hooks/crud/useGet";
import { useUpdate, useUpdateCache } from "@/hooks/crud/useUpdate";
@ -120,6 +121,12 @@ const Diagrams = () => {
},
invalidate: false,
});
const { mutateAsync: deleteBlocks } = useDeleteMany(EntityType.BLOCK, {
onSuccess: () => {
deleteDialogCtl.closeDialog();
setSelectedBlockId(undefined);
},
});
const { mutateAsync: updateBlock } = useUpdate(EntityType.BLOCK, {
invalidate: false,
});
@ -312,19 +319,17 @@ const Diagrams = () => {
const handleDeleteButton = () => {
const selectedEntities = engine?.getModel().getSelectedEntities();
const ids = selectedEntities?.map((model) => model.getID()).join(",");
const ids = selectedEntities?.map((model) => model.getID());
if (ids && selectedEntities) {
if (ids && selectedEntities && ids.length > 0) {
deleteCallbackRef.current = () => {
if (selectedEntities.length > 0) {
selectedEntities.forEach((model) => {
model.setLocked(false);
model.remove();
});
engine?.repaintCanvas();
}
selectedEntities.forEach((model) => {
model.setLocked(false);
model.remove();
});
engine?.repaintCanvas();
};
deleteDialogCtl.openDialog(ids);
deleteDialogCtl.openDialog(ids.join(","));
}
};
const handleMoveButton = () => {
@ -339,112 +344,100 @@ const Diagrams = () => {
const id = deleteDialogCtl?.data;
if (id) {
// Check if it's a link id
if (id.length === 36) {
// Remove link + update nextBlocks + TODO update port state
const link = model?.getLink(id) as any;
const sourceId = link?.sourcePort.parent.options.id;
const targetId = link?.targetPort.parent.options.id;
const ids = id.split(",");
if (link?.sourcePort.options.label === BlockPorts.nextBlocksOutPort) {
// Next/previous Link Delete
const previousData = getBlockFromCache(sourceId);
const nextBlocks = [...(previousData?.nextBlocks || [])];
if (ids.length > 1) {
await deleteBlocks(ids, {
onSuccess: () => {
ids.forEach((blockId) => {
const block = getBlockFromCache(blockId);
await updateBlock(
{
id: sourceId,
params: {
nextBlocks: nextBlocks.filter((block) => block !== targetId),
},
},
{
onSuccess() {
updateCachedBlock({
id: targetId,
preprocess: ({ previousBlocks = [], ...rest }) => ({
...rest,
previousBlocks: previousBlocks.filter(
(previousBlock) => previousBlock !== sourceId,
),
}),
});
},
},
);
} else if (
link?.sourcePort.options.label === BlockPorts.attachmentOutPort
) {
// Attached / AttachedTo Link Delete
await updateBlock(
{
id: sourceId,
params: {
attachedBlock: null,
},
},
{
onSuccess() {
updateCachedBlock({
id: targetId,
preprocess: (oldData) => ({
...oldData,
attachedToBlock: null,
}),
});
},
},
);
}
} else {
// Block Delete Case
const ids = id.includes(",") ? id.split(",") : [id];
if (block) {
// Update all linked blocks to remove references to deleted blocks
const linkedBlockIds = [
...(block?.nextBlocks || []),
...(block?.previousBlocks || []),
...(block?.attachedBlock ? [block.attachedBlock] : []),
...(block?.attachedToBlock ? [block.attachedToBlock] : []),
];
for (const blockId of ids) {
const block = getBlockFromCache(blockId);
linkedBlockIds.forEach((linkedBlockId) => {
const linkedBlock = getBlockFromCache(linkedBlockId);
await deleteBlock(blockId, {
onSuccess() {
// Update all linked blocks to remove any reference to the deleted block
const linkedBlockIds = [
...(block?.nextBlocks || []),
...(block?.previousBlocks || []),
...(block?.attachedBlock ? [block.attachedBlock] : []),
...(block?.attachedToBlock ? [block.attachedToBlock] : []),
];
for (const linkedBlockId of linkedBlockIds) {
const linkedBlock = getBlockFromCache(linkedBlockId);
if (linkedBlock) {
updateCachedBlock({
id: linkedBlock.id,
payload: {
...linkedBlock,
nextBlocks: linkedBlock.nextBlocks?.filter(
(nextBlockId) => nextBlockId !== blockId,
),
previousBlocks: linkedBlock.previousBlocks?.filter(
(previousBlockId) => previousBlockId !== blockId,
),
attachedBlock:
linkedBlock.attachedBlock === blockId
if (linkedBlock) {
updateCachedBlock({
id: linkedBlock.id,
payload: {
...linkedBlock,
nextBlocks: linkedBlock.nextBlocks?.filter(
(nextBlockId) => !ids.includes(nextBlockId),
),
previousBlocks: linkedBlock.previousBlocks?.filter(
(previousBlockId) => !ids.includes(previousBlockId),
),
attachedBlock: ids.includes(
linkedBlock.attachedBlock || "",
)
? undefined
: linkedBlock.attachedBlock,
attachedToBlock:
linkedBlock.attachedToBlock === blockId
attachedToBlock: ids.includes(
linkedBlock.attachedToBlock || "",
)
? undefined
: linkedBlock.attachedToBlock,
},
strategy: "overwrite",
});
}
},
strategy: "overwrite",
});
}
});
deleteCachedBlock(blockId);
}
});
},
});
} else {
const blockId = ids[0];
const block = getBlockFromCache(blockId);
deleteCachedBlock(blockId);
},
});
}
await deleteBlock(blockId, {
onSuccess() {
const linkedBlockIds = [
...(block?.nextBlocks || []),
...(block?.previousBlocks || []),
...(block?.attachedBlock ? [block.attachedBlock] : []),
...(block?.attachedToBlock ? [block.attachedToBlock] : []),
];
linkedBlockIds.forEach((linkedBlockId) => {
const linkedBlock = getBlockFromCache(linkedBlockId);
if (linkedBlock) {
updateCachedBlock({
id: linkedBlock.id,
payload: {
...linkedBlock,
nextBlocks: linkedBlock.nextBlocks?.filter(
(nextBlockId) => nextBlockId !== blockId,
),
previousBlocks: linkedBlock.previousBlocks?.filter(
(previousBlockId) => previousBlockId !== blockId,
),
attachedBlock:
linkedBlock.attachedBlock === blockId
? undefined
: linkedBlock.attachedBlock,
attachedToBlock:
linkedBlock.attachedToBlock === blockId
? undefined
: linkedBlock.attachedToBlock,
},
strategy: "overwrite",
});
}
});
deleteCachedBlock(blockId);
},
});
}
deleteCallbackRef.current?.();