mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-27 11:01:37 -05:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8004776eff | ||
|
|
cdc07d9f08 | ||
|
|
6be511fab2 | ||
|
|
b2a520fcbf | ||
|
|
a21807318b | ||
|
|
aac8f84fcc | ||
|
|
83384e13f8 | ||
|
|
d32f8c40b0 |
@@ -20,7 +20,7 @@ let localize = nls.loadMessageBundle();
|
|||||||
|
|
||||||
export class AzureAccountProviderService implements vscode.Disposable {
|
export class AzureAccountProviderService implements vscode.Disposable {
|
||||||
// CONSTANTS ///////////////////////////////////////////////////////////////
|
// CONSTANTS ///////////////////////////////////////////////////////////////
|
||||||
private static CommandClearTokenCache = 'accounts.clearTokenCache';
|
private static CommandClearTokenCache = 'accounts.azure.clearTokenCache';
|
||||||
private static ConfigurationSection = 'accounts.azure';
|
private static ConfigurationSection = 'accounts.azure';
|
||||||
private static CredentialNamespace = 'azureAccountProviderCredentials';
|
private static CredentialNamespace = 'azureAccountProviderCredentials';
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "sqlops",
|
"name": "sqlops",
|
||||||
"version": "0.33.7",
|
"version": "0.32.9",
|
||||||
"distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
|
"distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Microsoft Corporation"
|
"name": "Microsoft Corporation"
|
||||||
|
|||||||
@@ -70,7 +70,8 @@ export abstract class JobManagementView extends TabChild implements AfterContent
|
|||||||
abstract onFirstVisible();
|
abstract onFirstVisible();
|
||||||
|
|
||||||
protected openContextMenu(event): void {
|
protected openContextMenu(event): void {
|
||||||
let rowIndex = event.cell.row;
|
let grid = this._table.grid;
|
||||||
|
let rowIndex = grid.getCellFromEvent(event).row;
|
||||||
|
|
||||||
let targetObject = this.getCurrentTableObject(rowIndex);
|
let targetObject = this.getCurrentTableObject(rowIndex);
|
||||||
let actions = this.getTableActions();
|
let actions = this.getTableActions();
|
||||||
|
|||||||
@@ -100,11 +100,12 @@ modelview-dom-component img {
|
|||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
modelview-dom-component a, modelview-dom-component a:link{
|
modelview-dom-component a, a:link{
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
color: rgb(0, 0, 238) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
modelview-dom-component a:hover, modelview-dom-component a:link {
|
modelview-dom-component a:hover, a:link {
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,13 +12,12 @@ import { Insight } from './insights/insight';
|
|||||||
import QueryRunner from 'sql/parts/query/execution/queryRunner';
|
import QueryRunner from 'sql/parts/query/execution/queryRunner';
|
||||||
import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces';
|
import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces';
|
||||||
import { ChartOptions, IChartOption, ControlType } from './chartOptions';
|
import { ChartOptions, IChartOption, ControlType } from './chartOptions';
|
||||||
import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
|
|
||||||
import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox';
|
import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox';
|
||||||
import { IInsightOptions } from './insights/interfaces';
|
import { IInsightOptions } from './insights/interfaces';
|
||||||
import { CopyAction, SaveImageAction, CreateInsightAction, IChartActionContext } from './actions';
|
import { CopyAction, SaveImageAction, CreateInsightAction, IChartActionContext } from './actions';
|
||||||
import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
|
import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
|
||||||
import { ChartType } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces';
|
import { ChartType } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
|
||||||
import { Dimension, $, getContentHeight, getContentWidth } from 'vs/base/browser/dom';
|
import { Dimension, $, getContentHeight, getContentWidth } from 'vs/base/browser/dom';
|
||||||
import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
|
import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
|
||||||
import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
|
import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
|
||||||
@@ -41,8 +40,6 @@ declare class Proxy {
|
|||||||
constructor(object, handler);
|
constructor(object, handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
const insightRegistry = Registry.as<IInsightRegistry>(Extensions.InsightContribution);
|
|
||||||
|
|
||||||
export class ChartView implements IPanelView {
|
export class ChartView implements IPanelView {
|
||||||
private insight: Insight;
|
private insight: Insight;
|
||||||
private _queryRunner: QueryRunner;
|
private _queryRunner: QueryRunner;
|
||||||
@@ -126,7 +123,6 @@ export class ChartView implements IPanelView {
|
|||||||
}
|
}
|
||||||
}) as IInsightOptions;
|
}) as IInsightOptions;
|
||||||
|
|
||||||
ChartOptions.general[0].options = insightRegistry.getAllIds();
|
|
||||||
ChartOptions.general.map(o => {
|
ChartOptions.general.map(o => {
|
||||||
this.createOption(o, generalControls);
|
this.createOption(o, generalControls);
|
||||||
});
|
});
|
||||||
@@ -319,7 +315,7 @@ export class ChartView implements IPanelView {
|
|||||||
});
|
});
|
||||||
setFunc = (val: string) => {
|
setFunc = (val: string) => {
|
||||||
if (!isUndefinedOrNull(val)) {
|
if (!isUndefinedOrNull(val)) {
|
||||||
numberInput.value = val;
|
input.value = val;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
this.optionDisposables.push(attachInputBoxStyler(numberInput, this._themeService));
|
this.optionDisposables.push(attachInputBoxStyler(numberInput, this._themeService));
|
||||||
@@ -334,7 +330,7 @@ export class ChartView implements IPanelView {
|
|||||||
this._state = val;
|
this._state = val;
|
||||||
if (this.state.options) {
|
if (this.state.options) {
|
||||||
for (let key in this.state.options) {
|
for (let key in this.state.options) {
|
||||||
if (this.state.options.hasOwnProperty(key) && this.optionMap[key]) {
|
if (this.state.options.hasOwnProperty(key)) {
|
||||||
this.options[key] = this.state.options[key];
|
this.options[key] = this.state.options[key];
|
||||||
this.optionMap[key].set(this.state.options[key]);
|
this.optionMap[key].set(this.state.options[key]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ import { isArray, isUndefinedOrNull } from 'vs/base/common/types';
|
|||||||
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
|
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
|
||||||
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
||||||
import { IEditor } from 'vs/editor/common/editorCommon';
|
import { IEditor } from 'vs/editor/common/editorCommon';
|
||||||
import { QueryInput } from 'sql/parts/query/common/queryInput';
|
|
||||||
|
|
||||||
export interface IResultMessageIntern extends IResultMessage {
|
export interface IResultMessageIntern extends IResultMessage {
|
||||||
id?: string;
|
id?: string;
|
||||||
@@ -303,8 +302,14 @@ export class MessageController extends WorkbenchTreeController {
|
|||||||
if (element.selection) {
|
if (element.selection) {
|
||||||
let selection: ISelectionData = element.selection;
|
let selection: ISelectionData = element.selection;
|
||||||
// this is a batch statement
|
// this is a batch statement
|
||||||
let input = this.workbenchEditorService.activeEditor as QueryInput;
|
let control = this.workbenchEditorService.activeControl.getControl() as IEditor;
|
||||||
input.updateSelection(selection);
|
control.setSelection({
|
||||||
|
startColumn: selection.startColumn + 1,
|
||||||
|
endColumn: selection.endColumn + 1,
|
||||||
|
endLineNumber: selection.endLine + 1,
|
||||||
|
startLineNumber: selection.startLine + 1
|
||||||
|
});
|
||||||
|
control.focus();
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ Registry.as<IConfigurationRegistry>(ConfigExtensions.Configuration).registerConf
|
|||||||
'properties': {
|
'properties': {
|
||||||
'workbench.enablePreviewFeatures': {
|
'workbench.enablePreviewFeatures': {
|
||||||
'type': 'boolean',
|
'type': 'boolean',
|
||||||
'default': undefined,
|
'default': true,
|
||||||
'description': nls.localize('previewFeatures.configEnable', 'Enable unreleased preview features')
|
'description': nls.localize('previewFeatures.configEnable', 'Enable unreleased preview features')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,44 +27,46 @@ export class EnablePreviewFeatures implements IWorkbenchContribution {
|
|||||||
@ITelemetryService telemetryService: ITelemetryService,
|
@ITelemetryService telemetryService: ITelemetryService,
|
||||||
@IConfigurationService configurationService: IConfigurationService
|
@IConfigurationService configurationService: IConfigurationService
|
||||||
) {
|
) {
|
||||||
let previewFeaturesEnabled = configurationService.getValue('workbench')['enablePreviewFeatures'];
|
return;
|
||||||
if (previewFeaturesEnabled || storageService.get(EnablePreviewFeatures.ENABLE_PREVIEW_FEATURES_SHOWN)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Promise.all([
|
|
||||||
windowService.isFocused(),
|
|
||||||
windowsService.getWindowCount()
|
|
||||||
]).then(([focused, count]) => {
|
|
||||||
if (!focused && count > 1) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
configurationService.updateValue('workbench.enablePreviewFeatures', false);
|
|
||||||
|
|
||||||
const enablePreviewFeaturesNotice = localize('enablePreviewFeatures.notice', "Would you like to enable preview features?");
|
// let previewFeaturesEnabled = configurationService.getValue('workbench')['enablePreviewFeatures'];
|
||||||
notificationService.prompt(
|
// if (previewFeaturesEnabled || storageService.get(EnablePreviewFeatures.ENABLE_PREVIEW_FEATURES_SHOWN)) {
|
||||||
Severity.Info,
|
// return;
|
||||||
enablePreviewFeaturesNotice,
|
// }
|
||||||
[{
|
// Promise.all([
|
||||||
label: localize('enablePreviewFeatures.yes', "Yes"),
|
// windowService.isFocused(),
|
||||||
run: () => {
|
// windowsService.getWindowCount()
|
||||||
configurationService.updateValue('workbench.enablePreviewFeatures', true);
|
// ]).then(([focused, count]) => {
|
||||||
storageService.store(EnablePreviewFeatures.ENABLE_PREVIEW_FEATURES_SHOWN, true);
|
// if (!focused && count > 1) {
|
||||||
}
|
// return null;
|
||||||
}, {
|
// }
|
||||||
label: localize('enablePreviewFeatures.no', "No"),
|
// configurationService.updateValue('workbench.enablePreviewFeatures', false);
|
||||||
run: () => {
|
|
||||||
configurationService.updateValue('workbench.enablePreviewFeatures', false);
|
// const enablePreviewFeaturesNotice = localize('enablePreviewFeatures.notice', "Would you like to enable preview features?");
|
||||||
}
|
// notificationService.prompt(
|
||||||
}, {
|
// Severity.Info,
|
||||||
label: localize('enablePreviewFeatures.never', "No, don't show again"),
|
// enablePreviewFeaturesNotice,
|
||||||
run: () => {
|
// [{
|
||||||
configurationService.updateValue('workbench.enablePreviewFeatures', false);
|
// label: localize('enablePreviewFeatures.yes', "Yes"),
|
||||||
storageService.store(EnablePreviewFeatures.ENABLE_PREVIEW_FEATURES_SHOWN, true);
|
// run: () => {
|
||||||
},
|
// configurationService.updateValue('workbench.enablePreviewFeatures', true);
|
||||||
isSecondary: true
|
// storageService.store(EnablePreviewFeatures.ENABLE_PREVIEW_FEATURES_SHOWN, true);
|
||||||
}]
|
// }
|
||||||
);
|
// }, {
|
||||||
})
|
// label: localize('enablePreviewFeatures.no', "No"),
|
||||||
.then(null, onUnexpectedError);
|
// run: () => {
|
||||||
|
// configurationService.updateValue('workbench.enablePreviewFeatures', false);
|
||||||
|
// }
|
||||||
|
// }, {
|
||||||
|
// label: localize('enablePreviewFeatures.never', "No, don't show again"),
|
||||||
|
// run: () => {
|
||||||
|
// configurationService.updateValue('workbench.enablePreviewFeatures', false);
|
||||||
|
// storageService.store(EnablePreviewFeatures.ENABLE_PREVIEW_FEATURES_SHOWN, true);
|
||||||
|
// },
|
||||||
|
// isSecondary: true
|
||||||
|
// }]
|
||||||
|
// );
|
||||||
|
// })
|
||||||
|
// .then(null, onUnexpectedError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user