From 4e9262f81013134ad3870f392362b4afe1da307c Mon Sep 17 00:00:00 2001 From: ElementalCrisis <9443295+ElementalCrisis@users.noreply.github.com> Date: Wed, 3 Apr 2024 09:05:06 -0700 Subject: [PATCH] Add filepath to Unrecognized and timestamp to queue tasks. (#844) --- src/components/Utilities/UtilitiesTable.tsx | 2 +- src/components/Utilities/constants.tsx | 10 +++++++++- src/pages/dashboard/panels/QueueProcessor.tsx | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/components/Utilities/UtilitiesTable.tsx b/src/components/Utilities/UtilitiesTable.tsx index c3b15d0af..0e1842299 100644 --- a/src/components/Utilities/UtilitiesTable.tsx +++ b/src/components/Utilities/UtilitiesTable.tsx @@ -109,7 +109,7 @@ const Row = ( ? : ( <> -
+
{columns.map(column => (
{column.item(row)} diff --git a/src/components/Utilities/constants.tsx b/src/components/Utilities/constants.tsx index 597a3dfaa..d0fd9de0d 100644 --- a/src/components/Utilities/constants.tsx +++ b/src/components/Utilities/constants.tsx @@ -29,7 +29,15 @@ export const staticColumns: UtilityHeaderType[] = [ name: 'Filename', className: 'line-clamp-2 grow basis-0 overflow-hidden', item: file => ( -
{file.Locations[0]?.RelativePath.split(/[/\\]/g).pop()}
+
+ + {file.Locations[0]?.RelativePath.match(/^(.*)\\/)?.[1] ?? 'Root Level'} + + + {file.Locations[0]?.RelativePath?.split(/[/\\]/g) + .pop()} + +
), }, { diff --git a/src/pages/dashboard/panels/QueueProcessor.tsx b/src/pages/dashboard/panels/QueueProcessor.tsx index e47630d09..c815af1b7 100644 --- a/src/pages/dashboard/panels/QueueProcessor.tsx +++ b/src/pages/dashboard/panels/QueueProcessor.tsx @@ -12,6 +12,7 @@ import { useQueueResumeMutation, } from '@/core/react-query/queue/mutations'; import { useQueueItemsQuery } from '@/core/react-query/queue/queries'; +import { dayjs } from '@/core/util'; import useEventCallback from '@/hooks/useEventCallback'; import type { RootState } from '@/core/store'; @@ -78,7 +79,9 @@ const Title = () => { const QueueItem = ({ item }: { item: QueueItemType }) => (
- {item.Title} + + {`${item.Title} | ${dayjs(item.StartTime).format('MMMM DD YYYY, HH:mm')}`} + {map(item.Details, (value, key) => `${key}: ${value}`).join(', ')}
{item.IsRunning && }