pass provider ID info to runAddAccountAction (#23938)

This commit is contained in:
Christopher Suh
2023-07-20 10:16:28 -07:00
committed by GitHub
parent 5377367053
commit a2b1c2cfc5

View File

@@ -458,33 +458,39 @@ export class AccountDialog extends Modal {
this.layout(); this.layout();
} }
private registerActions(viewId: string) { private registerActions(providerId: string) {
const that = this; const that = this;
registerAction2(class extends Action2 { registerAction2(class extends Action2 {
constructor() { constructor() {
super({ super({
id: `workbench.actions.accountDialog.${viewId}.addAccount`, id: `workbench.actions.accountDialog.${providerId}.addAccount`,
title: { value: localize('accountDialog.addConnection', "Add an account"), original: 'Add an account' }, title: { value: localize('accountDialog.addConnection', "Add an account"), original: 'Add an account' },
f1: true, f1: true,
icon: { id: Codicon.add.id }, icon: { id: Codicon.add.id },
menu: { menu: {
id: MenuId.ViewTitle, id: MenuId.ViewTitle,
group: 'navigation', group: 'navigation',
when: ContextKeyEqualsExpr.create('view', viewId), when: ContextKeyEqualsExpr.create('view', providerId),
order: 1 order: 1
} }
}); });
} }
async run() { async run() {
await that.runAddAccountAction(); await that.runAddAccountAction(providerId);
} }
}); });
} }
private async runAddAccountAction() { private async runAddAccountAction(providerId?: string) {
this.logService.debug(`Adding account - providers ${JSON.stringify(Iterable.consume(this._providerViewsMap.keys()))}`); this.logService.debug(`Adding account - providers ${JSON.stringify(Iterable.consume(this._providerViewsMap.keys()))}`);
const vals = Iterable.consume(this._providerViewsMap.values())[0]; const vals = Iterable.consume(this._providerViewsMap.values())[0];
let pickedValue: string | undefined;
let v: IProviderViewUiComponent | undefined;
if (providerId) {
pickedValue = providerId;
v = vals.filter(v => v.view.id === pickedValue)?.[0];
} else {
let pickedValue: string | undefined; let pickedValue: string | undefined;
if (vals.length === 0) { if (vals.length === 0) {
this._notificationService.error(localize('accountDialog.noCloudsRegistered', "You have no clouds enabled. Go to Settings -> Search Azure Account Configuration -> Enable at least one cloud")); this._notificationService.error(localize('accountDialog.noCloudsRegistered', "You have no clouds enabled. Go to Settings -> Search Azure Account Configuration -> Enable at least one cloud"));
@@ -501,8 +507,8 @@ export class AccountDialog extends Modal {
} else { } else {
pickedValue = vals[0].view.title; pickedValue = vals[0].view.title;
} }
v = vals.filter(v => v.view.title === pickedValue)?.[0];
const v = vals.filter(v => v.view.title === pickedValue)?.[0]; }
if (!v) { if (!v) {
this._notificationService.error(localize('accountDialog.didNotPickAuthProvider', "You didn't select any authentication provider. Please try again.")); this._notificationService.error(localize('accountDialog.didNotPickAuthProvider', "You didn't select any authentication provider. Please try again."));