Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(Consumption): Changing parent ID for subgraph nodes #4395

Merged
merged 4 commits into from
Mar 20, 2024
Merged

fix(Consumption): Changing parent ID for subgraph nodes #4395

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f264a2
changing parent ID to scope node fron subgraph nodes
valentina-vallalta Mar 20, 2024
86f5d40
removing print statement
valentina-vallalta Mar 20, 2024
4cda143
fixing typo
valentina-vallalta Mar 20, 2024
4f32100
Merge branch 'main' into vvallalta/move_node
valentina-vallalta Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions libs/designer/src/lib/ui/connections/dropzone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { AppDispatch } from '../../core';
import { pasteOperation } from '../../core/actions/bjsworkflow/copypaste';
import { expandDiscoveryPanel } from '../../core/state/panel/panelSlice';
import { useUpstreamNodes } from '../../core/state/tokens/tokenSelectors';
import { useGetAllOperationNodesWithin, useNodeDisplayName } from '../../core/state/workflow/workflowSelectors';
import { useGetAllOperationNodesWithin, useNodeDisplayName, useNodeMetadata } from '../../core/state/workflow/workflowSelectors';
import { AllowDropTarget } from './dynamicsvgs/allowdroptarget';
import { BlockDropTarget } from './dynamicsvgs/blockdroptarget';
import { MenuDivider, MenuItem, MenuList, Popover, PopoverSurface, PopoverTrigger } from '@fluentui/react-components';
Expand Down Expand Up @@ -116,7 +116,16 @@ export const DropZone: React.FC<DropZoneProps> = ({ graphId, parentId, childId,
setShowCallout(false);
}, [dispatch, graphId, parentId]);

const upstreamNodesOfChild = useUpstreamNodes(removeIdTag(childId ?? parentId ?? graphId));
const nodeMetadata = useNodeMetadata(removeIdTag(parentId ?? ''));
// For subgraph nodes, we want to use the id of the scope node as the parentId to get the dependancies
const newParentId = useMemo(() => {
if (nodeMetadata?.subgraphType) {
return nodeMetadata.parentNodeId;
} else {
return parentId;
}
}, [nodeMetadata, parentId]);
const upstreamNodesOfChild = useUpstreamNodes(removeIdTag(childId ?? newParentId ?? graphId));
const immediateAncestor = useGetAllOperationNodesWithin(parentId && !containsIdTag(parentId) ? parentId : '');
const upstreamNodes = useMemo(() => new Set([...upstreamNodesOfChild, ...immediateAncestor]), [immediateAncestor, upstreamNodesOfChild]);

Expand Down
Loading