From e14be2ebb04ad49bd401350b3bc6c1cf846600ab Mon Sep 17 00:00:00 2001
From: Pontus Abrahamsson <pontus@lostisland.co>
Date: Tue, 19 Nov 2024 09:24:17 +0100
Subject: [PATCH] wip

---
 .../src/components/forms/tracker-project-form.tsx     |  6 ++++--
 .../src/components/sheets/tracker-update-sheet.tsx    | 11 ++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/dashboard/src/components/forms/tracker-project-form.tsx b/apps/dashboard/src/components/forms/tracker-project-form.tsx
index d1a4063a27..9ee1b31fd5 100644
--- a/apps/dashboard/src/components/forms/tracker-project-form.tsx
+++ b/apps/dashboard/src/components/forms/tracker-project-form.tsx
@@ -111,7 +111,6 @@ export function TrackerProjectForm({
 
           <SelectTags
             tags={form.getValues("tags")}
-            key={form.getValues("id")}
             onRemove={(tag) => {
               deleteProjectTag.execute({
                 tagId: tag.id,
@@ -294,7 +293,10 @@ export function TrackerProjectForm({
         </Collapsible>
 
         <div className="fixed bottom-8 w-full sm:max-w-[455px] right-8">
-          <Button className="w-full" disabled={isSaving}>
+          <Button
+            className="w-full"
+            disabled={isSaving || form.formState.isValid}
+          >
             {isSaving ? <Loader2 className="h-4 w-4 animate-spin" /> : "Save"}
           </Button>
         </div>
diff --git a/apps/dashboard/src/components/sheets/tracker-update-sheet.tsx b/apps/dashboard/src/components/sheets/tracker-update-sheet.tsx
index adf66dd762..000548d6f5 100644
--- a/apps/dashboard/src/components/sheets/tracker-update-sheet.tsx
+++ b/apps/dashboard/src/components/sheets/tracker-update-sheet.tsx
@@ -33,7 +33,7 @@ import { ScrollArea } from "@midday/ui/scroll-area";
 import { Sheet, SheetContent, SheetHeader } from "@midday/ui/sheet";
 import { useToast } from "@midday/ui/use-toast";
 import { useAction } from "next-safe-action/hooks";
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import type { z } from "zod";
 
@@ -46,6 +46,7 @@ type Props = {
 export function TrackerUpdateSheet({ teamId, customers }: Props) {
   const { toast } = useToast();
   const isDesktop = useMediaQuery("(min-width: 768px)");
+  const [isLoading, setIsLoading] = useState(false);
   const { setParams, update, projectId } = useTrackerParams();
   const supabase = createClient();
   const id = projectId ?? "";
@@ -70,6 +71,8 @@ export function TrackerUpdateSheet({ teamId, customers }: Props) {
 
   useEffect(() => {
     const fetchData = async () => {
+      setIsLoading(true);
+
       const { data } = await getTrackerProjectQuery(supabase, {
         teamId,
         projectId: id,
@@ -94,6 +97,8 @@ export function TrackerUpdateSheet({ teamId, customers }: Props) {
             })) ?? undefined,
         });
       }
+
+      setIsLoading(false);
     };
 
     if (id) {
@@ -135,6 +140,10 @@ export function TrackerUpdateSheet({ teamId, customers }: Props) {
     }
   }, [isOpen]);
 
+  if (isLoading) {
+    return null;
+  }
+
   if (isDesktop) {
     return (
       <AlertDialog>