feat: reorder columns; update formatElapsedTime to return 'just now' instead of 'a few second ago'

Author: ErwanDecoster

src/modules/apps/appsTable/columns.tsx

@@ -49,6 +49,14 @@ export const columns: ColumnDef<App>[] = [
       );
     },
   },
+  {
+    accessorKey: 'time',
+    header: 'Time',
+    cell: ({ row }) => {
+      const timestamp = row.original.timestamp;
+      return <div className="min-w-18">{formatElapsedTime(timestamp)}</div>;
+    },
+  },
   {
     accessorKey: 'tx_hash',
     header: 'TxHash',
@@ -64,12 +72,4 @@ export const columns: ColumnDef<App>[] = [
       );
     },
   },
-  {
-    accessorKey: 'time',
-    header: 'Time',
-    cell: ({ row }) => {
-      const timestamp = row.original.timestamp;
-      return <div className="min-w-32">{formatElapsedTime(timestamp)}</div>;
-    },
-  },
 ];

src/modules/datasets/datasetsTable/columns.tsx

@@ -51,6 +51,14 @@ export const columns: ColumnDef<Dataset>[] = [
       );
     },
   },
+  {
+    accessorKey: 'time',
+    header: 'Time',
+    cell: ({ row }) => {
+      const timestamp = row.original.timestamp;
+      return <div className="min-w-18">{formatElapsedTime(timestamp)}</div>;
+    },
+  },
   {
     accessorKey: 'tx_hash',
     header: 'TxHash',
@@ -66,12 +74,4 @@ export const columns: ColumnDef<Dataset>[] = [
       );
     },
   },
-  {
-    accessorKey: 'time',
-    header: 'Time',
-    cell: ({ row }) => {
-      const timestamp = row.original.timestamp;
-      return <div className="min-w-32">{formatElapsedTime(timestamp)}</div>;
-    },
-  },
 ];

src/modules/deals/dealsTable/columns.tsx

@@ -40,14 +40,6 @@ export const columns: ColumnDef<Deal>[] = [
       );
     },
   },
-  {
-    accessorKey: 'time',
-    header: 'Time',
-    cell: ({ row }) => {
-      const timestamp = row.original.timestamp;
-      return <div className="min-w-32">{formatElapsedTime(timestamp)}</div>;
-    },
-  },
   {
     accessorKey: 'workerpool.address',
     header: 'Workerpool',
@@ -81,6 +73,21 @@ export const columns: ColumnDef<Deal>[] = [
       );
     },
   },
+  {
+    accessorKey: 'time',
+    header: 'Time',
+    cell: ({ row }) => {
+      const timestamp = row.original.timestamp;
+      return <div className="min-w-18">{formatElapsedTime(timestamp)}</div>;
+    },
+  },
+  {
+    accessorKey: 'success',
+    header: 'Success',
+    cell: ({ row }) => {
+      return <SuccessCell deal={row.original} />;
+    },
+  },
   {
     accessorKey: 'price',
     header: 'Price',
@@ -96,11 +103,4 @@ export const columns: ColumnDef<Deal>[] = [
       return <span>{price} xRLC</span>;
     },
   },
-  {
-    accessorKey: 'success',
-    header: 'Success',
-    cell: ({ row }) => {
-      return <SuccessCell deal={row.original} />;
-    },
-  },
 ];

src/modules/tasks/tasksTable/columns.tsx

@@ -22,20 +22,6 @@ export const columns: ColumnDef<Task>[] = [
       );
     },
   },
-  {
-    accessorKey: 'deadline',
-    header: 'Deadline',
-    cell: ({ row }) => {
-      const deadline = new Intl.DateTimeFormat('en-US', {
-        day: '2-digit',
-        month: '2-digit',
-        year: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit',
-      }).format(new Date(row.original.finalDeadline * 1000));
-      return deadline;
-    },
-  },
   {
     accessorKey: 'workerpool.address',
     header: 'Status',
@@ -51,4 +37,18 @@ export const columns: ColumnDef<Task>[] = [
       );
     },
   },
+  {
+    accessorKey: 'deadline',
+    header: 'Deadline',
+    cell: ({ row }) => {
+      const deadline = new Intl.DateTimeFormat('en-US', {
+        day: '2-digit',
+        month: '2-digit',
+        year: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
+      }).format(new Date(row.original.finalDeadline * 1000));
+      return deadline;
+    },
+  },
 ];

src/modules/workerpools/workerpoolsTable/columns.tsx

@@ -52,6 +52,14 @@ export const columns: ColumnDef<Workerpool>[] = [
       );
     },
   },
+  {
+    accessorKey: 'time',
+    header: 'Time',
+    cell: ({ row }) => {
+      const timestamp = row.original.timestamp;
+      return <div className="min-w-18">{formatElapsedTime(timestamp)}</div>;
+    },
+  },
   {
     accessorKey: 'txHash',
     header: 'TxHash',
@@ -67,12 +75,4 @@ export const columns: ColumnDef<Workerpool>[] = [
       );
     },
   },
-  {
-    accessorKey: 'dataset.address',
-    header: 'Dataset',
-    cell: ({ row }) => {
-      const timestamp = row.original.timestamp;
-      return <div className="min-w-32">{formatElapsedTime(timestamp)}</div>;
-    },
-  },
 ];

src/utils/formatElapsedTime.ts

@@ -20,7 +20,7 @@ export function formatElapsedTime(timestamp: string | number): string {
   }
 
   if (elapsedTime / 1000 < 60) {
-    return 'a few seconds ago';
+    return 'just now';
   }
   if (elapsedTime / 1000 / 60 < 60) {
     return (elapsedTime / 1000 / 60).toFixed(0) + 'min ago';