Change fireSoon to take callback function (#4071)

* change firesoon to take callback function * use RDP label when determining type of registry
microsoft · Sep 14, 2023 · 4e6aa8a · 4e6aa8a
1 parent 51e8fa9
commit 4e6aa8a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/extensionVariables.ts b/src/extensionVariables.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { AzExtTreeDataProvider, AzExtTreeItem, IExperimentationServiceAdapter } from '@microsoft/vscode-azext-utils';
-import { DockerHubRegistryDataProvider, GenericRegistryV2DataProvider } from '@microsoft/vscode-docker-registries';
+import { DockerHubRegistryDataProvider, GenericRegistryV2DataProvider, GitHubRegistryDataProvider } from '@microsoft/vscode-docker-registries';
 import { ExtensionContext, StatusBarItem, TreeView } from 'vscode';
 import { ContainerRuntimeManager } from './runtimes/ContainerRuntimeManager';
 import { OrchestratorRuntimeManager } from './runtimes/OrchestratorRuntimeManager';
@@ -53,6 +53,7 @@ export namespace ext {
     export let genericRegistryV2DataProvider: GenericRegistryV2DataProvider;
     export let azureRegistryDataProvider: AzureRegistryDataProvider;
     export let dockerHubRegistryDataProvider: DockerHubRegistryDataProvider;
+    export let githubRegistryDataProvider: GitHubRegistryDataProvider;
 
     export let volumesTree: AzExtTreeDataProvider;
     export let volumesTreeView: TreeView<AzExtTreeItem>;

diff --git a/src/tree/registerTrees.ts b/src/tree/registerTrees.ts
@@ -48,7 +48,8 @@ export function registerTrees(): void {
     const genericRegistryV2DataProvider = new GenericRegistryV2DataProvider(ext.context);
     const azureRegistryDataProvider = new AzureRegistryDataProvider(ext.context);
     const dockerHubRegistryDataProvider = new DockerHubRegistryDataProvider(ext.context);
-    urtdp.registerProvider(new GitHubRegistryDataProvider(ext.context));
+    const githubRegistryDataProvider = new GitHubRegistryDataProvider(ext.context);
+    urtdp.registerProvider(githubRegistryDataProvider);
     urtdp.registerProvider(dockerHubRegistryDataProvider);
     urtdp.registerProvider(azureRegistryDataProvider);
     urtdp.registerProvider(genericRegistryV2DataProvider);
@@ -58,6 +59,7 @@ export function registerTrees(): void {
     ext.genericRegistryV2DataProvider = genericRegistryV2DataProvider;
     ext.azureRegistryDataProvider = azureRegistryDataProvider;
     ext.dockerHubRegistryDataProvider = dockerHubRegistryDataProvider;
+    ext.githubRegistryDataProvider = githubRegistryDataProvider;
 
     ext.volumesRoot = new VolumesTreeItem(undefined);
     const volumesLoadMore = 'vscode-docker.volumes.loadMore';

diff --git a/src/tree/registries/Azure/AzureRegistryDataProvider.ts b/src/tree/registries/Azure/AzureRegistryDataProvider.ts
@@ -62,7 +62,7 @@ export class AzureRegistryDataProvider extends RegistryV2DataProvider implements
         if (isRegistryRoot(element)) {
             if (!await this.subscriptionProvider.isSignedIn()) {
                 await this.subscriptionProvider.signIn();
-                this.fireSoon(element);
+                this.fireSoon(() => this.onDidChangeTreeDataEmitter.fire(element));
                 return [];
             }
 
@@ -216,11 +216,10 @@ export class AzureRegistryDataProvider extends RegistryV2DataProvider implements
         return this.authenticationProviders.get(registryString)!;
     }
 
-    private fireSoon(element?: CommonRegistryItem | undefined) {
+    private fireSoon(callback: () => void, delay: number = 5) {
         const timeout = setTimeout(() => {
             clearTimeout(timeout);
-            this.onDidChangeTreeDataEmitter.fire(element);
-        }, 5);
+            callback();
+        }, delay);
     }
-
 }
diff --git a/src/tree/registries/UnifiedRegistryTreeDataProvider.ts b/src/tree/registries/UnifiedRegistryTreeDataProvider.ts
@@ -1,5 +1,6 @@
 import { CommonRegistry, CommonRegistryRoot, RegistryDataProvider, isRegistry } from '@microsoft/vscode-docker-registries';
 import * as vscode from 'vscode';
+import { ext } from '../../extensionVariables';
 import { isAzureSubscriptionRegistryItem } from './Azure/AzureRegistryDataProvider';
 
 export interface UnifiedRegistryItem<T> {
@@ -149,14 +150,14 @@ export class UnifiedRegistryTreeDataProvider implements vscode.TreeDataProvider<
         // filter out registry roots that don't match the image base name
         if (imageBaseName) {
             if (imageBaseName === 'docker.io') {
-                registryRoots = registryRoots.filter(r => (r.wrappedItem as CommonRegistryRoot).label === 'Docker Hub');
+                registryRoots = registryRoots.filter(r => (r.wrappedItem as CommonRegistryRoot).label === ext.dockerHubRegistryDataProvider.label);
             }
             else if (imageBaseName.endsWith('azurecr.io')) {
-                registryRoots = registryRoots.filter(r => (r.wrappedItem as CommonRegistryRoot).label === 'Azure');
+                registryRoots = registryRoots.filter(r => (r.wrappedItem as CommonRegistryRoot).label === ext.azureRegistryDataProvider.label);
                 findAzureRegistryOnly = true;
             }
             else if (imageBaseName === 'ghcr.io') {
-                registryRoots = registryRoots.filter(r => (r.wrappedItem as CommonRegistryRoot).label === 'GitHub');
+                registryRoots = registryRoots.filter(r => (r.wrappedItem as CommonRegistryRoot).label === ext.githubRegistryDataProvider.label);
             }
             else {
                 registryRoots = registryRoots.filter(