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

Remove irrelevant context menu options from ledger objects in OE (#20571)

Browse Source 
* fixing icons for new ledger object SubTypes

* removing irrelevant context menu options from ledger objects in OE

* aligning LedgerDropped subtype context key specifically with the Table NodeType context key
This commit is contained in:
Jordan Hays
2022-09-09 08:50:57 -07:00
committed by GitHub
parent 06c8e3d7a8
commit 982c242301
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/mssql/package.json
View File

@@ -511,7 +511,7 @@
}, },
{ {
"command": "mssql.designTable", "command": "mssql.designTable",
"when": "connectionProvider == MSSQL && nodeType == Table && config.workbench.enablePreviewFeatures", "when": "connectionProvider == MSSQL && nodeType == Table && nodeSubType != LedgerDropped && config.workbench.enablePreviewFeatures",
"group": "0_query@3" "group": "0_query@3"
}, },
{ {

17
src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts
View File

@@ -132,6 +132,8 @@ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, {
when: when:
ContextKeyExpr.and( ContextKeyExpr.and(
TreeNodeContextKey.NodeType.isEqualTo(NodeType.Table), TreeNodeContextKey.NodeType.isEqualTo(NodeType.Table),
TreeNodeContextKey.SubType.notEqualsTo('LedgerAppendOnly'),
TreeNodeContextKey.SubType.notEqualsTo('LedgerDropped'),
ConnectionContextKey.Provider.notEqualsTo('KUSTO'), ConnectionContextKey.Provider.notEqualsTo('KUSTO'),
ConnectionContextKey.Provider.notEqualsTo('LOGANALYTICS'), ConnectionContextKey.Provider.notEqualsTo('LOGANALYTICS'),
ServerInfoContextKey.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString()), ServerInfoContextKey.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString()),
@@ -151,8 +153,14 @@ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, {
ConnectionContextKey.Provider.notEqualsTo('KUSTO'), ConnectionContextKey.Provider.notEqualsTo('KUSTO'),
ConnectionContextKey.Provider.notEqualsTo('LOGANALYTICS'), ConnectionContextKey.Provider.notEqualsTo('LOGANALYTICS'),
ContextKeyExpr.or( ContextKeyExpr.or(
ContextKeyExpr.and(
TreeNodeContextKey.NodeType.isEqualTo(NodeType.Table), TreeNodeContextKey.NodeType.isEqualTo(NodeType.Table),
TreeNodeContextKey.SubType.notEqualsTo('LedgerDropped')
),
ContextKeyExpr.and(
TreeNodeContextKey.NodeType.isEqualTo(NodeType.View), TreeNodeContextKey.NodeType.isEqualTo(NodeType.View),
TreeNodeContextKey.SubType.notEqualsTo('Ledger'),
),
TreeNodeContextKey.NodeType.isEqualTo(NodeType.Schema), TreeNodeContextKey.NodeType.isEqualTo(NodeType.Schema),
ContextKeyExpr.and(TreeNodeContextKey.NodeType.isEqualTo(NodeType.User), ServerInfoContextKey.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())), ContextKeyExpr.and(TreeNodeContextKey.NodeType.isEqualTo(NodeType.User), ServerInfoContextKey.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())),
TreeNodeContextKey.NodeType.isEqualTo(NodeType.User), TreeNodeContextKey.NodeType.isEqualTo(NodeType.User),
@@ -199,7 +207,8 @@ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, {
TreeNodeContextKey.NodeType.isEqualTo(NodeType.StoredProcedure)), TreeNodeContextKey.NodeType.isEqualTo(NodeType.StoredProcedure)),
ContextKeyExpr.and( ContextKeyExpr.and(
ConnectionContextKey.Provider.isEqualTo('MSSQL'), ConnectionContextKey.Provider.isEqualTo('MSSQL'),
TreeNodeContextKey.NodeType.isEqualTo(NodeType.View)), TreeNodeContextKey.NodeType.isEqualTo(NodeType.View),
TreeNodeContextKey.SubType.notEqualsTo('Ledger')),
ContextKeyExpr.and( ContextKeyExpr.and(
ConnectionContextKey.Provider.isEqualTo('MSSQL'), ConnectionContextKey.Provider.isEqualTo('MSSQL'),
TreeNodeContextKey.NodeType.isEqualTo(NodeType.AggregateFunction)), TreeNodeContextKey.NodeType.isEqualTo(NodeType.AggregateFunction)),
@@ -231,8 +240,14 @@ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, {
ConnectionContextKey.Provider.notEqualsTo('KUSTO'), ConnectionContextKey.Provider.notEqualsTo('KUSTO'),
ConnectionContextKey.Provider.notEqualsTo('LOGANALYTICS'), ConnectionContextKey.Provider.notEqualsTo('LOGANALYTICS'),
ContextKeyExpr.or( ContextKeyExpr.or(
ContextKeyExpr.and(
TreeNodeContextKey.NodeType.isEqualTo(NodeType.Table), TreeNodeContextKey.NodeType.isEqualTo(NodeType.Table),
TreeNodeContextKey.SubType.notEqualsTo('LedgerDropped')
),
ContextKeyExpr.and(
TreeNodeContextKey.NodeType.isEqualTo(NodeType.View), TreeNodeContextKey.NodeType.isEqualTo(NodeType.View),
TreeNodeContextKey.SubType.notEqualsTo('Ledger'),
),
TreeNodeContextKey.NodeType.isEqualTo(NodeType.Schema), TreeNodeContextKey.NodeType.isEqualTo(NodeType.Schema),
TreeNodeContextKey.NodeType.isEqualTo(NodeType.User), TreeNodeContextKey.NodeType.isEqualTo(NodeType.User),
TreeNodeContextKey.NodeType.isEqualTo(NodeType.UserDefinedTableType), TreeNodeContextKey.NodeType.isEqualTo(NodeType.UserDefinedTableType),

13
src/sql/workbench/services/objectExplorer/browser/media/objectTypes/objecttypes.css
View File

@@ -579,9 +579,15 @@
background: url("TableValuedFunctionParameter_Return.svg") center center no-repeat; background: url("TableValuedFunctionParameter_Return.svg") center center no-repeat;
} }
.vs .icon.table_ledger, .vs .icon.table_ledgerappendonly,
.vs-dark .icon.table_ledger, .vs-dark .icon.table_ledgerappendonly,
.hc-black .icon.table_ledger { .hc-black .icon.table_ledgerappendonly,
.vs .icon.table_ledgerupdatable,
.vs-dark .icon.table_ledgerupdatable,
.hc-black .icon.table_ledgerupdatable,
.vs .icon.table_ledgerdropped,
.vs-dark .icon.table_ledgerdropped,
.hc-black .icon.table_ledgerdropped {
background: url("Table_Ledger.svg") center center no-repeat; background: url("Table_Ledger.svg") center center no-repeat;
} }
@@ -609,7 +615,6 @@
background: url("Table_LedgerHistory.svg") center center no-repeat; background: url("Table_LedgerHistory.svg") center center no-repeat;
} }
.vs .icon.trigger, .vs .icon.trigger,
.vs-dark .icon.trigger, .vs-dark .icon.trigger,
.hc-black .icon.trigger { .hc-black .icon.trigger {