ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-13 03:28:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Isolate features (#6792)

Browse Source 
* working; new query and scripting

* working; removing manage from menus and combining data explorer contributions

* consolidate dashboard contributions; move manage action to dashboard contributions; make groupings the same

* fix notebook actions

* fix tests
This commit is contained in:
Anthony Dresser
2019-08-21 09:51:02 -07:00
committed by GitHub
parent 3fde278ed2
commit 85bf22322f
30 changed files with 655 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/workbench/contrib/files/browser/fileActions.ts
View File

@@ -47,10 +47,7 @@ import { ExplorerItem, NewExplorerItem } from 'vs/workbench/contrib/files/common
import { onUnexpectedError, getErrorMessage } from 'vs/base/common/errors';
// {{SQL CARBON EDIT}}
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
import * as TaskUtilities from 'sql/workbench/browser/taskUtilities';
import { openNewQuery } from 'sql/workbench/parts/query/browser/queryActions';
export const NEW_FILE_COMMAND_ID = 'explorer.newFile';
export const NEW_FILE_LABEL = nls.localize('newFile', "New File");
@@ -160,16 +157,14 @@ export class GlobalNewUntitledFileAction extends Action {
label: string,
// {{SQL CARBON EDIT}} - Make editorService protected and add other services
@IEditorService protected readonly editorService: IEditorService,
@IQueryEditorService private queryEditorService: IQueryEditorService,
@IConnectionManagementService private connectionManagementService: IConnectionManagementService,
@IObjectExplorerService protected _objectExplorerService: IObjectExplorerService
@IInstantiationService private readonly instantiationService: IInstantiationService
) {
super(id, label);
}
public run(): Promise<any> {
// {{SQL CARBON EDIT}}
return TaskUtilities.newQuery(undefined, this.connectionManagementService, this.queryEditorService, this._objectExplorerService, this.editorService);
return this.instantiationService.invokeFunction(openNewQuery);
}
}

14
src/vs/workbench/workbench.desktop.main.ts
View File

@@ -266,14 +266,14 @@ import 'sql/workbench/update/electron-browser/releaseNotes.contribution';
// data explorer
import 'sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution';
import 'sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet';
import 'sql/workbench/parts/dataExplorer/browser/dataExplorerExtensionPoint';
import 'sql/workbench/parts/dataExplorer/common/nodeActions.common.contribution';
import 'sql/workbench/parts/dataExplorer/electron-browser/nodeActions.contribution';
import 'sql/workbench/parts/telemetry/common/telemetry.contribution';
import 'sql/workbench/parts/connection/browser/connection.contribution';
// Scripting
import 'sql/workbench/parts/scripting/electron-browser/scripting.contribution';
// query editor
import 'sql/workbench/parts/query/browser/query.contribution';
import 'sql/workbench/parts/query/common/resultsGridContribution';
@@ -290,7 +290,6 @@ import 'sql/workbench/parts/accounts/browser/accounts.contribution';
import 'sql/workbench/parts/profiler/browser/profiler.contribution';
import 'sql/workbench/parts/profiler/browser/profilerActions.contribution';
import 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution';
import 'sql/workbench/parts/objectExplorer/electron-browser/objectExplorerScripting.contribution';
import 'sql/platform/accounts/browser/accountManagement.contribution';
// dashboard
@@ -304,16 +303,15 @@ import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/type
import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/countInsight.contribution';
import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/imageInsight.contribution';
import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/tableInsight.contribution';
import 'sql/workbench/parts/dashboard/browser/dashboard.contribution';
/* Tasks */
import 'sql/workbench/common/actions.contribution';
/* Widgets */
import 'sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.contribution';
import 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.common.contribution';
import 'sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerWidget.contribution';
import 'sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.contribution';
import 'sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.contribution';
import 'sql/workbench/parts/dashboard/browser/dashboardConfig.contribution';
import 'sql/workbench/parts/dashboard/browser/dashboard.contribution';
/* Tasks */
import 'sql/workbench/common/actions.contribution';
/* Model-based Views */
import 'sql/workbench/browser/modelComponents/components.contribution';
/* View Model Editor */