(fix): Update groupsLayout when deleting a group (#4155)

* Update groupsLayout when deleting a group * Rename some variables
cds-snc · Aug 1, 2024 · 3cc69ba · 3cc69ba
1 parent 2d20df6
commit 3cc69ba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/...e]/(form administration)/form-builder/components/shared/right-panel/treeview/TreeView.tsx b/...e]/(form administration)/form-builder/components/shared/right-panel/treeview/TreeView.tsx
@@ -210,6 +210,19 @@ const ControlledTree: ForwardRefRenderFunction<unknown, TreeDataProviderProps> =
                     });
 
                   deleteGroup(String(item.index));
+
+                  // When deleting a group, we need to select the previous group
+                  const itemsArray = Object.keys(items);
+                  const deletedItemIndex = itemsArray.indexOf(String(item.index));
+                  const previousItemId =
+                    deletedItemIndex > 0 ? itemsArray[deletedItemIndex - 1] : "start";
+                  setSelectedItems([previousItemId]);
+                  setExpandedItems([previousItemId]);
+                  setId(previousItemId);
+
+                  // And update the groups layout
+                  await updateGroupsLayout();
+
                   autoFlowAll();
                   setOpenConfirmDeleteDialog(false);
                   toast.success(

diff --git a/...tration)/form-builder/components/shared/right-panel/treeview/util/useUpdateGroupLayout.ts b/...tration)/form-builder/components/shared/right-panel/treeview/util/useUpdateGroupLayout.ts
@@ -11,7 +11,7 @@ export const useUpdateGroupLayout = () => {
 
   const updateGroupsLayout = async () => {
     // Add a delay to ensure the tree from previous actions updates before this is called
-    sleep(3000);
+    await sleep(2);
 
     const rootItems = environment?.current?.items.root.children as string[];