From dd0bc9d0f3f2dc0f4ec96cfd050bb16785156b93 Mon Sep 17 00:00:00 2001 From: Cory Rivera Date: Wed, 28 Jun 2023 10:03:04 -0700 Subject: [PATCH] Add Preview tags to object management context menu entries (#23499) --- extensions/mssql/package.json | 28 +++++++++++-------- extensions/mssql/package.nls.json | 8 +++--- .../notebook/browser/notebook.contribution.ts | 4 +-- .../query/browser/query.contribution.ts | 4 +-- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json index 99a5dc4753..aa7ecf43df 100644 --- a/extensions/mssql/package.json +++ b/extensions/mssql/package.json @@ -497,6 +497,10 @@ { "command": "mssql.renameObject", "when": "false" + }, + { + "command": "mssql.detachDatabase", + "when": "false" } ], "objectExplorer/item/context": [ @@ -519,38 +523,38 @@ { "command": "mssql.newObject", "when": "connectionProvider == MSSQL && nodeType == Folder && objectType =~ /^(ServerLevelLogins|Users|ServerLevelServerRoles|ApplicationRoles|DatabaseRoles|Databases)$/ && config.workbench.enablePreviewFeatures", - "group": "0_query@1" + "group": "1_objectManagement" }, { "command": "mssql.objectProperties", "when": "connectionProvider == MSSQL && nodeType =~ /^(ServerLevelLogin|User|ServerLevelServerRole|ApplicationRole|DatabaseRole)$/ && config.workbench.enablePreviewFeatures", - "group": "0_query@1", + "group": "z_objectManagement", "isDefault": true }, { "command": "mssql.objectProperties", "when": "connectionProvider == MSSQL && serverInfo && !isCloud && nodeType && nodeType =~ /^(Database|Server)$/ && mssql:engineedition != 11 && isDevelopment", - "group": "0_query@1" + "group": "z_objectManagement" }, { "command": "mssql.deleteObject", "when": "connectionProvider == MSSQL && nodeType =~ /^(ServerLevelLogin|User|ServerLevelServerRole|ApplicationRole|DatabaseRole|Database)$/ && config.workbench.enablePreviewFeatures", - "group": "0_query@2" + "group": "1_objectManagement" }, { "command": "mssql.renameObject", "when": "connectionProvider == MSSQL && nodeType =~ /^(ServerLevelLogin|User|Table|View|ServerLevelServerRole|ApplicationRole|DatabaseRole)$/ && config.workbench.enablePreviewFeatures", - "group": "0_query@3" + "group": "1_objectManagement" }, { "command": "mssql.renameObject", "when": "connectionProvider == MSSQL && nodeType == Column && config.workbench.enablePreviewFeatures && nodePath =~ /^.*\\/Tables\\/.*\\/Columns\\/.*$/", - "group": "0_query@3" + "group": "1_objectManagement" }, { "command": "mssql.detachDatabase", "when": "connectionProvider == MSSQL && nodeType == Database && !isCloud && config.workbench.enablePreviewFeatures", - "group": "0_query@4" + "group": "1_objectManagement" }, { "command": "mssql.enableGroupBySchema", @@ -600,27 +604,27 @@ { "command": "mssql.newObject", "when": "connectionProvider == MSSQL && nodeType == Folder && objectType =~ /^(ServerLevelLogins|Users|ServerLevelServerRoles|ApplicationRoles|DatabaseRoles|Databases)$/ && config.workbench.enablePreviewFeatures", - "group": "connection@1" + "group": "1_objectManagement" }, { "command": "mssql.objectProperties", "when": "connectionProvider == MSSQL && nodeType =~ /^(ServerLevelLogin|User|ServerLevelServerRole|ApplicationRole|DatabaseRole)$/ && config.workbench.enablePreviewFeatures", - "group": "connection@1" + "group": "z_objectManagement" }, { "command": "mssql.deleteObject", "when": "connectionProvider == MSSQL && nodeType =~ /^(ServerLevelLogin|User|ServerLevelServerRole|ApplicationRole|DatabaseRole|Database)$/ && config.workbench.enablePreviewFeatures", - "group": "connection@2" + "group": "1_objectManagement" }, { "command": "mssql.renameObject", "when": "connectionProvider == MSSQL && nodeType =~ /^(ServerLevelLogin|User|Table|View|ServerLevelServerRole|ApplicationRole|DatabaseRole)$/ && config.workbench.enablePreviewFeatures", - "group": "connection@3" + "group": "1_objectManagement" }, { "command": "mssql.renameObject", "when": "connectionProvider == MSSQL && nodeType == Column && config.workbench.enablePreviewFeatures && nodePath =~ /^.*\\/Tables\\/.*\\/Columns\\/.*$/", - "group": "connection@3" + "group": "1_objectManagement" }, { "command": "mssql.enableGroupBySchema", diff --git a/extensions/mssql/package.nls.json b/extensions/mssql/package.nls.json index 1d59535f9e..a9b1b0c0a6 100644 --- a/extensions/mssql/package.nls.json +++ b/extensions/mssql/package.nls.json @@ -184,9 +184,9 @@ "mssql.objectExplorer.enableGroupBySchemaTitle": "SQL Server: Enable Group By Schema", "mssql.objectExplorer.disableGroupBySchemaTitle": "SQL Server: Disable Group By Schema", "mssql.objectExplorer.expandTimeout": "The timeout in seconds for expanding a node in Object Explorer. The default value is 45 seconds.", - "title.newObject": "New", + "title.newObject": "New (Preview)", "title.objectProperties": "Properties (Preview)", - "title.deleteObject": "Delete", - "title.renameObject": "Rename", - "title.detachDatabase": "Detach" + "title.deleteObject": "Delete (Preview)", + "title.renameObject": "Rename (Preview)", + "title.detachDatabase": "Detach (Preview)" } diff --git a/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts index b92a99e72d..9b207850a3 100644 --- a/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts +++ b/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts @@ -126,7 +126,7 @@ CommandsRegistry.registerCommand({ MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, { group: '0_query', - order: 3, + order: 1, command: { id: DE_NEW_NOTEBOOK_COMMAND_ID, title: localize('newNotebook', "New Notebook") @@ -148,7 +148,7 @@ CommandsRegistry.registerCommand({ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, { group: '0_query', - order: 3, + order: 1, command: { id: OE_NEW_NOTEBOOK_COMMAND_ID, title: localize('newQuery', "New Notebook") diff --git a/src/sql/workbench/contrib/query/browser/query.contribution.ts b/src/sql/workbench/contrib/query/browser/query.contribution.ts index a960d25f8d..2a43dd9364 100644 --- a/src/sql/workbench/contrib/query/browser/query.contribution.ts +++ b/src/sql/workbench/contrib/query/browser/query.contribution.ts @@ -71,7 +71,7 @@ new NewQueryTask().registerTask(); MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, { group: '0_query', - order: 1, + order: 0, command: { id: OE_NEW_QUERY_ACTION_ID, title: localize('newQuery', "New Query") @@ -82,7 +82,7 @@ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, { // New Query MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, { group: '0_query', - order: 1, + order: 0, command: { id: DE_NEW_QUERY_COMMAND_ID, title: localize('newQuery', "New Query")