@cqa-lib/cqa-ui 1.1.257 → 1.1.258

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

@@ -22193,25 +22193,29 @@ class TestCaseLoopStepComponent {
             });
         }
         if (this.loopType === 'while') {
+            // When naturalTextActionId exists, populate condition and selected template from options so autocomplete shows selected template
+            const configWithId = this.config;
+            if (configWithId?.naturalTextActionId != null && this.naturalTextActionsOptions?.length) {
+                this.rebuildWhileConditionFromNaturalTextAction();
+            }
+            else if (this.condition || configWithId?.templateVariablesData) {
+                // Fallback: match by condition text when naturalTextActionId not set
+                const conditionStr = this.condition || configWithId?.condition || '';
+                if (conditionStr && (this.naturalTextActionsOptions || []).length > 0) {
+                    const matchingOption = this.naturalTextActionsOptions.find((opt) => (opt.naturalText || opt.name || opt.value) === conditionStr);
+                    const fullTemplate = matchingOption?.template || matchingOption;
+                    if (fullTemplate && fullTemplate.variables) {
+                        this.selectedTemplate = fullTemplate;
+                        this.templateVariables = this.setConditionTemplateVariables(fullTemplate) || [];
+                        this.buildTemplateVariablesForm();
+                    }
+                }
+            }
             this.editForm.patchValue({
                 condition: this.condition ?? '',
                 maxIterations: this.maxIterations ?? 5,
             });
         }
-        // While loop: restore selected template and template variables from config when opening edit
-        if (this.loopType === 'while' && (this.condition || this.config.templateVariablesData)) {
-            const configWithData = this.config;
-            const conditionStr = this.condition || configWithData.condition || '';
-            if (conditionStr && (this.naturalTextActionsOptions || []).length > 0) {
-                const matchingOption = this.naturalTextActionsOptions.find((opt) => (opt.naturalText || opt.name || opt.value) === conditionStr);
-                const fullTemplate = matchingOption?.template || matchingOption;
-                if (fullTemplate && fullTemplate.variables) {
-                    this.selectedTemplate = fullTemplate;
-                    this.templateVariables = this.setConditionTemplateVariables(fullTemplate) || [];
-                    this.buildTemplateVariablesForm();
-                }
-            }
-        }
         this.isEditing = true;
         this.edit.emit();
     }