Merge pull request #5418 from microsoft/qianjin-endgame-june-fix

set SDK "Others" Category as the last item and tidy messages/properties of SQL server.

Author: shenqianjin

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/java/com/microsoft/azure/toolkit/intellij/azuresdk/referencebook/AzureSdkTreePanel.java

@@ -131,7 +131,8 @@ private void loadData(final Map<String, List<AzureSdkCategoryEntity>> categoryTo
         final DefaultMutableTreeNode root = (DefaultMutableTreeNode) this.model.getRoot();
         root.removeAllChildren();
         final Map<String, AzureSdkServiceEntity> serviceMap = services.stream().collect(Collectors.toMap(e -> getServiceKeyByName(e.getName()), e -> e));
-        final List<String> categories = categoryToServiceMap.keySet().stream().sorted().collect(Collectors.toList());
+        final List<String> categories = categoryToServiceMap.keySet().stream().filter(StringUtils::isNotBlank).sorted(
+                (s1, s2) -> StringUtils.contains(s1, "Others") ? 1 : StringUtils.contains(s2, "Others") ? -1 : s1.compareTo(s2)).collect(Collectors.toList());
         for (final String category : categories) {
             // no feature found for current category
             if (CollectionUtils.isEmpty(categoryToServiceMap.get(category)) ||

PluginsAndFeatures/azure-toolkit-for-intellij/resources/com/microsoft/azure/toolkit/operation/titles_sqlserver_intellij.properties

@@ -1,9 +1,6 @@
-sqlserver.create=create Azure Database for SQL Server({0}) in subscription({1})
-sqlserver|database.list.server|subscription=list all Azure SQL Server database schemas in server({0}) of subscription({1})
-sqlserver|region.list.supported=list Azure SQL Server-supported regions
-sqlserver|version.list.supported=list Azure SQL Server-supported versions
-sqlserver.update_password=update password of SQL Server instance
-sqlserver.connect_server=connect to Azure SQL Server({0})
-sqlserver.delete=delete SQL Server({0})
-sqlserver.open_portal=open configuration page of SQL Server({0}) in portal
-sqlserver.show_properties=show properties of SQL Server({0})
+sqlserver|server.create=create SQL Server({0}) in subscription({1})
+sqlserver|server.delete=delete SQL Server({0})
+sqlserver|server.open_portal=open configuration page of SQL Server({0}) in portal
+sqlserver|server.show_properties=show properties of SQL Server({0})
+sqlserver|server.open_by_database_tools=open SQL Server({0}) by Database Tools plugin.
+sqlserver|server.database_load|subscription=list all SQL Server databases in server({0}) of subscription({1})

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/OpenSqlServerByToolsAction.java

@@ -60,7 +60,7 @@ protected String getOperationName(NodeActionEvent event) {
         return ActionConstants.parse(ActionConstants.SqlServer.CONNECT_TO_SERVER).getOperationName();
     }
 
-    @AzureOperation(name = "sqlserver.connect_server", params = {"this.node.getServer().entity().getName()"}, type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = "sqlserver|server.open_by_database_tools", params = {"this.node.getServer().entity().getName()"}, type = AzureOperation.Type.ACTION)
     private void doActionPerformed(boolean isLoggedIn, Project project) {
         try {
             if (!isLoggedIn ||

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/common/SqlServerDatabaseComboBox.java

@@ -44,7 +44,7 @@ protected String getItemText(Object item) {
 
     @Override
     @AzureOperation(
-        name = "sqlserver|database.list.server|subscription",
+        name = "sqlserver|server.database_load|subscription",
         params = {"this.server.name()", "this.subscription.subscriptionId()"},
         type = AzureOperation.Type.SERVICE
     )

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/task/CreateSqlServerTask.java

@@ -34,7 +34,7 @@ public CreateSqlServerTask(SqlServerConfig config) {
     }
 
     @AzureOperation(
-        name = "sqlserver.create",
+        name = "sqlserver|server.create",
         params = {
             "config.getServerName()",
             "config.getSubscription().displayName()"

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/sqlserver/SqlServerNode.java

@@ -66,18 +66,18 @@ public List<NodeAction> getNodeActions() {
         return super.getNodeActions();
     }
 
-    @AzureOperation(name = "sqlserver.delete", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = "sqlserver|server.delete", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
     private void delete() {
         this.serverState = SERVER_UPDATING;
         this.getParent().removeNode(this.subscriptionId, this.getId(), SqlServerNode.this);
     }
 
-    @AzureOperation(name = "sqlserver.open_portal", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = "sqlserver|server.open_portal", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
     private void openInPortal() {
         this.openResourcesInPortal(this.subscriptionId, this.server.entity().getId());
     }
 
-    @AzureOperation(name = "sqlserver.show_properties", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = "sqlserver|server.show_properties", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
     private void showProperties() {
         DefaultLoader.getUIHelper().openSqlServerPropertyView(SqlServerNode.this);
     }