From 37f31424793b44c1bc20f5a6976fbc1ed06a92aa Mon Sep 17 00:00:00 2001
From: yuye-aws <yuyezhu@amazon.com>
Date: Wed, 13 Sep 2023 17:05:45 +0800
Subject: [PATCH] register dev tools into opensearch features category

Signed-off-by: yuye-aws <yuyezhu@amazon.com>
---
 src/core/utils/default_app_categories.ts | 10 +++++++++-
 src/plugins/dev_tools/public/plugin.ts   |  2 +-
 src/plugins/workspace/server/plugin.ts   |  5 +++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/core/utils/default_app_categories.ts b/src/core/utils/default_app_categories.ts
index 68531107a5f1..d417f22f8429 100644
--- a/src/core/utils/default_app_categories.ts
+++ b/src/core/utils/default_app_categories.ts
@@ -64,12 +64,20 @@ export const DEFAULT_APP_CATEGORIES: Record<string, AppCategory> = Object.freeze
     order: 4000,
     euiIconType: 'logoSecurity',
   },
+  openSearchFeatures: {
+    id: 'openSearchFeatures',
+    label: i18n.translate('core.ui.openSearchFeaturesNavList.label', {
+      defaultMessage: 'OpenSearch Features',
+    }),
+    order: 5000,
+    euiIconType: 'folderClosed',
+  },
   management: {
     id: 'management',
     label: i18n.translate('core.ui.managementNavList.label', {
       defaultMessage: 'Management',
     }),
-    order: 5000,
+    order: 6000,
     euiIconType: 'managementApp',
   },
 });
diff --git a/src/plugins/dev_tools/public/plugin.ts b/src/plugins/dev_tools/public/plugin.ts
index c23431799ead..c2b6d9d819ec 100644
--- a/src/plugins/dev_tools/public/plugin.ts
+++ b/src/plugins/dev_tools/public/plugin.ts
@@ -85,7 +85,7 @@ export class DevToolsPlugin implements Plugin<DevToolsSetup> {
       icon: '/plugins/home/public/assets/logos/opensearch_mark_default.svg',
       /* the order of dev tools, it shows as last item of management section */
       order: 9070,
-      category: DEFAULT_APP_CATEGORIES.management,
+      category: DEFAULT_APP_CATEGORIES.openSearchFeatures,
       mount: async (params: AppMountParameters) => {
         const { element, history } = params;
         element.classList.add('devAppWrapper');
diff --git a/src/plugins/workspace/server/plugin.ts b/src/plugins/workspace/server/plugin.ts
index 53b795993169..0920d680f262 100644
--- a/src/plugins/workspace/server/plugin.ts
+++ b/src/plugins/workspace/server/plugin.ts
@@ -4,7 +4,6 @@
  */
 import { i18n } from '@osd/i18n';
 import { Observable } from 'rxjs';
-
 import {
   PluginInitializerContext,
   CoreSetup,
@@ -26,7 +25,7 @@ import { IWorkspaceDBImpl } from './types';
 import { WorkspaceClientWithSavedObject } from './workspace_client';
 import { WorkspaceSavedObjectsClientWrapper } from './saved_objects';
 import { registerRoutes } from './routes';
-import { WORKSPACE_OVERVIEW_APP_ID, WORKSPACE_UPDATE_APP_ID } from '../common/constants';
+import { WORKSPACE_OVERVIEW_APP_ID } from '../common/constants';
 import { ConfigSchema } from '../config';
 
 export class WorkspacePlugin implements Plugin<{}, {}> {
@@ -133,6 +132,7 @@ export class WorkspacePlugin implements Plugin<{}, {}> {
       users: ['*'],
     });
     const DSM_APP_ID = 'dataSources';
+    const DEV_TOOLS_APP_ID = 'dev_tools';
 
     await Promise.all([
       this.checkAndCreateWorkspace(
@@ -157,6 +157,7 @@ export class WorkspacePlugin implements Plugin<{}, {}> {
             `@${DEFAULT_APP_CATEGORIES.management.id}`,
             WORKSPACE_OVERVIEW_APP_ID,
             DSM_APP_ID,
+            DEV_TOOLS_APP_ID,
           ],
         },
         managementWorkspaceACL.getPermissions()