@cqa-lib/cqa-ui 1.1.398 → 1.1.400

package/fesm2020/cqa-lib-cqa-ui.mjs

@@ -25138,7 +25138,8 @@ class TestCaseConditionStepComponent {
     }
     buildElseIfBranch(index) {
         // Initialize ELSE IF form with empty values or from existing ELSE IF branch if available
-        const elseIfBranches = this.branches?.filter(b => b.type === 'else-if') || [];
+        // Use getAllBranchesFlat to include chained nextBranch ELSE IFs
+        const elseIfBranches = this.getAllBranchesFlat().filter(b => b.type === 'else-if');
         const branchIndex = index !== undefined ? index : elseIfBranches.length;
         const elseIfBranch = elseIfBranches[branchIndex];
         const elseCondition = elseIfBranch?.action || '';
@@ -25466,8 +25467,25 @@ class TestCaseConditionStepComponent {
     }
     /** Count and summarize condition branches using their display step numbers.
      * Example: IF + 2x ELSE IF + ELSE → "Steps 6-9 (4 steps)". */
+    /**
+     * Returns a flat list of all branches including those chained via nextBranch.
+     * Used for counting, badge display, and summary when the condition uses a chained structure.
+     */
+    getAllBranchesFlat() {
+        const result = [];
+        const traverse = (branches) => {
+            for (const b of branches) {
+                result.push(b);
+                if (b.nextBranch)
+                    traverse([b.nextBranch]);
+            }
+        };
+        traverse(this.branches || []);
+        return result;
+    }
     getStepsSummary() {
-        const branchCount = this.branches?.length ?? 0;
+        const allBranches = this.getAllBranchesFlat();
+        const branchCount = allBranches.length;
         if (branchCount === 0) {
             return '0 steps';
         }
@@ -25481,7 +25499,8 @@ class TestCaseConditionStepComponent {
     /** Branch type badges for step row: IF, ELSE IF (with count if multiple), ELSE */
     getBranchTypeBadges() {
         const badges = [];
-        const elseIfCount = this.branches?.filter(b => b.type === 'else-if').length ?? 0;
+        const allBranches = this.getAllBranchesFlat();
+        const elseIfCount = allBranches.filter(b => b.type === 'else-if').length;
         const hasElse = this.hasElseBranch;
         badges.push({ label: 'IF', type: 'if', badgeClass: 'cqa-bg-[#0DBD7D1A] cqa-text-[#0D542B] cqa-border cqa-border-solid cqa-border-[#0DBD7D]' });
         if (elseIfCount > 0) {
@@ -25700,7 +25719,7 @@ class TestCaseConditionStepComponent {
     }
     /** True when condition already has an ELSE branch (disables Add ELSE IF / Add ELSE). */
     get hasElseBranch() {
-        return this.branches?.some(b => b.type === 'else') ?? false;
+        return this.getAllBranchesFlat().some(b => b.type === 'else');
     }
     onOpenExternal() {
         // Not used in condition step, but needed for recursive step groups
@@ -25908,6 +25927,7 @@ class TestCaseConditionStepComponent {
         let updatedConfig;
         if (isEditingElseIfBranch && branchForEdit && branchForEdit.id != null) {
             // Editing existing ELSE IF branch: target that branch's step ID and send raw condition so backend updates the branch only.
+            // Any new ELSE IF added here chains off this specific ELSE IF (handled by step-list since updatedConfig.id = this branch's id).
             updatedConfig = {
                 ...updatedConfigBase,
                 id: String(branchForEdit.id),
@@ -25917,10 +25937,15 @@ class TestCaseConditionStepComponent {
             };
         }
         else {
-            // IF condition edit (step row or IF branch row): use formatted condition for display
+            // IF condition edit (step row or IF branch row): use formatted condition for display.
+            // When editing from the IF TRUE branch row (branchIndex === 0), any new ELSE IFs must be
+            // inserted directly after the IF branch — not at the end of the chain.
+            // Pass insertAfterBranchId so step-list knows the exact insertion point.
+            const isEditingIfBranchRow = isEditingBranchRow && branchForEdit?.type === 'if' && branchForEdit.id != null;
             updatedConfig = {
                 ...updatedConfigBase,
                 condition: this.condition,
+                ...(isEditingIfBranchRow && { insertAfterBranchId: String(branchForEdit.id) }),
             };
         }
         // Emit individual change event
@@ -31420,24 +31445,29 @@ class TemplateVariablesFormComponent {
                             if (variable.selectedTestDataProfileId != null) {
                                 profileToUse = this.parameterOptions.find((testData) => testData.id === variable.selectedTestDataProfileId);
                                 if (profileToUse && profileToUse.data && profileToUse.data.length > 0) {
-                                    // Find the data set that contains the parameter value
-                                    const paramName = rawValue;
-                                    if (paramName && paramName.trim()) {
-                                        // Search through all data sets to find the one containing this parameter
-                                        for (const dataSet of profileToUse.data) {
-                                            if (dataSet && dataSet.data) {
-                                                // Check if this data set has the parameter
-                                                if (dataSet.data.hasOwnProperty(paramName)) {
-                                                    dataSetToUse = dataSet;
-                                                    break;
+                                    // If defaultTestDataStartIndex is provided, use it directly
+                                    if (this.defaultTestDataStartIndex != null && profileToUse.data.length > this.defaultTestDataStartIndex) {
+                                        dataSetToUse = profileToUse.data[this.defaultTestDataStartIndex];
+                                    }
+                                    else {
+                                        // Find the data set that contains the parameter value
+                                        const paramName = rawValue;
+                                        if (paramName && paramName.trim()) {
+                                            // Search through all data sets to find the one containing this parameter
+                                            for (const dataSet of profileToUse.data) {
+                                                if (dataSet && dataSet.data) {
+                                                    // Check if this data set has the parameter
+                                                    if (dataSet.data.hasOwnProperty(paramName)) {
+                                                        dataSetToUse = dataSet;
+                                                        break;
+                                                    }
                                                 }
                                             }
                                         }
-                                    }
-                                    // If not found by parameter name, use first data set as fallback
-                                    // This ensures the data set dropdown is shown even if parameter isn't found yet
-                                    if (!dataSetToUse && profileToUse.data.length > 0) {
-                                        dataSetToUse = profileToUse.data[0];
+                                        // If not found by parameter name, use first data set as fallback
+                                        if (!dataSetToUse && profileToUse.data.length > 0) {
+                                            dataSetToUse = profileToUse.data[0];
+                                        }
                                     }
                                 }
                             }