fix/fix build and routes (#2331)

motatoes · web-flow · commit d86d480f0059 · 2025-10-22T10:25:50.000-07:00
* fix build

* add more routes

* implement routes

* fix the routes
diff --git a/ui/src/api/drift_serverFunctions.ts b/ui/src/api/drift_serverFunctions.ts
@@ -0,0 +1,10 @@
+import { createServerFn } from "@tanstack/react-start"
+import { testSlackWebhook } from "./drift_slack"
+
+export const testSlackWebhookFn = createServerFn({method: 'POST'})
+    .inputValidator((data : {notification_url: string}) => data)
+    .handler(async ({ data }) => {
+    const response : any = await testSlackWebhook(data.notification_url)
+    return response
+  })
+  
diff --git a/ui/src/api/orchestrator_serverFunctions.ts b/ui/src/api/orchestrator_serverFunctions.ts
@@ -1,7 +1,9 @@
 import { createServerFn } from "@tanstack/react-start";
 import { Job, OrgSettings, Project, Repo } from './orchestrator_types'
-import { fetchRepos, testSlackWebhook } from "./orchestrator_repos";
-import { fetchProject, fetchProjects, getOrgSettings, updateOrgSettings, updateProject } from "./orchestrator_orgs";
+import { fetchRepos } from "./orchestrator_repos";
+import { getOrgSettings, updateOrgSettings } from "./orchestrator_orgs";
+import { testSlackWebhook } from "./drift_slack";
+import { fetchProjects, updateProject, fetchProject } from "./orchestrator_projects";
 
 export const getOrgSettingsFn = createServerFn({method: 'GET'})
   .inputValidator((data : {userId: string, organisationId: string}) => data)
@@ -104,12 +106,3 @@ export const switchToOrganizationFn = createServerFn({method: 'POST'})
       return null
     })
 
-
-
-export const testSlackWebhookFn = createServerFn({method: 'POST'})
-    .inputValidator((data : {notification_url: string}) => data)
-    .handler(async ({ data }) => {
-    const response : any = await testSlackWebhook(data.notification_url)
-    return response
-  })
-  
diff --git a/ui/src/components/DiggerYmlButton.tsx b/ui/src/components/DiggerYmlButton.tsx
@@ -2,7 +2,6 @@
 
 import { Button } from "@/components/ui/button"
 import { FileText } from "lucide-react"
-import { trackDiggerYmlAdded } from "@/lib/analytics"
 
 interface DiggerYmlButtonProps {
   onClick: () => void
diff --git a/ui/src/components/GithubConnectButton.tsx b/ui/src/components/GithubConnectButton.tsx
@@ -3,7 +3,6 @@
 import { Button } from "@/components/ui/button"
 import { Github } from "lucide-react"
 
-import { trackConnectWithGithub } from "@/lib/analytics"
 
 interface GithubConnectButtonProps {
   source: 'onboarding' | 'add_connection_dialog'
diff --git a/ui/src/components/PRCreatedButton.tsx b/ui/src/components/PRCreatedButton.tsx
@@ -3,7 +3,6 @@
 import { Button } from "@/components/ui/button"
 import { GitPullRequest } from "lucide-react"
 
-import { trackPRCreated } from "@/lib/analytics"
 
 interface PRCreatedButtonProps {
   onClick: () => void
diff --git a/ui/src/components/WorkflowFileButton.tsx b/ui/src/components/WorkflowFileButton.tsx
@@ -2,7 +2,6 @@
 
 import { Button } from "@/components/ui/button"
 import { CheckCircle2 } from "lucide-react"
-import { trackWorkflowFileAdded } from "@/lib/analytics"
 
 interface WorkflowFileButtonProps {
   onClick: () => void
diff --git a/ui/src/routeTree.gen.ts b/ui/src/routeTree.gen.ts
diff --git a/ui/src/routes/_authenticated/_dashboard/dashboard/drift.tsx b/ui/src/routes/_authenticated/_dashboard/dashboard/drift.tsx
@@ -9,7 +9,8 @@ import { CheckCircle, AlertCircle, Save, TestTube, Clock, ArrowLeft, Slack } fro
 import { OrgSettings } from '@/api/orchestrator_types'
 import { useState } from 'react'
 import { useToast } from '@/hooks/use-toast'
-import { getOrgSettingsFn, updateOrgSettingsFn, testSlackWebhookFn } from '@/api/orchestrator_serverFunctions'
+import { getOrgSettingsFn, updateOrgSettingsFn } from '@/api/orchestrator_serverFunctions'
+import { testSlackWebhookFn } from '@/api/drift_serverFunctions'
 import { ToastAction } from '@/components/ui/toast'
 
 
diff --git a/ui/src/routes/_authenticated/_dashboard/dashboard/projects.index.tsx b/ui/src/routes/_authenticated/_dashboard/dashboard/projects.index.tsx
@@ -1,11 +1,9 @@
 import { createFileRoute, Link, useLoaderData } from '@tanstack/react-router'
 import { getProjectsFn } from '@/api/orchestrator_serverFunctions'
 import { updateProjectFn } from '@/api/orchestrator_serverFunctions'
-import { trackProjectDriftToggled } from '@/lib/analytics'
 import { useToast } from "@/hooks/use-toast"
 import { useState } from 'react'
 import { Project } from '@/api/orchestrator_types'
-import { Dialog } from '@/components/ui/dialog'
 import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '@/components/ui/card'
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table'
 import { Button } from '@/components/ui/button'
@@ -35,7 +33,7 @@ function RouteComponent() {
     const [projectList, setProjectList] = useState<Project[]>(projects)
 
     const handleDriftToggle = async (project: Project) => {
-        trackProjectDriftToggled(user, organisationId, project.id.toString(), !project.drift_enabled ? 'enabled' : 'disabled')
+        // trackProjectDriftToggled(user, organisationId, project.id.toString(), !project.drift_enabled ? 'enabled' : 'disabled')
 
         try {
             // Optimistically update UI
diff --git a/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx b/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx
@@ -32,7 +32,7 @@ export const Route = createFileRoute(
   loader: async ({ context }) => {
     const { user, organisationId } = context;
     const unitsData = await listUnitsFn({data: {organisationId: organisationId || '', userId: user?.id || '', email: user?.email || ''}})
-    return { unitsData: unitsData, user, organisationId }
+    return { unitsData: unitsData, user, organisationId } 
   }
 })
 
@@ -105,7 +105,7 @@ function CreateUnitModal({ onUnitCreated }: { onUnitCreated: () => void }) {
           </DialogHeader>
           <div className="py-4">
             <Label htmlFor="name" className="text-right">
-              Unit Name {unitName} {user.email} {user.id} {organisationId}
+              Unit Name
             </Label>
             <Input
               id="name"
@@ -187,7 +187,7 @@ function RouteComponent() {
               <TableCell>{formatDate(unit.updatedAt || new Date())}</TableCell>
               <TableCell className="text-right">
                 <Button variant="ghost" asChild className="justify-end">
-                  <Link to={`/dashboard/units/${unit.id}`}>
+                  <Link to={`/dashboard/units/$unitId`} params={{ unitId: unit.id }}>
                     View Details <ExternalLink className="ml-2 h-4 w-4" />
                   </Link>
                 </Button>
diff --git a/ui/src/routes/_authenticated/_dashboard/dashboard/units.tsx b/ui/src/routes/_authenticated/_dashboard/dashboard/units.tsx
diff --git a/ui/src/routes/_orchestrator/job_artefacts.tsx b/ui/src/routes/_orchestrator/job_artefacts.tsx
@@ -0,0 +1,26 @@
+import { createFileRoute } from '@tanstack/react-router';
+
+
+export const Route = createFileRoute('/_orchestrator/job_artefacts')({
+  server: {
+    handlers: {
+      PUT: async ({ request }) => {
+        try {
+          const body = await request.json();
+          
+          const response = await fetch(`${process.env.ORCHESTRATOR_BACKEND_URL}/job_artefacts`, {
+            method: 'PUT',
+            headers: request.headers,
+            body: JSON.stringify(body)
+            });
+
+          return response
+
+        } catch (error) {
+          console.error('Error in PUT handler:', error);
+          return new Response('Internal server error', { status: 500 });
+        }
+      },
+    },
+  },
+});
diff --git a/ui/src/routes/_orchestrator/orgs/$orgId.access_policy.tsx b/ui/src/routes/_orchestrator/orgs/$orgId.access_policy.tsx
@@ -0,0 +1,22 @@
+import { createFileRoute } from '@tanstack/react-router';
+
+
+export const Route = createFileRoute('/_orchestrator/orgs/$orgId/access_policy')({
+  server: {
+    handlers: {
+      GET: async ({ request, params }) => {
+        try {
+          
+          const response = await fetch(`${process.env.ORCHESTRATOR_BACKEND_URL}/orgs/${params.orgId}/access_policy`, {
+            method: 'GET',
+            headers: request.headers,
+          });
+          return response
+        } catch (error) {
+          console.error('Error in PUT handler:', error);
+          return new Response('Internal server error', { status: 500 });
+        }
+      },
+    },
+  },
+});
diff --git a/ui/src/routes/_orchestrator/orgs/$orgId.plan_policy.tsx b/ui/src/routes/_orchestrator/orgs/$orgId.plan_policy.tsx
@@ -0,0 +1,22 @@
+import { createFileRoute } from '@tanstack/react-router';
+
+
+export const Route = createFileRoute('/_orchestrator/orgs/$orgId/plan_policy')({
+  server: {
+    handlers: {
+      GET: async ({ request, params }) => {
+        try {
+          
+          const response = await fetch(`${process.env.ORCHESTRATOR_BACKEND_URL}/orgs/${params.orgId}/plan_policy`, {
+            method: 'GET',
+            headers: request.headers,
+          });
+          return response
+        } catch (error) {
+          console.error('Error in PUT handler:', error);
+          return new Response('Internal server error', { status: 500 });
+        }
+      },
+    },
+  },
+});
diff --git a/ui/src/routes/_orchestrator/repos/$namespace/projects/$projectName/access_policy.tsx b/ui/src/routes/_orchestrator/repos/$namespace/projects/$projectName/access_policy.tsx
@@ -0,0 +1,22 @@
+import { createFileRoute } from '@tanstack/react-router';
+
+
+export const Route = createFileRoute('/_orchestrator/repos/$namespace/projects/$projectName/access_policy')({
+  server: {
+    handlers: {
+      GET: async ({ request, params }) => {
+        try {
+          
+          const response = await fetch(`${process.env.ORCHESTRATOR_BACKEND_URL}/repos/${params.namespace}/projects/${params.projectName}/access_policy`, {
+            method: 'GET',
+            headers: request.headers,
+          }).then(response => response.json())
+          return response
+        } catch (error) {
+          console.error('Error in GET handler:', error);
+          return { error: 'Internal server error' }
+        }
+      },
+    },
+  },
+});
diff --git a/ui/src/routes/_orchestrator/repos/$namespace/projects/$projectName/jobs.$jobId.set-status.tsx b/ui/src/routes/_orchestrator/repos/$namespace/projects/$projectName/jobs.$jobId.set-status.tsx
@@ -0,0 +1,24 @@
+import { createFileRoute } from '@tanstack/react-router';
+
+
+export const Route = createFileRoute('/_orchestrator/repos/$namespace/projects/$projectName/jobs/$jobId/set-status')({
+  server: {
+    handlers: {
+      POST: async ({ request, params }) => {
+        try {
+          const body = await request.json();
+          const response = await fetch(`${process.env.ORCHESTRATOR_BACKEND_URL}/repos/${params.namespace}/projects/${params.projectName}/jobs/${params.jobId}/set-status`, {
+            method: 'POST',
+            headers: request.headers,
+            body: JSON.stringify(body)
+          });
+
+          return response;
+        } catch (error) {
+          console.error('Error in POST handler:', error);
+          return new Response('Internal server error', { status: 500 });
+        }
+      },
+    },
+  },
+});
diff --git a/ui/src/routes/_orchestrator/repos/$namespace/projects/$projectName/plan_policy.tsx b/ui/src/routes/_orchestrator/repos/$namespace/projects/$projectName/plan_policy.tsx
@@ -0,0 +1,22 @@
+import { createFileRoute } from '@tanstack/react-router';
+
+
+export const Route = createFileRoute('/_orchestrator/repos/$namespace/projects/$projectName/plan_policy')({
+  server: {
+    handlers: {
+      GET: async ({ request, params }) => {
+        try {
+          
+          const response = await fetch(`${process.env.ORCHESTRATOR_BACKEND_URL}/repos/${params.namespace}/projects/${params.projectName}/plan_policy`, {
+            method: 'GET',
+            headers: request.headers,
+          }).then(response => response.json())
+          return response
+        } catch (error) {
+          console.error('Error in GET handler:', error);
+          return { error: 'Internal server error' }
+        }
+      },
+    },
+  },
+});
diff --git a/ui/src/routes/_orchestrator/repos/$namespace/report-projects.tsx b/ui/src/routes/_orchestrator/repos/$namespace/report-projects.tsx
@@ -0,0 +1,26 @@
+import { createFileRoute } from '@tanstack/react-router';
+
+
+export const Route = createFileRoute('/_orchestrator/repos/$namespace/report-projects')({
+  server: {
+    handlers: {
+      POST: async ({ request, params }) => {
+        try {
+          const body = await request.json();
+          
+          const response = await fetch(`${process.env.ORCHESTRATOR_BACKEND_URL}/repos/${params.namespace}/report-projects`, {
+            method: 'POST',
+            headers: request.headers,
+            body: JSON.stringify(body)
+          });
+
+          return response
+
+        } catch (error) {
+          console.error('Error in POST handler:', error);
+          return new Response('Internal server error', { status: 500 });
+        }
+      },
+    },
+  },
+});
diff --git a/ui/src/routes/api/auth/workos/switch-org.tsx b/ui/src/routes/api/auth/workos/switch-org.tsx
@@ -30,7 +30,7 @@ async function refreshSession({
   const session = await getSessionFromCookie();
   if (!session) {
     if (ensureSignedIn) {
-      await redirectToSignIn();
+      // await redirectToSignIn();
     }
     return { user: null };
   }
@@ -54,10 +54,10 @@ async function refreshSession({
     });
   }
 
-  const headersList = await headers();
+  const headersList = new Headers();
   const url = headersList.get('x-url');
 
-  await saveSession(refreshResult, url || WORKOS_REDIRECT_URI);
+  await saveSession(refreshResult);
 
   const { accessToken, user, impersonator } = refreshResult;
 
@@ -68,18 +68,15 @@ async function refreshSession({
     roles,
     permissions,
     entitlements,
-    feature_flags: featureFlags,
   } = decodeJwt<AccessToken>(accessToken);
 
   return {
     sessionId,
     user,
     organizationId,
     role,
-    roles,
     permissions,
     entitlements,
-    featureFlags,
     impersonator,
     accessToken,
   };
diff --git a/ui/src/routes/orchestrator/github/callback.tsx b/ui/src/routes/orchestrator/github/callback.tsx
diff --git a/ui/src/routes/orchestrator/github/webhook.tsx b/ui/src/routes/orchestrator/github/webhook.tsx
