From 703cae70268a6bb3cf28c83c7564bb3db9a318fe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2024 09:20:19 +0000
Subject: [PATCH] [Workspace]Support search dev tools by its category name
 (#8920)

* support search dev tools by category name

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* Changeset file for PR #8920 created/updated

* address review comments

Signed-off-by: Hailong Cui <ihailong@amazon.com>

---------

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit 1c744d675ebf0c93a9990ddc7f424636e539fff9)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 changelogs/fragments/8920.yml                   |  2 ++
 .../search_devtool_command.test.tsx             | 17 ++++++++++++++++-
 .../global_search/search_devtool_command.tsx    | 12 +++++++++---
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/fragments/8920.yml

diff --git a/changelogs/fragments/8920.yml b/changelogs/fragments/8920.yml
new file mode 100644
index 000000000000..f25a3042d437
--- /dev/null
+++ b/changelogs/fragments/8920.yml
@@ -0,0 +1,2 @@
+feat:
+- [workspace]support search dev tools by its category name ([#8920](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8920))
\ No newline at end of file
diff --git a/src/plugins/dev_tools/public/global_search/search_devtool_command.test.tsx b/src/plugins/dev_tools/public/global_search/search_devtool_command.test.tsx
index 883584e49e08..9a5ce520e8f1 100644
--- a/src/plugins/dev_tools/public/global_search/search_devtool_command.test.tsx
+++ b/src/plugins/dev_tools/public/global_search/search_devtool_command.test.tsx
@@ -32,6 +32,17 @@ describe('DevtoolSearchCommand', () => {
     expect(searchResult).toHaveLength(0);
   });
 
+  it('searchForDevTools matches category', async () => {
+    const searchResult = await searchForDevTools('dev', {
+      devTools: devToolsFn,
+      title: 'Dev tools',
+      uiActionsApi: uiActionsApiFn,
+    });
+
+    // match all sub apps
+    expect(searchResult).toHaveLength(2);
+  });
+
   it('searchForDevTools with match tool', async () => {
     const searchResult = await searchForDevTools('console', {
       devTools: devToolsFn,
@@ -56,7 +67,11 @@ describe('DevtoolSearchCommand', () => {
                   />
                 </EuiFlexItem>
                 <EuiFlexItem>
-                  Dev tools
+                  <EuiHighlight
+                    search="console"
+                  >
+                    Dev tools
+                  </EuiHighlight>
                 </EuiFlexItem>
               </EuiFlexGroup>,
             },
diff --git a/src/plugins/dev_tools/public/global_search/search_devtool_command.tsx b/src/plugins/dev_tools/public/global_search/search_devtool_command.tsx
index 7bb8a9cb7238..03efbb751807 100644
--- a/src/plugins/dev_tools/public/global_search/search_devtool_command.tsx
+++ b/src/plugins/dev_tools/public/global_search/search_devtool_command.tsx
@@ -33,12 +33,18 @@ export const searchForDevTools = async (
       <EuiFlexItem>
         <EuiIcon type="consoleApp" color="text" />
       </EuiFlexItem>
-      <EuiFlexItem>{props.title}</EuiFlexItem>
+      <EuiFlexItem>
+        <EuiHighlight search={query}>{props.title}</EuiHighlight>
+      </EuiFlexItem>
     </EuiFlexGroup>
   );
 
-  return tools
-    .filter((tool) => tool.title.toLowerCase().includes(query.toLowerCase()))
+  const titleMatched = props.title.toLowerCase().includes(query.toLowerCase());
+  const matchedTools = titleMatched
+    ? tools
+    : tools.filter((tool) => tool.title.toLowerCase().includes(query.toLowerCase()));
+
+  return matchedTools
     .map((tool) => ({
       breadcrumbs: [
         {