Adds logic to display noMatchingResources for multiple container registry steps (#471)

Author: MicroFish91

src/commands/deployImage/imageSource/containerRegistry/RegistryRepositoriesListBaseStep.ts

@@ -5,19 +5,24 @@
 
 import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils";
 import type { QuickPickItem } from "vscode";
-import { QuickPicksCache, loadMoreQp } from "../../../../constants";
+import { QuickPicksCache, loadMoreQp, noMatchingResourcesQp } from "../../../../constants";
 import { localize } from "../../../../utils/localize";
 import type { IContainerRegistryImageContext } from "./IContainerRegistryImageContext";
 
 export abstract class RegistryRepositoriesListStepBase extends AzureWizardPromptStep<IContainerRegistryImageContext> {
     public async prompt(context: IContainerRegistryImageContext): Promise<void> {
         const picksCache: QuickPicksCache = { cache: [], next: null };
         const placeHolder: string = localize('selectRepo', 'Select a repository');
-        let result: QuickPickItem;
+        let result: QuickPickItem | undefined;
 
         do {
-            result = await context.ui.showQuickPick(this.getPicks(context, picksCache), { placeHolder });
-        } while (result === loadMoreQp)
+            if (result === noMatchingResourcesQp) {
+                // Don't need to store any data since there's only one pick available
+                await context.ui.showQuickPick([noMatchingResourcesQp], { placeHolder });
+            } else {
+                result = await context.ui.showQuickPick(this.getPicks(context, picksCache), { placeHolder });
+            }
+        } while (result === noMatchingResourcesQp || result === loadMoreQp)
 
         context.repositoryName = result.label;
     }

src/commands/deployImage/imageSource/containerRegistry/acr/AcrListStep.ts

@@ -7,7 +7,7 @@ import type { ContainerRegistryManagementClient, Registry } from "@azure/arm-con
 import type { ResourceGroup } from "@azure/arm-resources";
 import { LocationListStep, ResourceGroupListStep, getResourceGroupFromId, uiUtils } from "@microsoft/vscode-azext-azureutils";
 import { AzureWizardExecuteStep, AzureWizardPromptStep, IAzureQuickPickItem, ISubscriptionActionContext, IWizardOptions, nonNullProp } from "@microsoft/vscode-azext-utils";
-import { ImageSource, acrDomain, currentlyDeployed, quickStartImageName } from "../../../../../constants";
+import { ImageSource, acrDomain, currentlyDeployed, noMatchingResources, noMatchingResourcesQp, quickStartImageName } from "../../../../../constants";
 import { createContainerRegistryManagementClient } from "../../../../../utils/azureClients";
 import { parseImageName } from "../../../../../utils/imageNameUtils";
 import { localize } from "../../../../../utils/localize";
@@ -24,7 +24,13 @@ import { SkuListStep } from "./createAcr/SkuListStep";
 export class AcrListStep extends AzureWizardPromptStep<IContainerRegistryImageContext> {
     public async prompt(context: IContainerRegistryImageContext): Promise<void> {
         const placeHolder: string = localize('selectRegistry', 'Select an Azure Container Registry');
-        context.registry = (await context.ui.showQuickPick(this.getPicks(context), { placeHolder })).data;
+
+        let result: Registry | typeof noMatchingResources | undefined;
+        do {
+            result = (await context.ui.showQuickPick(this.getPicks(context), { placeHolder })).data;
+        } while (result === noMatchingResources)
+
+        context.registry = result;
     }
 
     public shouldPrompt(context: IContainerRegistryImageContext): boolean {
@@ -63,7 +69,7 @@ export class AcrListStep extends AzureWizardPromptStep<IContainerRegistryImageCo
         return undefined;
     }
 
-    public async getPicks(context: IContainerRegistryImageContext): Promise<IAzureQuickPickItem<Registry | undefined>[]> {
+    public async getPicks(context: IContainerRegistryImageContext): Promise<IAzureQuickPickItem<Registry | typeof noMatchingResources | undefined>[]> {
         const registries: Registry[] = await AcrListStep.getRegistries(context);
 
         // Try to suggest a registry only when the user is deploying to a Container App
@@ -86,7 +92,7 @@ export class AcrListStep extends AzureWizardPromptStep<IContainerRegistryImageCo
             }
         }
 
-        const picks: IAzureQuickPickItem<Registry | undefined>[] = [];
+        const picks: IAzureQuickPickItem<Registry | typeof noMatchingResources | undefined>[] = [];
 
         // The why of `suppressCreate` in a nutshell: https://github.com/microsoft/vscode-azurecontainerapps/issues/78#issuecomment-1090686282
         const suppressCreate: boolean = context.imageSource !== ImageSource.RemoteAcrBuild;
@@ -98,6 +104,10 @@ export class AcrListStep extends AzureWizardPromptStep<IContainerRegistryImageCo
             });
         }
 
+        if (!picks.length && !registries.length) {
+            picks.push(noMatchingResourcesQp);
+        }
+
         return picks.concat(
             registries.map((r) => {
                 return !!suggestedRegistry && r.loginServer === suggestedRegistry ?

src/commands/deployImage/imageSource/containerRegistry/acr/AcrRepositoriesListStep.ts

@@ -2,10 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+
 import { uiUtils } from "@microsoft/vscode-azext-azureutils";
 import { nonNullValue } from "@microsoft/vscode-azext-utils";
 import type { QuickPickItem } from "vscode";
-import { acrDomain, currentlyDeployed, quickStartImageName } from "../../../../../constants";
+import { acrDomain, currentlyDeployed, noMatchingResourcesQp, quickStartImageName } from "../../../../../constants";
 import { createContainerRegistryClient } from "../../../../../utils/azureClients";
 import { parseImageName } from "../../../../../utils/imageNameUtils";
 import type { IContainerRegistryImageContext } from "../IContainerRegistryImageContext";
@@ -37,6 +38,10 @@ export class AcrRepositoriesListStep extends RegistryRepositoriesListStepBase {
             }
         }
 
+        if (!repositoryNames.length) {
+            return [noMatchingResourcesQp];
+        }
+
         // Preferring 'suppressPersistence: true' over 'priority: highest' to avoid the possibility of a double parenthesis appearing in the description
         return repositoryNames.map((rn) => {
             return !!suggestedRepository && rn === suggestedRepository ?

src/commands/deployImage/imageSource/containerRegistry/dockerHub/DockerHubContainerRepositoryListStep.ts

@@ -5,9 +5,8 @@
 
 import { nonNullProp } from "@microsoft/vscode-azext-utils";
 import type { QuickPickItem } from "vscode";
-import { QuickPicksCache, currentlyDeployed, dockerHubDomain, loadMoreQp, quickStartImageName } from "../../../../../constants";
+import { QuickPicksCache, currentlyDeployed, dockerHubDomain, loadMoreQp, noMatchingResourcesQp, quickStartImageName } from "../../../../../constants";
 import { parseImageName } from "../../../../../utils/imageNameUtils";
-import { localize } from "../../../../../utils/localize";
 import type { IContainerRegistryImageContext } from "../IContainerRegistryImageContext";
 import { RegistryRepositoriesListStepBase } from "../RegistryRepositoriesListBaseStep";
 import { getLatestContainerAppImage } from "../getLatestContainerImage";
@@ -17,9 +16,8 @@ import type { DockerHubV2Repository } from "./DockerHubV2Types";
 export class DockerHubContainerRepositoryListStep extends RegistryRepositoriesListStepBase {
     public async getPicks(context: IContainerRegistryImageContext, cachedPicks: QuickPicksCache): Promise<QuickPickItem[]> {
         const response = await getReposForNamespace(context, nonNullProp(context, 'dockerHubNamespace'), cachedPicks.next);
-
         if (response.count === 0) {
-            await context.ui.showWarningMessage(localize('noRepos', 'Unable to find any repositories associated to namespace "{0}"', context.dockerHubNamespace), { modal: true });
+            return [noMatchingResourcesQp];
         }
 
         // Try to suggest a repository only when the user is deploying to a Container App
@@ -43,12 +41,12 @@ export class DockerHubContainerRepositoryListStep extends RegistryRepositoriesLi
         }
 
         // Preferring 'suppressPersistence: true' over 'priority: highest' to avoid the possibility of a double parenthesis appearing in the description
-        const quickPicks: QuickPickItem[] = response.results.map((r) => {
+        const picks: QuickPickItem[] = response.results.map((r) => {
             return !!suggestedRepository && r.name === suggestedRepository ?
                 { label: r.name, description: r.description ? `${r.description} ${currentlyDeployed}` : currentlyDeployed, suppressPersistence: true } :
                 { label: r.name, description: r.description, suppressPersistence: srExists }
         });
-        cachedPicks.cache.push(...quickPicks);
+        cachedPicks.cache.push(...picks);
 
         if (response.next) {
             cachedPicks.next = response.next;

src/constants.ts

@@ -69,6 +69,14 @@ export type SupportedRegistries = 'azurecr.io' | 'docker.io';
 
 export const browseItem: IAzureQuickPickItem<undefined> = { label: `$(file-directory) ${localize('browse', 'Browse...')}`, description: '', data: undefined };
 export const loadMoreQp: IAzureQuickPickItem = { label: '$(sync) Load More', data: undefined, suppressPersistence: true };
+
+export const noMatchingResources = 'noMatchingResources';
+export const noMatchingResourcesQp: IAzureQuickPickItem<typeof noMatchingResources> = {
+    label: localize('noMatchingResources', 'No matching resources found.'),
+    description: '',
+    data: noMatchingResources
+};
+
 export type QuickPicksCache = { cache: QuickPickItem[], next: string | null };
 
 export const vscodeFolder: string = '.vscode';