Small fix for sorting currently deployed pick (#840)

microsoft · Jan 14, 2025 · 3b0b051 · 3b0b051
1 parent 8face28
commit 3b0b051
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/src/commands/image/imageSource/containerRegistry/acr/AcrListStep.ts b/src/commands/image/imageSource/containerRegistry/acr/AcrListStep.ts
@@ -73,7 +73,7 @@ export class AcrListStep<T extends ContainerRegistryImageSourceContext> extends
 
             await tryConfigureResourceGroupForRegistry(context, promptSteps);
 
-            if (context.resourceGroup) {
+            if (!LocationListStep.hasLocation(context) && context.resourceGroup) {
                 await LocationListStep.setLocation(context, context.resourceGroup.location);
             } else {
                 LocationListStep.addStep(context, promptSteps);
@@ -188,22 +188,18 @@ export class AcrListStep<T extends ContainerRegistryImageSourceContext> extends
                 };
             });
 
-            // If a currently deployed registry exists, we can expect it to be in the first resource group because we already sorted the group to the front
-            if (i === 0 && hasCurrentRegistry) {
-                groupedRegistries.sort((a, b) => {
-                    if (hasMatchingPickDescription(a, currentlyDeployedPickDescription)) {
-                        return -1;
-                    } else if (hasMatchingPickDescription(b, currentlyDeployedPickDescription)) {
-                        return 1;
-                    } else {
-                        return 0;
-                    }
-                });
-            }
-
             picks.push(...groupedRegistries);
         }
 
+        // If a currently deployed registry exists, bring it to the front of the list
+        if (hasCurrentRegistry) {
+            const cdIdx: number = picks.findIndex(p => hasMatchingPickDescription(p, currentlyDeployedPickDescription));
+            if (cdIdx !== -1) {
+                const currentlyDeployedPick: IAzureQuickPickItem<Registry> | undefined = picks.splice(cdIdx, 1)[0];
+                picks.unshift(currentlyDeployedPick);
+            }
+        }
+
         return picks;
     }