chore(juno): update tanstack router to fix basepath and schema validation issues (#1246)

taymoor89 · web-flow · commit 5931aabaef13 · 2025-10-23T13:48:19.000+02:00
* fix(greenhouse): convert null to undefined

* chore(juno): change how we redirect to default page

* chore(supernova): remove manual normalization of legacy state

* chore(juno): update changesets

* test(supernova): remove test
diff --git a/.changeset/cute-seas-drive.md b/.changeset/cute-seas-drive.md
@@ -0,0 +1,6 @@
+---
+"@cloudoperators/juno-app-supernova": patch
+---
+
+- Update tanstack router to fix issue where the basepath would be overwritten while redirection.
+- Remove manual normalization part of legacy state to `undefined` that is no longer needed with latest version of the router.
diff --git a/.changeset/orange-eagles-drum.md b/.changeset/orange-eagles-drum.md
@@ -0,0 +1,7 @@
+---
+"@cloudoperators/juno-app-greenhouse": patch
+"@cloudoperators/juno-app-heureka": patch
+"@cloudoperators/juno-app-doop": patch
+---
+
+Update tanstack router to fix issue where the basepath would be overwritten while redirection.
diff --git a/apps/doop/package.json b/apps/doop/package.json
@@ -17,7 +17,7 @@
     "@cloudoperators/juno-config": "workspace:*",
     "@tanstack/react-query": "5.62.2",
     "@tailwindcss/vite": "4.1.13",
-    "@tanstack/router-plugin": "1.131.25",
+    "@tanstack/router-plugin": "1.133.22",
     "@testing-library/jest-dom": "6.8.0",
     "@testing-library/react": "16.3.0",
     "@types/react": "19.1.8",
@@ -47,7 +47,7 @@
     "@cloudoperators/juno-messages-provider": "workspace:*",
     "@cloudoperators/juno-ui-components": "workspace:*",
     "@cloudoperators/juno-url-state-provider": "workspace:*",
-    "@tanstack/react-router": "1.131.25",
+    "@tanstack/react-router": "1.133.22",
     "react": "19.1.0",
     "react-dom": "19.1.0"
   }
diff --git a/apps/doop/src/routes/index.tsx b/apps/doop/src/routes/index.tsx
@@ -6,5 +6,11 @@
 import { createFileRoute, redirect } from "@tanstack/react-router"
 
 export const Route = createFileRoute("/")({
-  loader: () => redirect({ to: "/violations", search: (prev) => ({ ...prev }) }), // redirect to the default /violations page
+  beforeLoad: () => {
+    // eslint-disable-next-line @typescript-eslint/only-throw-error
+    throw redirect({
+      to: "/violations",
+      search: (prev) => ({ ...prev }),
+    })
+  },
 })
diff --git a/apps/greenhouse/package.json b/apps/greenhouse/package.json
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@cloudoperators/juno-config": "workspace:*",
     "@tailwindcss/vite": "4.1.13",
-    "@tanstack/router-plugin": "1.131.25",
+    "@tanstack/router-plugin": "1.133.22",
     "@testing-library/jest-dom": "6.8.0",
     "@testing-library/react": "16.3.0",
     "@types/lodash": "4.17.16",
@@ -58,7 +58,7 @@
     "@cloudoperators/juno-oauth": "workspace:*",
     "@cloudoperators/juno-ui-components": "workspace:*",
     "@cloudoperators/juno-url-state-provider": "workspace:*",
-    "@tanstack/react-router": "1.131.25",
+    "@tanstack/react-router": "1.133.22",
     "lodash": "4.17.21"
   }
 }
diff --git a/apps/greenhouse/src/components/Extension.tsx b/apps/greenhouse/src/components/Extension.tsx
@@ -50,7 +50,7 @@ function Extension({ id, config, auth, appProps }: ExtensionProps) {
           ? {
               embedded: true,
               token: auth?.JWT,
-              basePath: `${router.basepath}/${config.id}`,
+              basePath: `${router.basepath === "/" ? "" : router.basepath}/${config.id}`,
               enableHashedRouting: appProps?.enableHashedRouting || false,
             }
           : { auth: auth }),
diff --git a/apps/heureka/package.json b/apps/heureka/package.json
@@ -32,7 +32,7 @@
     "@cloudoperators/juno-ui-components": "workspace:*",
     "@cloudoperators/juno-url-state-provider": "workspace:*",
     "@tanstack/react-query": "5.89.0",
-    "@tanstack/react-router": "1.131.25",
+    "@tanstack/react-router": "1.133.22",
     "lodash": "4.17.21",
     "react": "19.1.0",
     "react-dom": "19.1.0"
@@ -44,7 +44,7 @@
     "@graphql-codegen/typescript": "4.1.6",
     "@graphql-codegen/typescript-operations": "4.6.1",
     "@graphql-codegen/typescript-react-apollo": "4.3.3",
-    "@tanstack/router-plugin": "1.131.25",
+    "@tanstack/router-plugin": "1.133.22",
     "@tailwindcss/vite": "4.1.13",
     "@testing-library/jest-dom": "6.8.0",
     "@testing-library/react": "16.3.0",
diff --git a/apps/heureka/src/routes/index.tsx b/apps/heureka/src/routes/index.tsx
@@ -6,5 +6,11 @@
 import { createFileRoute, redirect } from "@tanstack/react-router"
 
 export const Route = createFileRoute("/")({
-  loader: () => redirect({ to: "/services", search: (prev) => ({ ...prev }) }), // redirect to the default /services page
+  beforeLoad: () => {
+    // eslint-disable-next-line @typescript-eslint/only-throw-error
+    throw redirect({
+      to: "/services",
+      search: (prev) => ({ ...prev }),
+    })
+  },
 })
diff --git a/apps/supernova/package.json b/apps/supernova/package.json
@@ -19,7 +19,7 @@
     "@cloudoperators/juno-config": "workspace:*",
     "@tailwindcss/vite": "4.1.13",
     "@tanstack/react-query": "5.62.2",
-    "@tanstack/router-plugin": "1.131.25",
+    "@tanstack/router-plugin": "1.133.22",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.3.0",
     "@types/react": "19.1.8",
@@ -50,7 +50,7 @@
     "@cloudoperators/juno-messages-provider": "workspace:*",
     "@cloudoperators/juno-ui-components": "workspace:*",
     "@cloudoperators/juno-url-state-provider": "workspace:*",
-    "@tanstack/react-router": "1.131.25",
+    "@tanstack/react-router": "1.133.22",
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "react-error-boundary": "4.1.2"
diff --git a/apps/supernova/src/lib/urlStateUtils.test.ts b/apps/supernova/src/lib/urlStateUtils.test.ts
@@ -40,18 +40,6 @@ describe("readLegacyUrlState", () => {
       silencesRegEx: "regexPattern",
     })
   })
-
-  it("should handle NaN values for predefinedFilter and showDetailsFor", () => {
-    const state = {
-      p: NaN,
-      d: NaN,
-    }
-
-    const result = readLegacyUrlState(state)
-
-    expect(result.predefinedFilter).toBeUndefined()
-    expect(result.showDetailsFor).toBeUndefined()
-  })
 })
 
 describe("getFiltersForUrl", () => {
diff --git a/apps/supernova/src/lib/urlStateUtils.ts b/apps/supernova/src/lib/urlStateUtils.ts
@@ -16,8 +16,8 @@ export const readLegacyUrlState = (state: any) => {
   const activeFilters = state?.[ACTIVE_FILTERS]
   const pausedFilters = state?.[PAUSED_FILTERS]
   const searchTerm = state?.[SEARCH_TERM]
-  const predefinedFilter = !isNaN(state?.[ACTIVE_PREDEFINED_FILTER]) ? state?.[ACTIVE_PREDEFINED_FILTER] : undefined // for some reason old state return NaN if the value not present
-  const showDetailsFor = !isNaN(state?.[DETAILS_FOR]) ? state?.[DETAILS_FOR] : undefined // for some reason old state return NaN if the value not present
+  const predefinedFilter = state?.[ACTIVE_PREDEFINED_FILTER]
+  const showDetailsFor = state?.[DETAILS_FOR]
   const activeTab = state?.[ACTIVE_TAB]
   const silencesRegEx = state?.[SILENCE_REG_EX]
   const silencesStatus = state?.[SILENCE_STATUS]
diff --git a/apps/supernova/src/routes/index.tsx b/apps/supernova/src/routes/index.tsx
@@ -6,5 +6,11 @@
 import { createFileRoute, redirect } from "@tanstack/react-router"
 
 export const Route = createFileRoute("/")({
-  loader: () => redirect({ to: "/alerts", search: (prev) => ({ ...prev }) }), // redirect to the default /services page
+  beforeLoad: () => {
+    // eslint-disable-next-line @typescript-eslint/only-throw-error
+    throw redirect({
+      to: "/alerts",
+      search: (prev) => ({ ...prev }),
+    })
+  },
 })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ function Extension({ id, config, auth, appProps }: ExtensionProps) {`
`50`	`50`	`? {`
`51`	`51`	`embedded: true,`
`52`	`52`	`token: auth?.JWT,`
`53`		- basePath: `${router.basepath}/${config.id}`,
	`53`	+ basePath: `${router.basepath === "/" ? "" : router.basepath}/${config.id}`,
`54`	`54`	`enableHashedRouting: appProps?.enableHashedRouting \|\| false,`
`55`	`55`	`}`
`56`	`56`	`: { auth: auth }),`