Skip to content

A self-hosted media server and file management system

feat: move metadata editor to cedar global modal

aminnausinf971dfcd8e81
diff --git a/resources/js/components/modals/EditMediaModal.vue b/resources/js/components/modals/EditMediaModal.vue
new file mode 100644
index 00000000..8c1209c1
--- /dev/null
+++ b/resources/js/components/modals/EditMediaModal.vue
@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import type { VideoResource } from '@/types/resources';
+
+import { useContentStore } from '@/stores/ContentStore';
+import { toFormattedDate } from '@/service/util';
+import { useModalStore } from '@/stores/ModalStore';
+import { BaseModal } from '@/components/cedar-ui/modal';
+
+import EditVideo from '@/components/forms/EditVideo.vue';
+
+const { updateVideoData } = useContentStore();
+const modal = useModalStore();
+
+const handleVideoDetailsUpdate = (res: any) => {
+ if (res?.data?.id) updateVideoData(res.data as VideoResource);
+ modal.close();
+};
+</script>
+
+<template>
+ <BaseModal>
+ <template #title>{{ modal.props.title ?? 'Edit Track/Video' }}</template>
+ <template #description v-if="modal.props.mediaResource && modal.props.mediaResource.series?.editor_id && modal.props.mediaResource.series.date_updated">
+ Last edited by
+ <a title="Editor profile" target="_blank" :href="`/profile/${modal.props.mediaResource.series.editor_id}`" class="hover:text-primary dark:hover:text-primary-muted">
+ @{{ modal.props.mediaResource.series.editor_id }}
+ </a>
+ at
+ {{ toFormattedDate(new Date(modal.props.mediaResource.series.date_updated)) }}
+ </template>
+ <EditVideo v-if="modal.props.mediaResource" :video="modal.props.mediaResource" @handleFinish="handleVideoDetailsUpdate" />
+ </BaseModal>
+</template>
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index f0a58efe..6c0f212d 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -10,17 +10,16 @@ import { useAuthStore } from '@/stores/AuthStore';
import { BasePopover } from '@/components/cedar-ui/popover';
import { storeToRefs } from 'pinia';
import { HoverCard } from '@/components/cedar-ui/hover-card';
-import { ModalBase } from '@/components/cedar-ui/modal';
import { MediaType } from '@/types/types';
import { BadgeTag } from '@/components/cedar-ui/badge';
import { emitSeek } from '@/service/player/seekBus';
import { useRoute } from 'vue-router';
+import { toast } from '@aminnausin/cedar-ui';
import EditFolderModal from '@/components/modals/EditFolderModal.vue';
+import EditMediaModal from '@/components/modals/EditMediaModal.vue';
import useMetaData from '@/composables/useMetaData';
import ShareModal from '@/components/modals/ShareModal.vue';
-import EditVideo from '@/components/forms/EditVideo.vue';
-import useModal from '@/composables/useModal';
import ProiconsArrowDownload from '~icons/proicons/arrow-download';
import ProiconsMoreVertical from '~icons/proicons/more-vertical';
@@ -30,7 +29,6 @@ import CircumEdit from '~icons/circum/edit';
const defaultDescription = `No description yet.`;
-const { updateVideoData } = useContentStore();
const { stateVideo, stateFolder } = storeToRefs(useContentStore());
const { userData } = storeToRefs(useAuthStore());
const { title, description: parsedDescription, views } = useMetaData(stateVideo);
@@ -44,23 +42,26 @@ const personalViewCount = ref(-1);
const isOverflowing = ref(false);
const isExpanded = ref(false);
-const editVideoModal = useModal({ title: 'Edit Metadata', submitText: 'Submit Metadata' });
-
-const videoURL = computed(() => {
- return document.location.origin + route.path + (stateVideo.value.id ? `?video=${stateVideo.value.id}` : '');
-});
-
const mediaTypeDescription = computed(() => {
return stateVideo.value?.metadata?.media_type === MediaType.AUDIO || stateFolder.value?.is_majority_audio ? 'Track' : 'Video';
});
-const handleVideoDetailsUpdate = (res: any) => {
- updateVideoData(res?.data);
- editVideoModal.toggleModal(false);
+const handleShare = () => {
+ if (!stateVideo.value.id) {
+ toast.error('ID Missing');
+ return;
+ }
+
+ modal.open(ShareModal, { title: `Share ${mediaTypeDescription.value}`, shareLink: `${document.location.origin}${route.path}?video=${stateVideo.value.id}` });
};
-const handleShare = () => {
- modal.open(ShareModal, { title: `Share ${mediaTypeDescription.value}`, shareLink: videoURL.value });
+const handleEdit = () => {
+ if (!stateVideo.value.id) {
+ toast.error('ID Missing');
+ return;
+ }
+
+ modal.open(EditMediaModal, { title: `Edit ${mediaTypeDescription.value} Metadata`, mediaResource: stateVideo.value });
};
function handleSeek(seconds: number) {
@@ -138,7 +139,7 @@ onMounted(() => {
:action="
() => {
popover?.handleClose();
- editVideoModal.toggleModal();
+ handleEdit();
}
"
/>
@@ -223,7 +224,7 @@ onMounted(() => {
{{ stateVideo.id < 1 ? '' : (title ?? '[File Not Found]') }}
</h2>
<div class="flex h-8 w-fit justify-end gap-2 select-none *:ring-inset lg:min-w-32">
- <ButtonText v-if="userData" aria-label="edit details" title="Edit Metadata" @click="editVideoModal.toggleModal()">
+ <ButtonText v-if="userData" aria-label="edit details" title="Edit Metadata" @click="handleEdit">
<p class="text-nowrap">Edit Metadata</p>
</ButtonText>
<ButtonIcon aria-label="download" :title="`Download ${mediaTypeDescription}`" class="hidden">
@@ -317,19 +318,6 @@ onMounted(() => {
</article>
</div>
</section>
- <ModalBase :modalData="editVideoModal" :useControls="false">
- <template #description v-if="stateVideo.metadata?.editor_id && stateVideo.metadata.updated_at">
- Last edited by
- <a title="Editor profile" target="_blank" :href="`/profile/${stateVideo.metadata.editor_id}`" class="hover:text-primary dark:hover:text-primary-muted">
- @{{ stateVideo.metadata.editor_id }}
- </a>
- at
- {{ toFormattedDate(new Date(stateVideo.metadata.updated_at)) }}
- </template>
- <template #content>
- <EditVideo :video="stateVideo" @handleFinish="handleVideoDetailsUpdate" />
- </template>
- </ModalBase>
</template>
<style lang="css">
diff --git a/resources/js/views/VideoView.vue b/resources/js/views/VideoView.vue
index 8e5e48a2..93226060 100755
--- a/resources/js/views/VideoView.vue
+++ b/resources/js/views/VideoView.vue
@@ -4,46 +4,36 @@ import type { SortDir } from '@/service/sort/types';
import { computed, nextTick, onMounted, ref, watch } from 'vue';
import { useContentStore } from '@/stores/ContentStore';
-import { toFormattedDate } from '@/service/util';
import { useModalStore } from '@/stores/ModalStore';
import { toParamNumber } from '@/util/route';
import { queryClient } from '@/service/vue-query';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import { TableBase } from '@/components/cedar-ui/table';
-import { ModalBase } from '@/components/cedar-ui/modal';
import { MediaType } from '@/types/types';
import { useRoute } from 'vue-router';
+import { toast } from '@aminnausin/cedar-ui';
import VideoAmbientPlayer from '@/components/video/VideoAmbientPlayer.vue';
+import EditMediaModal from '@/components/modals/EditMediaModal.vue';
import VideoInfoPanel from '@/components/video/VideoInfoPanel.vue';
import VideoSidebar from '@/components/panels/VideoSidebar.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
import ShareModal from '@/components/modals/ShareModal.vue';
import VideoCard from '@/components/cards/data/VideoCard.vue';
-import EditVideo from '@/components/forms/EditVideo.vue';
-import useModal from '@/composables/useModal';
const { selectedSideBar, pageTitle } = storeToRefs(useAppStore());
const { getFolder, getCategory, playlistFind, playlistSort, updateVideoData } = useContentStore();
const { searchQuery, stateFilteredPlaylist, stateDirectory, stateVideo, stateFolder } = storeToRefs(useContentStore());
const isLoading = ref(false);
-const cachedVideo = ref<VideoResource>();
const modal = useModalStore();
const route = useRoute();
-const editVideoModal = useModal({ title: 'Edit Video Details', submitText: 'Submit Details' });
-
const mediaTypeDescription = computed(() => (stateVideo.value?.metadata?.media_type === MediaType.AUDIO || stateFolder.value?.is_majority_audio ? 'Track' : 'Video'));
const queryVideoId = computed(() => toParamNumber(route.query.video));
-const handleVideoDetailsUpdate = (res: any) => {
- if (res?.data?.id) updateVideoData(res.data as VideoResource);
- editVideoModal.toggleModal(false);
-};
-
async function cycleSideBar(state: string) {
// Invalidate query everytime sidebar is opened
if (state === 'history') {
@@ -141,16 +131,27 @@ const handleSort = (column: keyof VideoResource = 'date', dir: SortDir = 1) => {
playlistSort({ column, dir });
};
-const handleVideoAction = (e: Event, id: number, action: 'edit' | 'share') => {
+const handleVideoAction = (e: Event, id: number, action: 'edit' | 'share' | 'download') => {
if (!stateFolder.value?.videos) return;
- const video = stateFolder.value.videos.find((video: VideoResource) => video.id === id);
+ const mediaResource = stateFolder.value.videos.find((video: VideoResource) => video.id === id);
- if (!video) return;
- cachedVideo.value = video;
+ if (!mediaResource) {
+ toast.error('File not found');
+ return;
+ }
- if (action === 'edit') editVideoModal.toggleModal();
- else modal.open(ShareModal, { title: `Share ${mediaTypeDescription.value}`, shareLink: encodeURI(document.location.origin + route.path + `?video=${video.id}`) });
+ switch (action) {
+ case 'edit':
+ modal.open(EditMediaModal, { title: `Edit ${mediaTypeDescription.value} Metadata`, mediaResource: mediaResource });
+ break;
+ case 'share':
+ modal.open(ShareModal, { title: `Share ${mediaTypeDescription.value}`, shareLink: encodeURI(document.location.origin + route.path + `?video=${mediaResource.id}`) });
+ break;
+ default:
+ toast.error('Option Unavailable', { description: `You cannot ${action} this file.` });
+ break;
+ }
};
const setFolderAsPageTitle = () => {
@@ -223,30 +224,6 @@ watch(() => stateVideo.value, setVideoAsDocumentTitle, { immediate: true });
:startAscending="true"
v-model="searchQuery"
/>
-
- <ModalBase :modalData="editVideoModal" :useControls="false">
- <template #description>
- <template v-if="cachedVideo && cachedVideo.metadata?.editor_id && cachedVideo.metadata.updated_at">
- <span>
- Last edited by
- <a
- title="Editor profile"
- target="_blank"
- :href="`/profile/${cachedVideo.metadata.editor_id}`"
- class="hover:text-primary dark:hover:text-primary-muted"
- >
- @{{ cachedVideo.metadata.editor_id }}
- </a>
- at
- {{ toFormattedDate(new Date(cachedVideo.metadata.updated_at)) }}
- </span>
- </template>
- <span class="block w-full">{{ stateVideo.metadata?.uuid }}</span>
- </template>
- <template #content>
- <EditVideo v-if="cachedVideo" :video="cachedVideo" @handleFinish="handleVideoDetailsUpdate" />
- </template>
- </ModalBase>
</section>
</template>
<template v-slot:sidebar>