ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 09:35:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove CMS ApiWrapper (#11439)

Browse Source
This commit is contained in:
Charles Gagnon
2020-07-20 15:24:36 -07:00
committed by GitHub
parent 921beebd79
commit 8828758b2f
14 changed files with 28 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
extensions/cms/src/cmsResource/cmsResourceCommands.ts
View File

@@ -5,6 +5,7 @@
import * as nls from 'vscode-nls';
import * as azdata from 'azdata';
import * as vscode from 'vscode';
import { AppContext } from '../appContext';
import { TreeNode } from './treeNode';
import { CmsResourceTreeProvider } from './tree/treeProvider';
@@ -17,7 +18,7 @@ const localize = nls.loadMessageBundle();
export function registerCmsServerCommand(appContext: AppContext, tree: CmsResourceTreeProvider): void {
// Create a CMS Server
appContext.apiWrapper.registerCommand('cms.resource.registerCmsServer', async (node?: TreeNode, connectionProfile?: azdata.IConnectionProfile) => {
vscode.commands.registerCommand('cms.resource.registerCmsServer', async (node?: TreeNode, connectionProfile?: azdata.IConnectionProfile) => {
if (node && !(node instanceof CmsResourceEmptyTreeNode)) {
return;
}
@@ -60,7 +61,7 @@ export function registerCmsServerCommand(appContext: AppContext, tree: CmsResour
export function deleteCmsServerCommand(appContext: AppContext, tree: CmsResourceTreeProvider): void {
// Delete a CMS Server
appContext.apiWrapper.registerCommand('cms.resource.deleteCmsServer', async (node?: TreeNode) => {
vscode.commands.registerCommand('cms.resource.deleteCmsServer', async (node?: TreeNode) => {
if (!(node instanceof CmsResourceTreeNode)) {
return;
}
@@ -72,7 +73,7 @@ export function deleteCmsServerCommand(appContext: AppContext, tree: CmsResource
export function addRegisteredServerCommand(appContext: AppContext, tree: CmsResourceTreeProvider): void {
// Add a registered server
appContext.apiWrapper.registerCommand('cms.resource.addRegisteredServer', async (node?: TreeNode) => {
vscode.commands.registerCommand('cms.resource.addRegisteredServer', async (node?: TreeNode) => {
if (!(node instanceof CmsResourceTreeNode || node instanceof ServerGroupTreeNode)) {
return;
}
@@ -86,11 +87,11 @@ export function addRegisteredServerCommand(appContext: AppContext, tree: CmsReso
export function deleteRegisteredServerCommand(appContext: AppContext, tree: CmsResourceTreeProvider): void {
// Delete a registered server
appContext.apiWrapper.registerCommand('cms.resource.deleteRegisteredServer', async (node?: TreeNode) => {
vscode.commands.registerCommand('cms.resource.deleteRegisteredServer', async (node?: TreeNode) => {
if (!(node instanceof RegisteredServerTreeNode)) {
return;
}
let result = await appContext.apiWrapper.showWarningMessage(
let result = await vscode.window.showWarningMessage(
`${localize('cms.confirmDeleteServer', "Are you sure you want to delete")} ${node.name}?`,
localize('cms.yes', "Yes"),
localize('cms.no', "No"));
@@ -103,7 +104,7 @@ export function deleteRegisteredServerCommand(appContext: AppContext, tree: CmsR
export function addServerGroupCommand(appContext: AppContext, tree: CmsResourceTreeProvider): void {
// Add a registered server group
appContext.apiWrapper.registerCommand('cms.resource.addServerGroup', async (node?: TreeNode) => {
vscode.commands.registerCommand('cms.resource.addServerGroup', async (node?: TreeNode) => {
if (!(node instanceof ServerGroupTreeNode || node instanceof CmsResourceTreeNode)) {
return;
}
@@ -153,7 +154,7 @@ export function addServerGroupCommand(appContext: AppContext, tree: CmsResourceT
} else {
// error out for same server group
const errorText = localize('cms.errors.sameServerGroupName', "{0} already has a Server Group with the name {1}", node.name, serverGroupName);
appContext.apiWrapper.showErrorMessage(errorText);
vscode.window.showErrorMessage(errorText);
throw new Error(errorText);
}
});
@@ -162,11 +163,11 @@ export function addServerGroupCommand(appContext: AppContext, tree: CmsResourceT
export function deleteServerGroupCommand(appContext: AppContext, tree: CmsResourceTreeProvider): void {
// Remove a registered server group
appContext.apiWrapper.registerCommand('cms.resource.deleteServerGroup', async (node?: TreeNode) => {
vscode.commands.registerCommand('cms.resource.deleteServerGroup', async (node?: TreeNode) => {
if (!(node instanceof ServerGroupTreeNode)) {
return;
}
let result = await appContext.apiWrapper.showWarningMessage(
let result = await vscode.window.showWarningMessage(
`${localize('cms.confirmDeleteGroup', "Are you sure you want to delete")} ${node.name}?`,
localize('cms.yes', "Yes"),
localize('cms.no', "No"));
@@ -179,7 +180,7 @@ export function deleteServerGroupCommand(appContext: AppContext, tree: CmsResour
export function refreshCommand(appContext: AppContext, tree: CmsResourceTreeProvider): void {
// Refresh the cms resource
appContext.apiWrapper.registerCommand('cms.resource.refresh', async (node?: TreeNode) => {
vscode.commands.registerCommand('cms.resource.refresh', async (node?: TreeNode) => {
if (!node) {
return;
}

12
extensions/cms/src/cmsResource/tree/treeProvider.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { TreeDataProvider, EventEmitter, Event, TreeItem } from 'vscode';
import * as vscode from 'vscode';
import { AppContext } from '../../appContext';
import * as nls from 'vscode-nls';
const localize = nls.loadMessageBundle();
@@ -14,7 +14,7 @@ import { ICmsResourceTreeChangeHandler } from './treeChangeHandler';
import { CmsResourceMessageTreeNode } from '../messageTreeNode';
import { CmsResourceTreeNode } from './cmsResourceTreeNode';
export class CmsResourceTreeProvider implements TreeDataProvider<TreeNode>, ICmsResourceTreeChangeHandler {
export class CmsResourceTreeProvider implements vscode.TreeDataProvider<TreeNode>, ICmsResourceTreeChangeHandler {
private _appContext: AppContext;
private _children: TreeNode[] = [CmsResourceMessageTreeNode.create(CmsResourceTreeProvider.loadingLabel, undefined)];
@@ -32,7 +32,7 @@ export class CmsResourceTreeProvider implements TreeDataProvider<TreeNode>, ICms
}
if (!this.isSystemInitialized) {
this.loadSavedServers().catch(err => this._appContext.apiWrapper.showErrorMessage(localize('cms.resource.tree.treeProvider.loadError', "Unexpected error occurred while loading saved servers {0}", err)));
this.loadSavedServers().catch(err => vscode.window.showErrorMessage(localize('cms.resource.tree.treeProvider.loadError', "Unexpected error occurred while loading saved servers {0}", err)));
return this._children;
}
try {
@@ -56,7 +56,7 @@ export class CmsResourceTreeProvider implements TreeDataProvider<TreeNode>, ICms
return this._children;
}
public get onDidChangeTreeData(): Event<TreeNode> {
public get onDidChangeTreeData(): vscode.Event<TreeNode> {
return this._onDidChangeTreeData.event;
}
@@ -68,7 +68,7 @@ export class CmsResourceTreeProvider implements TreeDataProvider<TreeNode>, ICms
this._onDidChangeTreeData.fire(node);
}
public getTreeItem(element: TreeNode): TreeItem | Thenable<TreeItem> {
public getTreeItem(element: TreeNode): vscode.TreeItem | Thenable<vscode.TreeItem> {
return element.getTreeItem();
}
@@ -107,7 +107,7 @@ export class CmsResourceTreeProvider implements TreeDataProvider<TreeNode>, ICms
}
public isSystemInitialized: boolean = false;
private _onDidChangeTreeData = new EventEmitter<TreeNode>();
private _onDidChangeTreeData = new vscode.EventEmitter<TreeNode>();
private static readonly loadingLabel = localize('cms.resource.tree.treeProvider.loadingLabel', "Loading ...");
}