ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-03 11:01:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

ok button targetted fix (#9095)

Browse Source
This commit is contained in:
Amir Omidi
2020-02-07 17:17:58 -08:00
committed by GitHub
parent ba66305bb5
commit 6770bf877e
4 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
extensions/azurecore/src/azureResource/commands.ts
View File

@@ -71,13 +71,26 @@ export function registerAzureResourceCommands(appContext: AppContext, tree: Azur
}; };
}).sort((a, b) => a.label.localeCompare(b.label)); }).sort((a, b) => a.label.localeCompare(b.label));
const selectedSubscriptionQuickPickItems = await window.showQuickPick(subscriptionQuickPickItems, { canPickMany: true }); const selectedQuickPickItems = subscriptionQuickPickItems.filter(s => s.picked);
if (selectedSubscriptionQuickPickItems && selectedSubscriptionQuickPickItems.length > 0) {
await tree.refresh(node, false);
selectedSubscriptions = selectedSubscriptionQuickPickItems.map((subscriptionItem) => subscriptionItem.subscription); const quickPick = window.createQuickPick<AzureResourceSubscriptionQuickPickItem>();
await subscriptionFilterService.saveSelectedSubscriptions(accountNode.account, selectedSubscriptions); quickPick.ok = true;
} quickPick.items = subscriptionQuickPickItems;
quickPick.canSelectMany = true;
quickPick.selectedItems = selectedQuickPickItems;
quickPick.show();
quickPick.onDidAccept(async event => {
quickPick.hide();
const selectedSubscriptionQuickPickItems = quickPick.selectedItems;
if (selectedSubscriptionQuickPickItems && selectedSubscriptionQuickPickItems.length > 0) {
await tree.refresh(node, false);
selectedSubscriptions = selectedSubscriptionQuickPickItems.map((subscriptionItem) => subscriptionItem.subscription);
await subscriptionFilterService.saveSelectedSubscriptions(accountNode.account, selectedSubscriptions);
}
});
}); });
appContext.apiWrapper.registerCommand('azure.resource.refreshall', () => tree.notifyNodeChanged(undefined)); appContext.apiWrapper.registerCommand('azure.resource.refreshall', () => tree.notifyNodeChanged(undefined));

24
extensions/azurecore/src/azureResource/services/subscriptionFilterService.ts
View File

@@ -54,19 +54,21 @@ export class AzureResourceSubscriptionFilterService implements IAzureResourceSub
filters.push(...selectedSubscriptionsCache[accountId].map((subcription) => `${accountId}/${subcription.id}/${subcription.name}`)); filters.push(...selectedSubscriptionsCache[accountId].map((subcription) => `${accountId}/${subcription.id}/${subcription.name}`));
} }
const resourceFilterConfig = this._config.inspect<string[]>(AzureResourceSubscriptionFilterService.filterConfigName); if (this._config) {
let configTarget = ConfigurationTarget.Global; const resourceFilterConfig = this._config.inspect<string[]>(AzureResourceSubscriptionFilterService.filterConfigName);
if (resourceFilterConfig) { let configTarget = ConfigurationTarget.Global;
if (resourceFilterConfig.workspaceFolderValue) { if (resourceFilterConfig) {
configTarget = ConfigurationTarget.WorkspaceFolder; if (resourceFilterConfig.workspaceFolderValue) {
} else if (resourceFilterConfig.workspaceValue) { configTarget = ConfigurationTarget.WorkspaceFolder;
configTarget = ConfigurationTarget.Workspace; } else if (resourceFilterConfig.workspaceValue) {
} else if (resourceFilterConfig.globalValue) { configTarget = ConfigurationTarget.Workspace;
configTarget = ConfigurationTarget.Global; } else if (resourceFilterConfig.globalValue) {
configTarget = ConfigurationTarget.Global;
}
} }
}
await this._config.update(AzureResourceSubscriptionFilterService.filterConfigName, filters, configTarget); await this._config.update(AzureResourceSubscriptionFilterService.filterConfigName, filters, configTarget);
}
} }
private _config: WorkspaceConfiguration = undefined; private _config: WorkspaceConfiguration = undefined;

3
src/vs/vscode.d.ts vendored
View File

@@ -7940,6 +7940,9 @@ declare module 'vscode' {
* An event signaling when the selected items have changed. * An event signaling when the selected items have changed.
*/ */
readonly onDidChangeSelection: Event<T[]>; readonly onDidChangeSelection: Event<T[]>;
// {SQL CARBON EDIT} Temporary change to allow setting the behavior of the QuickPick
ok: boolean;
} }
/** /**

13
src/vs/workbench/api/common/extHostQuickOpen.ts
View File

@@ -261,9 +261,22 @@ class ExtHostQuickInput implements QuickInput {
this._onDidChangeValueEmitter this._onDidChangeValueEmitter
]; ];
constructor(protected _proxy: MainThreadQuickOpenShape, protected _extensionId: ExtensionIdentifier, private _onDidDispose: () => void) { constructor(protected _proxy: MainThreadQuickOpenShape, protected _extensionId: ExtensionIdentifier, private _onDidDispose: () => void) {
} }
// {SQL CARBON EDIT} START Temporary change for ok button visibility
private _ok = false;
get ok() {
return this._ok;
}
set ok(ok: boolean) {
this._ok = ok;
this.update({ ok });
}
// {SQL CARBON EDIT} END Temporary change for ok button visibility
get title() { get title() {
return this._title; return this._title;
} }