chore(juno): apps no longer need to keep 'org' url search param

Author: taymoor89

apps/doop/src/routes/violations.tsx

@@ -20,7 +20,6 @@ import { isObjectWithKeys } from "../lib/helpers"
 
 const searchSchema = z
   .object({
-    org: z.string().optional(),
     searchTerm: z.string().optional(),
     violationGroup: z.string().optional(),
   })
@@ -38,13 +37,6 @@ const searchSchema = z
 
 export const Route = createFileRoute("/violations")({
   validateSearch: searchSchema,
-  search: {
-    /**
-     * TODO: remove it when no longer needed
-     * but we need to keep "org" search parameter due to it's significance in the shell app.
-     */
-    middlewares: [retainSearchParams(["org"])],
-  },
   beforeLoad: ({ search }) => {
     // extract alerts specific state from the URL search params
     const { activeFilters, searchTerm, violationGroup } = convertUrlStateToAppState(search)

apps/greenhouse/src/routes/$extensionId.$.tsx

@@ -4,30 +4,13 @@
  */
 
 import React from "react"
-import { createFileRoute, retainSearchParams } from "@tanstack/react-router"
-import { z } from "zod"
+import { createFileRoute } from "@tanstack/react-router"
 
 import { usePlugin } from "../components/StoreProvider"
 import { useAuth } from "../components/AuthProvider"
 import Extension from "../components/Extension"
 
-const searchSchema = z.object({
-  /**
-   * TODO: remove it when no longer needed
-   * but we need to keep "org" search parameter due to it's significance in the shell app.
-   */
-  org: z.string().optional(),
-})
-
 export const Route = createFileRoute("/$extensionId/$")({
-  validateSearch: searchSchema,
-  search: {
-    /**
-     * TODO: remove it when no longer needed
-     * but we need to keep "org" search parameter due to it's significance in the shell app.
-     */
-    middlewares: [retainSearchParams(["org"])],
-  },
   component: RouteComponent,
 })
 

apps/heureka/src/routes/services/$service.tsx

@@ -3,26 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createFileRoute, retainSearchParams } from "@tanstack/react-router"
+import { createFileRoute } from "@tanstack/react-router"
 import { z } from "zod"
 import { Service } from "../../components/Service"
 import { LoaderWithCrumb } from "../-types"
 import { fetchService } from "../../api/fetchService"
 
 const serviceSearchSchema = z.object({
-  org: z.string().optional(),
   imageVersion: z.string().optional(),
 })
 
 export const Route = createFileRoute("/services/$service")({
   validateSearch: serviceSearchSchema,
-  search: {
-    /**
-     * TODO: remove it when no longer needed
-     * but we need to keep "org" search parameter due to it's significance in the shell app.
-     */
-    middlewares: [retainSearchParams(["org"])],
-  },
   shouldReload: false,
   loaderDeps: ({ search }) => {
     const { imageVersion, ...rest } = search

apps/heureka/src/routes/services/index.tsx

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createFileRoute, retainSearchParams } from "@tanstack/react-router"
+import { createFileRoute } from "@tanstack/react-router"
 import { z } from "zod"
 import { Services } from "../../components/Services"
 import { SELECTED_FILTER_PREFIX } from "../../constants"
@@ -19,7 +19,6 @@ import {
 // Schema for validating and transforming search parameters related to /services page.
 const servicesSearchSchema = z
   .object({
-    org: z.string().optional(),
     service: z.string().optional(),
     searchTerm: z.string().optional(),
   })
@@ -39,13 +38,6 @@ export type ServicesSearchParams = z.infer<typeof servicesSearchSchema>
 
 export const Route = createFileRoute("/services/")({
   validateSearch: servicesSearchSchema,
-  search: {
-    /**
-     * TODO: remove it when no longer needed
-     * but we need to keep "org" search parameter due to it's significance in the shell app.
-     */
-    middlewares: [retainSearchParams(["org"])],
-  },
   loaderDeps: ({ search }) => {
     const { service, ...rest } = search
     return rest

apps/heureka/src/routes/vulnerabilities/index.tsx

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createFileRoute, retainSearchParams } from "@tanstack/react-router"
+import { createFileRoute } from "@tanstack/react-router"
 import { z } from "zod"
 import { Vulnerabilities } from "../../components/Vulnerabilities"
 import { SELECTED_FILTER_PREFIX } from "../../constants"
@@ -17,7 +17,6 @@ import {
 
 const vulnerabilitiesSearchSchema = z
   .object({
-    org: z.string().optional(),
     vulnerability: z.string().optional(),
     searchTerm: z.preprocess((val) => (typeof val === "number" ? val.toString() : val), z.string().optional()),
   })
@@ -37,13 +36,6 @@ export type VulnerabilitiesSearchParams = z.infer<typeof vulnerabilitiesSearchSc
 
 export const Route = createFileRoute("/vulnerabilities/")({
   validateSearch: vulnerabilitiesSearchSchema,
-  search: {
-    /**
-     * TODO: remove it when no longer needed
-     * but we need to keep "org" search parameter due to it's significance in the shell app.
-     */
-    middlewares: [retainSearchParams(["org"])],
-  },
   loaderDeps: ({ search }) => {
     const { vulnerability, ...rest } = search
     return rest

apps/supernova/src/routes/alerts.tsx

@@ -4,7 +4,7 @@
  */
 
 import React, { useLayoutEffect } from "react"
-import { createFileRoute, retainSearchParams } from "@tanstack/react-router"
+import { createFileRoute } from "@tanstack/react-router"
 import { z } from "zod"
 import { MessagesProvider } from "@cloudoperators/juno-messages-provider"
 import AlertDetail from "../components/alerts/AlertDetail"
@@ -17,7 +17,6 @@ import { isObjectWithKeys } from "../lib/utils"
 
 const searchSchema = z
   .object({
-    org: z.string().optional(),
     searchTerm: z.string().optional(),
     showDetailsFor: z.string().optional(),
     predefinedFilter: z.string().optional(),
@@ -41,13 +40,6 @@ const searchSchema = z
 
 export const Route = createFileRoute("/alerts")({
   validateSearch: searchSchema,
-  search: {
-    /**
-     * TODO: remove it when no longer needed
-     * but we need to keep "org" search parameter due to it's significance in the shell app.
-     */
-    middlewares: [retainSearchParams(["org"])],
-  },
   beforeLoad: ({ search }) => {
     // extract alerts specific state from the URL search params
     const { activeFilters, pausedFilters, predefinedFilter, searchTerm, showDetailsFor } =

apps/supernova/src/routes/silences.tsx

@@ -4,27 +4,19 @@
  */
 
 import React, { useLayoutEffect } from "react"
-import { createFileRoute, retainSearchParams } from "@tanstack/react-router"
+import { createFileRoute } from "@tanstack/react-router"
 import { z } from "zod"
 import SilencesList from "../components/silences/SilencesList"
 import { convertUrlStateToAppState } from "../lib/urlStateUtils"
 import { useSilencesActions } from "../components/StoreProvider"
 
 const searchSchema = z.object({
-  org: z.string().optional(),
   silencesRegEx: z.string().optional(),
   silencesStatus: z.string().optional(),
 })
 
 export const Route = createFileRoute("/silences")({
   validateSearch: searchSchema,
-  search: {
-    /**
-     * TODO: remove it when no longer needed
-     * but we need to keep "org" search parameter due to it's significance in the shell app.
-     */
-    middlewares: [retainSearchParams(["org"])],
-  },
   beforeLoad: ({ search }) => {
     // extract silences specific state from the URL search params
     const { silencesRegEx, silencesStatus } = convertUrlStateToAppState(search)