[Bug] Trace Analytics bugfix for breadcrumbs and id pathing (opensear…

…ch-project#2037) * bugfix ids and breadcrumbs Signed-off-by: Adam Tackett <tackadam@amazon.com> * remove comments Signed-off-by: Adam Tackett <tackadam@amazon.com> * quick fix Signed-off-by: Adam Tackett <tackadam@amazon.com> --------- Signed-off-by: Adam Tackett <tackadam@amazon.com> Co-authored-by: Adam Tackett <tackadam@amazon.com>
ps48 · Aug 3, 2024 · faf2207 · faf2207
1 parent b1a4c7c
commit faf2207
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/public/components/trace_analytics/components/services/service_view.tsx b/public/components/trace_analytics/components/services/service_view.tsx
@@ -104,12 +104,14 @@ export function ServiceView(props: ServiceViewProps) {
   useEffect(() => {
     if (page !== 'serviceFlyout')
       setNavBreadCrumbs(
-        [props.parentBreadcrumb],
         [
+          props.parentBreadcrumb,
           {
             text: 'Trace analytics',
-            href: '#/',
+            href: '#/services',
           },
+        ],
+        [
           {
             text: 'Services',
             href: '#/services',

diff --git a/public/components/trace_analytics/components/traces/trace_view.tsx b/public/components/trace_analytics/components/traces/trace_view.tsx
@@ -233,12 +233,14 @@ export function TraceView(props: TraceViewProps) {
 
   useEffect(() => {
     setNavBreadCrumbs(
-      [props.parentBreadcrumb],
       [
+        props.parentBreadcrumb,
         {
           text: 'Trace analytics',
-          href: '#/',
+          href: '#/services',
         },
+      ],
+      [
         {
           text: 'Traces',
           href: '#/traces',

diff --git a/public/components/trace_analytics/home.tsx b/public/components/trace_analytics/home.tsx
@@ -123,7 +123,7 @@ export const Home = (props: HomeProps) => {
   let defaultRoute = props.defaultRoute ?? '/services';
   const currentHash = window.location.hash.split('#')[1] || '';
 
-  if (currentHash === '/traces' || currentHash === '/services') {
+  if (currentHash.startsWith('/traces') || currentHash.startsWith('/services')) {
     defaultRoute = currentHash;
   }
 
@@ -196,21 +196,29 @@ export const Home = (props: HomeProps) => {
   }, [mode]);
 
   const serviceBreadcrumbs = [
-    {
-      text: 'Trace analytics',
-      href: '#/services',
-    },
+    ...(!isNavGroupEnabled
+      ? [
+          {
+            text: 'Trace analytics',
+            href: '#/services',
+          },
+        ]
+      : []),
     {
       text: 'Services',
       href: '#/services',
     },
   ];
 
   const traceBreadcrumbs = [
-    {
-      text: 'Trace analytics',
-      href: '#/services',
-    },
+    ...(!isNavGroupEnabled
+      ? [
+          {
+            text: 'Trace analytics',
+            href: '#/services',
+          },
+        ]
+      : []),
     {
       text: 'Traces',
       href: '#/traces',