From f6052076a8e40b44bc81e58ef1e62408529900a6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:56:00 +0000
Subject: [PATCH] [Navigation] Remove integrations from new NavGroups (#1950)

* Remove integrations from new Nav

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* Integrations only in observability

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* Update snapshots

Signed-off-by: Adam Tackett <tackadam@amazon.com>

---------

Signed-off-by: Adam Tackett <tackadam@amazon.com>
Co-authored-by: Adam Tackett <tackadam@amazon.com>
(cherry picked from commit 0b472ec140f71f02061b6e19daaca8a944c19dc8)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 public/plugin.tsx     | 16 ++++++++--------
 public/plugin_nav.tsx | 37 ++++++++++++-------------------------
 2 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/public/plugin.tsx b/public/plugin.tsx
index 47d50ec97a..6de531c842 100644
--- a/public/plugin.tsx
+++ b/public/plugin.tsx
@@ -302,6 +302,14 @@ export class ObservabilityPlugin
       mount: appMountWithStartPage('applications'),
     });
 
+    core.application.register({
+      id: observabilityIntegrationsID,
+      title: observabilityIntegrationsTitle,
+      category: DEFAULT_APP_CATEGORIES.management,
+      order: observabilityIntegrationsPluginOrder,
+      mount: appMountWithStartPage('integrations'),
+    });
+
     if (core.chrome.navGroup.getNavGroupEnabled()) {
       core.application.register({
         id: 'observability-traces-nav',
@@ -351,14 +359,6 @@ export class ObservabilityPlugin
       mount: appMountWithStartPage('notebooks'),
     });
 
-    core.application.register({
-      id: observabilityIntegrationsID,
-      title: observabilityIntegrationsTitle,
-      category: DEFAULT_APP_CATEGORIES.management,
-      order: observabilityIntegrationsPluginOrder,
-      mount: appMountWithStartPage('integrations'),
-    });
-
     registerAllPluginNavGroups(core);
 
     core.application.register({
diff --git a/public/plugin_nav.tsx b/public/plugin_nav.tsx
index ac60a0ab95..457167fe96 100644
--- a/public/plugin_nav.tsx
+++ b/public/plugin_nav.tsx
@@ -2,6 +2,7 @@
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
+
 import {
   observabilityApplicationsID,
   observabilityIntegrationsID,
@@ -21,6 +22,14 @@ export function registerAllPluginNavGroups(core: CoreSetup<AppPluginStartDepende
     },
   ]);
 
+  core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
+    {
+      id: observabilityIntegrationsID,
+      category: DEFAULT_APP_CATEGORIES.visualizeAndReport,
+      order: 500,
+    },
+  ]);
+
   core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
     {
       id: observabilityMetricsID,
@@ -33,47 +42,25 @@ export function registerAllPluginNavGroups(core: CoreSetup<AppPluginStartDepende
   core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
     {
       id: observabilityNotebookID,
-      category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
+      category: DEFAULT_APP_CATEGORIES.visualizeAndReport,
       order: 400,
     },
   ]);
   core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS[`security-analytics`], [
     {
       id: observabilityNotebookID,
-      category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
+      category: DEFAULT_APP_CATEGORIES.visualizeAndReport,
       order: 400,
     },
   ]);
   core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.analytics, [
     {
       id: observabilityNotebookID,
-      category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
+      category: DEFAULT_APP_CATEGORIES.visualizeAndReport,
       order: 400,
     },
   ]);
 
-  core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
-    {
-      id: observabilityIntegrationsID,
-      category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
-      order: 500,
-    },
-  ]);
-  core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS[`security-analytics`], [
-    {
-      id: observabilityIntegrationsID,
-      category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
-      order: 500,
-    },
-  ]);
-  core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.analytics, [
-    {
-      id: observabilityIntegrationsID,
-      category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
-      order: 500,
-    },
-  ]);
-
   core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
     {
       id: 'observability-traces-nav',