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

More layering (#6541)

Browse Source 
* layer unlayered code; fix layering

* readd os

* fix definition of recommended extensions

* protect against tests
This commit is contained in:
Anthony Dresser
2019-07-31 22:20:39 -07:00
committed by GitHub
parent 161c182a56
commit 9bfe8813b1
38 changed files with 77 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/sql/workbench/parts/grid/views/editData/editData.component.html → src/sql/workbench/parts/editData/browser/editData.component.html
View File

6
src/sql/workbench/parts/grid/views/editData/editData.component.ts → src/sql/workbench/parts/editData/browser/editData.component.ts
View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import 'vs/css!sql/workbench/parts/grid/media/flexbox';
import 'vs/css!sql/workbench/parts/grid/media/styles';
import 'vs/css!./media/editData';
import { ElementRef, ChangeDetectorRef, OnInit, OnDestroy, Component, Inject, forwardRef, EventEmitter } from '@angular/core';
@@ -13,8 +11,8 @@ import { VirtualizedCollection } from 'angular2-slickgrid';
import { IGridDataSet } from 'sql/workbench/parts/grid/common/interfaces';
import * as Services from 'sql/base/browser/ui/table/formatters';
import { IEditDataComponentParams, IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams';
import { GridParentComponent } from 'sql/workbench/parts/grid/views/gridParentComponent';
import { EditDataGridActionProvider } from 'sql/workbench/parts/grid/views/editData/editDataGridActions';
import { GridParentComponent } from 'sql/workbench/parts/editData/browser/gridParentComponent';
import { EditDataGridActionProvider } from 'sql/workbench/parts/editData/browser/editDataGridActions';
import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin';
import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin';

2
src/sql/workbench/parts/grid/views/editData/editData.module.ts → src/sql/workbench/parts/editData/browser/editData.module.ts
View File

@@ -9,7 +9,7 @@ import { CommonModule } from '@angular/common';
import { BrowserModule } from '@angular/platform-browser';
import { SlickGrid } from 'angular2-slickgrid';
import { EditDataComponent } from 'sql/workbench/parts/grid/views/editData/editData.component';
import { EditDataComponent } from 'sql/workbench/parts/editData/browser/editData.component';
import { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';

4
src/sql/workbench/parts/grid/views/editData/editDataGridActions.ts → src/sql/workbench/parts/editData/browser/editDataGridActions.ts
View File

@@ -4,8 +4,8 @@
*--------------------------------------------------------------------------------------------*/
import { IGridInfo } from 'sql/workbench/parts/grid/common/interfaces';
import { DataService } from 'sql/workbench/parts/grid/services/dataService';
import { GridActionProvider } from 'sql/workbench/parts/grid/views/gridActions';
import { DataService } from 'sql/workbench/parts/grid/common/dataService';
import { GridActionProvider } from 'sql/workbench/parts/editData/common/gridActions';
import { localize } from 'vs/nls';
import { IAction, Action } from 'vs/base/common/actions';

4
src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts
View File

@@ -18,8 +18,8 @@ import { IQueryModelService } from 'sql/platform/query/common/queryModel';
import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService';
import { BareResultsGridInfo } from 'sql/workbench/parts/query/browser/queryResultsEditor';
import { IEditDataComponentParams } from 'sql/platform/bootstrap/common/bootstrapParams';
import { EditDataModule } from 'sql/workbench/parts/grid/views/editData/editData.module';
import { EDITDATA_SELECTOR } from 'sql/workbench/parts/grid/views/editData/editData.component';
import { EditDataModule } from 'sql/workbench/parts/editData/browser/editData.module';
import { EDITDATA_SELECTOR } from 'sql/workbench/parts/editData/browser/editData.component';
import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';
import { CancellationToken } from 'vs/base/common/cancellation';
import { IStorageService } from 'vs/platform/storage/common/storage';

0
src/sql/workbench/parts/grid/views/gridCommands.ts → src/sql/workbench/parts/editData/browser/gridCommands.ts
View File

8
src/sql/workbench/parts/grid/views/gridParentComponent.ts → src/sql/workbench/parts/editData/browser/gridParentComponent.ts
View File

@@ -3,8 +3,8 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import 'vs/css!sql/workbench/parts/grid/media/flexbox';
import 'vs/css!sql/workbench/parts/grid/media/styles';
import 'vs/css!./media/flexbox';
import 'vs/css!./media/styles';
import { Subscription, Subject } from 'rxjs/Rx';
import { ElementRef, QueryList, ChangeDetectorRef, ViewChildren } from '@angular/core';
@@ -13,8 +13,8 @@ import * as Constants from 'sql/workbench/parts/query/common/constants';
import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants';
import { IGridInfo, IGridDataSet, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces';
import * as Utils from 'sql/platform/connection/common/utils';
import { DataService } from 'sql/workbench/parts/grid/services/dataService';
import * as actions from 'sql/workbench/parts/grid/views/gridActions';
import { DataService } from 'sql/workbench/parts/grid/common/dataService';
import * as actions from 'sql/workbench/parts/editData/common/gridActions';
import * as GridContentEvents from 'sql/workbench/parts/grid/common/gridContentEvents';
import { ResultsVisibleContext, ResultsGridFocussedContext, ResultsMessagesFocussedContext, QueryEditorVisibleContext } from 'sql/workbench/parts/query/common/queryContext';
import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';

0
src/sql/workbench/parts/grid/views/editData/media/editData.css → src/sql/workbench/parts/editData/browser/media/editData.css
View File

0
src/sql/workbench/parts/grid/media/flexbox.css → src/sql/workbench/parts/editData/browser/media/flexbox.css
View File

0
src/sql/workbench/parts/grid/media/styles.css → src/sql/workbench/parts/editData/browser/media/styles.css
View File

2
src/sql/workbench/parts/grid/views/gridActions.ts → src/sql/workbench/parts/editData/common/gridActions.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { IGridInfo, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces';
import { DataService } from 'sql/workbench/parts/grid/services/dataService';
import { DataService } from 'sql/workbench/parts/grid/common/dataService';
import { localize } from 'vs/nls';
import { IAction, Action } from 'vs/base/common/actions';

0
src/sql/workbench/parts/grid/services/dataService.ts → src/sql/workbench/parts/grid/common/dataService.ts
View File

2
src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts
View File

@@ -13,7 +13,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces';
import { IDataResource } from 'sql/workbench/services/notebook/sql/sqlSessionManager';
import { IDataResource } from 'sql/workbench/services/notebook/common/sql/sqlSessionManager';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';
import { getEolString, shouldIncludeHeaders, shouldRemoveNewLines } from 'sql/platform/query/common/queryRunner';
import { INotificationService } from 'vs/platform/notification/common/notification';

2
src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts
View File

@@ -8,7 +8,7 @@ import { Table } from 'sql/base/browser/ui/table/table';
import { textFormatter } from 'sql/base/browser/ui/table/formatters';
import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin';
import { escape } from 'sql/base/common/strings';
import { IDataResource } from 'sql/workbench/services/notebook/sql/sqlSessionManager';
import { IDataResource } from 'sql/workbench/services/notebook/common/sql/sqlSessionManager';
import { attachTableStyler } from 'sql/platform/theme/common/styler';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { MouseWheelSupport } from 'sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin';

11
src/sql/workbench/parts/query/browser/actions.ts
View File

@@ -18,11 +18,11 @@ import { removeAnsiEscapeCodes } from 'vs/base/common/strings';
import { IGridDataProvider } from 'sql/platform/query/common/gridDataProvider';
import { INotificationService } from 'vs/platform/notification/common/notification';
import QueryRunner from 'sql/platform/query/common/queryRunner';
import product from 'vs/platform/product/node/product';
import { GridTableState } from 'sql/workbench/parts/query/common/gridPanelState';
import * as Constants from 'sql/workbench/contrib/extensions/constants';
import { IAdsTelemetryService } from 'sql/platform/telemetry/telemetry';
import * as Constants from 'sql/workbench/contrib/extensions/common/constants';
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
export interface IGridActionContext {
gridDataProvider: IGridDataProvider;
@@ -206,14 +206,15 @@ export class ChartDataAction extends Action {
constructor(
@IEditorService private editorService: IEditorService,
@IExtensionTipsService private readonly extensionTipsService: IExtensionTipsService
@IExtensionTipsService private readonly extensionTipsService: IExtensionTipsService,
@IEnvironmentService private readonly environmentService: IEnvironmentService
) {
super(ChartDataAction.ID, ChartDataAction.LABEL, ChartDataAction.ICON);
}
public run(context: IGridActionContext): Promise<boolean> {
const activeEditor = this.editorService.activeControl as QueryEditor;
if (product.quality !== 'stable') {
if (this.environmentService.appQuality !== 'stable') {
this.extensionTipsService.promptRecommendedExtensionsByScenario(Constants.visualizerExtensions);
}
activeEditor.chart({ batchId: context.batchId, resultId: context.resultId });

4
src/sql/workbench/parts/query/browser/query.contribution.ts
View File

@@ -25,8 +25,8 @@ import {
RunQueryKeyboardAction, RunCurrentQueryKeyboardAction, CancelQueryKeyboardAction, RefreshIntellisenseKeyboardAction, ToggleQueryResultsKeyboardAction,
RunQueryShortcutAction, RunCurrentQueryWithActualPlanKeyboardAction, FocusOnCurrentQueryKeyboardAction, ParseSyntaxAction
} from 'sql/workbench/parts/query/browser/keyboardQueryActions';
import * as gridActions from 'sql/workbench/parts/grid/views/gridActions';
import * as gridCommands from 'sql/workbench/parts/grid/views/gridCommands';
import * as gridActions from 'sql/workbench/parts/editData/common/gridActions';
import * as gridCommands from 'sql/workbench/parts/editData/browser/gridCommands';
import * as Constants from 'sql/workbench/parts/query/common/constants';
import { localize } from 'vs/nls';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';

2
src/sql/workbench/parts/telemetry/common/telemetry.contribution.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { IAdsTelemetryService } from 'sql/platform/telemetry/telemetry';
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
import { Registry } from 'vs/platform/registry/common/platform';
import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';