Changed organization for 2 mixed components

components/calendar/Calendar.vue

@@ -53,8 +53,8 @@ onMounted(() => {
       <component :is="currentViewComponent" />
 
       <CalendarSearch />
-      <CalendarFormUpdateEvent />
+      <CalendarDialogUpdateEvent />
-      <CalendarFormDeleteEvent />
+      <CalendarDialogDeleteEvent />
     </div>
   </div>
 </template>

components/calendar/dialog/DeleteEvent.vue

@@ -0,0 +1,45 @@
+<script lang="ts" setup>
+const { isDeleteEventModalOpen, eventSkeleton, lastActiveEvent } = storeToRefs(useCalendar())
+
+const isLoading = ref<boolean>(false)
+
+// Watch the popover state
+watch(isDeleteEventModalOpen, (hasOpened, _o) => {
+  if (hasOpened && lastActiveEvent.value) {
+    eventSkeleton.value = { ...lastActiveEvent.value }
+  }
+})
+
+/**
+ * Prevents the modal from closing if's still loading
+ *
+ * @param e The closing event (can be keydown or click)
+ */
+function handleClosing(e: Event): void {
+  if (isLoading.value) {
+    e.preventDefault()
+  }
+}
+</script>
+
+<template>
+  <UiAlertDialog v-model:open="isDeleteEventModalOpen">
+    <UiAlertDialogContent
+      :disable-outside-pointer-events="true"
+      :trap-focus="true"
+      class="min-w-96 border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
+      @escape-key-down="handleClosing"
+      @focus-outside="handleClosing"
+      @interact-outside="handleClosing"
+      @pointer-down-outside="handleClosing"
+    >
+      <UiAlertDialogTitle>{{ $t('entity.calendar.event.deleteDialog.title') }}</UiAlertDialogTitle>
+
+      <UiAlertDialogDescription>
+        {{ $t('entity.calendar.event.deleteDialog.subtitle') }}
+      </UiAlertDialogDescription>
+
+      <CalendarFormDeleteEvent />
+    </UiAlertDialogContent>
+  </UiAlertDialog>
+</template>

components/calendar/dialog/QuickCreateEvent.vue

@@ -19,7 +19,7 @@ function toggleDialog() {
   </UiButton>
 
   <UiDialog v-model:open="isDialogOpen">
-    <UiDialogContent>
+    <UiDialogContent class="border-indigo-200 dark:bg-slate-950 dark:border-indigo-950">
       <UiDialogTitle>
         {{ $t("entity.calendar.event.addSingle") }}
       </UiDialogTitle>

components/calendar/dialog/UpdateEvent.vue

@@ -0,0 +1,49 @@
+<script lang="ts" setup>
+const { eventSkeleton, lastActiveEvent, isEditEventModalOpen } = storeToRefs(useCalendar())
+
+const isLoading = ref(false)
+
+// Watch the popover state
+watch(isEditEventModalOpen, (hasOpened, _o) => {
+  if (hasOpened && lastActiveEvent.value) {
+    eventSkeleton.value = { ...lastActiveEvent.value }
+  }
+})
+
+/**
+ * Prevents the modal from closing if's still loading
+ *
+ * @param e The closing event (can be keydown or click)
+ */
+function handleClosing(e: Event) {
+  if (isLoading.value) {
+    e.preventDefault()
+  }
+}
+</script>
+
+<template>
+  <UiDialog v-model:open="isEditEventModalOpen">
+    <UiDialogContent
+      :disable-outside-pointer-events="true"
+      :trap-focus="true"
+      class="pl-3 min-w-96 border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
+      @escape-key-down="handleClosing"
+      @focus-outside="handleClosing"
+      @interact-outside="handleClosing"
+      @pointer-down-outside="(e) => e.preventDefault()"
+    >
+      <header class="pl-8 grid gap-y-2">
+        <UiDialogTitle>
+          {{ $t('entity.calendar.event.editDialog.title') }}
+        </UiDialogTitle>
+
+        <UiDialogDescription>
+          {{ $t('entity.calendar.event.editDialog.subtitle') }}
+        </UiDialogDescription>
+      </header>
+
+      <CalendarFormUpdateEvent />
+    </UiDialogContent>
+  </UiDialog>
+</template>

components/calendar/form/DeleteEvent.vue

@@ -3,7 +3,7 @@ import { PhCircleNotch } from "@phosphor-icons/vue";
 import { useToast } from "~/components/ui/toast";
 
 const { resetSkeleton, deleteEventFromSkeleton, cancelLatestRequest } = useCalendar()
-const { isDeleteEventModalOpen, eventSkeleton, lastActiveEvent } = storeToRefs(useCalendar())
+const { isDeleteEventModalOpen, eventSkeleton } = storeToRefs(useCalendar())
 
 const { toast } = useToast()
 const { t } = useI18n()
@@ -14,13 +14,6 @@ const formErrors = reactive<{ message: string | null }>({
   message: null
 })
 
-// Watch the popover state
-watch(isDeleteEventModalOpen, (hasOpened, _o) => {
-  if (hasOpened && lastActiveEvent.value) {
-    eventSkeleton.value = { ...lastActiveEvent.value }
-  }
-})
-
 async function handleAction(): Promise<void> {
   if (isLoading.value) return
 
@@ -48,17 +41,6 @@ async function handleAction(): Promise<void> {
   }
 }
 
-/**
- * Prevents the modal from closing if's still loading
- *
- * @param e The closing event (can be keydown or click)
- */
-function handleClosing(e: Event): void {
-  if (isLoading.value) {
-    e.preventDefault()
-  }
-}
-
 /**
  * Click on the cancel button
  *
@@ -71,22 +53,6 @@ function handleCancel(): void {
 </script>
 
 <template>
-  <UiAlertDialog v-model:open="isDeleteEventModalOpen">
-    <UiAlertDialogContent
-      :disable-outside-pointer-events="true"
-      :trap-focus="true"
-      class="min-w-96 border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
-      @escape-key-down="handleClosing"
-      @focus-outside="handleClosing"
-      @interact-outside="handleClosing"
-      @pointer-down-outside="handleClosing"
-    >
-      <UiAlertDialogTitle>{{ $t('entity.calendar.event.deleteDialog.title') }}</UiAlertDialogTitle>
-
-      <UiAlertDialogDescription>
-        {{ $t('entity.calendar.event.deleteDialog.subtitle') }}
-      </UiAlertDialogDescription>
-
   <form @submit.prevent="handleAction">
     <div class="grid grid-cols-2 gap-y-4">
       <div class="text-red-500 ml-8">
@@ -118,6 +84,4 @@ function handleCancel(): void {
       </div>
     </footer>
   </form>
-    </UiAlertDialogContent>
-  </UiAlertDialog>
 </template>

components/calendar/form/UpdateEvent.vue

@@ -4,7 +4,7 @@ import { useToast } from "~/components/ui/toast";
 import type { APIError } from "~/models/Errors";
 
 const { resetSkeleton, updateEventFromSkeleton, cancelLatestRequest } = useCalendar()
-const { eventSkeleton, lastActiveEvent, isEditEventModalOpen } = storeToRefs(useCalendar())
+const { eventSkeleton, lastActiveEvent } = storeToRefs(useCalendar())
 
 const { toast } = useToast()
 const { t } = useI18n()
@@ -15,13 +15,6 @@ const formErrors = reactive<{ message: string | null }>({
   message: null
 })
 
-// Watch the popover state
-watch(isEditEventModalOpen, (hasOpened, _o) => {
-  if (hasOpened && lastActiveEvent.value) {
-    eventSkeleton.value = { ...lastActiveEvent.value }
-  }
-})
-
 async function handleAction() {
   if (isLoading.value) return
 
@@ -44,18 +37,6 @@ async function handleAction() {
   } finally {
     resetSkeleton()
     isLoading.value = false
-    isEditEventModalOpen.value = false
-  }
-}
-
-/**
- * Prevents the modal from closing if's still loading
- *
- * @param e The closing event (can be keydown or click)
- */
-function handleClosing(e: Event) {
-  if (isLoading.value) {
-    e.preventDefault()
   }
 }
 
@@ -71,26 +52,6 @@ function handleCancel() {
 </script>
 
 <template>
-  <UiDialog v-model:open="isEditEventModalOpen">
-    <UiDialogContent
-      :disable-outside-pointer-events="true"
-      :trap-focus="true"
-      class="pl-3 min-w-96 border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
-      @escape-key-down="handleClosing"
-      @focus-outside="handleClosing"
-      @interact-outside="handleClosing"
-      @pointer-down-outside="(e) => e.preventDefault()"
-    >
-      <header class="pl-8 grid gap-y-2">
-        <UiDialogTitle>
-          {{ $t('entity.calendar.event.editDialog.title') }}
-        </UiDialogTitle>
-
-        <UiDialogDescription>
-          {{ $t('entity.calendar.event.editDialog.subtitle') }}
-        </UiDialogDescription>
-      </header>
-
   <form @submit.prevent="handleAction">
     <div class="grid grid-cols-2 gap-y-3">
       <div class="col-span-2">
@@ -239,6 +200,4 @@ function handleCancel() {
       </UiButton>
     </footer>
   </form>
-    </UiDialogContent>
-  </UiDialog>
 </template>