From c99059d9a858f6f7eed4e4ed587573693a270b52 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Thu, 19 Dec 2024 14:01:05 +0100 Subject: [PATCH] Fixed event popover not closing on submit This was caused by a random stray isLoading --- components/calendar/dialog/CreateEvent.vue | 8 ++------ components/calendar/form/Create.vue | 2 +- models/CalendarConfig.ts | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/components/calendar/dialog/CreateEvent.vue b/components/calendar/dialog/CreateEvent.vue index e3619eb..14e999d 100644 --- a/components/calendar/dialog/CreateEvent.vue +++ b/components/calendar/dialog/CreateEvent.vue @@ -5,8 +5,6 @@ const { eventSkeleton, operationInProgress } = storeToRefs(useCalendar()) const { resetSkeleton } = useCalendar() const popoverOpen = ref(false) -const isLoading = ref(false) - const props = defineProps<{ date?: RPGDate btnClass?: string @@ -38,10 +36,8 @@ function openEventCreatePopover() { * @param e The closing event (can be keydown or click) */ function handleClosing(e: Event) { - if (isLoading.value) { - popoverOpen.value = false - e.preventDefault() - } + popoverOpen.value = false + e.preventDefault() } diff --git a/components/calendar/form/Create.vue b/components/calendar/form/Create.vue index d8f8353..f570051 100644 --- a/components/calendar/form/Create.vue +++ b/components/calendar/form/Create.vue @@ -2,7 +2,7 @@ import type { Calendar } from "~/models/CalendarConfig"; import { PhAlarm, PhCalendarDots, PhCircleNotch, PhWrench } from "@phosphor-icons/vue"; -const defaultSkeleton: Calendar = { name: "", today: { day: 1, month: 0, year: 0 }, months: [], events: []} +const defaultSkeleton: Calendar = { name: "", today: { day: 1, month: 0, year: 0 }, months: [], events: [], state: "draft" } const calendarSkeleton = ref({ ...defaultSkeleton }) onMounted(() => { diff --git a/models/CalendarConfig.ts b/models/CalendarConfig.ts index 3acac83..a3fa150 100644 --- a/models/CalendarConfig.ts +++ b/models/CalendarConfig.ts @@ -13,7 +13,7 @@ export interface CalendarConfig { export interface Calendar extends CalendarConfig { id?: number - shortId: string + shortId?: string name: string events: CalendarEvent[] state: CalendarState