From 780c1ed85a968588cd246825f4e6d07970a43eb8 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Thu, 30 Jan 2025 07:29:02 +0530
Subject: [PATCH 01/21] start working

---
 src/pages/Scheduling/ScheduleExceptions.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Scheduling/ScheduleExceptions.tsx b/src/pages/Scheduling/ScheduleExceptions.tsx
index 7480c49a323..27bb8658725 100644
--- a/src/pages/Scheduling/ScheduleExceptions.tsx
+++ b/src/pages/Scheduling/ScheduleExceptions.tsx
@@ -112,6 +112,7 @@ const ScheduleExceptionItem = (
             </span>
           </div>
         </div>
+        {/* working on alertdialog */}
         <Button
           variant="secondary"
           size="sm"

From 461d858a8030c62aa7bec5a974ba51b88346a148 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Fri, 31 Jan 2025 00:43:17 +0530
Subject: [PATCH 02/21] confirmation popup added on exception

---
 src/pages/Scheduling/ScheduleExceptions.tsx | 50 ++++++++++++++++-----
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/pages/Scheduling/ScheduleExceptions.tsx b/src/pages/Scheduling/ScheduleExceptions.tsx
index 27bb8658725..9554e4f03a9 100644
--- a/src/pages/Scheduling/ScheduleExceptions.tsx
+++ b/src/pages/Scheduling/ScheduleExceptions.tsx
@@ -1,5 +1,6 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { format, parseISO } from "date-fns";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 
@@ -9,6 +10,14 @@ import ColoredIndicator from "@/CAREUI/display/ColoredIndicator";
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
 import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog";
 
 import Loading from "@/components/Common/Loading";
 
@@ -63,6 +72,7 @@ const ScheduleExceptionItem = (
 ) => {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
+  const [open, setOpen] = useState(false);
 
   const { mutate: deleteException, isPending } = useMutation({
     mutationFn: mutate(scheduleApis.exceptions.delete, {
@@ -112,16 +122,36 @@ const ScheduleExceptionItem = (
             </span>
           </div>
         </div>
-        {/* working on alertdialog */}
-        <Button
-          variant="secondary"
-          size="sm"
-          disabled={isPending}
-          onClick={() => deleteException(undefined)}
-        >
-          <CareIcon icon="l-minus-circle" className="text-base" />
-          <span className="ml-2">{t("remove")}</span>
-        </Button>
+        <Dialog open={open} onOpenChange={setOpen}>
+          <DialogTrigger asChild>
+            <Button variant="secondary" size="sm" disabled={isPending}>
+              <CareIcon icon="l-minus-circle" className="text-base" />
+              <span className="ml-2">{t("remove")}</span>
+            </Button>
+          </DialogTrigger>
+          <DialogContent>
+            <DialogHeader>
+              <DialogTitle>{t("are_you_sure")}</DialogTitle>
+              <DialogDescription>
+                {t("this_will_permanently_remove_the_exception")}
+              </DialogDescription>
+            </DialogHeader>
+            <div className="flex justify-end space-x-2">
+              <Button variant="outline" onClick={() => setOpen(false)}>
+                {t("cancel")}
+              </Button>
+              <Button
+                variant="destructive"
+                onClick={() => {
+                  deleteException(undefined);
+                  setOpen(false);
+                }}
+              >
+                {t("remove")}
+              </Button>
+            </div>
+          </DialogContent>
+        </Dialog>
       </div>
       {/* TODO: Add this information */}
       {/* <div className="px-4 py-2">

From a4cd8142073d20bf1fb9cd06370cda47e174d0e6 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Fri, 31 Jan 2025 00:44:06 +0530
Subject: [PATCH 03/21] translation added

---
 public/locale/en.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/locale/en.json b/public/locale/en.json
index 4baaa151214..7f3ddcd02ea 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -382,6 +382,7 @@
   "archived_files": "Archived Files",
   "are_non_editable_fields": "are non-editable fields",
   "are_you_still_watching": "Are you still watching?",
+  "are_you_sure": "Are you sure?",
   "are_you_sure_want_to_delete": "Are you sure you want to delete {{name}}?",
   "are_you_sure_want_to_delete_this_record": "Are you sure want to delete this record?",
   "are_you_sure_want_to_remove": "Are you sure you want to remove {{name}} from the patient? This action cannot be undone",
@@ -1982,6 +1983,7 @@
   "thank_you_for_choosing": "Thank you for choosing our care service",
   "the_request_for_resources_placed_by_yourself_is": "The request for resource (details below) placed by yourself is",
   "third_party_software_licenses": "Third Party Software Licenses",
+  "this_will_permanently_remove_the_exception": "This action will permanently remove the exception",
   "time": "Time",
   "time_slot": "Time Slot",
   "title_of_request": "Title of Request",

From 1d341166594062b46b1475ed4c33c3c3de8f44eb Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Fri, 31 Jan 2025 01:27:28 +0530
Subject: [PATCH 04/21] crteate Schedule template sheet popup added

---
 .../CreateScheduleTemplateSheet.tsx           | 77 +++++++++++++++----
 1 file changed, 62 insertions(+), 15 deletions(-)

diff --git a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
index a32f3d193bf..eab1ded63eb 100644
--- a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
@@ -3,6 +3,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { isAfter, isBefore, parse } from "date-fns";
 import { ArrowRightIcon } from "lucide-react";
 import { useQueryParams } from "raviger";
+import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { Trans } from "react-i18next";
@@ -17,6 +18,14 @@ import WeekdayCheckbox, {
 
 import { Button } from "@/components/ui/button";
 import { DatePicker } from "@/components/ui/date-picker";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog";
 import {
   Form,
   FormControl,
@@ -235,6 +244,9 @@ export default function CreateScheduleTemplateSheet({
     );
   };
 
+  const [openDialog, setOpenDialog] = useState(false);
+  const [removeIndex, setRemoveIndex] = useState<number | null>(null);
+
   return (
     <Sheet
       open={qParams.sheet === "create_template"}
@@ -351,21 +363,56 @@ export default function CreateScheduleTemplateSheet({
                           {form.watch(`availabilities.${index}.name`)}
                         </span>
                       </div>
-                      <Button
-                        type="button"
-                        variant="secondary"
-                        size="sm"
-                        className="text-gray-600 hover:text-gray-900"
-                        onClick={() => {
-                          const availabilities =
-                            form.getValues("availabilities");
-                          availabilities.splice(index, 1);
-                          form.setValue("availabilities", availabilities);
-                        }}
-                      >
-                        <CareIcon icon="l-trash" className="text-base" />
-                        <span className="ml-2">{t("remove")}</span>
-                      </Button>
+                      <Dialog open={openDialog} onOpenChange={setOpenDialog}>
+                        <DialogTrigger asChild>
+                          <Button
+                            type="button"
+                            variant="secondary"
+                            size="sm"
+                            className="text-gray-600 hover:text-gray-900"
+                            onClick={() => {
+                              setRemoveIndex(index);
+                              setOpenDialog(true);
+                            }}
+                          >
+                            <CareIcon icon="l-trash" className="text-base" />
+                            <span className="ml-2">{t("remove")}</span>
+                          </Button>
+                        </DialogTrigger>
+                        <DialogContent>
+                          <DialogHeader>
+                            <DialogTitle>{t("are_you_sure")}</DialogTitle>
+                            <DialogDescription>
+                              {t("this_will_permanently_remove_the_template")}
+                            </DialogDescription>
+                          </DialogHeader>
+                          <div className="flex justify-end space-x-2">
+                            <Button
+                              variant="outline"
+                              onClick={() => setOpenDialog(false)}
+                            >
+                              {t("cancel")}
+                            </Button>
+                            <Button
+                              variant="destructive"
+                              onClick={() => {
+                                const availabilities =
+                                  form.getValues("availabilities");
+                                if (removeIndex !== null) {
+                                  availabilities.splice(removeIndex, 1);
+                                  form.setValue(
+                                    "availabilities",
+                                    availabilities,
+                                  );
+                                }
+                                setOpenDialog(false);
+                              }}
+                            >
+                              {t("remove")}
+                            </Button>
+                          </div>
+                        </DialogContent>
+                      </Dialog>
                     </div>
 
                     <div className="grid grid-cols-2 gap-x-6 gap-y-4">

From 3d1963630cc4b2d6e6062b1dd2d4a90be421ce74 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Fri, 31 Jan 2025 01:28:22 +0530
Subject: [PATCH 05/21] edit shedule template sheet popup added

---
 .../components/EditScheduleTemplateSheet.tsx  | 57 +++++++++++++++----
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
index 5cdd6790bcb..1b78f8fee79 100644
--- a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
@@ -17,6 +17,14 @@ import WeekdayCheckbox, {
 
 import { Button } from "@/components/ui/button";
 import { DatePicker } from "@/components/ui/date-picker";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog";
 import {
   Form,
   FormControl,
@@ -126,6 +134,7 @@ const ScheduleTemplateEditor = ({
 }) => {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
+  const [isDialogOpen, setDialogOpen] = useState(false);
 
   const templateFormSchema = z
     .object({
@@ -250,16 +259,44 @@ const ScheduleTemplateEditor = ({
           </div>
 
           <div className="flex justify-end gap-2">
-            <Button
-              type="button"
-              variant="outline"
-              onClick={() => deleteTemplate()}
-              disabled={isProcessing}
-              size="sm"
-            >
-              <Trash2Icon />
-              {isDeleting ? t("deleting") : t("delete")}
-            </Button>
+            <Dialog open={isDialogOpen} onOpenChange={setDialogOpen}>
+              <DialogTrigger asChild>
+                <Button
+                  type="button"
+                  variant="outline"
+                  disabled={isProcessing}
+                  size="sm"
+                >
+                  <Trash2Icon />
+                  {isDeleting ? t("deleting") : t("delete")}
+                </Button>
+              </DialogTrigger>
+              <DialogContent>
+                <DialogHeader>
+                  <DialogTitle>{t("are_you_sure")}</DialogTitle>
+                  <DialogDescription>
+                    {t("this_will_permanently_remove_the_template")}
+                  </DialogDescription>
+                </DialogHeader>
+                <div className="flex justify-end space-x-2">
+                  <Button
+                    variant="outline"
+                    onClick={() => setDialogOpen(false)}
+                  >
+                    {t("cancel")}
+                  </Button>
+                  <Button
+                    variant="destructive"
+                    onClick={() => {
+                      deleteTemplate();
+                      setDialogOpen(false);
+                    }}
+                  >
+                    {t("delete")}
+                  </Button>
+                </div>
+              </DialogContent>
+            </Dialog>
             <Button
               variant="primary"
               type="submit"

From 4ec21666843a18445438ebb697ecf9ee38870caf Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Fri, 31 Jan 2025 01:29:20 +0530
Subject: [PATCH 06/21] translation updated

---
 public/locale/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/locale/en.json b/public/locale/en.json
index 7f3ddcd02ea..3af78ee35de 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -1984,6 +1984,7 @@
   "the_request_for_resources_placed_by_yourself_is": "The request for resource (details below) placed by yourself is",
   "third_party_software_licenses": "Third Party Software Licenses",
   "this_will_permanently_remove_the_exception": "This action will permanently remove the exception",
+  "this_will_permanently_remove_the_template": "This action will permanently remove the template",
   "time": "Time",
   "time_slot": "Time Slot",
   "title_of_request": "Title of Request",

From c5248109309fffd1cebdc2a024ccb56355a40055 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Tue, 4 Feb 2025 21:43:16 +0530
Subject: [PATCH 07/21] Schedule exception confirm popup added

---
 src/pages/Scheduling/ScheduleExceptions.tsx | 64 +++++++++++----------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/pages/Scheduling/ScheduleExceptions.tsx b/src/pages/Scheduling/ScheduleExceptions.tsx
index 9554e4f03a9..b07974736a2 100644
--- a/src/pages/Scheduling/ScheduleExceptions.tsx
+++ b/src/pages/Scheduling/ScheduleExceptions.tsx
@@ -9,15 +9,19 @@ import { cn } from "@/lib/utils";
 import ColoredIndicator from "@/CAREUI/display/ColoredIndicator";
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
-import { Button } from "@/components/ui/button";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@/components/ui/alert-dialog";
+import { Button } from "@/components/ui/button";
 
 import Loading from "@/components/Common/Loading";
 
@@ -122,36 +126,38 @@ const ScheduleExceptionItem = (
             </span>
           </div>
         </div>
-        <Dialog open={open} onOpenChange={setOpen}>
-          <DialogTrigger asChild>
+        <AlertDialog open={open} onOpenChange={setOpen}>
+          <AlertDialogTrigger asChild>
             <Button variant="secondary" size="sm" disabled={isPending}>
               <CareIcon icon="l-minus-circle" className="text-base" />
               <span className="ml-2">{t("remove")}</span>
             </Button>
-          </DialogTrigger>
-          <DialogContent>
-            <DialogHeader>
-              <DialogTitle>{t("are_you_sure")}</DialogTitle>
-              <DialogDescription>
-                {t("this_will_permanently_remove_the_exception")}
-              </DialogDescription>
-            </DialogHeader>
-            <div className="flex justify-end space-x-2">
-              <Button variant="outline" onClick={() => setOpen(false)}>
-                {t("cancel")}
-              </Button>
-              <Button
-                variant="destructive"
+          </AlertDialogTrigger>
+          <AlertDialogContent>
+            <AlertDialogHeader>
+              <AlertDialogTitle>{t("are_you_sure")}</AlertDialogTitle>
+              <AlertDialogDescription>
+                <Alert variant="destructive" className="mt-4">
+                  <AlertTitle>{t("warning")}</AlertTitle>
+                  <AlertDescription>
+                    {t("this_will_permanently_remove_the_template")}
+                  </AlertDescription>
+                </Alert>
+              </AlertDialogDescription>
+            </AlertDialogHeader>
+            <AlertDialogFooter>
+              <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
+              <AlertDialogAction
                 onClick={() => {
                   deleteException(undefined);
                   setOpen(false);
                 }}
               >
-                {t("remove")}
-              </Button>
-            </div>
-          </DialogContent>
-        </Dialog>
+                {t("confirm")}
+              </AlertDialogAction>
+            </AlertDialogFooter>
+          </AlertDialogContent>
+        </AlertDialog>
       </div>
       {/* TODO: Add this information */}
       {/* <div className="px-4 py-2">

From 5394fb1e78e03c732f8911a5d97cc94b7f6d66fa Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Tue, 4 Feb 2025 21:44:31 +0530
Subject: [PATCH 08/21] confirm popup added on scheduleTemplate

---
 .../CreateScheduleTemplateSheet.tsx           | 74 +++++++++++--------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
index 3851534e11a..31d3e85b0f9 100644
--- a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
@@ -16,16 +16,20 @@ import WeekdayCheckbox, {
   DayOfWeek,
 } from "@/CAREUI/interactive/WeekdayCheckbox";
 
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@/components/ui/alert-dialog";
 import { Button } from "@/components/ui/button";
 import { DatePicker } from "@/components/ui/date-picker";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
 import {
   Form,
   FormControl,
@@ -363,8 +367,11 @@ export default function CreateScheduleTemplateSheet({
                           {form.watch(`availabilities.${index}.name`)}
                         </span>
                       </div>
-                      <Dialog open={openDialog} onOpenChange={setOpenDialog}>
-                        <DialogTrigger asChild>
+                      <AlertDialog
+                        open={openDialog}
+                        onOpenChange={setOpenDialog}
+                      >
+                        <AlertDialogTrigger asChild>
                           <Button
                             type="button"
                             variant="secondary"
@@ -378,23 +385,26 @@ export default function CreateScheduleTemplateSheet({
                             <CareIcon icon="l-trash" className="text-base" />
                             <span className="ml-2">{t("remove")}</span>
                           </Button>
-                        </DialogTrigger>
-                        <DialogContent>
-                          <DialogHeader>
-                            <DialogTitle>{t("are_you_sure")}</DialogTitle>
-                            <DialogDescription>
-                              {t("this_will_permanently_remove_the_template")}
-                            </DialogDescription>
-                          </DialogHeader>
-                          <div className="flex justify-end space-x-2">
-                            <Button
-                              variant="outline"
-                              onClick={() => setOpenDialog(false)}
-                            >
-                              {t("cancel")}
-                            </Button>
-                            <Button
-                              variant="destructive"
+                        </AlertDialogTrigger>
+                        <AlertDialogContent>
+                          <AlertDialogHeader>
+                            <AlertDialogTitle>
+                              {t("are_you_sure")}
+                            </AlertDialogTitle>
+                            <AlertDialogDescription>
+                              <Alert variant="destructive" className="mt-4">
+                                <AlertTitle>{t("warning")}</AlertTitle>
+                                <AlertDescription>
+                                  {t(
+                                    "this_will_permanently_remove_the_template",
+                                  )}
+                                </AlertDescription>
+                              </Alert>
+                            </AlertDialogDescription>
+                          </AlertDialogHeader>
+                          <AlertDialogFooter>
+                            <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
+                            <AlertDialogAction
                               onClick={() => {
                                 const availabilities =
                                   form.getValues("availabilities");
@@ -408,11 +418,11 @@ export default function CreateScheduleTemplateSheet({
                                 setOpenDialog(false);
                               }}
                             >
-                              {t("remove")}
-                            </Button>
-                          </div>
-                        </DialogContent>
-                      </Dialog>
+                              {t("confirm")}
+                            </AlertDialogAction>
+                          </AlertDialogFooter>
+                        </AlertDialogContent>
+                      </AlertDialog>
                     </div>
 
                     <div className="grid grid-cols-2 gap-x-6 gap-y-4">

From 48e16248cfd0f5c5420b6fbd42c75e39adc6feee Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Tue, 4 Feb 2025 21:45:12 +0530
Subject: [PATCH 09/21] confirm popup added on Editschedule Template

---
 .../components/EditScheduleTemplateSheet.tsx  | 114 +++++++++++-------
 1 file changed, 73 insertions(+), 41 deletions(-)

diff --git a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
index 1b78f8fee79..982bd643cb8 100644
--- a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
@@ -15,16 +15,20 @@ import WeekdayCheckbox, {
   DayOfWeek,
 } from "@/CAREUI/interactive/WeekdayCheckbox";
 
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@/components/ui/alert-dialog";
 import { Button } from "@/components/ui/button";
 import { DatePicker } from "@/components/ui/date-picker";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
 import {
   Form,
   FormControl,
@@ -259,8 +263,8 @@ const ScheduleTemplateEditor = ({
           </div>
 
           <div className="flex justify-end gap-2">
-            <Dialog open={isDialogOpen} onOpenChange={setDialogOpen}>
-              <DialogTrigger asChild>
+            <AlertDialog open={isDialogOpen} onOpenChange={setDialogOpen}>
+              <AlertDialogTrigger asChild>
                 <Button
                   type="button"
                   variant="outline"
@@ -270,33 +274,32 @@ const ScheduleTemplateEditor = ({
                   <Trash2Icon />
                   {isDeleting ? t("deleting") : t("delete")}
                 </Button>
-              </DialogTrigger>
-              <DialogContent>
-                <DialogHeader>
-                  <DialogTitle>{t("are_you_sure")}</DialogTitle>
-                  <DialogDescription>
-                    {t("this_will_permanently_remove_the_template")}
-                  </DialogDescription>
-                </DialogHeader>
-                <div className="flex justify-end space-x-2">
-                  <Button
-                    variant="outline"
-                    onClick={() => setDialogOpen(false)}
-                  >
-                    {t("cancel")}
-                  </Button>
-                  <Button
-                    variant="destructive"
+              </AlertDialogTrigger>
+              <AlertDialogContent>
+                <AlertDialogHeader>
+                  <AlertDialogTitle>{t("are_you_sure")}</AlertDialogTitle>
+                  <AlertDialogDescription>
+                    <Alert variant="destructive" className="mt-4">
+                      <AlertTitle>{t("warning")}</AlertTitle>
+                      <AlertDescription>
+                        {t("this_will_permanently_remove_the_template")}
+                      </AlertDescription>
+                    </Alert>
+                  </AlertDialogDescription>
+                </AlertDialogHeader>
+                <AlertDialogFooter>
+                  <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
+                  <AlertDialogAction
                     onClick={() => {
                       deleteTemplate();
                       setDialogOpen(false);
                     }}
                   >
-                    {t("delete")}
-                  </Button>
-                </div>
-              </DialogContent>
-            </Dialog>
+                    {t("confirm")}
+                  </AlertDialogAction>
+                </AlertDialogFooter>
+              </AlertDialogContent>
+            </AlertDialog>
             <Button
               variant="primary"
               type="submit"
@@ -326,6 +329,7 @@ const AvailabilityEditor = ({
 }) => {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
+  const [openDialog, setOpenDialog] = useState(false);
 
   const { mutate: deleteAvailability, isPending: isDeleting } = useMutation({
     mutationFn: mutate(scheduleApis.templates.availabilities.delete, {
@@ -388,15 +392,43 @@ const AvailabilityEditor = ({
           </span>
         </div>
 
-        <Button
-          variant="ghost"
-          size="icon"
-          onClick={() => deleteAvailability()}
-          disabled={isDeleting}
-          className="text-red-600 hover:text-red-700 hover:bg-red-50"
-        >
-          <CareIcon icon="l-trash" className="text-lg" />
-        </Button>
+        <AlertDialog open={openDialog} onOpenChange={setOpenDialog}>
+          <AlertDialogTrigger asChild>
+            <Button
+              variant="ghost"
+              size="icon"
+              onClick={() => setOpenDialog(true)}
+              disabled={isDeleting}
+              className="text-red-600 hover:text-red-700 hover:bg-red-50"
+            >
+              <CareIcon icon="l-trash" className="text-lg" />
+            </Button>
+          </AlertDialogTrigger>
+          <AlertDialogContent>
+            <AlertDialogHeader>
+              <AlertDialogTitle>{t("are_you_sure")}</AlertDialogTitle>
+              <AlertDialogDescription>
+                <Alert variant="destructive" className="mt-4">
+                  <AlertTitle>{t("warning")}</AlertTitle>
+                  <AlertDescription>
+                    {t("this_will_permanently_remove_the_template")}
+                  </AlertDescription>
+                </Alert>
+              </AlertDialogDescription>
+            </AlertDialogHeader>
+            <AlertDialogFooter>
+              <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
+              <AlertDialogAction
+                onClick={() => {
+                  deleteAvailability();
+                  setOpenDialog(false);
+                }}
+              >
+                {t("confirm")}
+              </AlertDialogAction>
+            </AlertDialogFooter>
+          </AlertDialogContent>
+        </AlertDialog>
       </div>
 
       <div className="space-y-4">

From 036002cdc9856de67388d006bf80c994e7418c93 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Tue, 4 Feb 2025 21:46:15 +0530
Subject: [PATCH 10/21] warning translation added

---
 public/locale/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/locale/en.json b/public/locale/en.json
index 2b8704cbdf6..b1565de1993 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -2019,6 +2019,7 @@
   "thank_you_for_choosing": "Thank you for choosing our care service",
   "the_request_for_resources_placed_by_yourself_is": "The request for resource (details below) placed by yourself is",
   "third_party_software_licenses": "Third Party Software Licenses",
+  "this_will_permanently_remove_the_template": "This will permanently remove the template and cannot be undone",
   "time": "Time",
   "time_slot": "Time Slot",
   "title": "Title",

From 4336c0420543e4b39a7eb1a90d4a25069b7edc2d Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Wed, 5 Feb 2025 01:12:29 +0530
Subject: [PATCH 11/21] minor issues solved

---
 public/locale/en.json                       | 2 ++
 src/pages/Scheduling/ScheduleExceptions.tsx | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/locale/en.json b/public/locale/en.json
index b1565de1993..f54818117b0 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -2019,6 +2019,8 @@
   "thank_you_for_choosing": "Thank you for choosing our care service",
   "the_request_for_resources_placed_by_yourself_is": "The request for resource (details below) placed by yourself is",
   "third_party_software_licenses": "Third Party Software Licenses",
+  "this_action_is_irreversible": "This action is irreversible. Once a file is archived it cannot be unarchived.",
+  "this_file_has_been_archived": "This file has been archived and cannot be unarchived.",
   "this_will_permanently_remove_the_template": "This will permanently remove the template and cannot be undone",
   "time": "Time",
   "time_slot": "Time Slot",
diff --git a/src/pages/Scheduling/ScheduleExceptions.tsx b/src/pages/Scheduling/ScheduleExceptions.tsx
index b07974736a2..c4762e75732 100644
--- a/src/pages/Scheduling/ScheduleExceptions.tsx
+++ b/src/pages/Scheduling/ScheduleExceptions.tsx
@@ -149,7 +149,7 @@ const ScheduleExceptionItem = (
               <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
               <AlertDialogAction
                 onClick={() => {
-                  deleteException(undefined);
+                  deleteException();
                   setOpen(false);
                 }}
               >

From b10ce7daeac5c9bef7f4dd78145574f05e128bc6 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Thu, 6 Feb 2025 22:53:38 +0530
Subject: [PATCH 12/21] alert-dialog destructive variant added

---
 src/components/ui/alert-dialog.tsx | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/alert-dialog.tsx b/src/components/ui/alert-dialog.tsx
index 3d1ea1cd215..2bc2c159db5 100644
--- a/src/components/ui/alert-dialog.tsx
+++ b/src/components/ui/alert-dialog.tsx
@@ -1,4 +1,5 @@
 import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
+import { type VariantProps, cva } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -97,13 +98,27 @@ const AlertDialogDescription = React.forwardRef<
 AlertDialogDescription.displayName =
   AlertDialogPrimitive.Description.displayName;
 
+const alertVariants = cva("mt-2 sm:mt-0", {
+  variants: {
+    variant: {
+      default: "bg-white text-gray-950 dark:bg-gray-950 dark:text-gray-50",
+      destructive:
+        "bg-red-500 text-gray-50 shadow-sm hover:bg-red-500/90 dark:bg-red-900 dark:text-gray-50 dark:hover:bg-red-900/90",
+    },
+  },
+  defaultVariants: {
+    variant: "default",
+  },
+});
+
 const AlertDialogAction = React.forwardRef<
   React.ElementRef<typeof AlertDialogPrimitive.Action>,
-  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
->(({ className, ...props }, ref) => (
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action> &
+    VariantProps<typeof alertVariants>
+>(({ className, variant, ...props }, ref) => (
   <AlertDialogPrimitive.Action
     ref={ref}
-    className={cn(buttonVariants(), className)}
+    className={cn(buttonVariants(), alertVariants({ variant }), className)}
     {...props}
   />
 ));

From b2e4b77422e012c8de49e704b1054a3541ecf748 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Fri, 7 Feb 2025 00:16:31 +0530
Subject: [PATCH 13/21] confirm button color updated, variant distructive added

---
 src/pages/Scheduling/ScheduleExceptions.tsx                     | 1 +
 src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx | 1 +
 src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx   | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/src/pages/Scheduling/ScheduleExceptions.tsx b/src/pages/Scheduling/ScheduleExceptions.tsx
index c4762e75732..85b76c0bf1c 100644
--- a/src/pages/Scheduling/ScheduleExceptions.tsx
+++ b/src/pages/Scheduling/ScheduleExceptions.tsx
@@ -148,6 +148,7 @@ const ScheduleExceptionItem = (
             <AlertDialogFooter>
               <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
               <AlertDialogAction
+                variant="destructive"
                 onClick={() => {
                   deleteException();
                   setOpen(false);
diff --git a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
index 31d3e85b0f9..288c7882116 100644
--- a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
@@ -405,6 +405,7 @@ export default function CreateScheduleTemplateSheet({
                           <AlertDialogFooter>
                             <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
                             <AlertDialogAction
+                              variant={"destructive"}
                               onClick={() => {
                                 const availabilities =
                                   form.getValues("availabilities");
diff --git a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
index 982bd643cb8..8be3fd33c3e 100644
--- a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
@@ -290,6 +290,7 @@ const ScheduleTemplateEditor = ({
                 <AlertDialogFooter>
                   <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
                   <AlertDialogAction
+                    variant="destructive"
                     onClick={() => {
                       deleteTemplate();
                       setDialogOpen(false);
@@ -419,6 +420,7 @@ const AvailabilityEditor = ({
             <AlertDialogFooter>
               <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
               <AlertDialogAction
+                variant="destructive"
                 onClick={() => {
                   deleteAvailability();
                   setOpenDialog(false);

From e92c37dfa12f27cc986cd416b3d900e50773dd54 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Fri, 7 Feb 2025 20:19:06 +0530
Subject: [PATCH 14/21] removed extra className of the button, only use variant
 for better maintainability

---
 src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx | 1 -
 src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
index 288c7882116..f7db692cc13 100644
--- a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
@@ -376,7 +376,6 @@ export default function CreateScheduleTemplateSheet({
                             type="button"
                             variant="secondary"
                             size="sm"
-                            className="text-gray-600 hover:text-gray-900"
                             onClick={() => {
                               setRemoveIndex(index);
                               setOpenDialog(true);
diff --git a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
index 8be3fd33c3e..2c9ff3a35e6 100644
--- a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
@@ -400,7 +400,6 @@ const AvailabilityEditor = ({
               size="icon"
               onClick={() => setOpenDialog(true)}
               disabled={isDeleting}
-              className="text-red-600 hover:text-red-700 hover:bg-red-50"
             >
               <CareIcon icon="l-trash" className="text-lg" />
             </Button>

From 36bcbd3791db39a3daf7434d1fb6aff60737a2a7 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Fri, 7 Feb 2025 21:07:29 +0530
Subject: [PATCH 15/21] Reset the state on both cancel and confirm.

---
 src/pages/Scheduling/ScheduleExceptions.tsx    |  4 +++-
 .../components/CreateScheduleTemplateSheet.tsx | 15 +++++++++++++--
 .../components/EditScheduleTemplateSheet.tsx   | 18 ++++++++++++++----
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/pages/Scheduling/ScheduleExceptions.tsx b/src/pages/Scheduling/ScheduleExceptions.tsx
index 85b76c0bf1c..0f8077a7833 100644
--- 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
index f7db692cc13..e2319d4d453 100644
--- 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
index 2c9ff3a35e6..22af0406d3a 100644
--- 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={() => {

From 5d4d8c881aea23656f249213f13aa4af3ca12c10 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Fri, 7 Feb 2025 22:59:46 +0530
Subject: [PATCH 16/21] this_will_permanently_remove_the_template updated with
 dynamic data

---
 public/locale/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/locale/en.json b/public/locale/en.json
index 94db79cee10..a2c5cd611ed 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -2076,7 +2076,7 @@
   "third_party_software_licenses": "Third Party Software Licenses",
   "this_action_is_irreversible": "This action is irreversible. Once a file is archived it cannot be unarchived.",
   "this_file_has_been_archived": "This file has been archived and cannot be unarchived.",
-  "this_will_permanently_remove_the_template": "This will permanently remove the template and cannot be undone",
+  "this_will_permanently_remove_the_template": "This will permanently remove the {{data}} and cannot be undone",
   "time": "Time",
   "time_slot": "Time Slot",
   "title": "Title",

From b786036fdb080ebcb638becddf13f82dec0eddd7 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Fri, 7 Feb 2025 23:01:19 +0530
Subject: [PATCH 17/21] translation text updated

---
 src/pages/Scheduling/ScheduleExceptions.tsx               | 4 +++-
 .../Scheduling/components/CreateScheduleTemplateSheet.tsx | 3 +++
 .../Scheduling/components/EditScheduleTemplateSheet.tsx   | 8 ++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/pages/Scheduling/ScheduleExceptions.tsx b/src/pages/Scheduling/ScheduleExceptions.tsx
index 0f8077a7833..1503c519f0b 100644
--- a/src/pages/Scheduling/ScheduleExceptions.tsx
+++ b/src/pages/Scheduling/ScheduleExceptions.tsx
@@ -140,7 +140,9 @@ const ScheduleExceptionItem = (
                 <Alert variant="destructive" className="mt-4">
                   <AlertTitle>{t("warning")}</AlertTitle>
                   <AlertDescription>
-                    {t("this_will_permanently_remove_the_template")}
+                    {t("this_will_permanently_remove_the_template", {
+                      data: "exception",
+                    })}
                   </AlertDescription>
                 </Alert>
               </AlertDialogDescription>
diff --git a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
index e2319d4d453..24c721aa8e5 100644
--- a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
@@ -399,6 +399,9 @@ export default function CreateScheduleTemplateSheet({
                                 <AlertDescription>
                                   {t(
                                     "this_will_permanently_remove_the_template",
+                                    {
+                                      data: "session",
+                                    },
                                   )}
                                 </AlertDescription>
                               </Alert>
diff --git a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
index 22af0406d3a..f5d16c3c225 100644
--- a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
@@ -285,7 +285,9 @@ const ScheduleTemplateEditor = ({
                     <Alert variant="destructive" className="mt-4">
                       <AlertTitle>{t("warning")}</AlertTitle>
                       <AlertDescription>
-                        {t("this_will_permanently_remove_the_template")}
+                        {t("this_will_permanently_remove_the_template", {
+                          data: "scheduled teplate",
+                        })}
                       </AlertDescription>
                     </Alert>
                   </AlertDialogDescription>
@@ -419,7 +421,9 @@ const AvailabilityEditor = ({
                 <Alert variant="destructive" className="mt-4">
                   <AlertTitle>{t("warning")}</AlertTitle>
                   <AlertDescription>
-                    {t("this_will_permanently_remove_the_template")}
+                    {t("this_will_permanently_remove_the_template", {
+                      data: "available session",
+                    })}
                   </AlertDescription>
                 </Alert>
               </AlertDialogDescription>

From ed005ac27fc8a84b3b77484087291954a71b0f05 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Fri, 7 Feb 2025 23:35:51 +0530
Subject: [PATCH 18/21] distructive variant added to the alertDialog on
 AppointmentDetails page

---
 src/pages/Appointments/AppointmentDetail.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Appointments/AppointmentDetail.tsx b/src/pages/Appointments/AppointmentDetail.tsx
index c29454bfaf0..033a2c45ccc 100644
--- a/src/pages/Appointments/AppointmentDetail.tsx
+++ b/src/pages/Appointments/AppointmentDetail.tsx
@@ -551,6 +551,7 @@ const AppointmentActions = ({
           <AlertDialogFooter>
             <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
             <AlertDialogAction
+              variant="destructive"
               onClick={() => cancelAppointment({ reason: "cancelled" })}
             >
               {t("confirm")}
@@ -581,6 +582,7 @@ const AppointmentActions = ({
           <AlertDialogFooter>
             <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
             <AlertDialogAction
+              variant="destructive"
               onClick={() => cancelAppointment({ reason: "entered_in_error" })}
             >
               {t("confirm")}

From 13d062e82e8d36de00f9a4f73b49faf6a01db21b Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Mon, 10 Feb 2025 07:07:22 +0530
Subject: [PATCH 19/21] buttonVariants added

---
 src/pages/Appointments/AppointmentDetail.tsx              | 6 +++---
 src/pages/Scheduling/ScheduleExceptions.tsx               | 4 ++--
 .../Scheduling/components/CreateScheduleTemplateSheet.tsx | 8 ++++++--
 .../Scheduling/components/EditScheduleTemplateSheet.tsx   | 8 +++++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/pages/Appointments/AppointmentDetail.tsx b/src/pages/Appointments/AppointmentDetail.tsx
index 033a2c45ccc..31835c32cf4 100644
--- a/src/pages/Appointments/AppointmentDetail.tsx
+++ b/src/pages/Appointments/AppointmentDetail.tsx
@@ -33,7 +33,7 @@ import {
   AlertDialogTrigger,
 } from "@/components/ui/alert-dialog";
 import { Badge, BadgeProps } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
+import { Button, buttonVariants } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Separator } from "@/components/ui/separator";
 import {
@@ -551,8 +551,8 @@ const AppointmentActions = ({
           <AlertDialogFooter>
             <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
             <AlertDialogAction
-              variant="destructive"
               onClick={() => cancelAppointment({ reason: "cancelled" })}
+              className={cn(buttonVariants({ variant: "destructive" }))}
             >
               {t("confirm")}
             </AlertDialogAction>
@@ -582,8 +582,8 @@ const AppointmentActions = ({
           <AlertDialogFooter>
             <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
             <AlertDialogAction
-              variant="destructive"
               onClick={() => cancelAppointment({ reason: "entered_in_error" })}
+              className={cn(buttonVariants({ variant: "destructive" }))}
             >
               {t("confirm")}
             </AlertDialogAction>
diff --git a/src/pages/Scheduling/ScheduleExceptions.tsx b/src/pages/Scheduling/ScheduleExceptions.tsx
index 1503c519f0b..fed3d0ea2b4 100644
--- a/src/pages/Scheduling/ScheduleExceptions.tsx
+++ b/src/pages/Scheduling/ScheduleExceptions.tsx
@@ -21,7 +21,7 @@ import {
   AlertDialogTitle,
   AlertDialogTrigger,
 } from "@/components/ui/alert-dialog";
-import { Button } from "@/components/ui/button";
+import { Button, buttonVariants } from "@/components/ui/button";
 
 import Loading from "@/components/Common/Loading";
 
@@ -152,7 +152,7 @@ const ScheduleExceptionItem = (
                 {t("cancel")}
               </AlertDialogCancel>
               <AlertDialogAction
-                variant="destructive"
+                className={cn(buttonVariants({ variant: "destructive" }))}
                 onClick={() => {
                   deleteException();
                   setOpen(false);
diff --git a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
index 24c721aa8e5..3724fa1f333 100644
--- a/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/CreateScheduleTemplateSheet.tsx
@@ -10,6 +10,8 @@ import { Trans } from "react-i18next";
 import { toast } from "sonner";
 import * as z from "zod";
 
+import { cn } from "@/lib/utils";
+
 import Callout from "@/CAREUI/display/Callout";
 import CareIcon from "@/CAREUI/icons/CareIcon";
 import WeekdayCheckbox, {
@@ -28,7 +30,7 @@ import {
   AlertDialogTitle,
   AlertDialogTrigger,
 } from "@/components/ui/alert-dialog";
-import { Button } from "@/components/ui/button";
+import { Button, buttonVariants } from "@/components/ui/button";
 import { DatePicker } from "@/components/ui/date-picker";
 import {
   Form,
@@ -417,7 +419,9 @@ export default function CreateScheduleTemplateSheet({
                               {t("cancel")}
                             </AlertDialogCancel>
                             <AlertDialogAction
-                              variant={"destructive"}
+                              className={cn(
+                                buttonVariants({ variant: "destructive" }),
+                              )}
                               onClick={() => {
                                 const availabilities =
                                   form.getValues("availabilities");
diff --git a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
index f5d16c3c225..48d4845bf6b 100644
--- a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
@@ -9,6 +9,8 @@ import { Trans } from "react-i18next";
 import { toast } from "sonner";
 import * as z from "zod";
 
+import { cn } from "@/lib/utils";
+
 import Callout from "@/CAREUI/display/Callout";
 import CareIcon from "@/CAREUI/icons/CareIcon";
 import WeekdayCheckbox, {
@@ -27,7 +29,7 @@ import {
   AlertDialogTitle,
   AlertDialogTrigger,
 } from "@/components/ui/alert-dialog";
-import { Button } from "@/components/ui/button";
+import { Button, buttonVariants } from "@/components/ui/button";
 import { DatePicker } from "@/components/ui/date-picker";
 import {
   Form,
@@ -297,7 +299,7 @@ const ScheduleTemplateEditor = ({
                     {t("cancel")}
                   </AlertDialogCancel>
                   <AlertDialogAction
-                    variant="destructive"
+                    className={cn(buttonVariants({ variant: "destructive" }))}
                     onClick={() => {
                       deleteTemplate();
                       setDialogOpen(false);
@@ -433,7 +435,7 @@ const AvailabilityEditor = ({
                 {t("cancel")}
               </AlertDialogCancel>
               <AlertDialogAction
-                variant="destructive"
+                className={cn(buttonVariants({ variant: "destructive" }))}
                 onClick={() => {
                   deleteAvailability();
                   setOpenDialog(false);

From f931ce5bdd1c43a8787e3dd41c86f599f93daed4 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Mon, 10 Feb 2025 07:11:13 +0530
Subject: [PATCH 20/21] alert-dialog changes removed

---
 src/components/ui/alert-dialog.tsx | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/components/ui/alert-dialog.tsx b/src/components/ui/alert-dialog.tsx
index 2bc2c159db5..3d1ea1cd215 100644
--- a/src/components/ui/alert-dialog.tsx
+++ b/src/components/ui/alert-dialog.tsx
@@ -1,5 +1,4 @@
 import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
-import { type VariantProps, cva } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -98,27 +97,13 @@ const AlertDialogDescription = React.forwardRef<
 AlertDialogDescription.displayName =
   AlertDialogPrimitive.Description.displayName;
 
-const alertVariants = cva("mt-2 sm:mt-0", {
-  variants: {
-    variant: {
-      default: "bg-white text-gray-950 dark:bg-gray-950 dark:text-gray-50",
-      destructive:
-        "bg-red-500 text-gray-50 shadow-sm hover:bg-red-500/90 dark:bg-red-900 dark:text-gray-50 dark:hover:bg-red-900/90",
-    },
-  },
-  defaultVariants: {
-    variant: "default",
-  },
-});
-
 const AlertDialogAction = React.forwardRef<
   React.ElementRef<typeof AlertDialogPrimitive.Action>,
-  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action> &
-    VariantProps<typeof alertVariants>
->(({ className, variant, ...props }, ref) => (
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
+>(({ className, ...props }, ref) => (
   <AlertDialogPrimitive.Action
     ref={ref}
-    className={cn(buttonVariants(), alertVariants({ variant }), className)}
+    className={cn(buttonVariants(), className)}
     {...props}
   />
 ));

From 1a85341a82f904ed7e812e9a09e75473f7735c43 Mon Sep 17 00:00:00 2001
From: Mohamed amaan <mohamedamaan319@gmail.com>
Date: Wed, 12 Feb 2025 15:26:06 +0530
Subject: [PATCH 21/21] merge conflict solved

---
 public/locale/en.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/locale/en.json b/public/locale/en.json
index e105ab7d19e..421e00b2339 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -2110,6 +2110,8 @@
   "third_party_software_licenses": "Third Party Software Licenses",
   "this_action_is_irreversible": "This action is irreversible. Once a file is archived it cannot be unarchived.",
   "this_file_has_been_archived": "This file has been archived and cannot be unarchived.",
+  "this_will_permanently_remove_the_template": "This will permanently remove the {{data}} and cannot be undone",
+  "thread_already_exists": "Thread with this title already exists",
   "time": "Time",
   "time_slot": "Time Slot",
   "title": "Title",