fix: adjust code after rebasing

packages/app/src/App.tsx

@@ -28,7 +28,7 @@ import { hot } from 'react-hot-loader/root';
 import { providers } from './identityProviders';
 import { CatalogRouter } from '@backstage/plugin-catalog';
 // import { ExplorePlugin } from '@backstage/plugin-explore';
-import { Route, Routes } from 'react-router';
+import { Route, Routes, Navigate } from 'react-router';
 
 import { EntityPage } from './components/catalog/EntityPage';
 
@@ -58,6 +58,7 @@ const AppRoutes = () => (
       path="/catalog/*"
       element={<CatalogRouter EntityPage={EntityPage} />}
     />
+    <Route path="/" element={<Navigate to="/catalog" />} />
     {/* <Route path="/explore" element={<ExplorePlugin />} /> */}
   </Routes>
 );

plugins/catalog/src/components/EntityPageLayout/Tabbed/Tabbed.tsx

@@ -28,10 +28,14 @@ import { Tab, HeaderTabs, Content } from '@backstage/core';
 import { Grid } from '@material-ui/core';
 import { Helmet } from 'react-helmet';
 
-const getSelectedIndex = (matchedRoute: RouteMatch, tabs: Tab[]) => {
-  if (!matchedRoute) return 0;
+const getSelectedIndexOrDefault = (
+  matchedRoute: RouteMatch,
+  tabs: Tab[],
+  defaultIndex = 0,
+) => {
+  if (!matchedRoute) return defaultIndex;
   const tabIndex = tabs.findIndex(t => t.id === matchedRoute.route.path);
-  return ~tabIndex ? tabIndex : 0;
+  return ~tabIndex ? tabIndex : defaultIndex;
 };
 
 /**
@@ -86,12 +90,16 @@ export const Tabbed = {
 
     const [matchedRoute] =
       matchRoutes(routes as RouteObject[], `/${params['*']}`) ?? [];
-    const selectedIndex = getSelectedIndex(matchedRoute, tabs);
+    const selectedIndex = getSelectedIndexOrDefault(matchedRoute, tabs);
     const currentTab = tabs[selectedIndex];
     const title = currentTab.label;
 
     const onTabChange = (index: number) =>
-      navigate(tabs[index].id.replace(/\/\*$/g, ''));
+      // Remove trailing /*
+      // And remove leading / for relative navigation
+      // Note! route resolves relative to the position in the React tree,
+      // not relative to current location
+      navigate(tabs[index].id.replace(/\/\*$/, '').replace(/^\//, ''));
 
     const currentRouteElement = useRoutes(routes);
 

yarn.lock

@@ -2724,7 +2724,7 @@
   dependencies:
     "@types/node" ">= 8"
 
-"@open-draft/until@^1.0.3":
+"@open-draft/until@^1.0.0", "@open-draft/until@^1.0.3":
   version "1.0.3"
   resolved "https://registry.npmjs.org/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca"
   integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==
@@ -4106,6 +4106,11 @@
   dependencies:
     "@types/express" "*"
 
+"@types/cookie@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803"
+  integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==
+
 "@types/cookie@^0.4.0":
   version "0.4.0"
   resolved "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108"
@@ -11650,7 +11655,7 @@ graphql-upload@^8.0.2:
     http-errors "^1.7.3"
     object-path "^0.11.4"
 
-graphql@15.3.0, graphql@^15.3.0:
+graphql@15.3.0, graphql@^15.0.0, graphql@^15.3.0:
   version "15.3.0"
   resolved "https://registry.npmjs.org/graphql/-/graphql-15.3.0.tgz#3ad2b0caab0d110e3be4a5a9b2aa281e362b5278"
   integrity sha512-GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w==
@@ -11858,7 +11863,7 @@ he@^1.2.0:
   resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-headers-utils@^1.2.0:
+headers-utils@^1.1.9, headers-utils@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/headers-utils/-/headers-utils-1.2.0.tgz#5e10d1bc9d2bccf789547afca5b991a3167241e8"
   integrity sha512-4/BMXcWrJErw7JpM87gF8MNEXcIMLzepYZjNRv/P9ctgupl2Ywa3u1PgHtNhSRq84bHH9Ndlkdy7bSi+bZ9I9A==
@@ -15561,6 +15566,22 @@ ms@^2.0.0, ms@^2.1.1:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+msw@^0.19.5:
+  version "0.19.5"
+  resolved "https://registry.npmjs.org/msw/-/msw-0.19.5.tgz#7d2a1a852ccf1644d3db6735d69fff6777aac33f"
+  integrity sha512-J5eQ++gDVZoHPC8gVXtWcakLjgmPipvFj/sEnlRV/WViXuiq2CamSqO3Wbh6H8bAmj+k2vUWCfcVT1HjMdKB2Q==
+  dependencies:
+    "@open-draft/until" "^1.0.0"
+    "@types/cookie" "^0.3.3"
+    chalk "^4.0.0"
+    cookie "^0.4.1"
+    graphql "^15.0.0"
+    headers-utils "^1.1.9"
+    node-match-path "^0.4.2"
+    node-request-interceptor "^0.2.5"
+    statuses "^2.0.0"
+    yargs "^15.3.1"
+
 msw@^0.20.5:
   version "0.20.5"
   resolved "https://registry.npmjs.org/msw/-/msw-0.20.5.tgz#b6141080c0d8b17c451d9ca36c28cc47b4ac487a"
@@ -15807,7 +15828,7 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-match-path@^0.4.4:
+node-match-path@^0.4.2, node-match-path@^0.4.4:
   version "0.4.4"
   resolved "https://registry.npmjs.org/node-match-path/-/node-match-path-0.4.4.tgz#516a10926093c0cc6f237d020685b593b19baebb"
   integrity sha512-pBq9gp7TG0r0VXuy/oeZmQsjBSnYQo7G886Ly/B3azRwZuEtHCY155dzmfoKWcDPGgyfIGD8WKVC7h3+6y7yTg==
@@ -15866,6 +15887,14 @@ node-releases@^1.1.29, node-releases@^1.1.52, node-releases@^1.1.58:
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084"
   integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==
 
+node-request-interceptor@^0.2.5:
+  version "0.2.6"
+  resolved "https://registry.npmjs.org/node-request-interceptor/-/node-request-interceptor-0.2.6.tgz#541278d7033bb6a8befb5dd793f83428cf6446a2"
+  integrity sha512-aJW1tPSM7nzuZFRe+C/KSz22GJO3CVFMxHHmMGX8Z+tjP7TCIVbzeckLFVfJG68BdVgrdOOP7Ejc57ag820eyA==
+  dependencies:
+    debug "^4.1.1"
+    headers-utils "^1.2.0"
+
 node-request-interceptor@^0.3.5:
   version "0.3.5"
   resolved "https://registry.npmjs.org/node-request-interceptor/-/node-request-interceptor-0.3.5.tgz#4b26159617829c9a70643012c0fdc3ae4c78ae43"