@cqa-lib/cqa-ui 1.1.395 → 1.1.396

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

@@ -31329,20 +31329,23 @@ class TemplateVariablesFormComponent {
                     this.cdr.markForCheck();
                 }
             }
-            // If parameter options changed and we have default values, try to initialize them.
-            // IMPORTANT: only do this on the FIRST time parameterOptions arrive, otherwise every
-            // search (which also updates parameterOptions) would re-run initializeTestDataVariables()
-            // and reset the test-data type dropdown back to 'plain-text'.
+            // Re-run initializeTestDataVariables whenever parameterOptions changes and there are still
+            // variables that need initialization (have profileId but missing profile name or dataSet).
+            // We do NOT use firstChange here because the saved profile may arrive in a second API call
+            // (id@<profileId>) after the initial paginated list, so firstChange would miss it.
+            // The inner some() guard ensures we only re-run when variables are still incomplete,
+            // preventing unnecessary re-runs on user search updates.
             if (changes['parameterOptions'] &&
-                changes['parameterOptions'].firstChange &&
                 this.parameterOptions.length > 0 &&
-                ((this.defaultTestDataProfileId && this.defaultTestDataStartIndex != null) ||
-                    // Check if any variable has selectedTestDataProfileId but is missing selectedTestDataProfile or selectedDataSet
-                    // This happens when loading a saved step - setTemplateVariables sets the ID, but we need parameterOptions to set the name and data set
-                    this.templateVariables?.some(v => this.needsDataTypeDropdown(v) &&
-                        v.dataType === 'parameter' &&
-                        v.selectedTestDataProfileId != null &&
-                        (!v.selectedTestDataProfile || !v.selectedDataSet)) ||
+                (
+                // Check if any variable has selectedTestDataProfileId but is missing selectedTestDataProfile or selectedDataSet
+                // This happens when loading a saved step - setTemplateVariables sets the ID, but we need parameterOptions to set the name and data set
+                this.templateVariables?.some(v => this.needsDataTypeDropdown(v) &&
+                    v.dataType === 'parameter' &&
+                    v.selectedTestDataProfileId != null &&
+                    (!v.selectedTestDataProfile || !v.selectedDataSet)) ||
+                    (this.defaultTestDataProfileId && this.defaultTestDataStartIndex != null &&
+                        this.templateVariables?.some(v => this.needsDataTypeDropdown(v) && v.dataType === 'parameter' && !v.selectedTestDataProfile)) ||
                     // The extra uninitialized-variable check below is debug-only: only run it in debug mode
                     // to avoid double-initialising variables in non-debug step-builder flows.
                     (this.isDebug && this.templateVariables?.some(v => this.needsDataTypeDropdown(v) && v.dataType === 'parameter' && !v.selectedTestDataProfile)))) {
@@ -31555,14 +31558,22 @@ class TemplateVariablesFormComponent {
                     // For environment type, parse the value to extract environment and parameter
                     if (dataType === 'environment') {
                         // Environment values are in format *|parameterName|
-                        // We need to find which environment this parameter belongs to
                         const paramName = rawValue;
                         if (paramName) {
-                            // Find the environment that contains this parameter
-                            const envOption = this.environmentOptions.find(env => env.name === paramName);
+                            // If we have a saved environmentId, use it for an exact match (env-{id}-{param})
+                            // to avoid selecting the wrong environment when multiple environments share param names.
+                            let envOption;
+                            if (variable.selectedEnvironmentId != null) {
+                                const exactId = `env-${variable.selectedEnvironmentId}-${paramName}`;
+                                envOption = this.environmentOptions.find(env => env.id === exactId);
+                            }
+                            // Fallback: match by param name only (legacy / first-time save)
+                            if (!envOption) {
+                                envOption = this.environmentOptions.find(env => env.name === paramName);
+                            }
                             if (envOption) {
                                 variable.selectedEnvironment = envOption.environment;
-                                // Extract and store environment ID
+                                // Extract and store environment ID from the option id
                                 const idMatch = envOption.id.match(/env-(\d+)-/);
                                 if (idMatch && idMatch[1]) {
                                     variable.selectedEnvironmentId = parseInt(idMatch[1], 10);