minor rule fixes

pingidentity · Dec 5, 2024 · fde1282 · fde1282
1 parent f4bd701
commit fde1282
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/rules/dv-rule-node-001/NodeRule.js b/rules/dv-rule-node-001/NodeRule.js
@@ -50,10 +50,7 @@ class NodeRule extends LintRule {
           if (
             data.nodeType === "CONNECTION" &&
             !data.properties?.nodeTitle?.value &&
-            !(
-              (data.name === "Teleport" || data.name === "Node") &&
-              data.capabilityName === "goToNode"
-            )
+            !(data.capabilityName === 'goToNode' || data.capabilityName === 'returnBackToCallingNode')
           ) {
             this.addError("dv-bp-node-001", {
               flowId: flow.flowId,
@@ -67,10 +64,7 @@ class NodeRule extends LintRule {
           if (
             data.nodeType === "CONNECTION" &&
             !data.properties?.nodeDescription?.value &&
-            !(
-              (data.name === "Teleport" || data.name === "Node") &&
-              data.capabilityName === "goToNode"
-            )
+            !(data.capabilityName === 'goToNode' || data.capabilityName === 'returnBackToCallingNode')
           ) {
             this.addError("dv-bp-node-003", {
               flowId: flow.flowId,
@@ -95,7 +89,7 @@ class NodeRule extends LintRule {
               this.addError("dv-bp-node-002", {
                 flowId: flow.flowId,
                 messageArgs: [
-                  data.properties?.backgroundColor?.value.toLowerCase(),
+                  data.properties?.backgroundColor?.value.toLowerCase() || '',
                   `${data.name} (${data.id}) - ${data.capabilityName}`,
                 ],
                 recommendationArgs: [`${data.name} (${data.id}) - ${data.capabilityName}`, backgroundColor[connectorCapability]],

diff --git a/rules/dv-rule-subflow-001/SubflowRule.js b/rules/dv-rule-subflow-001/SubflowRule.js
@@ -97,6 +97,7 @@ class DVRule extends LintRule {
               if (missingFields?.length > 0) {
                 const selectedSubflowName = node.data.properties.subFlowId.value.label;
                 this.addError("dv-er-subflow-003", {
+                  flowId: targetFlow.flowId,
                   messageArgs: [selectedSubflowName],
                   recommendationArgs: [selectedSubflowName],
                   nodeId: node.data.id,