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

Fix for query editor toolbar actions to show correctly based on file type (#11976)

Browse Source 
* Fix for query editor toolbar actions to show correctly based on file type when not connected

* Addressed comments

* Fix when it is .sql file but connection is kust

Co-authored-by: Monica Gupta <mogupt@microsoft.com>
This commit is contained in:
Monica Gupta
2020-08-31 12:01:23 -07:00
committed by GitHub
parent 1984c4ca97
commit 3d0dd0de98
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/workbench/contrib/query/browser/queryEditor.ts
View File

@@ -6,6 +6,7 @@
import 'vs/css!./media/queryEditor'; import 'vs/css!./media/queryEditor';
import * as DOM from 'vs/base/browser/dom'; import * as DOM from 'vs/base/browser/dom';
import * as path from 'vs/base/common/path';
import { EditorOptions, IEditorControl, IEditorMemento } from 'vs/workbench/common/editor'; import { EditorOptions, IEditorControl, IEditorMemento } from 'vs/workbench/common/editor';
import { BaseEditor, EditorMemento } from 'vs/workbench/browser/parts/editor/baseEditor'; import { BaseEditor, EditorMemento } from 'vs/workbench/browser/parts/editor/baseEditor';
import { Orientation } from 'vs/base/browser/ui/sash/sash'; import { Orientation } from 'vs/base/browser/ui/sash/sash';
@@ -30,6 +31,7 @@ import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileE
import { URI } from 'vs/base/common/uri'; import { URI } from 'vs/base/common/uri';
import { IFileService, FileChangesEvent } from 'vs/platform/files/common/files'; import { IFileService, FileChangesEvent } from 'vs/platform/files/common/files';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { IModeService } from 'vs/editor/common/services/modeService';
import { QueryEditorInput, IQueryEditorStateChange } from 'sql/workbench/common/editor/query/queryEditorInput'; import { QueryEditorInput, IQueryEditorStateChange } from 'sql/workbench/common/editor/query/queryEditorInput';
import { QueryResultsEditor } from 'sql/workbench/contrib/query/browser/queryResultsEditor'; import { QueryResultsEditor } from 'sql/workbench/contrib/query/browser/queryResultsEditor';
import * as queryContext from 'sql/workbench/contrib/query/common/queryContext'; import * as queryContext from 'sql/workbench/contrib/query/common/queryContext';
@@ -98,7 +100,8 @@ export class QueryEditor extends BaseEditor {
@IConnectionManagementService private readonly connectionManagementService: IConnectionManagementService, @IConnectionManagementService private readonly connectionManagementService: IConnectionManagementService,
@IEditorService private readonly editorService: IEditorService, @IEditorService private readonly editorService: IEditorService,
@IInstantiationService private readonly instantiationService: IInstantiationService, @IInstantiationService private readonly instantiationService: IInstantiationService,
@IConfigurationService private readonly configurationService: IConfigurationService @IConfigurationService private readonly configurationService: IConfigurationService,
@IModeService private readonly modeService: IModeService,
) { ) {
super(QueryEditor.ID, telemetryService, themeService, storageService); super(QueryEditor.ID, telemetryService, themeService, storageService);
@@ -201,9 +204,9 @@ export class QueryEditor extends BaseEditor {
if (stateChangeEvent.connectedChange) { if (stateChangeEvent.connectedChange) {
this._toggleConnectDatabaseAction.connected = this.input.state.connected; this._toggleConnectDatabaseAction.connected = this.input.state.connected;
this._changeConnectionAction.enabled = this.input.state.connected; this._changeConnectionAction.enabled = this.input.state.connected;
this.setTaskbarContent();
if (this.input.state.connected) { if (this.input.state.connected) {
this.listDatabasesActionItem.onConnected(); this.listDatabasesActionItem.onConnected();
this.setTaskbarContent();
} else { } else {
this.listDatabasesActionItem.onDisconnect(); this.listDatabasesActionItem.onDisconnect();
} }
@@ -260,9 +263,10 @@ export class QueryEditor extends BaseEditor {
let content: ITaskbarContent[]; let content: ITaskbarContent[];
const previewFeaturesEnabled = this.configurationService.getValue('workbench')['enablePreviewFeatures']; const previewFeaturesEnabled = this.configurationService.getValue('workbench')['enablePreviewFeatures'];
let connectionProfile = this.connectionManagementService.getConnectionProfile(this.input?.uri); let connectionProfile = this.connectionManagementService.getConnectionProfile(this.input?.uri);
let fileExtension = path.extname(this.input?.uri || '');
// TODO: Make it more generic, some way for extensions to register the commands it supports // TODO: Make it more generic, some way for extensions to register the commands it supports
if (connectionProfile?.providerName === 'KUSTO') { if ((!fileExtension && connectionProfile?.providerName === 'KUSTO') || this.modeService.getExtensions('Kusto').indexOf(fileExtension) > -1) {
content = [ content = [
{ action: this._runQueryAction }, { action: this._runQueryAction },
{ action: this._cancelQueryAction }, { action: this._cancelQueryAction },