Merge pull request #1018 from qoretechnologies/develop

v3.6.6

CHANGELOG.md

@@ -1,7 +1,15 @@
 # Changelog
 
+## Version 3.6.6
+
+#### Bug Fixes
+
+- Fixed a bug that left "null" value in an FSM state when removing all transitions
+
 ## Version 3.6.5
 
+#### Bug Fixes
+
 - Fixed a bug that caused a crash when creating a job while the Schedule field was empty
 
 ## Version 3.6.4

README.md

@@ -5,6 +5,10 @@ This extension makes it possible to easily create, deploy, and test Qorus interf
 It is a perfect tool for creating no-code solutions for the Qorus Integration Engine. The Qorus Developer Tools allow to create building blocks that can be
 reused later and setup an initial configuration for them.
 
+## Version 3.6.6 overview - What's new:
+
+- Fixed a bug that left "null" value in an FSM state when removing all transitions
+
 ## Version 3.6.5 overview - What's new:
 
 - Fixed a bug that caused a crash when creating a job while the Schedule field was empty

package.json

@@ -2,7 +2,7 @@
   "name": "qorus-vscode",
   "displayName": "Qorus Developer Tools",
   "description": "Qorus Integration Engine developer tools",
-  "version": "3.6.5",
+  "version": "3.6.6",
   "publisher": "qoretechnologies",
   "author": {
     "name": "Qore Technologies",

web/containers/InterfaceCreator/fsm/index.tsx

@@ -961,6 +961,11 @@ const FSMView: React.FC<IFSMViewProps> = ({
         fixedStates[id].transitions = newTransitions;
       }
 
+      // Check if transitions are null and remove them
+      if (size(fixedStates[id].transitions) === 0) {
+        delete fixedStates[id].transitions;
+      }
+
       fixedStates = await fixIncomptibleStates(id, fixedStates);
     }
 
@@ -977,7 +982,7 @@ const FSMView: React.FC<IFSMViewProps> = ({
       const anotherTransitionData = transitionData?.data;
       const remove = !transitionData;
 
-      let transitionsCopy = [...states[stateId].transitions];
+      let transitionsCopy = [...(states[stateId].transitions || [])];
 
       if (remove) {
         delete transitionsCopy[index];
@@ -989,7 +994,6 @@ const FSMView: React.FC<IFSMViewProps> = ({
       }
 
       transitionsCopy = transitionsCopy.filter((t) => t);
-      transitionsCopy = size(transitionsCopy) === 0 ? null : transitionsCopy;
 
       // @ts-expect-error
       const data: IFSMState = { transitions: transitionsCopy };
@@ -999,6 +1003,11 @@ const FSMView: React.FC<IFSMViewProps> = ({
         ...data,
       };
 
+      // Remove the transitions if they are empty
+      if (size(fixedStates[stateId].transitions) === 0) {
+        delete fixedStates[stateId].transitions;
+      }
+
       if (data?.type !== states[stateId].type || !isEqual(data.action, states[stateId].action)) {
         if (size(fixedStates[stateId].transitions)) {
           const newTransitions = [];
@@ -1093,12 +1102,12 @@ const FSMView: React.FC<IFSMViewProps> = ({
   const hasBothWayTransition = (
     stateId: string,
     targetId: string
-  ): { stateId: string; index: number } => {
+  ): { stateId: string; index: number } | null => {
     const transitionIndex = states[targetId].transitions?.findIndex(
       (transition) => transition.state === stateId
     );
 
-    if (transitionIndex >= 0) {
+    if (transitionIndex && transitionIndex >= 0) {
       return { stateId: targetId, index: transitionIndex };
     }