A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: add edit folder images link in folder editor and remove thumbnail_url field
aminnausin2c4a2db49b24
diff --git a/app/Support/SeriesRules.php b/app/Support/SeriesRules.phpindex b6761502..ed8697a0 100644--- a/app/Support/SeriesRules.php+++ b/app/Support/SeriesRules.php@@ -14,7 +14,6 @@ class SeriesRules {'films' => RequestPresets::NON_NEGATIVE_INT,'started_at' => 'nullable|date|date_format:"F d, Y"','ended_at' => 'nullable|date|date_format:"F d, Y"',- 'thumbnail_url' => 'nullable|url','avg_intro_duration' => 'min:0','tags' => 'nullable|array','tags.*.name' => 'required|min:1|max:64',diff --git a/resources/js/components/forms/EditFolder.vue b/resources/js/components/forms/EditFolder.vueindex da409794..ce24e057 100644--- a/resources/js/components/forms/EditFolder.vue+++ b/resources/js/components/forms/EditFolder.vue@@ -4,9 +4,11 @@ import type { SeriesUpdateRequest } from '@/types/requests';import type { SelectItem } from '@/types/types';import type { FormField } from '@aminnausin/cedar-ui';-import { handleStorageURL, toCalendarFormattedDate } from '@/service/util';import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';import { computed, reactive, ref, watch } from 'vue';+import { toCalendarFormattedDate } from '@/service/util';+import { handleEditFolderImages } from '@/service/folder/folderActions';+import { ButtonBase, ButtonForm } from '@/components/cedar-ui/button';import { useDateFieldModel } from '@/components/cedar-ui/date-picker/useDateFieldModel';import { FormNumberField } from '@/components/cedar-ui/number-field';import { InputMultiChip } from '@/components/cedar-ui/multi-select';@@ -14,9 +16,10 @@ import { useGetAllTags } from '@/service/queries';import { FormTextArea } from '@/components/cedar-ui/textarea';import { UseCreateTag } from '@/service/mutations';import { DatePicker } from '@/components/cedar-ui/date-picker';-import { ButtonForm } from '@/components/cedar-ui/button';import { toast } from '@aminnausin/cedar-ui';+import ModalFormFooter from '@/components/forms/ModalFormFooter.vue';+import ProIconsPhoto from '@/components/icons/ProIconsPhoto.vue';import mediaAPI from '@/service/mediaAPI.ts';import useForm from '@/composables/useForm';@@ -31,7 +34,6 @@ const isAudio = computed(() => {});const allTags = ref<TagResource[]>([]);-// 'title', 'description', 'studio', 'seasons', 'episodes', 'films', 'started_at', 'ended_at', 'thumbnail_url', 'editor_id';const fields = reactive<FormField[]>([{name: 'title',@@ -117,14 +119,6 @@ const fields = reactive<FormField[]>([subtext: `The release date of the last ${isAudio.value ? 'track' : 'item'}`,default: null,},- {- name: 'thumbnail_url',- text: 'Folder Thumbnail URL',- type: 'url',- value: handleStorageURL(props.folder?.series?.thumbnail_url),- subtext: `A thumbnail associated with the ${isAudio.value ? 'album or folder' : 'series'}`,- default: null,- },{name: 'tags',text: 'Tags',@@ -147,7 +141,6 @@ const form = useForm<SeriesUpdateRequest>({films: props.folder?.series?.films?.toString() ?? null,started_at: toCalendarFormattedDate(props.folder?.series?.started_at),ended_at: toCalendarFormattedDate(props.folder?.series?.ended_at),- thumbnail_url: handleStorageURL(props.folder?.series?.thumbnail_url) ?? null,avg_intro_duration: props.folder.series?.avg_intro_duration ?? 0,tags: props.folder.series?.folder_tags ?? [],deleted_tags: [],@@ -235,9 +228,19 @@ watch(tagsQuery, () => {<FormErrorList :errors="form.errors" :field-name="field.name" /></div>- <div class="relative mt-2 flex w-full flex-col-reverse gap-2 *:h-9 sm:flex-row sm:justify-end">- <ButtonForm @click="$emit('handleFinish')" variant="reset" :disabled="form.processing"> Cancel </ButtonForm>- <ButtonForm @click="handleSubmit" variant="submit" :disabled="form.processing"> Save </ButtonForm>- </div>++ <ModalFormFooter class="*:h-9">+ <ButtonBase+ variant="transparent"+ type="button"+ class="text-foreground-2 hover:text-foreground-0 xs:-ms-1 xs:mr-auto xs:max-h-none xs:px-1 max-h-6 gap-1.5 p-0 text-xs transition-colors"+ @click="() => handleEditFolderImages(props.folder)"+ >+ <ProIconsPhoto class="size-3.5" />+ Edit Images+ </ButtonBase>+ <ButtonForm variant="reset" :disabled="form.processing" @click="$emit('handleFinish')">Cancel</ButtonForm>+ <ButtonForm variant="submit" :disabled="form.processing" @click="handleSubmit">Save</ButtonForm>+ </ModalFormFooter></form></template>diff --git a/resources/js/components/modals/EditFolderImagesModal.vue b/resources/js/components/modals/EditFolderImagesModal.vueindex e61f36d6..80281ed9 100644--- a/resources/js/components/modals/EditFolderImagesModal.vue+++ b/resources/js/components/modals/EditFolderImagesModal.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import type { SeriesImageEditorProps } from '@/types/modals';+import type { FolderImageEditorProps } from '@/types/modals';import type { SeriesResource } from '@/types/resources';import { updateSeriesImage } from '@/service/mediaAPI';@@ -16,7 +16,7 @@ const { updateFolderData } = useContentStore();const queryClient = useQueryClient();const modal = useModalStore();-const modalProps = modal.getProps<SeriesImageEditorProps>();+const modalProps = modal.getProps<FolderImageEditorProps>();const handleSeriesUpdate = (data: SeriesResource) => {updateFolderData(data);diff --git a/resources/js/service/folder/folderActions.ts b/resources/js/service/folder/folderActions.tsnew file mode 100644index 00000000..5d0ded40--- /dev/null+++ b/resources/js/service/folder/folderActions.ts@@ -0,0 +1,22 @@+import type { FolderImageEditorProps } from '@/types/modals';+import type { FolderResource } from '@/contracts/media';++import { useModalStore } from '@/stores/ModalStore';+import { toast } from '@aminnausin/cedar-ui';++import EditFolderImagesModal from '@/components/modals/EditFolderImagesModal.vue';++export function handleEditFolderImages(folder: FolderResource) {+ if (!folder.series?.id || !folder.series?.uuid) return toast.error('ID Missing');++ const modal = useModalStore();++ const tooltipInfo = { titleTooltip: `UUID: ${folder.series.uuid}` };+ modal.open<FolderImageEditorProps>(EditFolderImagesModal, {+ title: `Edit Folder Images`,+ resource: folder.series,+ images: folder.series.images ?? [],+ isMajorityAudio: folder.is_majority_audio,+ ...tooltipInfo,+ });+}diff --git a/resources/js/types/modals.ts b/resources/js/types/modals.tsindex 397b1fdd..6275cbf6 100644--- a/resources/js/types/modals.ts+++ b/resources/js/types/modals.ts@@ -1,6 +1,6 @@import type { ImageResource, MetadataResource, SeriesResource } from './resources';-export interface SeriesImageEditorProps {+export interface FolderImageEditorProps {resource: SeriesResource;images: ImageResource[];isMajorityAudio: boolean;diff --git a/resources/js/types/requests.ts b/resources/js/types/requests.tsindex 3cb07a02..cec86e7d 100644--- a/resources/js/types/requests.ts+++ b/resources/js/types/requests.ts@@ -39,7 +39,6 @@ export interface SeriesUpdateRequest {films?: string | null;started_at?: string | null;ended_at?: string | null;- thumbnail_url?: string | null;avg_intro_duration: number;tags: { name: string; id: number; folder_tag_id?: number }[];deleted_tags: number[];