Remove app analytics (#154)

* removing app analytics from sidenav * removed unused headers * added trace analytics as default page
opensearch-project · Oct 27, 2021 · 8e95476 · 8e95476
1 parent eaf5fdd
commit 8e95476
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 57 deletions.
diff --git a/dashboards-observability/public/components/app.tsx b/dashboards-observability/public/components/app.tsx
@@ -17,7 +17,6 @@ import { CoreStart } from '../../../../src/core/public';
 import { observabilityTitle } from '../../common/constants/shared';
 import store from '../framework/redux/store';
 import { AppPluginStartDependencies } from '../types';
-import { Home as ApplicationAnalyticsHome } from './application_analytics/home';
 import { renderPageWithSidebar } from './common/side_nav';
 import { Home as CustomPanelsHome } from './custom_panels/home';
 import { EventAnalytics } from './explorer/event_analytics';
@@ -41,7 +40,6 @@ export const App = ({
   savedObjects,
   timestampUtils
 }: ObservabilityAppDeps) => {
-
   const { chrome, http, notifications } = CoreStart;
   const parentBreadcrumb = {
     text: observabilityTitle,
@@ -59,31 +57,6 @@ export const App = ({
         <I18nProvider>
           <>
             <Switch>
-              <Route
-                exact
-                path={['/', '/application_analytics', '/application_analytics/home']}
-                render={(props) => {
-                  chrome.setBreadcrumbs([
-                    parentBreadcrumb,
-                    {
-                      text: 'Application analytics',
-                      href: '#/application_analytics',
-                    },
-                  ]);
-                  return renderPageWithSidebar(<ApplicationAnalyticsHome />);
-                }}
-              />
-              <Route
-                path={['/trace_analytics', '/trace_analytics/home']}
-                render={(props) => (
-                  <TraceAnalyticsHome
-                    {...props}
-                    chrome={chrome}
-                    http={http}
-                    parentBreadcrumb={parentBreadcrumb}
-                  />
-                )}
-              />
               <Route
                 path="/notebooks"
                 render={(props) => (
@@ -117,7 +90,7 @@ export const App = ({
                 }}
               />
               <Route
-                path={['/operational_panels']}
+                path="/operational_panels"
                 render={(props) => {
                   chrome.setBreadcrumbs([parentBreadcrumb, customPanelBreadcrumb]);
                   return (
@@ -131,6 +104,17 @@ export const App = ({
                   );
                 }}
               />
+              <Route
+                path={['/', '/trace_analytics', '/trace_analytics/home']}
+                render={(props) => (
+                  <TraceAnalyticsHome
+                    {...props}
+                    chrome={chrome}
+                    http={http}
+                    parentBreadcrumb={parentBreadcrumb}
+                  />
+                )}
+              />
             </Switch>
           </>
         </I18nProvider>

diff --git a/dashboards-observability/public/components/application_analytics/home.tsx b/dashboards-observability/public/components/application_analytics/home.tsx
diff --git a/dashboards-observability/public/components/common/side_nav.tsx b/dashboards-observability/public/components/common/side_nav.tsx
@@ -38,43 +38,38 @@ export const renderPageWithSidebar = (BodyComponent: React.ReactNode) => {
       name: 'Observability',
       id: 0,
       items: [
-        {
-          name: 'Application analytics',
-          id: 1,
-          href: '#/application_analytics/home',
-        },
         {
           name: 'Trace analytics',
-          id: 2,
+          id: 1,
           href: '#/trace_analytics/home',
           items: [
             {
               name: 'Traces',
-              id: 2.1,
+              id: 1.1,
               href: '#/trace_analytics/traces',
             },
             {
               name: 'Services',
-              id: 2.2,
+              id: 1.2,
               href: '#/trace_analytics/services',
             },
           ],
         },
         {
           name: 'Event analytics',
-          id: 3,
+          id: 2,
           href: '#/event_analytics',
         },
         {
           name: 'Operational panels',
-          id: 4,
+          id: 3,
           href: '#/operational_panels/',
         },
         {
           name: 'Notebooks',
-          id: 5,
+          id: 4,
           href: '#/notebooks',
-        }
+        },
       ],
     },
   ];

diff --git a/dashboards-observability/public/components/trace_analytics/home.tsx b/dashboards-observability/public/components/trace_analytics/home.tsx
@@ -86,7 +86,7 @@ export const Home = (props: HomeProps) => {
     <>
       <Route
         exact
-        path={['/trace_analytics', '/trace_analytics/home']}
+        path={['/', '/trace_analytics', '/trace_analytics/home']}
         render={(routerProps) => renderPageWithSidebar(<Dashboard {...commonProps} />)}
       />
       <Route
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,7 +86,7 @@ export const Home = (props: HomeProps) => { @@
         <>
           <Route
             exact
-            path={['/trace_analytics', '/trace_analytics/home']}
+            path={['/', '/trace_analytics', '/trace_analytics/home']}
             render={(routerProps) => renderPageWithSidebar(<Dashboard {...commonProps} />)}
           />
           <Route
@@ Expand Down @@