Reset the state on both cancel and confirm.

ohcnetwork · Feb 7, 2025 · 36bcbd3 · 36bcbd3
1 parent e92c37d
commit 36bcbd3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/src/pages/Scheduling/ScheduleExceptions.tsx b/src/pages/Scheduling/ScheduleExceptions.tsx
@@ -146,7 +146,9 @@ const ScheduleExceptionItem = (
               </AlertDialogDescription>
             </AlertDialogHeader>
             <AlertDialogFooter>
-              <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
+              <AlertDialogCancel onClick={() => setOpen(false)}>
+                {t("cancel")}
+              </AlertDialogCancel>
               <AlertDialogAction
                 variant="destructive"
                 onClick={() => {

diff --git a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
@@ -369,7 +369,10 @@ export default function CreateScheduleTemplateSheet({
                       </div>
                       <AlertDialog
                         open={openDialog}
-                        onOpenChange={setOpenDialog}
+                        onOpenChange={(open) => {
+                          setOpenDialog(open);
+                          if (!open) setRemoveIndex(null);
+                        }}
                       >
                         <AlertDialogTrigger asChild>
                           <Button
@@ -402,7 +405,14 @@ export default function CreateScheduleTemplateSheet({
                             </AlertDialogDescription>
                           </AlertDialogHeader>
                           <AlertDialogFooter>
-                            <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
+                            <AlertDialogCancel
+                              onClick={() => {
+                                setOpenDialog(false);
+                                setRemoveIndex(null);
+                              }}
+                            >
+                              {t("cancel")}
+                            </AlertDialogCancel>
                             <AlertDialogAction
                               variant={"destructive"}
                               onClick={() => {
@@ -416,6 +426,7 @@ export default function CreateScheduleTemplateSheet({
                                   );
                                 }
                                 setOpenDialog(false);
+                                setRemoveIndex(null);
                               }}
                             >
                               {t("confirm")}

diff --git a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
@@ -263,7 +263,10 @@ const ScheduleTemplateEditor = ({
           </div>
 
           <div className="flex justify-end gap-2">
-            <AlertDialog open={isDialogOpen} onOpenChange={setDialogOpen}>
+            <AlertDialog
+              open={isDialogOpen}
+              onOpenChange={(open) => setDialogOpen(open)}
+            >
               <AlertDialogTrigger asChild>
                 <Button
                   type="button"
@@ -288,7 +291,9 @@ const ScheduleTemplateEditor = ({
                   </AlertDialogDescription>
                 </AlertDialogHeader>
                 <AlertDialogFooter>
-                  <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
+                  <AlertDialogCancel onClick={() => setDialogOpen(false)}>
+                    {t("cancel")}
+                  </AlertDialogCancel>
                   <AlertDialogAction
                     variant="destructive"
                     onClick={() => {
@@ -393,7 +398,10 @@ const AvailabilityEditor = ({
           </span>
         </div>
 
-        <AlertDialog open={openDialog} onOpenChange={setOpenDialog}>
+        <AlertDialog
+          open={openDialog}
+          onOpenChange={(open) => setOpenDialog(open)}
+        >
           <AlertDialogTrigger asChild>
             <Button
               variant="ghost"
@@ -417,7 +425,9 @@ const AvailabilityEditor = ({
               </AlertDialogDescription>
             </AlertDialogHeader>
             <AlertDialogFooter>
-              <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
+              <AlertDialogCancel onClick={() => setOpenDialog(false)}>
+                {t("cancel")}
+              </AlertDialogCancel>
               <AlertDialogAction
                 variant="destructive"
                 onClick={() => {