sort job

labring · Sep 13, 2023 · 4dc8a0b · 4dc8a0b
1 parent b3df4dd
commit 4dc8a0b
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 27 deletions.
diff --git a/frontend/providers/cronjob/src/api/job.ts b/frontend/providers/cronjob/src/api/job.ts
@@ -66,14 +66,13 @@ export const getJobListEventsAndLogs = async (cronJobName: string) => {
 
     const jobPod = podJobMap.get(job.name);
     if (!jobPod?.metadata?.name) continue;
+    job.podName = jobPod?.metadata?.name;
     getPodLogs(jobPod?.metadata?.name)
       .then((podLog) => {
         job.logs = podLog;
-        job.podName = jobPod?.metadata?.name || '';
       })
       .catch((err) => {
         job.logs = err;
-        job.podName = jobPod?.metadata?.name || '';
       });
   }
 

diff --git a/frontend/providers/cronjob/src/pages/job/detail/components/AppMainInfo.tsx b/frontend/providers/cronjob/src/pages/job/detail/components/AppMainInfo.tsx
@@ -94,18 +94,31 @@ export default function AppBaseInfo({ appName }: { appName: string }) {
             </Box>
           ))}
         </Box>
-        <Box overflowY={'auto'} py="24px" px="28px">
-          <Text>
-            {t('Log')} (pod: {ActivePod?.podName})
-          </Text>
-          <Text mt="12px">{ActivePod?.logs}</Text>
-        </Box>
-        {data?.history?.length === 0 && !isLoading && (
-          <Flex alignItems={'center'} justifyContent={'center'} flexDirection={'column'} h={'100%'}>
+        {ActivePod?.podName && !isLoading ? (
+          <Flex
+            flexDirection={'column'}
+            flex={1}
+            w="0"
+            overflowY={'scroll'}
+            overflowX="hidden"
+            py="24px"
+            px="28px"
+          >
+            <Text>
+              {t('Log')} (pod: {ActivePod?.podName})
+            </Text>
+            <Text mt="12px">{ActivePod?.logs}</Text>
+          </Flex>
+        ) : (
+          <Flex
+            flex={1}
+            w="0"
+            alignItems={'center'}
+            justifyContent={'center'}
+            flexDirection={'column'}
+            h={'100%'}
+          >
             <MyIcon name="noEvents" w={'48px'} h={'48px'} color={'transparent'} />
-            <Box mt={4} color={'myGray.600'}>
-              No Events
-            </Box>
           </Flex>
         )}
       </Flex>

diff --git a/frontend/providers/cronjob/src/pages/job/edit/components/Cron.tsx b/frontend/providers/cronjob/src/pages/job/edit/components/Cron.tsx
@@ -93,7 +93,7 @@ export default function Cron({ formHook }: { formHook: UseFormReturn<CronJobEdit
           </Link>
         </Flex>
       </Flex>
-      <Box alignItems={'self-start'} maxW={'200px'} ml="12px" overflowWrap="break-word">
+      <Box alignItems={'self-start'} ml="12px" overflowWrap="break-word">
         {cronMessage && `"${cronMessage}"`}
       </Box>
     </Flex>

diff --git a/frontend/providers/cronjob/src/utils/adapt.ts b/frontend/providers/cronjob/src/utils/adapt.ts
@@ -148,19 +148,25 @@ export const adaptServiceAccountList = (
 export const adaptJobItemList = (jobs: V1Job[]) => {
   const total = jobs.length;
   let successAmount = 0;
-  const history = jobs.map((item) => {
-    if (!!item.status?.succeeded) successAmount++;
-    return {
-      status: !!item.status?.succeeded,
-      startTime: dayjs(item.status?.startTime).format('YYYY-MM-DD HH:mm'),
-      completionTime: dayjs(item.status?.completionTime).format('YYYY-MM-DD HH:mm'),
-      uid: item.metadata?.uid,
-      name: item.metadata?.name,
-      events: [] as JobEvent[],
-      logs: '',
-      podName: ''
-    };
-  });
+  const history = jobs
+    .map((item) => {
+      if (!!item.status?.succeeded) successAmount++;
+      const startTimeTimestamp = dayjs(item.status?.startTime).unix();
+      return {
+        status: !!item.status?.succeeded,
+        startTime: dayjs(item.status?.startTime).format('YYYY-MM-DD HH:mm'),
+        completionTime: dayjs(item.status?.completionTime).format('YYYY-MM-DD HH:mm'),
+        uid: item.metadata?.uid,
+        name: item.metadata?.name,
+        events: [] as JobEvent[],
+        logs: '',
+        podName: '',
+        startTimeTimestamp: startTimeTimestamp
+      };
+    })
+    .sort((a, b) => {
+      return b.startTimeTimestamp - a.startTimeTimestamp;
+    });
 
   return {
     total,