A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: update datepicker to always have internal value of Y-m-d fixes Datepicker overrides format Fixes #344
aminnausinb5c7a543a5cc
diff --git a/app/Support/RequestPresets.php b/app/Support/RequestPresets.phpindex 55aabb33..f98b17b3 100644--- a/app/Support/RequestPresets.php+++ b/app/Support/RequestPresets.php@@ -9,5 +9,5 @@ class RequestPresets {public const LONG_TEXT = 'nullable|max:255';- public const OPTIONAL_DATE = 'nullable|date|date_format:"F d, Y"';+ public const OPTIONAL_DATE = 'nullable|date|date_format:Y-m-d';}diff --git a/app/Support/SeriesRules.php b/app/Support/SeriesRules.phpindex ed8697a0..2570d72a 100644--- a/app/Support/SeriesRules.php+++ b/app/Support/SeriesRules.php@@ -12,8 +12,8 @@ class SeriesRules {'seasons' => RequestPresets::NON_NEGATIVE_INT,'episodes' => RequestPresets::NON_NEGATIVE_INT,'films' => RequestPresets::NON_NEGATIVE_INT,- 'started_at' => 'nullable|date|date_format:"F d, Y"',- 'ended_at' => 'nullable|date|date_format:"F d, Y"',+ 'started_at' => 'nullable|date|date_format:Y-m-d',+ 'ended_at' => 'nullable|date|date_format:Y-m-d','avg_intro_duration' => 'min:0','tags' => 'nullable|array','tags.*.name' => 'required|min:1|max:64',diff --git a/resources/js/components/cedar-ui/date-picker/ButtonDatePicker.vue b/resources/js/components/cedar-ui/date-picker/ButtonDatePicker.vueindex 65dd6475..06b3e556 100644--- a/resources/js/components/cedar-ui/date-picker/ButtonDatePicker.vue+++ b/resources/js/components/cedar-ui/date-picker/ButtonDatePicker.vue@@ -17,7 +17,7 @@ withDefaults(<template><ButtonBase:class="[- 'hocus:bg-overlay-accent text-foreground-1 dark:text-foreground-4 dark:hocus:text-foreground-5 text-center transition-none',+ 'hover:bg-overlay-accent focus-visible:bg-overlay-accent text-foreground-1 dark:text-foreground-4 dark:hocus:text-foreground-5 text-center transition-none',{'hover:text-foreground bg-overlay-accent dark:hocus:bg-overlay-accent dark:bg-overlay-accent/80': isDefault && !isSelected,'dark:bg-opacity-60 hocus:bg-primary dark:bg-primary-active bg-neutral-800 text-white': isSelected,diff --git a/resources/js/components/cedar-ui/date-picker/DatePicker.vue b/resources/js/components/cedar-ui/date-picker/DatePicker.vueindex ce97335b..dd9b8696 100644--- a/resources/js/components/cedar-ui/date-picker/DatePicker.vue+++ b/resources/js/components/cedar-ui/date-picker/DatePicker.vue@@ -1,4 +1,6 @@<script setup lang="ts">+import type { DatePickerFormat } from '@/components/cedar-ui/date-picker/useDatePicker';+import { CedarCalendar, CedarChevronLeft, CedarChevronRight } from '@/components/cedar-ui/icons';import { nextTick, useTemplateRef, watch } from 'vue';import { ButtonDatePicker, useDatePicker } from '.';@@ -7,7 +9,7 @@ import { OnClickOutside } from '@vueuse/components';import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';import { InputShell } from '@/components/cedar-ui/input';-const props = defineProps<{ field: any; disabled?: boolean; useNativeUi?: boolean }>();+const props = defineProps<{ field: any; disabled?: boolean; useNativeUi?: boolean; format?: DatePickerFormat }>();const datePickerInput = useTemplateRef('datePickerInput');const datePickerCalendar = useTemplateRef('datePickerCalendar');@@ -36,7 +38,8 @@ const {datePickerValueClicked,showDatePickerPanel,setDate,-} = useDatePicker({ model }, datePickerInput, datePickerCalendar);+ datePickerValue,+} = useDatePicker({ model, format: props.format }, datePickerInput, datePickerCalendar);async function focusInitialElement() {await nextTick();@@ -81,7 +84,7 @@ watch(datePickerPanel, () => {@keydown.enter.prevent="toggleDatePicker()"@click="toggleDatePicker()"@keydown.esc="toggleDatePicker(false)"- v-model="model"+ :value="datePickerValue"type="text":id="field.name":name="field.name"@@ -118,8 +121,8 @@ watch(datePickerPanel, () => {<divref="datePickerCalendar":class="[- 'absolute left-0 z-30 w-full max-w-68 p-4',- 'rounded-md shadow-xs transition ease-in-out',+ 'absolute left-0 z-30 w-full max-w-69 p-4',+ 'rounded-lg shadow-xs transition ease-in-out','text-foreground bg-overlay border-overlay-border border',`${datePickerPosition === 'top' ? 'bottom-0 mb-12' : 'top-0 mt-12'}`,]"@@ -144,11 +147,11 @@ watch(datePickerPanel, () => {{{ datePickerYear }}</ButtonText></div>- <div class="text-foreground-3 dark:text-neutral-200">- <ButtonIcon variant="ghost" class="hocus:bg-overlay-accent inline-flex rounded-full p-0" :title="'Previous Page'" @click="datePickerPrevious()">+ <div class="text-foreground-3 flex dark:text-neutral-200">+ <ButtonIcon variant="ghost" class="hocus:bg-overlay-accent rounded-full p-0" :title="'Previous Page'" @click="datePickerPrevious()"><CedarChevronLeft class="size-6" /></ButtonIcon>- <ButtonIcon variant="ghost" class="hocus:bg-overlay-accent inline-flex rounded-full p-0" :title="'Next Page'" @click="datePickerNext()">+ <ButtonIcon variant="ghost" class="hocus:bg-overlay-accent rounded-full p-0" :title="'Next Page'" @click="datePickerNext()"><CedarChevronRight class="size-6" /></ButtonIcon></div>@@ -193,13 +196,11 @@ watch(datePickerPanel, () => {/></div>- <div class="flex justify-between gap-2">- <ButtonText variant="ghost" @click="datePickerValueClicked()" class="hocus:bg-overlay-accent h-fit px-2 py-1" title="Clear selected date">- Clear- </ButtonText>- <ButtonText variant="ghost" @click="setDate(new Date(), true, true)" class="hocus:bg-overlay-accent h-fit px-2 py-1" title="Set date to today">- Today- </ButtonText>+ <div+ class="text-foreground-0 dark:text-foreground-4 *:hover:bg-overlay-accent *:focus-visible:bg-overlay-accent *:hocus:text-foreground-0 flex justify-between gap-2 *:h-fit *:px-2 *:py-1"+ >+ <ButtonText variant="ghost" @click="datePickerValueClicked()" title="Clear selected date"> Clear </ButtonText>+ <ButtonText variant="ghost" @click="setDate(new Date(), true, true)" title="Set date to today"> Today </ButtonText></div></div></UseFocusTrap>diff --git a/resources/js/components/cedar-ui/date-picker/useDatePicker.ts b/resources/js/components/cedar-ui/date-picker/useDatePicker.tsindex a1204341..df6dd36a 100644--- a/resources/js/components/cedar-ui/date-picker/useDatePicker.ts+++ b/resources/js/components/cedar-ui/date-picker/useDatePicker.ts@@ -2,10 +2,12 @@ import type { ModelRef, Ref } from 'vue';import { computed, nextTick, onMounted, ref, watch } from 'vue';+export type DatePickerFormat = 'F d, Y' | 'd M, Y' | 'Y M d' | 'MM-DD-YYYY' | 'DD-MM-YYYY' | 'YYYY-MM-DD' | 'D d M, Y';interface DatePickerProps {model?: ModelRef<string | undefined | null>;defaultDate?: string;useDefaultDate?: boolean;+ format?: DatePickerFormat;}export default function useDatePicker(props: DatePickerProps, datePickerInput: Ref<HTMLElement | null>, datePickerCalendar: Ref<HTMLElement | null>) {@@ -14,8 +16,8 @@ export default function useDatePicker(props: DatePickerProps, datePickerInput: Rconst datePickerDay = ref(0);const datePickerOpen = ref(false);- const datePickerValue = ref(props.model?.value ?? props.defaultDate ?? '');- const datePickerFormat = ref<'F d, Y' | 'd M, Y' | 'Y M d' | 'MM-DD-YYYY' | 'DD-MM-YYYY' | 'YYYY-MM-DD' | 'D d M, Y'>('F d, Y');+ const datePickerValue = ref('');+ const datePickerFormat = ref<'F d, Y' | 'd M, Y' | 'Y M d' | 'MM-DD-YYYY' | 'DD-MM-YYYY' | 'YYYY-MM-DD' | 'D d M, Y'>(props.format ?? 'F d, Y');const datePickerDaysInMonth = ref<number[]>([]);const datePickerBlankDaysInMonth = ref<number[]>([]);@@ -74,14 +76,29 @@ export default function useDatePicker(props: DatePickerProps, datePickerInput: R}}+ function toISODate(date: Date): string {+ const y = date.getFullYear();+ const m = String(date.getMonth() + 1).padStart(2, '0');+ const d = String(date.getDate()).padStart(2, '0');+ return `${y}-${m}-${d}`;+ }++ function parseISODate(iso?: string | null): Date | null {+ if (!iso || iso === null) return null;++ const match = /^(\d{4})-(\d{2})-(\d{2})/.exec(iso);+ if (!match) return null;+ const [, y, m, d] = match;++ return new Date(Number(y), Number(m) - 1, Number(d));+ }+function datePickerValueClicked(value?: number) {if (!value) {datePickerValue.value = '';datePickerOpen.value = false;- if (props.model) {- props.model.value = datePickerValue.value;- }+ if (props.model) props.model.value = '';return;}@@ -99,12 +116,13 @@ export default function useDatePicker(props: DatePickerProps, datePickerInput: Rdefault:datePickerDay.value = value;- datePickerValue.value = datePickerFormatDate(new Date(datePickerYear.value, datePickerMonth.value, value));++ const selectedDate = new Date(datePickerYear.value, datePickerMonth.value, value);++ datePickerValue.value = datePickerFormatDate(selectedDate);datePickerOpen.value = false;- if (props.model) {- props.model.value = datePickerValue.value;- }+ if (props.model) props.model.value = toISODate(selectedDate);break;}}@@ -155,14 +173,17 @@ export default function useDatePicker(props: DatePickerProps, datePickerInput: R* Is the date picker looking at the month of the currently selected value*/function datePickerIsSelectedMonth() {- if (!datePickerDay.value) return false;- const d = new Date(datePickerValue.value);- return d.getMonth() === datePickerMonth.value && d.getFullYear() === datePickerYear.value;+ if (!props.model?.value) return false;++ const selected = parseISODate(props.model.value);+ return selected ? selected.getMonth() === datePickerMonth.value && selected.getFullYear() === datePickerYear.value : false;}function datePickerIsSelectedDate(day: number) {- const d = new Date(datePickerYear.value, datePickerMonth.value, day);- return datePickerValue.value === datePickerFormatDate(d);+ if (!props.model?.value) return false;++ const selected = parseISODate(props.model.value);+ return selected ? selected.getFullYear() === datePickerYear.value && selected.getMonth() === datePickerMonth.value && selected.getDate() === day : false;}function datePickerIsToday(day: number) {@@ -172,9 +193,11 @@ export default function useDatePicker(props: DatePickerProps, datePickerInput: R}function datePickerIsCurrentMonth() {+ if (!props.model?.value) return false;+const today = new Date();- const d = new Date(datePickerValue.value);- return d.getMonth() === today.getMonth() && d.getFullYear() === today.getFullYear();+ const selected = parseISODate(props.model.value);+ return selected ? selected.getMonth() === today.getMonth() && selected.getFullYear() === today.getFullYear() : false;}function calculateDays() {@@ -207,15 +230,14 @@ export default function useDatePicker(props: DatePickerProps, datePickerInput: RcalculateDays();if (setValue && props.model) {- props.model.value = datePickerValue.value;+ props.model.value = toISODate(date);datePickerOpen.value = false;}}function resetDate() {- if (datePickerValue.value) {- return setDate(new Date(datePickerValue.value.replaceAll('-', '/')));- }+ const parsed = parseISODate(props.model?.value);+ if (parsed) return setDate(parsed);setDate(new Date(), props.useDefaultDate);}@@ -235,6 +257,12 @@ export default function useDatePicker(props: DatePickerProps, datePickerInput: Rwindow.addEventListener('resize', updatePosition);});+ watch(datePickerFormat, () => {+ if (!props.model?.value) return;+ const selected = parseISODate(props.model.value);+ if (selected) datePickerValue.value = datePickerFormatDate(selected);+ });+return {datePickerInput,datePickerCalendar,diff --git a/resources/js/components/forms/EditFolder.vue b/resources/js/components/forms/EditFolder.vueindex 80be843b..195c958f 100644--- a/resources/js/components/forms/EditFolder.vue+++ b/resources/js/components/forms/EditFolder.vue@@ -150,8 +150,8 @@ const form = useForm<SeriesUpdateRequest>({episodes: props.folder?.series?.episodes ?? null,seasons: props.folder?.series?.seasons ?? null,films: props.folder?.series?.films ?? null,- started_at: toCalendarFormattedDate(props.folder?.series?.started_at),- ended_at: toCalendarFormattedDate(props.folder?.series?.ended_at),+ started_at: props.folder?.series?.started_at ?? '',+ ended_at: props.folder?.series?.ended_at ?? '',avg_intro_duration: props.folder.series?.avg_intro_duration ?? 0,thumbnail_url: props.folder.series?.thumbnail_url ?? null,tags: props.folder.series?.folder_tags ?? [],diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vueindex 819d10f1..c9c530f5 100755--- a/resources/js/components/forms/EditVideo.vue+++ b/resources/js/components/forms/EditVideo.vue@@ -168,7 +168,7 @@ const form = useForm<MetadataUpdateRequest>({album: props.video?.metadata?.album ?? '',episode: props.video?.episode ?? null,season: props.video?.season ?? null,- released_at: toCalendarFormattedDate(props.video?.released_at) ?? '',+ released_at: props.video?.released_at ?? '',video_tags: props.video?.video_tags ?? [],deleted_tags: [],intro_start: props.video.intro_start ?? null,@@ -177,13 +177,8 @@ const form = useForm<MetadataUpdateRequest>({const handleSubmit = async () => {form.submit(- async (fields) => {- const released_at = (toCalendarFormattedDate(fields.released_at, { year: 'numeric', month: '2-digit', day: '2-digit' }) ?? '').replaceAll(' ', '-');-- return props.video?.metadata?.id- ? mediaAPI.updateMetadata(props.video.metadata.id, { ...fields, released_at })- : mediaAPI.createMetadata({ ...fields, video_id: props.video.id, released_at });- },+ async (fields) =>+ props.video?.metadata?.id ? mediaAPI.updateMetadata(props.video.metadata.id, { ...fields }) : mediaAPI.createMetadata({ ...fields, video_id: props.video.id }),{onSuccess: (response) => {emit('handleFinish', response?.data);@@ -240,7 +235,7 @@ watch(tagsQuery, () => {<FormLabel :for="field.name" :text="field.text" :subtext="field.subtext" class="capitalize" /><FormTextArea v-if="field.type === 'textArea'" v-model="form.fields[field.name]" :field="field" />- <DatePicker v-else-if="field.type === 'date'" v-model="useDateFieldModel(form, field.name).value" :field="field" />+ <DatePicker v-else-if="field.type === 'date'" v-model="useDateFieldModel(form, field.name).value" :field="field" :use-native-ui="false" /><FormNumberField v-else-if="field.type === 'number'" v-model="form.fields[field.name]" :field="field" /><InputMultiChipv-else-if="field.name === 'video_tags'"diff --git a/resources/js/composables/useDatePicker.ts b/resources/js/composables/useDatePicker.tsindex da6d010f..51377370 100644--- a/resources/js/composables/useDatePicker.ts+++ b/resources/js/composables/useDatePicker.ts@@ -1,3 +1,4 @@+// Deprecatedimport { computed, nextTick, onMounted, ref, watch, type ModelRef, type Ref } from 'vue';interface DatePickerProps {