Skip to content

A self-hosted media server and file management system

feat: use edited at in edit header for series

aminnausin0b37ff741b70
diff --git a/app/Http/Resources/FolderResource.php b/app/Http/Resources/FolderResource.php
index edea2bab..7b7ec4be 100755
--- a/app/Http/Resources/FolderResource.php
+++ b/app/Http/Resources/FolderResource.php
@@ -11,6 +11,13 @@ class FolderResource extends JsonResource {
* Transform the resource into an array.
* Ideally eager load series.folderTags.tag and (if required) video.metadata.videoTags.tag
*
+ * id -> int8 (pk) (index)
+ * category_id -> int8 (fk)
+ * name -> varchar(255)
+ * path -> varchar(255) (index)
+ * created_at -> varchar(255) (nullable)
+ * last_scan -> int8
+ *
* @return array<string, mixed>
*/
public function toArray(Request $request): array {
@@ -23,13 +30,14 @@ class FolderResource extends JsonResource {
'total_size' => $this->series->total_size,
'is_majority_audio' => $this->series->primary_media_type->value === MediaType::AUDIO->value,
'category_id' => $this->category_id,
+ 'series' => new SeriesResource($this->series),
'videos' => $this->when($request->videos, function () {
return VideoResource::collection($this->videos);
}),
- 'series' => new SeriesResource($this->series),
'scanned_at' => $this->created_at,
- 'created_at' => $this->series?->created_at ?? $this->created_at,
- 'updated_at' => $this->series?->updated_at ?? $this->updated_at,
+ 'created_at' => $this->series?->created_at,
+ 'updated_at' => $this->series?->updated_at,
+ 'edited_at' => $this->series?->edited_at,
];
}
}
diff --git a/resources/js/components/headers/EditItemHeader.vue b/resources/js/components/headers/EditItemHeader.vue
index 77c25c43..e9a2da4e 100644
--- a/resources/js/components/headers/EditItemHeader.vue
+++ b/resources/js/components/headers/EditItemHeader.vue
@@ -2,7 +2,7 @@
import { useUserProfileById } from '@/service/users/useUsers';
import { toFormattedDate } from '@/service/util';
-const props = defineProps<{ editor_id: number; updated_at: string }>();
+const props = defineProps<{ editor_id: number; edited_at: string }>();
const { data: editor, isLoading } = useUserProfileById(props.editor_id);
</script>
@@ -14,6 +14,6 @@ const { data: editor, isLoading } = useUserProfileById(props.editor_id);
@{{ editor?.name ?? editor_id }}
</a>
at
- {{ toFormattedDate(new Date(updated_at)) }}
+ {{ toFormattedDate(new Date(edited_at)) }}
</template>
</template>
diff --git a/resources/js/components/modals/EditFolderModal.vue b/resources/js/components/modals/EditFolderModal.vue
index a27c88a8..6407d4e9 100644
--- a/resources/js/components/modals/EditFolderModal.vue
+++ b/resources/js/components/modals/EditFolderModal.vue
@@ -42,8 +42,8 @@ const invalidateQueries = async () => {
<template>
<BaseModal>
<template #title>Edit Folder</template>
- <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 #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>
<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.vue
index b806a01e..056addf9 100644
--- a/resources/js/components/modals/EditMediaModal.vue
+++ b/resources/js/components/modals/EditMediaModal.vue
@@ -21,7 +21,7 @@ const handleVideoDetailsUpdate = (res: any) => {
<BaseModal>
<template #title>{{ modal.props.title ?? 'Edit Track/Video' }}</template>
<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" />
+ <EditItemHeader :edited_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/types/resources.ts b/resources/js/types/resources.ts
index 998ce856..4da90ab4 100644
--- a/resources/js/types/resources.ts
+++ b/resources/js/types/resources.ts
@@ -44,6 +44,7 @@ export interface FolderResource {
scanned_at?: string;
created_at?: string;
updated_at?: string;
+ edited_at?: string;
last_scan: number;
}
export interface MetadataResource {
@@ -103,11 +104,13 @@ export interface SeriesResource {
seasons?: number;
episodes?: number;
films?: number;
+ thumbnail_url?: string;
folder_tags?: FolderTagResource[];
+ created_at?: string;
+ updated_at?: string;
+ edited_at?: string;
date_start?: string;
date_end?: string;
- date_updated?: string;
- thumbnail_url?: string;
}
export interface TagResource {
id: number;