fix: persist query params after redirect

elpassion · Oct 11, 2024 · f6d9baf · f6d9baf
1 parent 1799dda
commit f6d9baf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/apps/web-remix/app/routes/webchats.$organizationId.pipelines.$pipelineId.tsx b/apps/web-remix/app/routes/webchats.$organizationId.pipelines.$pipelineId.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import type { LoaderFunctionArgs, MetaFunction } from '@remix-run/node';
 import { json } from '@remix-run/node';
-import { useLoaderData, useNavigate } from '@remix-run/react';
+import { useLoaderData, useNavigate, useSearchParams } from '@remix-run/react';
 import type { OnConnect } from '@buildel/buildel';
 import invariant from 'tiny-invariant';
 
@@ -10,6 +10,7 @@ import { chatSize } from '~/components/chat/chat.types';
 import { Webchat } from '~/components/chat/Webchat';
 import { loaderBuilder } from '~/utils.server';
 import { metaWithDefaults } from '~/utils/metadata';
+import { routes } from '~/utils/routes.utils';
 
 export async function loader(args: LoaderFunctionArgs) {
   return loaderBuilder(async ({ params, request }, { fetch }) => {
@@ -37,6 +38,7 @@ export async function loader(args: LoaderFunctionArgs) {
 
 export default function WebsiteChat() {
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
   const {
     pipelineId,
     organizationId,
@@ -48,7 +50,17 @@ export default function WebsiteChat() {
   } = useLoaderData<typeof loader>();
 
   const onConnect: OnConnect = (config) => {
-    navigate(config.id.toString(), { replace: true });
+    navigate(
+      routes.chatPreviewRun(
+        organizationId,
+        pipelineId,
+        config.id,
+        Object.fromEntries(searchParams.entries()),
+      ),
+      {
+        replace: true,
+      },
+    );
   };
 
   return (

diff --git a/apps/web-remix/app/utils/routes.utils.ts b/apps/web-remix/app/utils/routes.utils.ts
@@ -288,13 +288,14 @@ export const routes = {
       `/webchats${routes.pipeline(organizationId, pipelineId)}`,
       params,
     ),
-  voiceChatPreview: (
+  chatPreviewRun: (
     organizationId: OrganizationId,
     pipelineId: PipelineId,
+    runId: RunId,
     params: RouteParam = {},
   ) =>
     buildUrlWithParams(
-      `/voice-chat${routes.pipeline(organizationId, pipelineId)}`,
+      `${routes.chatPreview(organizationId, pipelineId)}/${runId}`,
       params,
     ),
   formPreview: (