f-dag-app add new group in same group if all elements are from same g…

…roup
ollionorg · Jul 1, 2024 · 350dc13 · 350dc13
1 parent ae68978
commit 350dc13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/flow-lineage/src/components/f-dag/add-group.ts b/packages/flow-lineage/src/components/f-dag/add-group.ts
@@ -83,11 +83,14 @@ export function addSelectionToGroup(this: FDag, groupid: string) {
 export function addToNewGroup(this: FDag) {
 	const groupIdInput = this.querySelector<FInput>("#new-group-id")!;
 	const groupLabelInput = this.querySelector<FInput>("#new-group-label")!;
+	const parentGroupIfAny = this.selectedNodes[0].group;
 
+	const isAllFromSameGroup = this.selectedNodes.every(sn => sn.group === parentGroupIfAny);
 	this.config.groups.push({
 		id: groupIdInput.value as string,
 		label: groupLabelInput.value as string,
-		icon: "i-org"
+		icon: "i-org",
+		group: isAllFromSameGroup && parentGroupIfAny ? parentGroupIfAny : undefined
 	});
 
 	this.addSelectionToGroup(groupIdInput.value as string);

diff --git a/packages/flow-lineage/src/components/f-dag/drag-nodes-and-groups.ts b/packages/flow-lineage/src/components/f-dag/drag-nodes-and-groups.ts
@@ -158,8 +158,8 @@ export function updateNodePosition(this: FDag, event: MouseEvent) {
 			nodeLeft + nodeWidth < left + width
 		) {
 			insideGroup = true;
+			if (nodeElement.dataset.group !== group.getAttribute("id")) placedIn = group;
 			nodeElement.dataset.group = group.getAttribute("id")!;
-			placedIn = group;
 		}
 	}