fix(greenhouse): retain org search param in the url

Author: taymoor89

apps/greenhouse/src/components/nav/PluginNav.tsx

@@ -69,7 +69,13 @@ const PluginNav = () => {
   const { data: authData, loggedIn, login, logout } = useAuth()
 
   const navigateToApp = (appId: string) => {
-    navigate({ to: `/${appId}` })
+    navigate({
+      to: `/${appId}`,
+      search: (prev: { org?: string }) => {
+        const { org } = prev
+        return { org } // preserve only the "org" search parameter when navigating
+      },
+    })
   }
 
   return (

apps/greenhouse/src/routeTree.gen.ts

@@ -8,60 +8,60 @@
 // You should NOT make any changes in this file as it will be overwritten.
 // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
 
-import { Route as rootRouteImport } from "./routes/__root"
-import { Route as IndexRouteImport } from "./routes/index"
-import { Route as ExtensionIdSplatRouteImport } from "./routes/$extensionId.$"
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as ExtensionIdSplatRouteImport } from './routes/$extensionId.$'
 
 const IndexRoute = IndexRouteImport.update({
-  id: "/",
-  path: "/",
+  id: '/',
+  path: '/',
   getParentRoute: () => rootRouteImport,
 } as any)
 const ExtensionIdSplatRoute = ExtensionIdSplatRouteImport.update({
-  id: "/$extensionId/$",
-  path: "/$extensionId/$",
+  id: '/$extensionId/$',
+  path: '/$extensionId/$',
   getParentRoute: () => rootRouteImport,
 } as any)
 
 export interface FileRoutesByFullPath {
-  "/": typeof IndexRoute
-  "/$extensionId/$": typeof ExtensionIdSplatRoute
+  '/': typeof IndexRoute
+  '/$extensionId/$': typeof ExtensionIdSplatRoute
 }
 export interface FileRoutesByTo {
-  "/": typeof IndexRoute
-  "/$extensionId/$": typeof ExtensionIdSplatRoute
+  '/': typeof IndexRoute
+  '/$extensionId/$': typeof ExtensionIdSplatRoute
 }
 export interface FileRoutesById {
   __root__: typeof rootRouteImport
-  "/": typeof IndexRoute
-  "/$extensionId/$": typeof ExtensionIdSplatRoute
+  '/': typeof IndexRoute
+  '/$extensionId/$': typeof ExtensionIdSplatRoute
 }
 export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
-  fullPaths: "/" | "/$extensionId/$"
+  fullPaths: '/' | '/$extensionId/$'
   fileRoutesByTo: FileRoutesByTo
-  to: "/" | "/$extensionId/$"
-  id: "__root__" | "/" | "/$extensionId/$"
+  to: '/' | '/$extensionId/$'
+  id: '__root__' | '/' | '/$extensionId/$'
   fileRoutesById: FileRoutesById
 }
 export interface RootRouteChildren {
   IndexRoute: typeof IndexRoute
   ExtensionIdSplatRoute: typeof ExtensionIdSplatRoute
 }
 
-declare module "@tanstack/react-router" {
+declare module '@tanstack/react-router' {
   interface FileRoutesByPath {
-    "/": {
-      id: "/"
-      path: "/"
-      fullPath: "/"
+    '/': {
+      id: '/'
+      path: '/'
+      fullPath: '/'
       preLoaderRoute: typeof IndexRouteImport
       parentRoute: typeof rootRouteImport
     }
-    "/$extensionId/$": {
-      id: "/$extensionId/$"
-      path: "/$extensionId/$"
-      fullPath: "/$extensionId/$"
+    '/$extensionId/$': {
+      id: '/$extensionId/$'
+      path: '/$extensionId/$'
+      fullPath: '/$extensionId/$'
       preLoaderRoute: typeof ExtensionIdSplatRouteImport
       parentRoute: typeof rootRouteImport
     }
@@ -72,4 +72,6 @@ const rootRouteChildren: RootRouteChildren = {
   IndexRoute: IndexRoute,
   ExtensionIdSplatRoute: ExtensionIdSplatRoute,
 }
-export const routeTree = rootRouteImport._addFileChildren(rootRouteChildren)._addFileTypes<FileRouteTypes>()
+export const routeTree = rootRouteImport
+  ._addFileChildren(rootRouteChildren)
+  ._addFileTypes<FileRouteTypes>()

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

@@ -5,12 +5,22 @@
 
 import React from "react"
 import { createFileRoute } from "@tanstack/react-router"
+import { z } from "zod"
 
 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,
   component: RouteComponent,
 })