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

Remove unused code (#4873)

Browse Source 
* removes unused features

* remove more unused code; formatting

* lock changes

* fix run issue
This commit is contained in:
Anthony Dresser
2019-04-09 02:00:51 -07:00
committed by GitHub
parent 2fb06e7f4f
commit f96a17c930
23 changed files with 88 additions and 1229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/workbench/common/actions.contribution.ts
View File

@@ -2,18 +2,15 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { TaskRegistry } from 'sql/platform/tasks/common/tasks';
import * as Actions from './actions';
import { IJSONSchema } from 'vs/base/common/jsonSchema';
import * as nls from 'vs/nls';
import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
import { Registry } from 'vs/platform/registry/common/platform';
import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { ShowCurrentReleaseNotesAction } from 'sql/workbench/update/releaseNotes';
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry';
new Actions.BackupAction().registerTask();
@@ -49,4 +46,4 @@ Registry.as<IConfigurationRegistry>(ConfigExtensions.Configuration).registerConf
'description': nls.localize('showConnectDialogOnStartup', 'Show connect dialog on startup')
}
}
});
});

276
src/sql/workbench/common/actions.ts
View File

@@ -12,7 +12,6 @@ import { IScriptingService } from 'sql/platform/scripting/common/scriptingServic
import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService';
import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService';
import { IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService';
import { IAdminService } from 'sql/workbench/services/admin/common/adminService';
import * as Constants from 'sql/common/constants';
import { Task } from 'sql/platform/tasks/common/tasks';
import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
@@ -58,22 +57,13 @@ export class NewQueryAction extends Task {
}
public runTask(accessor: ServicesAccessor, profile: IConnectionProfile): Promise<void> {
return new Promise<void>((resolve, reject) => {
TaskUtilities.newQuery(
profile,
accessor.get<IConnectionManagementService>(IConnectionManagementService),
accessor.get<IQueryEditorService>(IQueryEditorService),
accessor.get<IObjectExplorerService>(IObjectExplorerService),
accessor.get<IEditorService>(IEditorService)
).then(
result => {
resolve(void 0);
},
error => {
resolve(void 0);
}
);
});
return TaskUtilities.newQuery(
profile,
accessor.get<IConnectionManagementService>(IConnectionManagementService),
accessor.get<IQueryEditorService>(IQueryEditorService),
accessor.get<IObjectExplorerService>(IObjectExplorerService),
accessor.get<IEditorService>(IEditorService)
).then();
}
}
@@ -91,21 +81,13 @@ export class ScriptSelectAction extends Action {
}
public run(actionContext: BaseActionContext): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
TaskUtilities.scriptSelect(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService
).then(
result => {
resolve(true);
},
error => {
resolve(false);
});
});
return TaskUtilities.scriptSelect(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService
).then(() => true);
}
}
@@ -124,24 +106,15 @@ export class ScriptExecuteAction extends Action {
}
public run(actionContext: BaseActionContext): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
TaskUtilities.script(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService,
TaskUtilities.ScriptOperation.Execute,
this._errorMessageService
).then(
result => {
resolve(true);
},
error => {
resolve(false);
}
);
});
return TaskUtilities.script(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService,
TaskUtilities.ScriptOperation.Execute,
this._errorMessageService
).then(() => true);
}
}
@@ -160,24 +133,15 @@ export class ScriptAlterAction extends Action {
}
public run(actionContext: BaseActionContext): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
TaskUtilities.script(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService,
TaskUtilities.ScriptOperation.Alter,
this._errorMessageService
).then(
result => {
resolve(true);
},
error => {
resolve(false);
}
);
});
return TaskUtilities.script(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService,
TaskUtilities.ScriptOperation.Alter,
this._errorMessageService
).then(() => true);
}
}
@@ -195,22 +159,13 @@ export class EditDataAction extends Action {
}
public run(actionContext: BaseActionContext): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
TaskUtilities.scriptEditSelect(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService
).then(
result => {
resolve(true);
},
error => {
resolve(false);
}
);
});
return TaskUtilities.scriptEditSelect(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService
).then(() => true);
}
}
@@ -229,24 +184,15 @@ export class ScriptCreateAction extends Action {
}
public run(actionContext: BaseActionContext): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
TaskUtilities.script(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService,
TaskUtilities.ScriptOperation.Create,
this._errorMessageService
).then(
result => {
resolve(true);
},
error => {
resolve(false);
}
);
});
return TaskUtilities.script(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService,
TaskUtilities.ScriptOperation.Create,
this._errorMessageService
).then(() => true);
}
}
@@ -265,24 +211,15 @@ export class ScriptDeleteAction extends Action {
}
public run(actionContext: BaseActionContext): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
TaskUtilities.script(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService,
TaskUtilities.ScriptOperation.Delete,
this._errorMessageService
).then(
result => {
resolve(true);
},
error => {
resolve(false);
}
);
});
return TaskUtilities.script(
actionContext.profile,
actionContext.object,
this._connectionManagementService,
this._queryEditorService,
this._scriptingService,
TaskUtilities.ScriptOperation.Delete,
this._errorMessageService
).then(() => true);
}
}
@@ -300,7 +237,7 @@ export class BackupAction extends Task {
});
}
runTask(accessor: ServicesAccessor, profile: IConnectionProfile): Promise<void> {
runTask(accessor: ServicesAccessor, profile: IConnectionProfile): void | Promise<void> {
if (!profile) {
let objectExplorerService = accessor.get<IObjectExplorerService>(IObjectExplorerService);
let connectionManagementService = accessor.get<IConnectionManagementService>(IConnectionManagementService);
@@ -310,24 +247,13 @@ export class BackupAction extends Task {
let configurationService = accessor.get<IConfigurationService>(IConfigurationService);
let previewFeaturesEnabled: boolean = configurationService.getValue('workbench')['enablePreviewFeatures'];
if (!previewFeaturesEnabled) {
return new Promise<void>((resolve, reject) => {
accessor.get<INotificationService>(INotificationService).info(nls.localize('backup.isPreviewFeature', 'You must enable preview features in order to use backup'));
});
return accessor.get<INotificationService>(INotificationService).info(nls.localize('backup.isPreviewFeature', 'You must enable preview features in order to use backup'));
}
return new Promise<void>((resolve, reject) => {
TaskUtilities.showBackup(
profile,
accessor.get<IBackupUiService>(IBackupUiService)
).then(
result => {
resolve(void 0);
},
error => {
resolve(void 0);
}
);
});
TaskUtilities.showBackup(
profile,
accessor.get<IBackupUiService>(IBackupUiService)
).then();
}
}
@@ -345,28 +271,17 @@ export class RestoreAction extends Task {
});
}
runTask(accessor: ServicesAccessor, profile: IConnectionProfile): Promise<void> {
runTask(accessor: ServicesAccessor, profile: IConnectionProfile): void | Promise<void> {
let configurationService = accessor.get<IConfigurationService>(IConfigurationService);
let previewFeaturesEnabled: boolean = configurationService.getValue('workbench')['enablePreviewFeatures'];
if (!previewFeaturesEnabled) {
return new Promise<void>((resolve, reject) => {
accessor.get<INotificationService>(INotificationService).info(nls.localize('restore.isPreviewFeature', 'You must enable preview features in order to use restore'));
});
return accessor.get<INotificationService>(INotificationService).info(nls.localize('restore.isPreviewFeature', 'You must enable preview features in order to use restore'));
}
return new Promise<void>((resolve, reject) => {
TaskUtilities.showRestore(
profile,
accessor.get<IRestoreDialogController>(IRestoreDialogController)
).then(
result => {
resolve(void 0);
},
error => {
resolve(void 0);
}
);
});
TaskUtilities.showRestore(
profile,
accessor.get<IRestoreDialogController>(IRestoreDialogController)
).then();
}
}
@@ -383,18 +298,12 @@ export class ManageAction extends Action {
}
run(actionContext: ManageActionContext): Promise<boolean> {
let self = this;
return new Promise<boolean>((resolve, reject) => {
self._connectionManagementService.connect(actionContext.profile, actionContext.uri, { showDashboard: true, saveTheConnection: false, params: undefined, showConnectionDialogOnError: false, showFirewallRuleOnError: true }).then(
() => {
self._angularEventingService.sendAngularEvent(actionContext.uri, AngularEventType.NAV_DATABASE);
resolve(true);
},
error => {
resolve(error);
}
);
});
return this._connectionManagementService.connect(actionContext.profile, actionContext.uri, { showDashboard: true, saveTheConnection: false, params: undefined, showConnectionDialogOnError: false, showFirewallRuleOnError: true }).then(
() => {
this._angularEventingService.sendAngularEvent(actionContext.uri, AngularEventType.NAV_DATABASE);
return true;
}
);
}
}
@@ -410,31 +319,8 @@ export class InsightAction extends Action {
}
run(actionContext: InsightActionContext): Promise<boolean> {
let self = this;
return new Promise<boolean>((resolve, reject) => {
self._insightsDialogService.show(actionContext.insight, actionContext.profile);
resolve(true);
});
}
}
export class NewDatabaseAction extends Action {
public static ID = 'newDatabase';
public static LABEL = nls.localize('newDatabase', 'New Database');
public static ICON = 'new-database';
constructor(
id: string, label: string, icon: string,
@IAdminService private _adminService: IAdminService,
@IErrorMessageService private _errorMessageService: IErrorMessageService,
) {
super(id, label, icon);
}
run(actionContext: BaseActionContext): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
TaskUtilities.showCreateDatabase(actionContext.profile, this._adminService, this._errorMessageService);
});
this._insightsDialogService.show(actionContext.insight, actionContext.profile);
return Promise.resolve(true);
}
}
@@ -454,12 +340,6 @@ export class ConfigureDashboardAction extends Task {
}
runTask(accessor: ServicesAccessor): Promise<void> {
return new Promise<void>((resolve, reject) => {
accessor.get<IWindowsService>(IWindowsService).openExternal(ConfigureDashboardAction.configHelpUri).then((result) => {
resolve(void 0);
}, err => {
resolve(void 0);
});
});
return accessor.get<IWindowsService>(IWindowsService).openExternal(ConfigureDashboardAction.configHelpUri).then();
}
}

1
src/sql/workbench/common/sqlWorkbenchUtils.ts
View File

@@ -2,7 +2,6 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import ConnectionConstants = require('sql/platform/connection/common/constants');
import { QueryInput } from 'sql/parts/query/common/queryInput';

95
src/sql/workbench/common/taskUtilities.ts
View File

@@ -2,7 +2,6 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as os from 'os';
@@ -15,7 +14,6 @@ import {
import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
import { IScriptingService } from 'sql/platform/scripting/common/scriptingService';
import { EditDataInput } from 'sql/parts/editData/common/editDataInput';
import { IAdminService } from 'sql/workbench/services/admin/common/adminService';
import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService';
import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
import { IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService';
@@ -57,31 +55,6 @@ const targetDatabaseEngineEditionMap = {
7: 'SqlServerStretchEdition'
};
// map for object types for scripting
const objectScriptMap = {
Table: 'Table',
View: 'View',
StoredProcedure: 'Procedure',
UserDefinedFunction: 'Function',
UserDefinedDataType: 'Type',
User: 'User',
Default: 'Default',
Rule: 'Rule',
DatabaseRole: 'Role',
ApplicationRole: 'Application Role',
SqlAssembly: 'Assembly',
DdlTrigger: 'Trigger',
Synonym: 'Synonym',
XmlSchemaCollection: 'Xml Schema Collection',
Schema: 'Schema',
PlanGuide: 'sp_create_plan_guide',
UserDefinedType: 'Type',
UserDefinedAggregate: 'Aggregate',
FullTextCatalog: 'Fulltext Catalog',
UserDefinedTableType: 'Type',
MaterializedView: 'Materialized View'
};
export enum ScriptOperation {
Select = 0,
Create = 1,
@@ -111,31 +84,6 @@ export function GetScriptOperationName(operation: ScriptOperation) {
}
}
export function connectIfNotAlreadyConnected(connectionProfile: IConnectionProfile, connectionService: IConnectionManagementService): Promise<void> {
return new Promise<void>((resolve, reject) => {
let connectionID = connectionService.getConnectionUri(connectionProfile);
let uri: string = connectionService.getFormattedUri(connectionID, connectionProfile);
if (!connectionService.isConnected(uri)) {
let options: IConnectionCompletionOptions = {
params: { connectionType: ConnectionType.editor, runQueryOnCompletion: RunQueryOnConnectionMode.executeQuery, input: undefined },
saveTheConnection: false,
showDashboard: false,
showConnectionDialogOnError: false,
showFirewallRuleOnError: true
};
connectionService.connect(connectionProfile, uri, options).then(() => {
setTimeout(function () {
resolve();
}, 2000);
}).catch(connectionError => {
reject(connectionError);
});
} else {
resolve();
}
});
}
/**
* Select the top rows from an object
*/
@@ -223,7 +171,7 @@ export function script(connectionProfile: IConnectionProfile, metadata: azdata.O
let script: string = result.script;
if (script) {
let description = (metadata.schema && metadata.schema !== '') ? `${metadata.schema}.${metadata.name}` : metadata.name;
let description = (metadata.schema && metadata.schema !== '') ? `${metadata.schema}.${metadata.name}` : metadata.name;
queryEditorService.newSqlEditor(script, connectionProfile.providerName, undefined, description).then((owner) => {
// Connect our editor to the input connection
let options: IConnectionCompletionOptions = {
@@ -336,27 +284,6 @@ export function replaceConnection(oldUri: string, newUri: string, connectionServ
});
}
export function showCreateDatabase(
connection: IConnectionProfile,
adminService: IAdminService,
errorMessageService: IErrorMessageService): Promise<void> {
return new Promise<void>((resolve) => {
// show not implemented
errorMessageService.showDialog(Severity.Info,
'Coming Soon',
'This feature is not yet implemented. It will be available in an upcoming release.');
// adminService.showCreateDatabaseWizard(uri, connection);
});
}
export function showCreateLogin(uri: string, connection: IConnectionProfile, adminService: IAdminService): Promise<void> {
return new Promise<void>((resolve) => {
adminService.showCreateLoginWizard(uri, connection);
});
}
export function showBackup(connection: IConnectionProfile, backupUiService: IBackupUiService): Promise<void> {
return new Promise<void>((resolve) => {
backupUiService.showBackup(connection).then(() => {
@@ -418,26 +345,6 @@ export function getCurrentGlobalConnection(objectExplorerService: IObjectExplore
return connection;
}
/* Helper Methods */
function getStartPos(script: string, operation: ScriptOperation, typeName: string): number {
let objectTypeName = objectScriptMap[typeName];
if (objectTypeName && script) {
let scriptTypeName = objectTypeName.toLowerCase();
switch (operation) {
case (ScriptOperation.Create):
return script.toLowerCase().indexOf(`create ${scriptTypeName}`);
case (ScriptOperation.Delete):
return script.toLowerCase().indexOf(`drop ${scriptTypeName}`);
default:
/* script wasn't found for that object */
return -1;
}
} else {
return -1;
}
}
function getScriptingParamDetails(connectionService: IConnectionManagementService, ownerUri: string, metadata: azdata.ObjectMetadata): azdata.ScriptingParamDetails {
let serverInfo: azdata.ServerInfo = getServerInfo(connectionService, ownerUri);
let paramDetails: azdata.ScriptingParamDetails = {

5
src/sql/workbench/common/workspaceActions.ts
View File

@@ -1,3 +1,8 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Action } from 'vs/base/common/actions';
import { IWindowsService } from 'vs/platform/windows/common/windows';
import { URI } from 'vs/base/common/uri';