Merge branch 'develop' of https://github.com/diggerhq/digger into fix/breardon2011/fix-unique

Author: breardon2011

ui/src/api/statesman_orgs.ts

@@ -14,12 +14,11 @@ export async function syncOrgToStatesman(orgId: string, orgName: string, display
             "external_org_id": orgId,
             "name": orgName,
             "display_name": displayName,
-            "created_by": adminEmail,
         })
     })  
 
     if (response.status === 409) {
-        console.log("Organization already exists in statesman")
+        console.log("Org already exists in statesman")
         return response.json();
     }
 

ui/src/api/statesman_units.ts

@@ -169,7 +169,7 @@ export async function createUnit(orgId: string, userId: string, email: string, n
             name: name,
         }),
     });
-    console.log(response)
+
     if (!response.ok) {
         throw new Error(`Failed to create unit: ${response.statusText}`);
     }

ui/src/api/statesman_users.ts

@@ -22,7 +22,6 @@ export async function syncUserToStatesman(userId: string, userEmail: string, org
     }
 
     if (!response.ok) {
-        console.log(response.text())
         throw new Error(`Failed to sync user: ${response.statusText}`);
     }
 

ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx

@@ -67,7 +67,7 @@ function CreateUnitModal({ onUnitCreated }: { onUnitCreated: () => void }) {
     setError(null)
 
     try {
-      await createUnitFn({
+      const unit = await createUnitFn({
         data: {
           userId: user?.id!,
           organisationId,
@@ -129,10 +129,14 @@ function CreateUnitModal({ onUnitCreated }: { onUnitCreated: () => void }) {
 }
 
 function RouteComponent() {
-  const {  unitsData } = Route.useLoaderData()
-  const units = unitsData?.units || []
+  const {  unitsData, organisationId, user } = Route.useLoaderData()
+  const [units, setUnits] = useState(unitsData?.units || [])
   const navigate = Route.useNavigate()
 
+  async function handleUnitCreated() {
+    const unitsData = await listUnitsFn({data: {organisationId: organisationId, userId: user?.id || '', email: user?.email || ''}})
+    setUnits(unitsData.units)
+  }
   return (<>
     <div className="container mx-auto p-4">
       <div className="mb-6">
@@ -149,7 +153,7 @@ function RouteComponent() {
             <CardTitle>Units</CardTitle>
             <CardDescription>List of terraform state units and their current status</CardDescription>
           </div>
-          <CreateUnitModal onUnitCreated={() => navigate({ to: '/dashboard/units' })} />
+          <CreateUnitModal onUnitCreated={handleUnitCreated} />
         </CardHeader>
         <CardContent>
           {units.length === 0 ? (

ui/src/routes/index.tsx

@@ -32,7 +32,7 @@ function Home() {
               </h1>
               <p className="mt-4 text-lg text-white/70">You're signed in. Head over to your dashboard to continue.</p>
               <div className="mt-8 flex items-center gap-4">
-                <a href="/dashboard/repos" className="inline-flex items-center rounded-md bg-white px-5 py-3 font-medium text-black shadow-lg shadow-white/10 transition hover:bg-white/90">Go to dashboard</a>
+                <a href="/dashboard/units" className="inline-flex items-center rounded-md bg-white px-5 py-3 font-medium text-black shadow-lg shadow-white/10 transition hover:bg-white/90">Go to dashboard</a>
                 <a href="/logout" className="inline-flex items-center rounded-md bg-transparent border border-white px-5 py-3 font-medium text-white shadow-lg shadow-white/10 transition hover:bg-white/10">Logout</a>
               </div>
             </>