feat/minor fix to create project form

diggerhq · Jul 19, 2024 · c3d294f · c3d294f
1 parent b1309d1
commit c3d294f
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 38 deletions.
diff --git a/...cation-pages)/org/[organizationId]/(specific-organization-pages)/projects/create/page.tsx b/...cation-pages)/org/[organizationId]/(specific-organization-pages)/projects/create/page.tsx
@@ -1,5 +1,5 @@
-
 import CreateProjectForm from "@/components/CreateProjectForm";
+import { getOrganizationRepos } from "@/data/user/repos";
 import { organizationParamSchema } from "@/utils/zod-schemas/params";
 import type { Metadata } from "next";
 
@@ -14,10 +14,11 @@ export default async function CreateProjectPage({
     params: unknown;
 }) {
     const { organizationId } = organizationParamSchema.parse(params);
+    const repositories = await getOrganizationRepos(organizationId);
 
     return (
         <div className="w-full mt-1">
-            <CreateProjectForm organizationId={organizationId} />
+            <CreateProjectForm organizationId={organizationId} repositories={repositories} />
         </div>
     );
 }
diff --git a/src/components/CreateProjectForm.tsx b/src/components/CreateProjectForm.tsx
@@ -32,23 +32,25 @@ const createProjectFormSchema = z.object({
 
 type CreateProjectFormData = z.infer<typeof createProjectFormSchema>;
 
-const repositories = [
-    { id: 12, name: 'Repository 1' },
-    { id: 123, name: 'Repository 2' },
-    { id: 41, name: 'Repository 3' },
-    { id: 24, name: 'Repository 4' },
-    { id: 124, name: 'Repository 5' },
-];
+type Repository = {
+    id: number;
+    name: string;
+};
 
-export default function CreateProjectForm({ organizationId }: { organizationId: string }) {
-    const [selectedRepo, setSelectedRepo] = useState(repositories[0].id);
+type CreateProjectFormProps = {
+    organizationId: string;
+    repositories: Repository[];
+};
+
+export default function CreateProjectForm({ organizationId, repositories }: CreateProjectFormProps) {
+    const [selectedRepo, setSelectedRepo] = useState(repositories[0]?.id || null);
     const router = useRouter();
 
     const { control, handleSubmit, setValue, watch } = useForm<CreateProjectFormData>({
         resolver: zodResolver(createProjectFormSchema),
         defaultValues: {
             name: "",
-            repository: repositories[0].id,
+            repository: repositories[0]?.id || 0,
             terraformDir: "",
             managedState: true,
             labels: [],
@@ -84,8 +86,6 @@ export default function CreateProjectForm({ organizationId }: { organizationId:
         createProjectMutation.mutate(data);
     };
 
-
-
     return (
         <div className="p-6 max-w-4xl mx-auto">
             <form onSubmit={(e) => {
@@ -159,31 +159,43 @@ export default function CreateProjectForm({ organizationId }: { organizationId:
                         </Badge>
                     </CardHeader>
                     <CardContent>
-                        <ScrollArea className="w-full whitespace-nowrap rounded-md border">
-                            <div className="flex w-max space-x-4 p-4">
-                                {repositories.map((repo, index) => (
-                                    <MotionCard
-                                        key={repo.id}
-                                        className={`w-[200px] cursor-pointer ${selectedRepo === repo.id ? 'ring-2 ring-primary' : ''}`}
-                                        whileHover={{ scale: 1.05 }}
-                                        whileTap={{ scale: 0.95 }}
-                                        onClick={() => {
-                                            setSelectedRepo(repo.id);
-                                            setValue("repository", repo.id);
-                                        }}
-                                        initial={{ opacity: 0, y: 20 }}
-                                        animate={{ opacity: 1, y: 0 }}
-                                        transition={{ delay: index * 0.1 }}
-                                    >
-                                        <CardContent className="flex items-center justify-center p-6">
-                                            <Github className="mr-2 h-6 w-6" />
-                                            <span>{repo.name}</span>
-                                        </CardContent>
-                                    </MotionCard>
-                                ))}
+                        {repositories.length > 0 ? (
+                            <ScrollArea className="w-full whitespace-nowrap rounded-md border">
+                                <div className="flex w-max space-x-4 p-4">
+                                    {repositories.map((repo, index) => (
+                                        <MotionCard
+                                            key={repo.id}
+                                            className={`w-[200px] cursor-pointer ${selectedRepo === repo.id ? 'ring-2 ring-primary' : ''}`}
+                                            whileHover={{ scale: 1.05 }}
+                                            whileTap={{ scale: 0.95 }}
+                                            onClick={() => {
+                                                setSelectedRepo(repo.id);
+                                                setValue("repository", repo.id);
+                                            }}
+                                            initial={{ opacity: 0, y: 20 }}
+                                            animate={{ opacity: 1, y: 0 }}
+                                            transition={{ delay: index * 0.1 }}
+                                        >
+                                            <CardContent className="flex items-center justify-center p-6">
+                                                <Github className="mr-2 h-6 w-6" />
+                                                <span>{repo.name}</span>
+                                            </CardContent>
+                                        </MotionCard>
+                                    ))}
+                                </div>
+                                <ScrollBar orientation="horizontal" />
+                            </ScrollArea>
+                        ) : (
+                            <div className="text-center py-8">
+                                <div className="bg-muted/50 rounded-full p-4 inline-block">
+                                    <Github className="mx-auto size-8 text-muted-foreground" />
+                                </div>
+                                <T.H4 className="mb-1 mt-4">No Repositories Found</T.H4>
+                                <T.P className="text-muted-foreground mb-4">
+                                    It looks like there are no repositories.
+                                </T.P>
                             </div>
-                            <ScrollBar orientation="horizontal" />
-                        </ScrollArea>
+                        )}
                     </CardContent>
                 </MotionCard>
 

diff --git a/src/data/user/repos.ts b/src/data/user/repos.ts
@@ -16,3 +16,17 @@ export async function getRepoDetails(repoId: number) {
 
   return data;
 }
+
+export async function getOrganizationRepos(organizationId: string) {
+  const supabaseClient = createSupabaseUserServerComponentClient();
+  const { data, error } = await supabaseClient
+    .from('repos')
+    .select('id, name')
+    .eq('organization_id', organizationId);
+
+  if (error) {
+    throw error;
+  }
+
+  return data;
+}