Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions libs/designer-v2/src/lib/core/parsers/addNodeToWorkflow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import CONSTANTS from '../../common/constants';
import type { RelationshipIds } from '../state/panel/panelTypes';
import type { NodesMetadata, WorkflowState } from '../state/workflow/workflowInterfaces';
import { isA2AWorkflow } from '../state/workflow/helper';
import { createWorkflowNode, createWorkflowEdge } from '../utils/graph';
import type { WorkflowEdge, WorkflowNode } from './models/workflowNode';
import { reassignEdgeSources, reassignEdgeTargets, addNewEdge, applyIsRootNode, removeEdge } from './restructuringHelpers';
Expand All @@ -13,7 +14,6 @@ import {
isScopeOperation,
WORKFLOW_NODE_TYPES,
getRecordEntry,
equals,
} from '@microsoft/logic-apps-shared';

export interface AddNodePayload {
Expand Down Expand Up @@ -53,7 +53,7 @@ export const addNodeToWorkflow = (
state.isDirty = true;

const isAfterTrigger = getRecordEntry(nodesMetadata, parentId ?? '')?.isTrigger;
const allowRunAfterTrigger = equals(state.workflowKind, 'agent');
const allowRunAfterTrigger = isA2AWorkflow(state);
const shouldAddRunAfters = allowRunAfterTrigger || (!isRoot && !isAfterTrigger);
nodesMetadata[newNodeId] = { graphId: subgraphId ?? graphId, parentNodeId, isRoot, isTrigger };
state.operations[newNodeId] = { ...state.operations[newNodeId], type: operation.type, kind: operation.kind };
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-disable no-param-reassign */
import type { NodesMetadata, WorkflowState } from '../state/workflow/workflowInterfaces';
import { isA2AWorkflow } from '../state/workflow/helper';
import type { WorkflowNode } from './models/workflowNode';
import { removeEdge, reassignEdgeSources, reassignEdgeTargets } from './restructuringHelpers';
import { equals, getRecordEntry, type LogicAppsV2 } from '@microsoft/logic-apps-shared';
Expand Down Expand Up @@ -80,7 +81,7 @@ export const deleteNodeFromWorkflow = (
const parentId = (workflowGraph.edges ?? []).find((edge) => edge.target === nodeId)?.source ?? '';
const parentMetadata = getRecordEntry(nodesMetadata, parentId);
const isAfterTrigger = parentMetadata?.isTrigger;
const allowRunAfterTrigger = equals(state.workflowKind, 'agent');
const allowRunAfterTrigger = isA2AWorkflow(state);
const shouldAddRunAfters = allowRunAfterTrigger || (!isRoot && !isAfterTrigger);
reassignEdgeSources(state, nodeId, parentId, workflowGraph, shouldAddRunAfters);
removeEdge(state, parentId, nodeId, workflowGraph);
Expand Down
7 changes: 4 additions & 3 deletions libs/designer-v2/src/lib/core/parsers/moveNodeInWorkflow.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* eslint-disable no-param-reassign */
import type { RelationshipIds } from '../state/panel/panelTypes';
import type { NodesMetadata, WorkflowState } from '../state/workflow/workflowInterfaces';
import { isA2AWorkflow } from '../state/workflow/helper';
import type { WorkflowNode } from './models/workflowNode';
import { addNewEdge, reassignEdgeSources, reassignEdgeTargets, removeEdge, applyIsRootNode } from './restructuringHelpers';
import type { LogicAppsV2 } from '@microsoft/logic-apps-shared';
import { containsIdTag, equals, getRecordEntry } from '@microsoft/logic-apps-shared';
import { containsIdTag, getRecordEntry } from '@microsoft/logic-apps-shared';

export interface MoveNodePayload {
nodeId: string;
Expand Down Expand Up @@ -73,7 +74,7 @@ export const moveNodeInWorkflow = (
const parentId = (oldWorkflowGraph.edges ?? []).find((edge) => edge.target === nodeId)?.source ?? '';
const parentMetadata = getRecordEntry(nodesMetadata, parentId);
const isAfterTrigger = parentMetadata?.isTrigger;
const allowRunAfterTrigger = equals(state.workflowKind, 'agent');
const allowRunAfterTrigger = isA2AWorkflow(state);
const shouldAddRunAfters = allowRunAfterTrigger || (!isOldRoot && !isAfterTrigger);
reassignEdgeSources(state, nodeId, parentId, oldWorkflowGraph, shouldAddRunAfters);
removeEdge(state, parentId, nodeId, oldWorkflowGraph);
Expand Down Expand Up @@ -105,7 +106,7 @@ export const moveNodeInWorkflow = (

const parentMetadata = getRecordEntry(nodesMetadata, parentId);
const isAfterTrigger = (parentMetadata?.isRoot && newGraphId === 'root') ?? false;
const allowRunAfterTrigger = equals(state.workflowKind, 'agent');
const allowRunAfterTrigger = isA2AWorkflow(state);
const shouldAddRunAfters = allowRunAfterTrigger || (!isNewRoot && !isAfterTrigger);

// 1 parent, 1 child
Expand Down
5 changes: 3 additions & 2 deletions libs/designer-v2/src/lib/core/parsers/pasteScopeInWorkflow.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import type { RelationshipIds } from '../state/panel/panelTypes';
import type { NodesMetadata, Operations, WorkflowState } from '../state/workflow/workflowInterfaces';
import { isA2AWorkflow } from '../state/workflow/helper';
import type { WorkflowNode } from './models/workflowNode';
import { addNewEdge, reassignEdgeSources, reassignEdgeTargets, removeEdge, applyIsRootNode } from './restructuringHelpers';
import { containsIdTag, equals, getRecordEntry } from '@microsoft/logic-apps-shared';
import { containsIdTag, getRecordEntry } from '@microsoft/logic-apps-shared';

export interface PasteScopeNodePayload {
relationshipIds: RelationshipIds;
Expand Down Expand Up @@ -56,7 +57,7 @@ export const pasteScopeInWorkflow = (

const parentMetadata = getRecordEntry(state.nodesMetadata, parentId);
const isAfterTrigger = (parentMetadata?.isRoot && newGraphId === 'root') ?? false;
const allowRunAfterTrigger = equals(state.workflowKind, 'agent');
const allowRunAfterTrigger = isA2AWorkflow(state);
const shouldAddRunAfters = allowRunAfterTrigger || (!isNewRoot && !isAfterTrigger);

// clear the existing runAfter
Expand Down
Loading
Loading