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

Fixing setting layout in OE (#23536)

Browse Source
This commit is contained in:
Aasim Khan
2023-06-29 00:09:05 -07:00
committed by GitHub
parent 78ccf9fe0d
commit dcef1d98a0
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution.ts
View File

@@ -46,6 +46,7 @@ configurationRegistry.registerConfiguration({
'id': 'startupConfig', 'id': 'startupConfig',
'title': localize('startupConfig', "Startup Configuration"), 'title': localize('startupConfig', "Startup Configuration"),
'type': 'object', 'type': 'object',
'order': 0,
'properties': { 'properties': {
'startup.alwaysShowServersView': { 'startup.alwaysShowServersView': {
'type': 'boolean', 'type': 'boolean',

23
src/sql/workbench/contrib/objectExplorer/common/serverGroup.contribution.ts
View File

@@ -15,12 +15,21 @@ const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Con
export const SERVER_GROUP_AUTOEXPAND_CONFIG = 'autoExpand'; export const SERVER_GROUP_AUTOEXPAND_CONFIG = 'autoExpand';
const serverGroupConfig: IConfigurationNode = { const serverGroupConfig: IConfigurationNode = {
id: 'Server Groups', id: 'serverGroup',
type: 'object', type: 'object',
title: localize('objectExplorerConfigurationTitle', "Object Explorer"),
order: 2,
properties: { properties: {
[SERVER_GROUP_CONFIG + '.' + SERVER_GROUP_COLORS_CONFIG]: <IJSONSchema>{ [`${SERVER_GROUP_CONFIG}.${SERVER_GROUP_AUTOEXPAND_CONFIG}`]: {
'order': 2,
'type': 'boolean',
'description': localize('serverGroup.autoExpand', "Auto-expand Server Groups in the Object Explorer viewlet."),
'default': 'true'
},
[`${SERVER_GROUP_CONFIG}.${SERVER_GROUP_COLORS_CONFIG}`]: <IJSONSchema>{
type: 'array', type: 'array',
items: 'string', items: 'string',
order: 3,
'description': localize('serverGroup.colors', "Server Group color palette used in the Object Explorer viewlet."), 'description': localize('serverGroup.colors', "Server Group color palette used in the Object Explorer viewlet."),
default: [ default: [
'#A1634D', '#A1634D',
@@ -33,11 +42,6 @@ const serverGroupConfig: IConfigurationNode = {
DefaultServerGroupColor DefaultServerGroupColor
] ]
}, },
[SERVER_GROUP_CONFIG + '.' + SERVER_GROUP_AUTOEXPAND_CONFIG]: {
'type': 'boolean',
'description': localize('serverGroup.autoExpand', "Auto-expand Server Groups in the Object Explorer viewlet."),
'default': 'true'
},
} }
}; };
@@ -46,8 +50,9 @@ const serverTreeConfig: IConfigurationNode = {
'id': 'serverTree', 'id': 'serverTree',
'title': localize('serverTree.configuration.title', "Server Tree"), 'title': localize('serverTree.configuration.title', "Server Tree"),
'type': 'object', 'type': 'object',
'order': 1,
'properties': { 'properties': {
'serverTree.useAsyncServerTree': { [`serverTree.useAsyncServerTree`]: {
'type': 'boolean', 'type': 'boolean',
'default': true, 'default': true,
'description': localize('serverTree.useAsyncServerTree', "Use the new async server tree for the Servers view and Connection Dialog with support for new features such as dynamic node filtering. Requires a restart to take effect.") 'description': localize('serverTree.useAsyncServerTree', "Use the new async server tree for the Servers view and Connection Dialog with support for new features such as dynamic node filtering. Requires a restart to take effect.")
@@ -55,5 +60,5 @@ const serverTreeConfig: IConfigurationNode = {
} }
}; };
configurationRegistry.registerConfiguration(serverGroupConfig);
configurationRegistry.registerConfiguration(serverTreeConfig); configurationRegistry.registerConfiguration(serverTreeConfig);
configurationRegistry.registerConfiguration(serverGroupConfig);

9
src/sql/workbench/contrib/preferences/browser/sqlSettingsLayout.ts
View File

@@ -6,6 +6,8 @@
import { localize } from 'vs/nls'; import { localize } from 'vs/nls';
import { tocData as vstocData, ITOCEntry } from 'vs/workbench/contrib/preferences/browser/settingsLayout'; import { tocData as vstocData, ITOCEntry } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
export const OBJECT_EXPLORER_CONFIG_PREFIX = 'objectExplorer';
// Copy existing table of contents and append // Copy existing table of contents and append
export const tocData: ITOCEntry<string> = Object.assign({}, vstocData); export const tocData: ITOCEntry<string> = Object.assign({}, vstocData);
let sqlTocItems: ITOCEntry<string>[] = [{ let sqlTocItems: ITOCEntry<string>[] = [{
@@ -15,7 +17,12 @@ let sqlTocItems: ITOCEntry<string>[] = [{
{ {
id: 'data/connection', id: 'data/connection',
label: localize('connection', "Connection"), label: localize('connection', "Connection"),
settings: ['startup.alwaysShowServersView', 'connection.*', 'serverGroup.*', 'datasource.*'] settings: ['connection.*', 'datasource.*']
},
{
id: 'data/objectExplorer',
label: localize('objectExplorer', "Object Explorer"),
settings: ['startup.alwaysShowServersView', 'serverTree.*', 'serverGroup.*']
}, },
{ {
id: 'data/queryEditor', id: 'data/queryEditor',