ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-23 21:30:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move protocol client out (#643)

Browse Source 
* close

* connection is working

* formatting

* adds all

* formatting

* formatting and changing how features are initialized

* formatting

* changed named of typings file

* update

* updated to use dataprotocol npm

* formatting

* removed unneeded logging

* readd npm shrinkwrap

* still not working

* removed unnecessary codfe

* addressed comments

* readded azure resource provider

* fix capabilities cacheing

* added backwards capat for older protocol

* update shrinkwrap

* update shrinkwrap

* updated shrinkwrap

* fixed tests

* removed dead code

* remove dead code

* fix compile

* remove backcompat stuff

* change location of npm

* vbump sqltools

* merge master

* fix imports

* fix build breaks

* update for sqlops

* update yarn dependencies
This commit is contained in:
Anthony Dresser
2018-02-20 13:38:16 -08:00
committed by GitHub
parent 8a9ee40524
commit 8570910a43
159 changed files with 4421 additions and 7180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/sql/parts/accountManagement/common/accountActions.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import * as data from 'data';
import * as sqlops from 'sqlops';
import Event, { Emitter } from 'vs/base/common/event';
import { localize } from 'vs/nls';
import { TPromise } from 'vs/base/common/winjs.base';
@@ -55,16 +55,16 @@ export class AddAccountAction extends Action {
return new TPromise((resolve, reject) => {
self._accountManagementService.addAccount(self._providerId)
.then(
() => {
self._addAccountCompleteEmitter.fire();
resolve(true);
},
err => {
error(`Error while adding account: ${err}`);
self._addAccountErrorEmitter.fire(err);
self._addAccountCompleteEmitter.fire();
reject(err);
}
() => {
self._addAccountCompleteEmitter.fire();
resolve(true);
},
err => {
error(`Error while adding account: ${err}`);
self._addAccountErrorEmitter.fire(err);
self._addAccountCompleteEmitter.fire();
reject(err);
}
);
});
}
@@ -78,7 +78,7 @@ export class RemoveAccountAction extends Action {
public static LABEL = localize('removeAccount', 'Remove account');
constructor(
private _account: data.Account,
private _account: sqlops.Account,
@IMessageService private _messageService: IMessageService,
@IErrorMessageService private _errorMessageService: IErrorMessageService,
@IAccountManagementService private _accountManagementService: IAccountManagementService
@@ -143,7 +143,7 @@ export class ApplyFilterAction extends Action {
export class RefreshAccountAction extends Action {
public static ID = 'account.refresh';
public static LABEL = localize('refreshAccount', 'Reenter your credentials');
public account: data.Account;
public account: sqlops.Account;
constructor(
@IAccountManagementService private _accountManagementService: IAccountManagementService
@@ -156,14 +156,14 @@ export class RefreshAccountAction extends Action {
if (self.account) {
self._accountManagementService.refreshAccount(self.account)
.then(
() => {
resolve(true);
},
err => {
error(`Error while refreshing account: ${err}`);
reject(err);
}
);
() => {
resolve(true);
},
err => {
error(`Error while refreshing account: ${err}`);
reject(err);
}
);
} else {
let errorMessage = localize('NoAccountToRefresh', 'There is no account to refresh');
reject(errorMessage);

14
src/sql/parts/accountManagement/common/accountListRenderer.ts
View File

@@ -15,20 +15,20 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { RemoveAccountAction, RefreshAccountAction } from 'sql/parts/accountManagement/common/accountActions';
import * as data from 'data';
import * as sqlops from 'sqlops';
export class AccountListDelegate implements IDelegate<data.Account> {
export class AccountListDelegate implements IDelegate<sqlops.Account> {
constructor(
private _height: number
) {
}
public getHeight(element: data.Account): number {
public getHeight(element: sqlops.Account): number {
return this._height;
}
public getTemplateId(element: data.Account): string {
public getTemplateId(element: sqlops.Account): string {
return 'accountListRenderer';
}
}
@@ -44,7 +44,7 @@ export interface AccountListTemplate {
actions?: ActionBar;
}
export class AccountPickerListRenderer implements IRenderer<data.Account, AccountListTemplate> {
export class AccountPickerListRenderer implements IRenderer<sqlops.Account, AccountListTemplate> {
public static TEMPLATE_ID = 'accountListRenderer';
public get templateId(): string {
@@ -64,7 +64,7 @@ export class AccountPickerListRenderer implements IRenderer<data.Account, Accoun
return tableTemplate;
}
public renderElement(account: data.Account, index: number, templateData: AccountListTemplate): void {
public renderElement(account: sqlops.Account, index: number, templateData: AccountListTemplate): void {
// Set the account icon
templateData.icon.classList.add('account-logo', account.displayInfo.accountType);
@@ -101,7 +101,7 @@ export class AccountListRenderer extends AccountPickerListRenderer {
return tableTemplate;
}
public renderElement(account: data.Account, index: number, templateData: AccountListTemplate): void {
public renderElement(account: sqlops.Account, index: number, templateData: AccountListTemplate): void {
super.renderElement(account, index, templateData);
if (account.isStale) {
templateData.content.innerText = localize('refreshCredentials', 'You need to refresh the credentials for this account.');

10
src/sql/parts/accountManagement/common/interfaces.ts
View File

@@ -7,7 +7,7 @@
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import Event from 'vs/base/common/event';
import * as data from 'data';
import * as sqlops from 'sqlops';
import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
@@ -26,7 +26,7 @@ export interface IResourceProviderService {
/**
* Register a resource provider
*/
registerProvider(providerId: string, provider: data.ResourceProvider): void;
registerProvider(providerId: string, provider: sqlops.ResourceProvider): void;
/**
* Unregister a resource provider
@@ -36,7 +36,7 @@ export interface IResourceProviderService {
/**
* Create a firewall rule
*/
createFirewallRule(selectedAccount: data.Account, firewallruleInfo: data.FirewallRuleInfo, resourceProviderId: string): Promise<data.CreateFirewallRuleResponse>;
createFirewallRule(selectedAccount: sqlops.Account, firewallruleInfo: sqlops.FirewallRuleInfo, resourceProviderId: string): Promise<sqlops.CreateFirewallRuleResponse>;
/**
* handle a firewall rule
@@ -56,6 +56,6 @@ export interface IAccountPickerService {
addAccountCompleteEvent: Event<void>;
addAccountErrorEvent: Event<string>;
addAccountStartEvent: Event<void>;
onAccountSelectionChangeEvent: Event<data.Account>;
selectedAccount: data.Account;
onAccountSelectionChangeEvent: Event<sqlops.Account>;
selectedAccount: sqlops.Account;
}

10
src/sql/parts/accountManagement/common/resourceProviderService.ts
View File

@@ -14,12 +14,12 @@ import * as TelemetryKeys from 'sql/common/telemetryKeys';
import * as TelemetryUtils from 'sql/common/telemetryUtilities';
import { FirewallRuleDialogController } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialogController';
import * as data from 'data';
import * as sqlops from 'sqlops';
export class ResourceProviderService implements IResourceProviderService {
public _serviceBrand: any;
private _providers: { [handle: string]: data.ResourceProvider; } = Object.create(null);
private _providers: { [handle: string]: sqlops.ResourceProvider; } = Object.create(null);
private _firewallRuleDialogController: FirewallRuleDialogController;
constructor(
@@ -44,8 +44,8 @@ export class ResourceProviderService implements IResourceProviderService {
/**
* Create a firewall rule
*/
public createFirewallRule(selectedAccount: data.Account, firewallruleInfo: data.FirewallRuleInfo, resourceProviderId: string): Promise<data.CreateFirewallRuleResponse> {
return new Promise<data.CreateFirewallRuleResponse>((resolve, reject) => {
public createFirewallRule(selectedAccount: sqlops.Account, firewallruleInfo: sqlops.FirewallRuleInfo, resourceProviderId: string): Promise<sqlops.CreateFirewallRuleResponse> {
return new Promise<sqlops.CreateFirewallRuleResponse>((resolve, reject) => {
let provider = this._providers[resourceProviderId];
if (provider) {
TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.FirewallRuleRequested, { provider: resourceProviderId });
@@ -96,7 +96,7 @@ export class ResourceProviderService implements IResourceProviderService {
/**
* Register a resource provider
*/
public registerProvider(providerId: string, provider: data.ResourceProvider): void {
public registerProvider(providerId: string, provider: sqlops.ResourceProvider): void {
this._providers[providerId] = provider;
}