fix(core): review chnages

review chnages in fix of else column GH-71
sourcefuse · Mar 4, 2024 · 08fd016 · 08fd016
1 parent 3840b36
commit 08fd016
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 22 deletions.
diff --git a/projects/workflows-creator/src/lib/builder/builder.component.ts b/projects/workflows-creator/src/lib/builder/builder.component.ts
@@ -209,22 +209,32 @@ export class BuilderComponent<E> implements OnInit, OnChanges {
    * This function checks if the else block should be hidden based on the type and number of events in
    * the event group.
    */
+
   hideElseBlockIfRequired() {
     const events = this.eventGroups[0].children;
-    let value = events[0].node.state.get('value');
+    const firstEvent = events[0]?.node;
+
+    if (events.length !== 1 || !firstEvent) {
+      this.elseBlockHidden = false;
+      return;
+    }
+
+    let value = firstEvent.state.get('value');
+
     if (typeof value === 'object') {
       value = value.value;
     }
-    if (events.length !== 1) {
-      this.elseBlockHidden = false;
-    } else {
-      this.elseBlockHidden =
-        events[0].node.getIdentifier() === EventTypes.OnIntervalEvent ||
-        events[0].node.getIdentifier() === EventTypes.OnAddItemEvent ||
-        (events[0].node.getIdentifier() === EventTypes.OnChangeEvent &&
-          (value === ValueTypes.AnyValue ||
-            events[0].node.state.get('valueType') === ValueTypes.AnyValue));
-    }
+
+    const eventType = firstEvent.getIdentifier();
+    const eventValue = firstEvent.state.get('value');
+    const eventValueType = firstEvent.state.get('valueType');
+
+    this.elseBlockHidden =
+      eventType === EventTypes.OnIntervalEvent ||
+      eventType === EventTypes.OnAddItemEvent ||
+      (eventType === EventTypes.OnChangeEvent &&
+        (eventValue === ValueTypes.AnyValue ||
+          eventValueType === ValueTypes.AnyValue));
   }
 
   /**
@@ -475,16 +485,16 @@ export class BuilderComponent<E> implements OnInit, OnChanges {
           case EventTypes.OnValueEvent:
           case ActionTypes.ChangeColumnValueAction:
             const columnExists = !!node.node.state.get('column');
-              let valueExists = false;
-              if (typeof node.node.state.get('value') !== 'undefined') {
-                valueExists = true;
-              } else if (
-                node.node.state.get('condition') === ConditionTypes.PastToday
-              ) {
-                valueExists = true;
-              } else {
-                valueExists = !!node.node.state.get('value');
-              }
+            let valueExists = false;
+            if (typeof node.node.state.get('value') !== 'undefined') {
+              valueExists = true;
+            } else if (
+              node.node.state.get('condition') === ConditionTypes.PastToday
+            ) {
+              valueExists = true;
+            } else {
+              valueExists = !!node.node.state.get('value');
+            }
             const valueTypeIsAnyValue =
               node.node.state.get('valueType') === ValueTypes.AnyValue;
             isValid = columnExists && (valueExists || valueTypeIsAnyValue);

diff --git a/projects/workflows-element/package.json b/projects/workflows-element/package.json
@@ -17,5 +17,5 @@
     "access": "public",
     "directory": "dist"
   },
-  "hash": "853bef78b9dcd9c176ad24ff687b712172ea5c2f610b41b15ee24ba65309c129"
+  "hash": "24191f21fc1004d7e80232918f4268c427089e3248f3c474b69e24a941a704bf"
 }