A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: remove old sorting functions from dashboard
aminnausin3ce6afd3a46a
diff --git a/resources/js/components/dashboard/DashboardActivity.vue b/resources/js/components/dashboard/DashboardActivity.vueindex fda13ea0..803987e6 100644--- a/resources/js/components/dashboard/DashboardActivity.vue+++ b/resources/js/components/dashboard/DashboardActivity.vue@@ -1,4 +1,5 @@<script setup lang="ts">+// Unimplemented?import type { CategoryResource } from '@/types/resources';import { computed, ref } from 'vue';diff --git a/resources/js/components/dashboard/DashboardLibraries.vue b/resources/js/components/dashboard/DashboardLibraries.vueindex 3b7756f7..7005c8f2 100644--- a/resources/js/components/dashboard/DashboardLibraries.vue+++ b/resources/js/components/dashboard/DashboardLibraries.vue@@ -6,6 +6,7 @@ import { startIndexFilesTask } from '@/service/siteAPI';import { useDashboardStore } from '@/stores/DashboardStore';import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';+import { sortObject } from '@/service/util';import { toast } from '@/service/toaster/toastService';import DashboardLibraryFolders from '@/components/dashboard/DashboardLibraryFolders.vue';@@ -75,19 +76,8 @@ const handleDelete = (id: number) => {const submitDelete = async () => {};-const handleSort = async (column = 'name', dir = 1) => {- let tempList = [...stateLibraries.value];- tempList.sort((categoryA: CategoryResource, categoryB: CategoryResource) => {- if (column === 'created_at') {- let dateA = new Date(categoryA?.created_at ?? '');- let dateB = new Date(categoryB?.created_at ?? '');- return (dateB.getTime() - dateA.getTime()) * dir;- }- let valueA = categoryA[column as keyof CategoryResource];- let valueB = categoryB[column as keyof CategoryResource];- if (valueA && valueB && typeof valueA === 'number' && typeof valueB === 'number') return (valueA - valueB) * dir;- return `${valueA}`?.localeCompare(`${valueB}`) * dir;- });+const handleSort = async (column: keyof CategoryResource = 'created_at', dir: -1 | 1 = 1) => {+ let tempList = [...stateLibraries.value].sort(sortObject<CategoryResource>(column, dir, ['created_at']));stateLibraries.value = tempList;return tempList;};diff --git a/resources/js/components/dashboard/DashboardLibraryFolders.vue b/resources/js/components/dashboard/DashboardLibraryFolders.vueindex 6fabe52b..c6c60f92 100644--- a/resources/js/components/dashboard/DashboardLibraryFolders.vue+++ b/resources/js/components/dashboard/DashboardLibraryFolders.vue@@ -8,6 +8,7 @@ import { useContentStore } from '@/stores/ContentStore';import { useQueryClient } from '@tanstack/vue-query';import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';+import { sortObject } from '@/service/util';import { toast } from '@/service/toaster/toastService';import CategoryFolderCard from '@/components/cards/CategoryFolderCard.vue';@@ -70,22 +71,8 @@ const filteredFolders = computed(() => {return tempList;});-const handleSort = async (column = 'name', dir = 1) => {- let tempList = [...stateLibraryFolders.value];- tempList.sort((folderA: FolderResource, folderB: FolderResource) => {- if (column === 'created_at') {- let dateA = new Date(folderA?.created_at ?? '');- let dateB = new Date(folderB?.created_at ?? '');- return (dateB.getTime() - dateA.getTime()) * dir;- }- if (column === 'name' && folderA.series?.title && folderB.series?.title) {- return `${folderA.series?.title}`?.localeCompare(`${folderB.series?.title}`) * dir;- }- let valueA = folderA[column as keyof FolderResource];- let valueB = folderB[column as keyof FolderResource];- if (valueA && valueB && typeof valueA === 'number' && typeof valueB === 'number') return (valueA - valueB) * dir;- return `${valueA}`?.localeCompare(`${valueB}`) * dir;- });+const handleSort = async (column: keyof FolderResource = 'created_at', dir: -1 | 1 = 1) => {+ let tempList = [...stateLibraryFolders.value].sort(sortObject<FolderResource>(column, dir, ['created_at']));stateLibraryFolders.value = tempList;return tempList;};diff --git a/resources/js/components/dashboard/DashboardTasks.vue b/resources/js/components/dashboard/DashboardTasks.vueindex 72f0c580..f5a1013f 100644--- a/resources/js/components/dashboard/DashboardTasks.vue+++ b/resources/js/components/dashboard/DashboardTasks.vue@@ -10,6 +10,7 @@ import { handleStartTask } from '@/service/taskService';import { useQueryClient } from '@tanstack/vue-query';import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';+import { sortObject } from '@/service/util';import { toast } from '@/service/toaster/toastService';import ButtonText from '@/components/inputs/ButtonText.vue';@@ -98,22 +99,9 @@ const filteredTasks = computed(() => {return tempList;});-const handleSort = async (column = 'date', dir = 1) => {- let tempList = [...stateTasks.value].sort((taskA: TaskResource, taskB: TaskResource) => {- if (column === 'created_at' || column === 'started_at' || column === 'ended_at') {- let dateA = new Date(taskA?.[column] ?? '');- let dateB = new Date(taskB?.[column] ?? '');- return (dateB.getTime() - dateA.getTime()) * dir;- }-- let valueA = taskA[column as keyof TaskResource];- let valueB = taskB[column as keyof TaskResource];-- if (valueA && valueB && typeof valueA === 'number' && typeof valueB === 'number') return (valueA - valueB) * dir;- return `${valueA}`?.localeCompare(`${valueB}`) * dir;- });+const handleSort = async (column: keyof TaskResource = 'created_at', dir: -1 | 1 = 1) => {+ let tempList = [...stateTasks.value].sort(sortObject<TaskResource>(column, dir, ['created_at', 'started_at', 'ended_at']));stateTasks.value = tempList;-return tempList;};@@ -176,15 +164,8 @@ const submitSubTaskDelete = async (id: number) => {};const loadData = async () => {- // const { data: rawTaskStats } = await getTaskStats();-- // taskStats.value = rawTaskStats;-queryClient.invalidateQueries({ queryKey: ['tasks'] });queryClient.invalidateQueries({ queryKey: ['taskStats'] });-- // const { data: rawTasks } = await getTasks();- // stateTasks.value = rawTasks?.data?.length > 0 ? rawTasks.data : [];};const updateScreenSize = () => {diff --git a/resources/js/components/dashboard/DashboardUsers.vue b/resources/js/components/dashboard/DashboardUsers.vueindex 05aa6576..e603deb4 100644--- a/resources/js/components/dashboard/DashboardUsers.vue+++ b/resources/js/components/dashboard/DashboardUsers.vue@@ -64,7 +64,7 @@ const handleSort = async (column: keyof UserResource = 'created_at', dir: -1 | 1.map((user) => {return { ...user, last_active: user.last_active || 0 };})- .sort(sortObject<UserResource>(column as keyof UserResource, dir, ['created_at', 'last_active']));+ .sort(sortObject<UserResource>(column, dir, ['created_at', 'last_active']));stateUsers.value = tempList;return tempList;};