@uipath/apollo-react 6.27.0 → 6.29.0

package/dist/canvas/utils/createPreviewGraph.cjs

@@ -100,14 +100,14 @@ function createPreviewGraph(options) {
         edges
     };
 }
-function showPreviewGraph(options) {
+function showPreviewGraph(options, applicationOptions = {}) {
     const preview = createPreviewGraph(options);
-    if (preview) applyPreviewGraphToReactFlow(preview, options.reactFlowInstance);
+    if (preview) applyPreviewGraphToReactFlow(preview, options.reactFlowInstance, applicationOptions);
     return preview;
 }
-function applyPreviewGraphToReactFlow(preview, reactFlowInstance) {
+function applyPreviewGraphToReactFlow(preview, reactFlowInstance, { canApply } = {}) {
     const originalEdge = preview.node.data?.originalEdge;
-    setTimeout(()=>{
+    const applyNodes = ()=>{
         reactFlowInstance.setNodes((nodes)=>[
                 ...nodes.filter((node)=>node.id !== external_constants_cjs_namespaceObject.PREVIEW_NODE_ID).map((node)=>({
                         ...node,
@@ -115,10 +115,15 @@ function applyPreviewGraphToReactFlow(preview, reactFlowInstance) {
                     })),
                 preview.node
             ]);
-        reactFlowInstance.setEdges((edges)=>[
-                ...edges.filter((edge)=>!(0, external_createPreviewNode_cjs_namespaceObject.isPreviewEdge)(edge) && edge.id !== originalEdge?.id),
-                ...preview.edges
-            ]);
+    };
+    const applyEdges = (edges)=>[
+            ...edges.filter((edge)=>!(0, external_createPreviewNode_cjs_namespaceObject.isPreviewEdge)(edge) && edge.id !== originalEdge?.id),
+            ...preview.edges
+        ];
+    setTimeout(()=>{
+        if (canApply?.(reactFlowInstance.getEdges()) === false) return;
+        applyNodes();
+        reactFlowInstance.setEdges(applyEdges);
     }, 0);
 }
 exports.applyPreviewGraphToReactFlow = __webpack_exports__.applyPreviewGraphToReactFlow;

package/dist/canvas/utils/createPreviewGraph.d.ts

@@ -6,6 +6,9 @@ export interface PreviewGraph {
     node: Node;
     edges: Edge[];
 }
+export interface PreviewApplicationOptions {
+    canApply?: (edges: Edge[]) => boolean;
+}
 export interface PreviewEndpoint {
     nodeId: string;
     handleId?: string | null;
@@ -35,6 +38,6 @@ export interface CreatePreviewGraphOptions {
 export type PreviewGraphOverrides = Partial<Pick<CreatePreviewGraphOptions, 'containerId' | 'data' | 'position' | 'positionMode' | 'target' | 'trailingEdgeId' | 'trailingEdgeStyle'>>;
 export declare function reparentPreviewNodeToContainer(previewNode: Node, containerId: string, reactFlowInstance: ReactFlowInstance): Node | null;
 export declare function createPreviewGraph(options: CreatePreviewGraphOptions): PreviewGraph | null;
-export declare function showPreviewGraph(options: CreatePreviewGraphOptions): PreviewGraph | null;
-export declare function applyPreviewGraphToReactFlow(preview: PreviewGraph, reactFlowInstance: ReactFlowInstance): void;
+export declare function showPreviewGraph(options: CreatePreviewGraphOptions, applicationOptions?: PreviewApplicationOptions): PreviewGraph | null;
+export declare function applyPreviewGraphToReactFlow(preview: PreviewGraph, reactFlowInstance: ReactFlowInstance, { canApply }?: PreviewApplicationOptions): void;
 //# sourceMappingURL=createPreviewGraph.d.ts.map

package/dist/canvas/utils/createPreviewGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPreviewGraph.d.ts","sourceRoot":"","sources":["../../../src/canvas/utils/createPreviewGraph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,iBAAiB,EAClB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE3C,OAAO,EAIL,KAAK,uBAAuB,EAC7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAuB,KAAK,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG/E,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,IAAI,CAAC;IACX,KAAK,EAAE,IAAI,EAAE,CAAC;CACf;AAGD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAMD,MAAM,WAAW,yBAAyB;IACxC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,gBAAgB,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IACvC,eAAe,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACpD,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,YAAY,CAAC,EAAE,uBAAuB,CAAC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,aAAa,CAAC;IAOlC,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;CAC3C;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,CACzC,IAAI,CACF,yBAAyB,EACvB,aAAa,GACb,MAAM,GACN,UAAU,GACV,cAAc,GACd,QAAQ,GACR,gBAAgB,GAChB,mBAAmB,CACtB,CACF,CAAC;AAgCF,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,IAAI,EACjB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,iBAAiB,GACnC,IAAI,GAAG,IAAI,CAkBb;AAwDD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,YAAY,GAAG,IAAI,CAqB1F;AAOD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,yBAAyB,GAAG,YAAY,GAAG,IAAI,CAMxF;AAOD,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,YAAY,EACrB,iBAAiB,EAAE,iBAAiB,GACnC,IAAI,CAgBN"}
+{"version":3,"file":"createPreviewGraph.d.ts","sourceRoot":"","sources":["../../../src/canvas/utils/createPreviewGraph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,iBAAiB,EAClB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE3C,OAAO,EAIL,KAAK,uBAAuB,EAC7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAuB,KAAK,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG/E,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,IAAI,CAAC;IACX,KAAK,EAAE,IAAI,EAAE,CAAC;CACf;AAED,MAAM,WAAW,yBAAyB;IAKxC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC;CACvC;AAGD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAMD,MAAM,WAAW,yBAAyB;IACxC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,gBAAgB,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IACvC,eAAe,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACpD,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,YAAY,CAAC,EAAE,uBAAuB,CAAC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,aAAa,CAAC;IAOlC,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;CAC3C;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,CACzC,IAAI,CACF,yBAAyB,EACvB,aAAa,GACb,MAAM,GACN,UAAU,GACV,cAAc,GACd,QAAQ,GACR,gBAAgB,GAChB,mBAAmB,CACtB,CACF,CAAC;AAgCF,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,IAAI,EACjB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,iBAAiB,GACnC,IAAI,GAAG,IAAI,CAkBb;AAwDD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,YAAY,GAAG,IAAI,CAqB1F;AAOD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,yBAAyB,EAClC,kBAAkB,GAAE,yBAA8B,GACjD,YAAY,GAAG,IAAI,CAMrB;AAOD,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,YAAY,EACrB,iBAAiB,EAAE,iBAAiB,EACpC,EAAE,QAAQ,EAAE,GAAE,yBAA8B,GAC3C,IAAI,CAuBN"}

package/dist/canvas/utils/createPreviewGraph.js

@@ -69,14 +69,14 @@ function createPreviewGraph(options) {
         edges
     };
 }
-function showPreviewGraph(options) {
+function showPreviewGraph(options, applicationOptions = {}) {
     const preview = createPreviewGraph(options);
-    if (preview) applyPreviewGraphToReactFlow(preview, options.reactFlowInstance);
+    if (preview) applyPreviewGraphToReactFlow(preview, options.reactFlowInstance, applicationOptions);
     return preview;
 }
-function applyPreviewGraphToReactFlow(preview, reactFlowInstance) {
+function applyPreviewGraphToReactFlow(preview, reactFlowInstance, { canApply } = {}) {
     const originalEdge = preview.node.data?.originalEdge;
-    setTimeout(()=>{
+    const applyNodes = ()=>{
         reactFlowInstance.setNodes((nodes)=>[
                 ...nodes.filter((node)=>node.id !== PREVIEW_NODE_ID).map((node)=>({
                         ...node,
@@ -84,10 +84,15 @@ function applyPreviewGraphToReactFlow(preview, reactFlowInstance) {
                     })),
                 preview.node
             ]);
-        reactFlowInstance.setEdges((edges)=>[
-                ...edges.filter((edge)=>!isPreviewEdge(edge) && edge.id !== originalEdge?.id),
-                ...preview.edges
-            ]);
+    };
+    const applyEdges = (edges)=>[
+            ...edges.filter((edge)=>!isPreviewEdge(edge) && edge.id !== originalEdge?.id),
+            ...preview.edges
+        ];
+    setTimeout(()=>{
+        if (canApply?.(reactFlowInstance.getEdges()) === false) return;
+        applyNodes();
+        reactFlowInstance.setEdges(applyEdges);
     }, 0);
 }
 export { applyPreviewGraphToReactFlow, createPreviewGraph, reparentPreviewNodeToContainer, showPreviewGraph };

package/dist/canvas/utils/manifest-resolver.cjs

@@ -64,10 +64,11 @@ function replaceTemplateVars(template, vars) {
 function resolveHandles(handleGroups, context) {
     const isCollapsed = context?.isCollapsed ?? false;
     return handleGroups.map((group)=>{
+        const hidesGroup = isCollapsed && 'inner' === group.boundary;
         const handles = group.handles.flatMap((handle)=>{
             const isArtifactHandle = 'artifact' === handle.handleType;
             const handleBaseVisible = resolveVisibility(handle.visible, context);
-            const handleVisible = isCollapsed && isArtifactHandle ? false : handleBaseVisible;
+            const handleVisible = hidesGroup || isCollapsed && isArtifactHandle ? false : handleBaseVisible;
             if (handle.repeat) {
                 const array = getPropertyByPath(context, handle.repeat);
                 if (!Array.isArray(array)) {

package/dist/canvas/utils/manifest-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-resolver.d.ts","sourceRoot":"","sources":["../../../src/canvas/utils/manifest-resolver.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AACnG,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAC5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAKrE,MAAM,WAAW,iBAAkB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAEhE,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAEhC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAUD,MAAM,MAAM,eAAe,GAAG,qBAAqB,GAAG;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wBAAwB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5C,CAAC;AAKF,MAAM,WAAW,cAAe,SAAQ,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;IAE7F,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAE9C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAEjD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;CAClD;AAKD,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC;IAE/E,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B;AAKD,UAAU,YAAY;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAkBD,wBAAgB,cAAc,CAC5B,eAAe,CAAC,EAAE,mBAAmB,EACrC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,eAAe,CAwCjB;AA6BD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,EACrC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAmBT;AAiCD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,MAAM,CAKhF;AAuCD,wBAAgB,cAAc,CAC5B,YAAY,EAAE,mBAAmB,EAAE,EACnC,OAAO,EAAE,iBAAiB,GACzB,mBAAmB,EAAE,CAmEvB"}
+{"version":3,"file":"manifest-resolver.d.ts","sourceRoot":"","sources":["../../../src/canvas/utils/manifest-resolver.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AACnG,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAC5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAKrE,MAAM,WAAW,iBAAkB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAEhE,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAEhC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAUD,MAAM,MAAM,eAAe,GAAG,qBAAqB,GAAG;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wBAAwB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5C,CAAC;AAKF,MAAM,WAAW,cAAe,SAAQ,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;IAE7F,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAE9C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAEjD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;CAClD;AAKD,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC;IAE/E,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B;AAKD,UAAU,YAAY;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAkBD,wBAAgB,cAAc,CAC5B,eAAe,CAAC,EAAE,mBAAmB,EACrC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,eAAe,CAwCjB;AA6BD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,EACrC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAmBT;AAiCD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,MAAM,CAKhF;AAuCD,wBAAgB,cAAc,CAC5B,YAAY,EAAE,mBAAmB,EAAE,EACnC,OAAO,EAAE,iBAAiB,GACzB,mBAAmB,EAAE,CAsEvB"}

package/dist/canvas/utils/manifest-resolver.js

@@ -33,10 +33,11 @@ function replaceTemplateVars(template, vars) {
 function resolveHandles(handleGroups, context) {
     const isCollapsed = context?.isCollapsed ?? false;
     return handleGroups.map((group)=>{
+        const hidesGroup = isCollapsed && 'inner' === group.boundary;
         const handles = group.handles.flatMap((handle)=>{
             const isArtifactHandle = 'artifact' === handle.handleType;
             const handleBaseVisible = resolveVisibility(handle.visible, context);
-            const handleVisible = isCollapsed && isArtifactHandle ? false : handleBaseVisible;
+            const handleVisible = hidesGroup || isCollapsed && isArtifactHandle ? false : handleBaseVisible;
             if (handle.repeat) {
                 const array = getPropertyByPath(context, handle.repeat);
                 if (!Array.isArray(array)) {

package/dist/canvas/utils/toolbar-resolver.cjs

@@ -42,6 +42,16 @@ const DEFAULT_ACTIONS_FOR_ALL_MODES = [
                 }
             ]
         }
+    },
+    {
+        id: 'collapse',
+        icon: 'chevrons-down-up',
+        label: 'Toggle collapse',
+        condition: {
+            shapes: [
+                'container'
+            ]
+        }
     }
 ];
 const DEFAULT_MODE_TOOLBARS = {
@@ -95,6 +105,10 @@ function evaluateCondition(manifest, action, nodeType, context) {
     }
     if (condition.hideOnExecution && context.executionState) return false;
     if (condition.nodeTypes && !condition.nodeTypes.includes(nodeType)) return false;
+    if (condition.shapes?.length) {
+        const shape = manifest.display?.shape;
+        if (!shape || !condition.shapes.includes(shape)) return false;
+    }
     if (condition.handles?.length) {
         const manifestHandles = manifest.handleConfiguration.flatMap((group)=>group.handles);
         const hasMatchingHandle = condition.handles.some((requiredHandle)=>manifestHandles.some((manifestHandle)=>manifestHandle.handleType === requiredHandle.handleType && (void 0 === requiredHandle.type || manifestHandle.type === requiredHandle.type)));
@@ -122,19 +136,31 @@ function convertToNodeAction(action, mode, nodeData) {
         }
     };
 }
+function dedupeById(actions) {
+    const byId = new Map();
+    for (const action of actions)byId.set(action.id, action);
+    return [
+        ...byId.values()
+    ];
+}
 function mergeToolbarConfigs(base, extension) {
     if (!base && !extension) return {
         actions: []
     };
     if (!base) return extension;
     if (!extension) return base;
+    const extensionIds = new Set([
+        ...extension.actions,
+        ...extension.overflowActions ?? []
+    ].map((action)=>action.id));
+    const notOverridden = (action)=>!extensionIds.has(action.id);
     return {
         actions: [
-            ...base.actions,
+            ...base.actions.filter(notOverridden),
             ...extension.actions
         ],
         overflowActions: [
-            ...base.overflowActions ?? [],
+            ...(base.overflowActions ?? []).filter(notOverridden),
             ...extension.overflowActions ?? []
         ]
     };
@@ -150,8 +176,9 @@ function resolveToolbar(manifest, context, nodeData) {
     } : rawDefaults;
     const nodeExtensions = manifestToolbarExtensions?.[mode];
     const merged = mergeToolbarConfigs(modeDefaults, nodeExtensions);
-    const filteredActions = merged.actions.filter((action)=>evaluateCondition(manifest, action, nodeType, context)).map((action)=>convertToNodeAction(action, mode, nodeData));
-    const filteredOverflow = (merged.overflowActions ?? []).filter((action)=>evaluateCondition(manifest, action, nodeType, context)).map((action)=>convertToNodeAction(action, mode, nodeData));
+    const resolveActions = (actions)=>dedupeById(actions.filter((action)=>evaluateCondition(manifest, action, nodeType, context))).map((action)=>convertToNodeAction(action, mode, nodeData));
+    const filteredActions = resolveActions(merged.actions);
+    const filteredOverflow = resolveActions(merged.overflowActions ?? []);
     if (0 === filteredActions.length && 0 === filteredOverflow.length) return;
     return {
         actions: filteredActions,

package/dist/canvas/utils/toolbar-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolbar-resolver.d.ts","sourceRoot":"","sources":["../../../src/canvas/utils/toolbar-resolver.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAGV,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;AAKrC,UAAU,mBAAoB,SAAQ,iBAAiB;IAErD,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AA0ID,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjC,iBAAiB,GAAG,SAAS,CA8C/B"}
+{"version":3,"file":"toolbar-resolver.d.ts","sourceRoot":"","sources":["../../../src/canvas/utils/toolbar-resolver.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAGV,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;AAKrC,UAAU,mBAAoB,SAAQ,iBAAiB;IAErD,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAsKD,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjC,iBAAiB,GAAG,SAAS,CA8C/B"}

package/dist/canvas/utils/toolbar-resolver.js

@@ -14,6 +14,16 @@ const DEFAULT_ACTIONS_FOR_ALL_MODES = [
                 }
             ]
         }
+    },
+    {
+        id: 'collapse',
+        icon: 'chevrons-down-up',
+        label: 'Toggle collapse',
+        condition: {
+            shapes: [
+                'container'
+            ]
+        }
     }
 ];
 const DEFAULT_MODE_TOOLBARS = {
@@ -67,6 +77,10 @@ function evaluateCondition(manifest, action, nodeType, context) {
     }
     if (condition.hideOnExecution && context.executionState) return false;
     if (condition.nodeTypes && !condition.nodeTypes.includes(nodeType)) return false;
+    if (condition.shapes?.length) {
+        const shape = manifest.display?.shape;
+        if (!shape || !condition.shapes.includes(shape)) return false;
+    }
     if (condition.handles?.length) {
         const manifestHandles = manifest.handleConfiguration.flatMap((group)=>group.handles);
         const hasMatchingHandle = condition.handles.some((requiredHandle)=>manifestHandles.some((manifestHandle)=>manifestHandle.handleType === requiredHandle.handleType && (void 0 === requiredHandle.type || manifestHandle.type === requiredHandle.type)));
@@ -94,19 +108,31 @@ function convertToNodeAction(action, mode, nodeData) {
         }
     };
 }
+function dedupeById(actions) {
+    const byId = new Map();
+    for (const action of actions)byId.set(action.id, action);
+    return [
+        ...byId.values()
+    ];
+}
 function mergeToolbarConfigs(base, extension) {
     if (!base && !extension) return {
         actions: []
     };
     if (!base) return extension;
     if (!extension) return base;
+    const extensionIds = new Set([
+        ...extension.actions,
+        ...extension.overflowActions ?? []
+    ].map((action)=>action.id));
+    const notOverridden = (action)=>!extensionIds.has(action.id);
     return {
         actions: [
-            ...base.actions,
+            ...base.actions.filter(notOverridden),
             ...extension.actions
         ],
         overflowActions: [
-            ...base.overflowActions ?? [],
+            ...(base.overflowActions ?? []).filter(notOverridden),
             ...extension.overflowActions ?? []
         ]
     };
@@ -122,8 +148,9 @@ function resolveToolbar(manifest, context, nodeData) {
     } : rawDefaults;
     const nodeExtensions = manifestToolbarExtensions?.[mode];
     const merged = mergeToolbarConfigs(modeDefaults, nodeExtensions);
-    const filteredActions = merged.actions.filter((action)=>evaluateCondition(manifest, action, nodeType, context)).map((action)=>convertToNodeAction(action, mode, nodeData));
-    const filteredOverflow = (merged.overflowActions ?? []).filter((action)=>evaluateCondition(manifest, action, nodeType, context)).map((action)=>convertToNodeAction(action, mode, nodeData));
+    const resolveActions = (actions)=>dedupeById(actions.filter((action)=>evaluateCondition(manifest, action, nodeType, context))).map((action)=>convertToNodeAction(action, mode, nodeData));
+    const filteredActions = resolveActions(merged.actions);
+    const filteredOverflow = resolveActions(merged.overflowActions ?? []);
     if (0 === filteredActions.length && 0 === filteredOverflow.length) return;
     return {
         actions: filteredActions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uipath/apollo-react",
-  "version": "6.27.0",
+  "version": "6.29.0",
   "description": "Apollo Design System - React component library with Material UI theming",
   "repository": {
     "type": "git",