A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: #211 Editor information does not show
aminnausin1eaefffc3217
diff --git a/resources/js/components/headers/EditItemHeader.vue b/resources/js/components/headers/EditItemHeader.vuenew file mode 100644index 00000000..77c25c43--- /dev/null+++ b/resources/js/components/headers/EditItemHeader.vue@@ -0,0 +1,19 @@+<script setup lang="ts">+import { useUserProfileById } from '@/service/users/useUsers';+import { toFormattedDate } from '@/service/util';++const props = defineProps<{ editor_id: number; updated_at: string }>();++const { data: editor, isLoading } = useUserProfileById(props.editor_id);+</script>+<template>+ <div v-if="isLoading" class="suspense-rounded bg-surface-2 h-5 w-32"></div>+ <template v-else>+ Last edited by+ <a title="Editor profile" target="_blank" :href="`/profile/${editor?.name ?? editor_id}`" class="hover:text-primary dark:hover:text-primary-muted">+ @{{ editor?.name ?? editor_id }}+ </a>+ at+ {{ toFormattedDate(new Date(updated_at)) }}+ </template>+</template>diff --git a/resources/js/components/modals/EditFolderModal.vue b/resources/js/components/modals/EditFolderModal.vueindex 3068d678..a27c88a8 100644--- a/resources/js/components/modals/EditFolderModal.vue+++ b/resources/js/components/modals/EditFolderModal.vue@@ -2,11 +2,11 @@import type { SeriesResource } from '@/types/resources';import { useContentStore } from '@/stores/ContentStore';-import { toFormattedDate } from '@/service/util';import { useQueryClient } from '@tanstack/vue-query';import { useModalStore } from '@/stores/ModalStore';import { BaseModal } from '@/components/cedar-ui/modal';+import EditItemHeader from '@/components/headers/EditItemHeader.vue';import EditFolder from '@/components/forms/EditFolder.vue';const { updateFolderData } = useContentStore();@@ -42,13 +42,8 @@ const invalidateQueries = async () => {<template><BaseModal><template #title>Edit Folder</template>- <template #description v-if="modal.props.cachedFolder && modal.props.cachedFolder.series?.editor_id && modal.props.cachedFolder.series.date_updated">- Last edited by- <a title="Editor profile" target="_blank" :href="`/profile/${modal.props.cachedFolder.series.editor_id}`" class="hover:text-primary dark:hover:text-primary-muted">- @{{ modal.props.cachedFolder.series.editor_id }}- </a>- at- {{ toFormattedDate(new Date(modal.props.cachedFolder.series.date_updated)) }}+ <template #description v-if="modal.props.cachedFolder.series.date_updated && modal.props.cachedFolder.series.editor_id">+ <EditItemHeader :updated_at="modal.props.cachedFolder.series.date_updated" :editor_id="modal.props.cachedFolder.series.editor_id" /></template><EditFolder v-if="modal.props.cachedFolder" :folder="modal.props.cachedFolder" @handleFinish="handleSeriesUpdate" /></BaseModal>diff --git a/resources/js/components/modals/EditMediaModal.vue b/resources/js/components/modals/EditMediaModal.vueindex 8c1209c1..2bf69f05 100644--- a/resources/js/components/modals/EditMediaModal.vue+++ b/resources/js/components/modals/EditMediaModal.vue@@ -6,6 +6,7 @@ import { toFormattedDate } from '@/service/util';import { useModalStore } from '@/stores/ModalStore';import { BaseModal } from '@/components/cedar-ui/modal';+import EditItemHeader from '@/components/headers/EditItemHeader.vue';import EditVideo from '@/components/forms/EditVideo.vue';const { updateVideoData } = useContentStore();@@ -20,13 +21,8 @@ const handleVideoDetailsUpdate = (res: any) => {<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 #description v-if="modal.props.mediaResource.date_updated && modal.props.mediaResource.metadata?.editor_id">+ <EditItemHeader :updated_at="modal.props.mediaResource.date_updated" :editor_id="modal.props.mediaResource.metadata.editor_id" /></template><EditVideo v-if="modal.props.mediaResource" :video="modal.props.mediaResource" @handleFinish="handleVideoDetailsUpdate" /></BaseModal>diff --git a/resources/js/components/profile/ProfileHeader.vue b/resources/js/components/profile/ProfileHeader.vueindex 5f31c584..227d493b 100644--- a/resources/js/components/profile/ProfileHeader.vue+++ b/resources/js/components/profile/ProfileHeader.vue@@ -1,27 +1,13 @@<script setup lang="ts">-import type { ProfileResource } from '@/types/resources';--import { getProfileByName } from '@/service/profileService';-import { onMounted, ref } from 'vue';+import { useUserProfile } from '@/service/users/useUsers';import { toTimeSpan } from '@/service/util';import { useRoute } from 'vue-router';+import { computed } from 'vue';-const router = useRoute();-const userProfile = ref<ProfileResource>();--onMounted(async () => {- const userIdentifier = router.params.username.toString();-- try {- const { data } = await getProfileByName(userIdentifier);+const route = useRoute();+const username = computed(() => route.params.username.toString());- if (data) {- userProfile.value = data;- }- } catch (error) {- console.log(error);- }-});+const { data: userProfile } = useUserProfile(username);</script><template><sectiondiff --git a/resources/js/service/profileService.ts b/resources/js/service/users/api.tssimilarity index 100%rename from resources/js/service/profileService.tsrename to resources/js/service/users/api.tsdiff --git a/resources/js/service/users/useUsers.ts b/resources/js/service/users/useUsers.tsnew file mode 100644index 00000000..a72cf5b6--- /dev/null+++ b/resources/js/service/users/useUsers.ts@@ -0,0 +1,38 @@+import type { MaybeRefOrGetter } from 'vue';+import type { ProfileResource } from '@/types/resources';++import { getProfileById, getProfileByName } from '@/service/users/api';+import { computed, toValue } from 'vue';+import { useQuery } from '@tanstack/vue-query';++export function useUserProfile(username: MaybeRefOrGetter<string>) {+ return useQuery<ProfileResource>({+ queryKey: ['profileByName', toValue(username)],+ queryFn: async () => {+ const { data } = await getProfileByName(toValue(username));+ if (!data) {+ throw new Error('Profile not found');+ }+ return data;+ },+ enabled: computed(() => !!toValue(username)),+ staleTime: 60 * 1000,+ retry: 1,+ });+}++export function useUserProfileById(id: MaybeRefOrGetter<number>) {+ return useQuery<ProfileResource>({+ queryKey: ['ProfileById', () => toValue(id)],+ queryFn: async () => {+ const { data } = await getProfileById(toValue(id));+ if (!data) {+ throw new Error('Profile not found');+ }+ return data;+ },+ enabled: computed(() => !!toValue(id)),+ staleTime: 60 * 1000,+ retry: 1,+ });+}