1652-PR fixes

Author: katarina-cala

client/src/pages/platform/cluster-element-editor/utils/createClusterElementsNodes.ts

@@ -43,11 +43,13 @@ export default function createClusterElementNodes({
         }
 
         const actionTypes = clusterRootComponentDefinition.actionClusterElementTypes;
+
         if (!actionTypes || Object.keys(actionTypes).length === 0) {
             return true;
         }
 
         const operationElementTypes = actionTypes[operationName];
+
         if (!operationElementTypes || operationElementTypes.length === 0) {
             return true;
         }

client/src/pages/platform/workflow-editor/WorkflowEditorLayout.tsx

@@ -14,7 +14,7 @@ import useRightSidebarStore from '@/pages/platform/workflow-editor/stores/useRig
 import useWorkflowEditorStore from '@/pages/platform/workflow-editor/stores/useWorkflowEditorStore';
 import {useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
 import {XIcon} from 'lucide-react';
-import {Suspense, lazy, useEffect} from 'react';
+import {Suspense, lazy, useEffect, useMemo} from 'react';
 import {twMerge} from 'tailwind-merge';
 import {useShallow} from 'zustand/shallow';
 
@@ -86,7 +86,10 @@ const WorkflowEditorLayout = ({includeComponents, runDisabled, showWorkflowInput
 
     const {invalidateWorkflowQueries, updateWorkflowMutation} = useWorkflowEditor();
 
-    const isMainRootClusterElement = currentNode?.clusterRoot && !currentNode.isNestedClusterRoot;
+    const isMainRootClusterElement = useMemo(
+        () => currentNode?.clusterRoot && !currentNode?.isNestedClusterRoot,
+        [currentNode?.clusterRoot, currentNode?.isNestedClusterRoot]
+    );
 
     useEffect(() => {
         if (isMainRootClusterElement) {

client/src/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel.tsx

@@ -497,9 +497,10 @@ const WorkflowNodeDetailsPanel = ({
 
     const filteredClusterElementOperations = useMemo(() => {
         if (currentComponentDefinition?.clusterElement && currentNode?.clusterElementType) {
-            return currentComponentDefinition?.clusterElements?.filter((clusterElement) => {
-                return clusterElement.type === convertNameToSnakeCase(currentNode.clusterElementType as string);
-            });
+            return currentComponentDefinition?.clusterElements?.filter(
+                (clusterElement) =>
+                    clusterElement.type === convertNameToSnakeCase(currentNode.clusterElementType as string)
+            );
         }
 
         return currentComponentDefinition?.clusterElements;

client/src/pages/platform/workflow-editor/nodes/WorkflowNode.tsx

@@ -111,24 +111,27 @@ const WorkflowNode = ({data, id}: {data: NodeDataType; id: string}) => {
         clusterElementsCanvasOpen && (!!isMainRootClusterElement || isNestedClusterRoot)
     );
 
-    const clusterElementTypesCount = useMemo(
-        () =>
+    const clusterElementTypesCount = useMemo(() => {
+        const clusterRootRequirementMet =
             clusterElementsCanvasOpen &&
             (isMainRootClusterElement || isNestedClusterRoot) &&
-            rootClusterElementDefinition
-                ? getClusterElementTypesCount({
-                      clusterRootComponentDefinition: rootClusterElementDefinition,
-                      operationName: data.operationName,
-                  })
-                : 0,
-        [
-            clusterElementsCanvasOpen,
-            isNestedClusterRoot,
-            isMainRootClusterElement,
-            rootClusterElementDefinition,
-            data.operationName,
-        ]
-    );
+            rootClusterElementDefinition;
+
+        if (!clusterRootRequirementMet) {
+            return 0;
+        }
+
+        return getClusterElementTypesCount({
+            clusterRootComponentDefinition: rootClusterElementDefinition,
+            operationName: data.operationName,
+        });
+    }, [
+        clusterElementsCanvasOpen,
+        isNestedClusterRoot,
+        isMainRootClusterElement,
+        rootClusterElementDefinition,
+        data.operationName,
+    ]);
 
     const nodeWidth = useMemo(
         () =>