resolved conflicts

Signed-off-by: sumukhswamy <[email protected]>
sumukhswamy · Jul 17, 2024 · efd62fd · efd62fd
1 parent d3a0d06
commit efd62fd
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 0 deletions.
diff --git a/public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap
@@ -90,8 +90,10 @@ exports[`Log Config component renders empty log config 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -717,8 +719,10 @@ exports[`Log Config component renders with query 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],

diff --git a/public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap
@@ -90,8 +90,10 @@ exports[`Service Config component renders empty service config 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -1287,8 +1289,10 @@ exports[`Service Config component renders with one service selected 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],

diff --git a/public/components/application_analytics/__tests__/__snapshots__/trace_config.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/trace_config.test.tsx.snap
@@ -89,8 +89,10 @@ exports[`Trace Config component renders empty trace config 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -999,8 +1001,10 @@ exports[`Trace Config component renders with one trace selected 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],

diff --git a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap
@@ -1231,8 +1231,10 @@ exports[`Panels View Component renders panel view container with visualizations
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -3024,8 +3026,10 @@ exports[`Panels View Component renders panel view container with visualizations
                           "registerRight": [MockFunction],
                         },
                         "navGroup": Object {
+                          "getCurrentNavGroup$": [MockFunction],
                           "getNavGroupEnabled": [MockFunction],
                           "getNavGroupsMap$": [MockFunction],
+                          "setCurrentNavGroup": [MockFunction],
                         },
                         "navLinks": Object {
                           "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -3474,8 +3478,10 @@ exports[`Panels View Component renders panel view container without visualizatio
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -5151,8 +5157,10 @@ exports[`Panels View Component renders panel view container without visualizatio
                           "registerRight": [MockFunction],
                         },
                         "navGroup": Object {
+                          "getCurrentNavGroup$": [MockFunction],
                           "getNavGroupEnabled": [MockFunction],
                           "getNavGroupsMap$": [MockFunction],
+                          "setCurrentNavGroup": [MockFunction],
                         },
                         "navLinks": Object {
                           "enableForcedAppSwitcherNavigation": [MockFunction],

diff --git a/...s/custom_panels/panel_modules/panel_grid/__tests__/__snapshots__/panel_grid.test.tsx.snap b/...s/custom_panels/panel_modules/panel_grid/__tests__/__snapshots__/panel_grid.test.tsx.snap
@@ -247,8 +247,10 @@ exports[`Panel Grid Component renders panel grid component with empty visualizat
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],

diff --git a/public/components/metrics/view/__tests__/__snapshots__/metrics_grid.test.tsx.snap b/public/components/metrics/view/__tests__/__snapshots__/metrics_grid.test.tsx.snap
@@ -100,8 +100,10 @@ exports[`Metrics Grid Component renders Metrics Grid Component 1`] = `
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -266,8 +268,10 @@ exports[`Metrics Grid Component renders Metrics Grid Component 1`] = `
             "registerRight": [MockFunction],
           },
           "navGroup": Object {
+            "getCurrentNavGroup$": [MockFunction],
             "getNavGroupEnabled": [MockFunction],
             "getNavGroupsMap$": [MockFunction],
+            "setCurrentNavGroup": [MockFunction],
           },
           "navLinks": Object {
             "enableForcedAppSwitcherNavigation": [MockFunction],

diff --git a/...ents/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap b/...ents/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap
@@ -103,8 +103,10 @@ exports[`Dashboard component renders dashboard 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -446,8 +448,10 @@ exports[`Dashboard component renders dashboard 1`] = `
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -1268,8 +1272,10 @@ exports[`Dashboard component renders empty dashboard 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -1610,8 +1616,10 @@ exports[`Dashboard component renders empty dashboard 1`] = `
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -2432,8 +2440,10 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -2776,8 +2786,10 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],

diff --git a/...onents/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap b/...onents/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap
@@ -103,8 +103,10 @@ exports[`Services component renders empty services page 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -434,8 +436,10 @@ exports[`Services component renders empty services page 1`] = `
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -2277,8 +2281,10 @@ exports[`Services component renders jaeger services page 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -2609,8 +2615,10 @@ exports[`Services component renders jaeger services page 1`] = `
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -3885,8 +3893,10 @@ exports[`Services component renders services page 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -4216,8 +4226,10 @@ exports[`Services component renders services page 1`] = `
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],

diff --git a/...components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap b/...components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap
@@ -103,8 +103,10 @@ exports[`Traces component renders empty traces page 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -433,8 +435,10 @@ exports[`Traces component renders empty traces page 1`] = `
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -1728,8 +1732,10 @@ exports[`Traces component renders jaeger traces page 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -2059,8 +2065,10 @@ exports[`Traces component renders jaeger traces page 1`] = `
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -3359,8 +3367,10 @@ exports[`Traces component renders traces page 1`] = `
         "registerRight": [MockFunction],
       },
       "navGroup": Object {
+        "getCurrentNavGroup$": [MockFunction],
         "getNavGroupEnabled": [MockFunction],
         "getNavGroupsMap$": [MockFunction],
+        "setCurrentNavGroup": [MockFunction],
       },
       "navLinks": Object {
         "enableForcedAppSwitcherNavigation": [MockFunction],
@@ -3689,8 +3699,10 @@ exports[`Traces component renders traces page 1`] = `
           "registerRight": [MockFunction],
         },
         "navGroup": Object {
+          "getCurrentNavGroup$": [MockFunction],
           "getNavGroupEnabled": [MockFunction],
           "getNavGroupsMap$": [MockFunction],
+          "setCurrentNavGroup": [MockFunction],
         },
         "navLinks": Object {
           "enableForcedAppSwitcherNavigation": [MockFunction],