A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: task status frontend is not expandable
aminnausin1018614d8a5a
diff --git a/resources/css/cedar-theme.css b/resources/css/cedar-theme.cssindex e42f4705..9e8fa130 100644--- a/resources/css/cedar-theme.css+++ b/resources/css/cedar-theme.css@@ -100,6 +100,7 @@--color-success: var(--color-green-500); /* green-500 */--color-info: var(--color-blue-500); /* blue-500 */--color-warning: var(--color-orange-500); /* orange-500 */+ --color-warning-2: var(--color-amber-500); /* amber-500 */--color-danger-0: var(--color-rose-400); /* rose-400 */--color-danger-1: var(--color-rose-500); /* rose-500 */--color-danger-2: var(--color-rose-600); /* rose-600 */@@ -158,6 +159,7 @@/* Indicator Colors */--color-success: var(--color-green-600); /* green-600 */+ --color-warning-2: var(--color-amber-600); /* amber-600 */--color-danger: var(--color-danger-2); /* rose-600 *//* Toasts Menus Popovers Dropdowns */diff --git a/resources/css/theme.css b/resources/css/theme.cssindex 66f8baa0..394d57df 100644--- a/resources/css/theme.css+++ b/resources/css/theme.css@@ -327,4 +327,8 @@.layout-page {@apply bg-surface-1 sm:bg-surface-0 xms:px-4 text-foreground-0 p-3 antialiased sm:p-6;}++ .trunc {+ @apply line-clamp-1 truncate capitalize;+ }}diff --git a/resources/js/components/cards/data/SubTaskCard.vue b/resources/js/components/cards/data/SubTaskCard.vueindex 90a9c672..536d24b6 100644--- a/resources/js/components/cards/data/SubTaskCard.vue+++ b/resources/js/components/cards/data/SubTaskCard.vue@@ -4,8 +4,9 @@ import type { SubTaskResource } from '@/types/resources';import { toFormattedDate, toFormattedDuration, toTimeSpan, within24Hrs } from '@/service/util';import { ButtonIcon } from '@/components/cedar-ui/button';import { HoverCard } from '@/components/cedar-ui/hover-card';-import { BadgeTag } from '@/components/cedar-ui/badge';-import { cn } from '@aminnausin/cedar-ui';++import TaskProgressBar from '@/components/tasks/TaskProgressBar.vue';+import TaskBadge from '@/components/tasks/TaskBadge.vue';import ProiconsArrowReply from '~icons/proicons/arrow-reply';import ProiconsDelete from '~icons/proicons/delete';@@ -54,36 +55,14 @@ const emit = defineEmits(['clickAction']);</div></div>- <div class="hidden h-fit min-w-32 flex-col gap-1 px-2 text-xs lg:flex">- <p class="w-full pe-8 text-left">- <span class="tabular-nums">{{ data.progress }}%</span> Processed- </p>- <div class="bg-primary-dark-900 flex h-1 w-full overflow-clip rounded-full">- <span- :class="['h-1 rounded-full', { 'bg-primary!': data.status === 'completed' }, data.status === 'failed' ? 'bg-danger-2!' : 'bg-amber-500 dark:bg-amber-600']"- :style="`width: ${data.progress}%;`"- ></span>- </div>- </div>+ <TaskProgressBar class="hidden md:flex" :progress-pct="data.progress" :segments="[{ status: data.status, progressPct: data.progress }]" /><div class="flex shrink-0 items-center gap-2 sm:flex-none">- <BadgeTag- :class="- cn(- 'flex h-6 items-center',- data.status === 'pending' ? 'bg-[#e4e4e4] text-gray-900 dark:bg-white' : 'text-white',- { 'bg-primary dark:bg-primary-dark': data.status === 'processing' },- { 'bg-amber-500 dark:bg-amber-600': data.status === 'cancelled' || data.status === 'incomplete' },- { 'bg-danger-2 dark:bg-danger-3': data.status === 'failed' },- { 'bg-primary-active dark:bg-primary-dark': data.status === 'completed' },- )- "- :label="data.status"- />+ <TaskBadge :status="data.status" /><ButtonIcon:variant="'ghost'"class="hover:dark:bg-surface-1 hover:bg-surface-6 text-foreground-1 hover:text-danger-2 hover:dark:text-danger-3 size-6 rounded-full p-0 transition-none"- label="Remove Sub Task Record From Server"+ title="Delete Sub Task Record":useDefaultStyle="false"@click="$emit('clickAction', 'subTask')">@@ -94,11 +73,3 @@ const emit = defineEmits(['clickAction']);<ProiconsArrowReply class="mx-2 my-auto hidden size-6 shrink-0 -scale-y-100 sm:block" /></span></template>--<style lang="css" scoped>-@reference '@css/app.css';--.trunc {- @apply line-clamp-1 truncate capitalize;-}-</style>diff --git a/resources/js/components/cards/data/TaskCard.vue b/resources/js/components/cards/data/TaskCard.vueindex 32d3256f..a2ddb59f 100644--- a/resources/js/components/cards/data/TaskCard.vue+++ b/resources/js/components/cards/data/TaskCard.vue@@ -8,11 +8,12 @@ import { BasePopover } from '@/components/cedar-ui/popover';import { getSubTasks } from '@/service/siteAPI';import { HoverCard } from '@/components/cedar-ui/hover-card';import { TableBase } from '@/components/cedar-ui/table';-import { BadgeTag } from '@/components/cedar-ui/badge';import { cn } from '@aminnausin/cedar-ui';import PulseDoughnutChart from '@/components/charts/PulseDoughnutChart.vue';+import TaskProgressBar from '@/components/tasks/TaskProgressBar.vue';import SubTaskCard from '@/components/cards/data/SubTaskCard.vue';+import TaskBadge from '@/components/tasks/TaskBadge.vue';import LazyImage from '@/components/lazy/LazyImage.vue';import ProiconsMoreVertical from '~icons/proicons/more-vertical';@@ -31,17 +32,20 @@ const progress = computed(() => {return Math.floor(val * 100);};- if (!props.data.id || !props.data.sub_tasks_total) return { complete: 0, processing: 0, failed: 0, pending: 100 };+ if (!props.data.id || !props.data.sub_tasks_total) return { complete: 0, processing: 0, failed: 0, pending: 100, completedPercentage: 0 };const complete = roundDown(props.data.sub_tasks_complete / props.data.sub_tasks_total);const failed = roundDown(props.data.sub_tasks_failed / props.data.sub_tasks_total);const pending = Math.ceil((Math.max(props.data.sub_tasks_total - props.data.sub_tasks_complete - props.data.sub_tasks_failed, 0) / props.data.sub_tasks_total) * 100);const processing = Math.max(100 - complete - failed - pending, 0);+ const completedPercentage = Math.ceil((Math.max(props.data.sub_tasks_complete, 0) / (props.data.sub_tasks_total ? props.data.sub_tasks_total : 1)) * 100);+return {complete,processing,failed,pending,+ completedPercentage,};});@@ -169,42 +173,19 @@ watch(],}"/>- <p class="text-left tabular-nums sm:hidden">{{ Math.ceil((Math.max(data.sub_tasks_complete, 0) / (data.sub_tasks_total ? data.sub_tasks_total : 1)) * 100) }}%</p>- <div class="hidden h-fit min-w-32 flex-1 flex-col gap-1 px-2 sm:flex">- <p class="w-full text-left">- <span class="tabular-nums">{{ Math.ceil((Math.max(data.sub_tasks_complete, 0) / (data.sub_tasks_total ? data.sub_tasks_total : 1)) * 100) }}%</span>- Processed- </p>- <div class="bg-primary-dark-900 flex h-1 w-full overflow-clip rounded-full">- <div- :class="[data.sub_tasks_failed + data.sub_tasks_pending == 0 ? 'rounded-full' : 'rounded-l-full', 'bg-primary']"- :style="`width: ${progress.complete}%;`"- ></div>- <div- :class="[{ 'rounded-l-full': data.sub_tasks_complete === 0 }, { 'rounded-r-full': data.sub_tasks_failed === 0 }, 'bg-amber-500 dark:bg-amber-600']"- :style="`width: ${progress.pending}%;`"- ></div>- <div- :class="[data.sub_tasks_complete + data.sub_tasks_pending == 0 ? 'rounded-full' : 'rounded-r-full', 'bg-danger-2']"- :style="`width: ${progress.failed}%;`"- ></div>- </div>- </div>+ <p class="text-left tabular-nums sm:hidden">{{ progress.completedPercentage }}%</p>+ <TaskProgressBar+ :class="'hidden flex-1 sm:flex'"+ :progress-pct="progress.completedPercentage"+ :segments="[+ { status: 'completed', progressPct: progress.complete },+ { status: 'failed', progressPct: progress.failed },+ { status: 'processing', progressPct: progress.processing },+ ]"+ /><div class="ml-auto flex items-center gap-1"><span class="mr-1 flex items-center justify-end sm:w-24">- <BadgeTag- :class="- cn(- 'xs:text-sm flex h-6 items-center text-xs',- data.status === 'pending' ? 'bg-[#e4e4e4] text-gray-900 dark:bg-white' : 'text-white',- { 'bg-primary dark:bg-primary-dark': data.status === 'processing' },- { 'bg-amber-500 dark:bg-amber-600': data.status === 'cancelled' || data.status === 'incomplete' },- { 'bg-danger-2 dark:bg-danger-3': data.status === 'failed' },- { 'bg-primary-active dark:bg-primary-dark': data.status === 'completed' },- )- "- :label="data.status"- />+ <TaskBadge :status="data.status" /></span><BasePopoverref="popover"diff --git a/resources/js/components/tasks/TaskBadge.vue b/resources/js/components/tasks/TaskBadge.vuenew file mode 100644index 00000000..20acce89--- /dev/null+++ b/resources/js/components/tasks/TaskBadge.vue@@ -0,0 +1,13 @@+<script setup lang="ts">+import type { TaskStatus } from '@/types/types';++import { taskStatusClass } from '@/service/util/taskStatusStyle';+import { BadgeTag } from '@/components/cedar-ui/badge';+import { cn } from '@aminnausin/cedar-ui';++defineProps<{ status: TaskStatus }>();+</script>++<template>+ <BadgeTag :class="cn('flex h-6 items-center text-xs text-white', taskStatusClass(status), $attrs.class)" :label="status" />+</template>diff --git a/resources/js/components/tasks/TaskProgressBar.vue b/resources/js/components/tasks/TaskProgressBar.vuenew file mode 100644index 00000000..971cba5d--- /dev/null+++ b/resources/js/components/tasks/TaskProgressBar.vue@@ -0,0 +1,36 @@+<script setup lang="ts">+import type { TaskStatus } from '@/types/types';++import { taskProgressBarClass } from '@/service/util/taskStatusStyle';+import { computed } from 'vue';+import { cn } from '@aminnausin/cedar-ui';++const props = withDefaults(+ defineProps<{+ progressPct: number;+ segments?: { progressPct: number; status: TaskStatus }[];+ }>(),+ {+ progressPct: 0,+ segments: () => [],+ },+);++const filteredSegments = computed(() => props.segments.filter((s) => s.progressPct));+</script>++<template>+ <div :class="cn('h-fit min-w-32 flex-col gap-1 px-2', $attrs.class)">+ <p class="w-full truncate text-left">+ <span class="tabular-nums">{{ progressPct }}%</span> Processed+ </p>+ <div class="bg-primary-dark-900 flex h-1 w-full overflow-clip rounded-full">+ <div+ v-for="(segment, index) in filteredSegments"+ :key="index"+ :class="cn(taskProgressBarClass(segment.status), { 'rounded-r-full': index === filteredSegments.length - 1 })"+ :style="`width: ${segment.progressPct}%;`"+ ></div>+ </div>+ </div>+</template>diff --git a/resources/js/service/util/taskStatusStyle.ts b/resources/js/service/util/taskStatusStyle.tsnew file mode 100644index 00000000..107c05a3--- /dev/null+++ b/resources/js/service/util/taskStatusStyle.ts@@ -0,0 +1,34 @@+import type { HTMLAttributes } from 'vue';+import type { TaskStatus } from '@/types/types';++export function taskStatusClass(status: TaskStatus): HTMLAttributes['class'] {+ switch (status) {+ case 'pending':+ return 'bg-[#e4e4e4] text-gray-900 dark:bg-white';+ case 'processing':+ return 'bg-primary dark:bg-primary-dark';+ case 'cancelled':+ case 'incomplete':+ case 'skipped':+ return 'bg-warning-2';+ case 'failed':+ return 'bg-danger-2 dark:bg-danger-3';+ case 'completed':+ return 'bg-primary-active dark:bg-primary-dark';+ }+}++export function taskProgressBarClass(status: TaskStatus): HTMLAttributes['class'] {+ switch (status) {+ case 'pending':+ case 'processing':+ case 'cancelled':+ case 'incomplete':+ case 'skipped':+ return 'bg-warning-2';+ case 'failed':+ return 'bg-danger-2 ';+ case 'completed':+ return 'bg-primary';+ }+}diff --git a/resources/js/types/types.ts b/resources/js/types/types.tsindex 76ea3a13..22e60aba 100644--- a/resources/js/types/types.ts+++ b/resources/js/types/types.ts@@ -41,7 +41,7 @@ export interface TaskStatsResponse {count_subtasks: number;}-export type TaskStatus = 'pending' | 'processing' | 'completed' | 'cancelled' | 'failed' | 'incomplete';+export type TaskStatus = 'pending' | 'processing' | 'completed' | 'cancelled' | 'failed' | 'incomplete' | 'skipped';export const MediaType = {VIDEO: 0,