fixed route resolving

Signed-off-by: Alex Rybchenko <arybchenko@box.com>

.changeset/real-mails-add.md

@@ -0,0 +1,6 @@
+---
+'@backstage/core-components': patch
+'@backstage/plugin-catalog': patch
+---
+
+fixed route resolving

packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx

@@ -33,9 +33,14 @@ export function useSelectedSubRoute(subRoutes: SubRoute[]): {
     element: children,
   }));
 
-  const element = useRoutes(routes) ?? subRoutes[0].children;
+  // TODO: remove once react-router updated
+  const sortedRoutes = routes.sort((a, b) =>
+    b.path.slice(0, -2).localeCompare(a.path.slice(0, -2)),
+  );
 
-  const [matchedRoute] = matchRoutes(routes, `/${params['*']}`) ?? [];
+  const element = useRoutes(sortedRoutes) ?? subRoutes[0].children;
+
+  const [matchedRoute] = matchRoutes(sortedRoutes, `/${params['*']}`) ?? [];
   const foundIndex = matchedRoute
     ? subRoutes.findIndex(t => `${t.path}/*` === matchedRoute.route.path)
     : 0;

plugins/catalog/src/components/EntityLayout/EntityLayout.tsx

@@ -200,7 +200,9 @@ export const EntityLayout = ({
               tabProps: props.tabProps,
             },
           ];
-        }),
+        })
+        // TODO: remove once react-router updated
+        .sort((a, b) => b.path.localeCompare(a.path)),
     [entity],
   );