Skip to content

A self-hosted media server and file management system

fix

aminnausine1de841d3e64
diff --git a/resources/js/components/cards/SubTaskCard.vue b/resources/js/components/cards/SubTaskCard.vue
index 23f78962..db5922b1 100644
--- a/resources/js/components/cards/SubTaskCard.vue
+++ b/resources/js/components/cards/SubTaskCard.vue
@@ -11,7 +11,7 @@ import PulseDoughnutChart from '../charts/PulseDoughnutChart.vue';
import ProiconsDelete from '~icons/proicons/delete';
import ProiconsArrowReply from '~icons/proicons/arrow-reply';
-const props = defineProps<{ data: SubTaskResource; isScreenSmall?: boolean }>();
+const props = defineProps<{ data: SubTaskResource; isScreenLarge?: boolean }>();
</script>
<template>
@@ -66,7 +66,7 @@ const props = defineProps<{ data: SubTaskResource; isScreenSmall?: boolean }>();
<div class="flex gap-1 items-center">
<PulseDoughnutChart
- v-if="isScreenSmall ?? false"
+ v-if="isScreenLarge ?? false"
v-cloak
class="!h-6 !w-6 lg:!hidden"
:chart-options="{
@@ -87,8 +87,8 @@ const props = defineProps<{ data: SubTaskResource; isScreenSmall?: boolean }>();
{
data: [
Math.max(100 - data.progress, 0),
- data.status === 'processing' || data.status === 'completed' ? Math.min(data.progress, 0) : 0,
- data.status === 'failed' ? Math.min(data.progress, 0) : 0,
+ data.status === 'processing' || data.status === 'completed' ? Math.max(data.progress, 0) : 0,
+ data.status === 'failed' ? Math.max(data.progress, 0) : 0,
],
backgroundColor: ['#f59e0b', '#9333ea', '#be123c'],
hoverBackgroundColor: ['#f59e0b', '#9333ea', '#e11d48'],
@@ -96,7 +96,7 @@ const props = defineProps<{ data: SubTaskResource; isScreenSmall?: boolean }>();
],
}"
/>
- <p class="text-left lg:!hidden text-xs">{{ Math.min(data.progress, 0) }}%</p>
+ <p class="text-left lg:!hidden text-xs">{{ Math.max(data.progress, 0) }}%</p>
<ChipTag
:class="`h-6 shadow-sm`"
diff --git a/resources/js/components/cards/TaskCard.vue b/resources/js/components/cards/TaskCard.vue
index 45e55762..8d40020a 100644
--- a/resources/js/components/cards/TaskCard.vue
+++ b/resources/js/components/cards/TaskCard.vue
@@ -20,7 +20,7 @@ import ProiconsArrowSync from '~icons/proicons/arrow-sync';
import ProiconsDelete from '~icons/proicons/delete';
import TableBase from '../table/TableBase.vue';
-const props = defineProps<{ data: TaskResource; isScreenSmall?: boolean }>();
+const props = defineProps<{ data: TaskResource; isScreenSmall?: boolean; isScreenLarge?: boolean }>();
const emit = defineEmits(['clickAction']);
const subTasks = ref<SubTaskResource[]>([]);
const popover = useTemplateRef('popover');
@@ -272,7 +272,7 @@ const handleClick = (cancel: boolean = false) => {
v-for="subTask in subTasks.slice(0, Math.min(subTasks.length, 8))"
:key="subTask.id"
:data="subTask"
- :is-screen-small="isScreenSmall"
+ :isScreenSmall="isScreenLarge"
/>
<TableBase
v-else
@@ -281,7 +281,7 @@ const handleClick = (cancel: boolean = false) => {
:use-pagination="true"
:data="subTasks"
:row="SubTaskCard"
- :row-attributes="{ isScreenSmall }"
+ :row-attributes="{ isScreenLarge }"
:loading="false"
:table-styles="'gap-4 xs:gap-2'"
:use-toolbar="false"
diff --git a/resources/js/components/dashboard/DashboardTasks.vue b/resources/js/components/dashboard/DashboardTasks.vue
index 87e9c5e3..8dc8fc04 100644
--- a/resources/js/components/dashboard/DashboardTasks.vue
+++ b/resources/js/components/dashboard/DashboardTasks.vue
@@ -75,6 +75,7 @@ const cachedID = ref<number | null>(null);
const taskStats = ref<TaskStatsResponse>();
const tasks = ref<TaskResource[]>([]);
const isScreenSmall = ref(false);
+const isScreenLarge = ref(false);
const taskPopover = useTemplateRef('taskPopover');
@@ -164,6 +165,7 @@ const handleStartTask = async (job: 'index' | 'sync' | 'verify' | 'scan') => {
const updateScreenSize = () => {
isScreenSmall.value = window.innerWidth < 640;
+ isScreenLarge.value = window.innerWidth < 1024;
};
onMounted(() => {
@@ -257,7 +259,7 @@ onUnmounted(() => {
:use-pagination="true"
:data="[...filteredTasks]"
:row="TaskCard"
- :row-attributes="{ isScreenSmall }"
+ :row-attributes="{ isScreenSmall, isScreenLarge }"
:loading="false"
:clickAction="handleDelete"
:sort-action="handleSort"