Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update @microsoft/vscode-docker-registries and clean up registerTrees.ts #4181

Merged
merged 3 commits into from
Nov 30, 2023
Merged

Update @microsoft/vscode-docker-registries and clean up registerTrees.ts #4181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb56b78
Use new @microsoft/vscode-docker-registries package
bwateratmsft Nov 30, 2023
2bd1509
Clean up `registerTrees.ts`
bwateratmsft Nov 30, 2023
7b86611
Show collapse-all
bwateratmsft Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3002,7 +3002,7 @@
"@microsoft/vscode-azext-azureutils": "^2.0.0",
"@microsoft/vscode-azext-utils": "^2.1.1",
"@microsoft/vscode-container-client": "^0.1.1",
"@microsoft/vscode-docker-registries": "^0.1.8",
"@microsoft/vscode-docker-registries": "^0.1.9",
"dayjs": "^1.11.7",
"dockerfile-language-server-nodejs": "^0.11.0",
"fs-extra": "^11.1.1",
Expand Down
20 changes: 20 additions & 0 deletions src/commands/images/pushImage/RefreshRegistriesViewStep.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE.md in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { AzureWizardExecuteStep } from '@microsoft/vscode-azext-utils';
import { ext } from '../../../extensionVariables';
import { PushImageWizardContext } from './PushImageWizardContext';

export class RefreshRegistriesViewStep extends AzureWizardExecuteStep<PushImageWizardContext> {
public priority: number = 400;

public async execute(wizardContext: PushImageWizardContext): Promise<void> {
void ext.registriesTree.refresh();
}

public shouldExecute(wizardContext: PushImageWizardContext): boolean {
return true;
}
}
2 changes: 2 additions & 0 deletions src/commands/images/pushImage/pushImage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { FinalTagPromptStep } from './FinalTagPromptStep';
import { GetRegistryTargetPromptStep } from './GetRegistryTargetPromptStep';
import { ImagePushStep } from './ImagePushStep';
import { PushImageWizardContext } from './PushImageWizardContext';
import { RefreshRegistriesViewStep } from './RefreshRegistriesViewStep';
import { RegistryLoginStep } from './RegistryLoginStep';

export async function pushImage(context: IActionContext, node: ImageTreeItem | undefined): Promise<void> {
Expand All @@ -36,6 +37,7 @@ export async function pushImage(context: IActionContext, node: ImageTreeItem | u
executeSteps: [
new RegistryLoginStep(),
new ImagePushStep(),
new RefreshRegistriesViewStep(),
],
showLoadingPrompt: true,
});
Expand Down
52 changes: 29 additions & 23 deletions src/tree/registerTrees.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,58 +26,42 @@ export function registerTrees(): void {
ext.containersTree = new AzExtTreeDataProvider(ext.containersRoot, containersLoadMore);
ext.containersTreeView = vscode.window.createTreeView('dockerContainers', { treeDataProvider: ext.containersTree, canSelectMany: true });
ext.context.subscriptions.push(ext.containersTreeView);
/* eslint-disable-next-line @typescript-eslint/promise-function-async */
registerCommand(containersLoadMore, (context: IActionContext, node: AzExtTreeItem) => ext.containersTree.loadMore(node, context));
registerCommand(containersLoadMore, async (context: IActionContext, node: AzExtTreeItem) => ext.containersTree.loadMore(node, context));

ext.networksRoot = new NetworksTreeItem(undefined);
const networksLoadMore = 'vscode-docker.networks.loadMore';
ext.networksTree = new AzExtTreeDataProvider(ext.networksRoot, networksLoadMore);
ext.networksTreeView = vscode.window.createTreeView('dockerNetworks', { treeDataProvider: ext.networksTree, canSelectMany: true });
ext.context.subscriptions.push(ext.networksTreeView);
/* eslint-disable-next-line @typescript-eslint/promise-function-async */
registerCommand(networksLoadMore, (context: IActionContext, node: AzExtTreeItem) => ext.networksTree.loadMore(node, context));
registerCommand(networksLoadMore, async (context: IActionContext, node: AzExtTreeItem) => ext.networksTree.loadMore(node, context));

ext.imagesRoot = new ImagesTreeItem(undefined);
const imagesLoadMore = 'vscode-docker.images.loadMore';
ext.imagesTree = new AzExtTreeDataProvider(ext.imagesRoot, imagesLoadMore);
ext.imagesTreeView = vscode.window.createTreeView('dockerImages', { treeDataProvider: ext.imagesTree, canSelectMany: true });
ext.context.subscriptions.push(ext.imagesTreeView);
/* eslint-disable-next-line @typescript-eslint/promise-function-async */
registerCommand(imagesLoadMore, (context: IActionContext, node: AzExtTreeItem) => ext.imagesTree.loadMore(node, context));
registerCommand(imagesLoadMore, async (context: IActionContext, node: AzExtTreeItem) => ext.imagesTree.loadMore(node, context));

const urtdp = new UnifiedRegistryTreeDataProvider(ext.context.globalState);
const genericRegistryV2DataProvider = new GenericRegistryV2DataProvider(ext.context);
const azureRegistryDataProvider = new AzureRegistryDataProvider(ext.context);
const dockerHubRegistryDataProvider = new DockerHubRegistryDataProvider(ext.context);
const githubRegistryDataProvider = new GitHubRegistryDataProvider(ext.context);
urtdp.registerProvider(githubRegistryDataProvider);
urtdp.registerProvider(dockerHubRegistryDataProvider);
urtdp.registerProvider(azureRegistryDataProvider);
urtdp.registerProvider(genericRegistryV2DataProvider);
ext.registriesRoot = urtdp;
ext.registriesTreeView = vscode.window.createTreeView('dockerRegistries', { treeDataProvider: urtdp });
ext.registriesTreeView = vscode.window.createTreeView('dockerRegistries', { treeDataProvider: urtdp, showCollapseAll: true });
ext.registriesTree = urtdp;
ext.genericRegistryV2DataProvider = genericRegistryV2DataProvider;
ext.azureRegistryDataProvider = azureRegistryDataProvider;
ext.dockerHubRegistryDataProvider = dockerHubRegistryDataProvider;
ext.githubRegistryDataProvider = githubRegistryDataProvider;
registerRegistryDataProviders(urtdp);
void migrateRegistriesData(ext.context);

ext.volumesRoot = new VolumesTreeItem(undefined);
const volumesLoadMore = 'vscode-docker.volumes.loadMore';
ext.volumesTree = new AzExtTreeDataProvider(ext.volumesRoot, volumesLoadMore);
ext.volumesTreeView = vscode.window.createTreeView('dockerVolumes', { treeDataProvider: ext.volumesTree, canSelectMany: true });
ext.context.subscriptions.push(ext.volumesTreeView);
/* eslint-disable-next-line @typescript-eslint/promise-function-async */
registerCommand(volumesLoadMore, (context: IActionContext, node: AzExtTreeItem) => ext.volumesTree.loadMore(node, context));
registerCommand(volumesLoadMore, async (context: IActionContext, node: AzExtTreeItem) => ext.volumesTree.loadMore(node, context));

ext.contextsRoot = new ContextsTreeItem(undefined);
const contextsLoadMore = 'vscode-docker.contexts.loadMore';
ext.contextsTree = new AzExtTreeDataProvider(ext.contextsRoot, contextsLoadMore);
ext.contextsTreeView = vscode.window.createTreeView('vscode-docker.views.dockerContexts', { treeDataProvider: ext.contextsTree, canSelectMany: false });
ext.context.subscriptions.push(ext.contextsTreeView);
/* eslint-disable-next-line @typescript-eslint/promise-function-async */
registerCommand(contextsLoadMore, (context: IActionContext, node: AzExtTreeItem) => ext.contextsTree.loadMore(node, context));
registerCommand(contextsLoadMore, async (context: IActionContext, node: AzExtTreeItem) => ext.contextsTree.loadMore(node, context));

const helpRoot = new HelpsTreeItem(undefined);
const helpTreeDataProvider = new AzExtTreeDataProvider(helpRoot, 'vscode-docker.help.loadMore');
Expand All @@ -90,3 +74,25 @@ export function registerTrees(): void {
// Register the refresh manager
ext.context.subscriptions.push(new RefreshManager());
}

function registerRegistryDataProviders(urtdp: UnifiedRegistryTreeDataProvider): void {
const githubRegistryDataProvider = new GitHubRegistryDataProvider(ext.context);
ext.context.subscriptions.push(urtdp.registerProvider(githubRegistryDataProvider));
ext.context.subscriptions.push(githubRegistryDataProvider);
ext.githubRegistryDataProvider = githubRegistryDataProvider;

const dockerHubRegistryDataProvider = new DockerHubRegistryDataProvider(ext.context);
ext.context.subscriptions.push(urtdp.registerProvider(dockerHubRegistryDataProvider));
ext.context.subscriptions.push(dockerHubRegistryDataProvider);
ext.dockerHubRegistryDataProvider = dockerHubRegistryDataProvider;

const azureRegistryDataProvider = new AzureRegistryDataProvider(ext.context);
ext.context.subscriptions.push(urtdp.registerProvider(azureRegistryDataProvider));
ext.context.subscriptions.push(azureRegistryDataProvider);
ext.azureRegistryDataProvider = azureRegistryDataProvider;

const genericRegistryV2DataProvider = new GenericRegistryV2DataProvider(ext.context);
ext.context.subscriptions.push(urtdp.registerProvider(genericRegistryV2DataProvider));
ext.context.subscriptions.push(genericRegistryV2DataProvider);
ext.genericRegistryV2DataProvider = genericRegistryV2DataProvider;
}
1 change: 1 addition & 0 deletions src/tree/registries/Azure/AzureRegistryDataProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ export class AzureRegistryDataProvider extends RegistryV2DataProvider implements
}

public dispose(): void {
super.dispose();
this.subscriptionProvider.dispose();
}

Expand Down