Skip to content

A self-hosted media server and file management system

feat: edit metadata button in image editor

aminnausin031862e07d58
diff --git a/resources/js/components/forms/EditImages.vue b/resources/js/components/forms/EditImages.vue
index 5a80d3fa..0eee1e5f 100644
--- a/resources/js/components/forms/EditImages.vue
+++ b/resources/js/components/forms/EditImages.vue
@@ -4,7 +4,7 @@ import type { AxiosError, AxiosResponse } from 'axios';
import type { ImageResource, ImageType } from '@/types/resources';
import { computed, nextTick, onMounted, onUnmounted, reactive, ref, useTemplateRef, watch } from 'vue';
-import { ButtonForm, ButtonText } from '@/components/cedar-ui/button';
+import { ButtonBase, ButtonForm, ButtonText } from '@/components/cedar-ui/button';
import { InputShell, TextInput } from '@/components/cedar-ui/input';
import { useImageManager } from '@/composables/editor/useImageManager';
import { FormErrorList } from '@/components/cedar-ui/form';
@@ -13,6 +13,7 @@ import { toPlural } from '@/service/util';
import ProIconsPhotoOff from '@/components/icons/ProIconsPhotoOff.vue';
import ModalFormFooter from '@/components/forms/ModalFormFooter.vue';
+import ProIconsPhoto from '@/components/icons/ProIconsPhoto.vue';
import TablerUpload from '@/components/icons/TablerUpload.vue';
import ImageCard from '@/components/cards/data/ImageCard.vue';
import useForm from '@/composables/useForm';
@@ -26,6 +27,7 @@ const props = defineProps<{
isAudio?: boolean;
readOnlyTypes?: T[];
submitFn: (data: FormData) => Promise<AxiosResponse<any>>;
+ openEditorFn?: () => void;
}>();
const emit = defineEmits(['handleFinish']);
@@ -449,6 +451,16 @@ onUnmounted(() => {
<FormErrorList class="w-full text-center" v-if="form.errors" :errors="form.errors" />
<ModalFormFooter v-if="!isReadOnly" class="mt-auto h-fit">
+ <ButtonBase
+ v-if="openEditorFn"
+ 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="openEditorFn"
+ >
+ <ProIconsPhoto class="size-3.5" />
+ Edit Metadata
+ </ButtonBase>
<ButtonForm variant="reset" class="h-9" :disabled="form.processing" @click="$emit('handleFinish')"> Cancel </ButtonForm>
<ButtonForm
variant="danger"
diff --git a/resources/js/components/modals/EditFolderImagesModal.vue b/resources/js/components/modals/EditFolderImagesModal.vue
index e9db4b6d..e8b1f42d 100644
--- a/resources/js/components/modals/EditFolderImagesModal.vue
+++ b/resources/js/components/modals/EditFolderImagesModal.vue
@@ -9,6 +9,7 @@ import { useModalStore } from '@/stores/ModalStore';
import { BaseModal } from '@/components/cedar-ui/modal';
import { toPlural } from '@/service/util';
+import EditFolderModal from '@/components/modals/EditFolderModal.vue';
import EditItemHeader from '@/components/headers/EditItemHeader.vue';
import EditImages from '@/components/forms/EditImages.vue';
@@ -60,6 +61,7 @@ const invalidateQueries = async () => {
:images="modalProps.images"
:is-audio="modalProps.isMajorityAudio"
:submit-fn="(formData) => updateSeriesImage(modalProps.resource.id, formData)"
+ :open-editor-fn="() => modal.open(EditFolderModal, { cachedFolder: modalProps.folderResource })"
@handleFinish="handleSeriesUpdate"
/>
</BaseModal>
diff --git a/resources/js/components/modals/EditFolderModal.vue b/resources/js/components/modals/EditFolderModal.vue
index 77537348..489295ca 100644
--- a/resources/js/components/modals/EditFolderModal.vue
+++ b/resources/js/components/modals/EditFolderModal.vue
@@ -1,4 +1,5 @@
<script setup lang="ts">
+import type { FolderMetadataEditorProps } from '@/types/modals';
import type { SeriesResource } from '@/types/resources';
import { useContentStore } from '@/stores/ContentStore';
@@ -13,19 +14,20 @@ const { updateFolderData } = useContentStore();
const queryClient = useQueryClient();
const modal = useModalStore();
+const modalProps = modal.getProps<FolderMetadataEditorProps>();
const handleSeriesUpdate = async (data: SeriesResource) => {
updateFolderData(data);
modal.close();
- if (modal.props.queryKeys) {
+ if (modalProps.queryKeys) {
invalidateQueries();
}
};
const invalidateQueries = async () => {
try {
- const QueriesToInvalidate: string[][] = modal.props.queryKeys;
+ const QueriesToInvalidate: string[][] = modalProps.queryKeys;
QueriesToInvalidate.forEach(async (query) => {
await queryClient.invalidateQueries({
@@ -41,9 +43,9 @@ const invalidateQueries = async () => {
<template>
<BaseModal>
<template #title>Edit Folder</template>
- <template #description v-if="modal.props.cachedFolder.series.edited_at && modal.props.cachedFolder.series.editor_id">
- <EditItemHeader :edited_at="modal.props.cachedFolder.series.edited_at" :editor_id="modal.props.cachedFolder.series.editor_id" />
+ <template #description v-if="modalProps.cachedFolder.series?.edited_at && modalProps.cachedFolder.series.editor_id">
+ <EditItemHeader :edited_at="modalProps.cachedFolder.series.edited_at" :editor_id="modalProps.cachedFolder.series.editor_id" />
</template>
- <EditFolder v-if="modal.props.cachedFolder" :folder="modal.props.cachedFolder" @handleFinish="handleSeriesUpdate" />
+ <EditFolder v-if="modalProps.cachedFolder" :folder="modalProps.cachedFolder" @handleFinish="handleSeriesUpdate" />
</BaseModal>
</template>
diff --git a/resources/js/components/modals/EditMediaImagesModal.vue b/resources/js/components/modals/EditMediaImagesModal.vue
index 5e901f9b..d63b4a66 100644
--- a/resources/js/components/modals/EditMediaImagesModal.vue
+++ b/resources/js/components/modals/EditMediaImagesModal.vue
@@ -10,6 +10,7 @@ import { MediaType } from '@/types/types';
import { toPlural } from '@/service/util';
import EditItemHeader from '@/components/headers/EditItemHeader.vue';
+import EditMediaModal from '@/components/modals/EditMediaModal.vue';
import EditImages from '@/components/forms/EditImages.vue';
const { updateVideoData } = useContentStore();
@@ -42,6 +43,17 @@ const handleVideoDetailsUpdate = (data: VideoResource) => {
:images="modalProps.images"
:is-audio="modalProps.resource.media_type === MediaType.AUDIO"
:submit-fn="(formData) => updateMediaImage(modalProps.resource.id, formData)"
+ :open-editor-fn="
+ () => {
+ const metadataInfo = { titleTooltip: `UUID: ${modalProps.resource.uuid}` };
+
+ modal.open(EditMediaModal, {
+ title: `Edit ${modalProps.resource.media_type === MediaType.AUDIO ? 'Track' : 'Video'} Metadata`,
+ mediaResource: modalProps.mediaResource,
+ ...metadataInfo,
+ });
+ }
+ "
@handleFinish="handleVideoDetailsUpdate"
/>
</BaseModal>
diff --git a/resources/js/components/modals/EditMediaModal.vue b/resources/js/components/modals/EditMediaModal.vue
index 4f7140bb..a6453271 100644
--- a/resources/js/components/modals/EditMediaModal.vue
+++ b/resources/js/components/modals/EditMediaModal.vue
@@ -1,4 +1,5 @@
<script setup lang="ts">
+import type { MediaMetadataEditorProps } from '@/types/modals';
import type { VideoResource } from '@/types/resources';
import { useContentStore } from '@/stores/ContentStore';
@@ -9,7 +10,9 @@ import EditItemHeader from '@/components/headers/EditItemHeader.vue';
import EditVideo from '@/components/forms/EditVideo.vue';
const { updateVideoData } = useContentStore();
+
const modal = useModalStore();
+const modalProps = modal.getProps<MediaMetadataEditorProps>();
const handleVideoDetailsUpdate = (data: VideoResource) => {
updateVideoData(data);
@@ -19,10 +22,10 @@ const handleVideoDetailsUpdate = (data: VideoResource) => {
<template>
<BaseModal>
- <template #title>{{ modal.props.title ?? 'Edit Track/Video' }}</template>
- <template #description v-if="modal.props.mediaResource.edited_at && modal.props.mediaResource.metadata?.editor_id">
- <EditItemHeader :edited_at="modal.props.mediaResource.edited_at" :editor_id="modal.props.mediaResource.metadata.editor_id" />
+ <template #title>{{ modalProps.title ?? 'Edit Track/Video' }}</template>
+ <template #description v-if="modalProps.mediaResource.edited_at && modalProps.mediaResource.metadata?.editor_id">
+ <EditItemHeader :edited_at="modalProps.mediaResource.edited_at" :editor_id="modalProps.mediaResource.metadata.editor_id" />
</template>
- <EditVideo v-if="modal.props.mediaResource" :video="modal.props.mediaResource" @handleFinish="handleVideoDetailsUpdate" />
+ <EditVideo v-if="modalProps.mediaResource" :video="modalProps.mediaResource" @handleFinish="handleVideoDetailsUpdate" />
</BaseModal>
</template>
diff --git a/resources/js/service/folder/folderActions.ts b/resources/js/service/folder/folderActions.ts
index 5d0ded40..72163f29 100644
--- a/resources/js/service/folder/folderActions.ts
+++ b/resources/js/service/folder/folderActions.ts
@@ -15,6 +15,7 @@ export function handleEditFolderImages(folder: FolderResource) {
modal.open<FolderImageEditorProps>(EditFolderImagesModal, {
title: `Edit Folder Images`,
resource: folder.series,
+ folderResource: folder,
images: folder.series.images ?? [],
isMajorityAudio: folder.is_majority_audio,
...tooltipInfo,
diff --git a/resources/js/service/media/mediaActions.ts b/resources/js/service/media/mediaActions.ts
index bd591343..6659d159 100644
--- a/resources/js/service/media/mediaActions.ts
+++ b/resources/js/service/media/mediaActions.ts
@@ -15,6 +15,7 @@ export function handleEditMediaImages(media: VideoResource) {
modal.open<MediaImageEditorProps>(EditMediaImagesModal, {
title: `Edit Media Images`,
resource: media.metadata,
+ mediaResource: media,
images: media.metadata.images ?? [],
...metadataInfo,
});
diff --git a/resources/js/types/modals.ts b/resources/js/types/modals.ts
index 6275cbf6..ed57f049 100644
--- a/resources/js/types/modals.ts
+++ b/resources/js/types/modals.ts
@@ -1,7 +1,8 @@
-import type { ImageResource, MetadataResource, SeriesResource } from './resources';
+import type { FolderResource, ImageResource, MetadataResource, SeriesResource, VideoResource } from './resources';
export interface FolderImageEditorProps {
resource: SeriesResource;
+ folderResource: FolderResource;
images: ImageResource[];
isMajorityAudio: boolean;
title?: string;
@@ -10,6 +11,18 @@ export interface FolderImageEditorProps {
export interface MediaImageEditorProps {
resource: MetadataResource;
+ mediaResource: VideoResource;
images: ImageResource[];
title?: string;
}
+
+export interface MediaMetadataEditorProps {
+ mediaResource: VideoResource;
+ title?: string;
+}
+
+export interface FolderMetadataEditorProps {
+ cachedFolder: FolderResource;
+ queryKeys: string[][];
+ title?: string;
+}