Merge pull request #948 from SeedCompany/files-column

Display modified instead of created
SeedCompany · Sep 28, 2021 · 684cfb8 · 684cfb8
2 parents e8bb4ac + 6d9b5fc
commit 684cfb8
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/scenes/Projects/Files/ProjectFilesList.tsx b/src/scenes/Projects/Files/ProjectFilesList.tsx
@@ -43,8 +43,8 @@ import { useUploadProjectFiles } from './useUploadProjectFiles';
 import { Directory, FileOrDirectory, isDirectory } from './util';
 
 type FileRowData = Pick<FileOrDirectory, 'id' | 'type' | 'name'> & {
-  createdAt: string;
-  createdBy: string;
+  modifiedAt: string;
+  modifiedBy: string;
   mimeType: string;
   size: number;
   item: FileOrDirectory;
@@ -153,8 +153,13 @@ const ProjectFilesListWrapped: FC = () => {
       id,
       type,
       name,
-      createdAt: formatDate(createdAt),
-      createdBy: createdBy.fullName ?? '',
+      modifiedAt: formatDate(
+        item.__typename === 'File' ? item.modifiedAt : createdAt
+      ),
+      modifiedBy:
+        (item.__typename === 'File'
+          ? item.modifiedBy.fullName
+          : createdBy.fullName) ?? '',
       mimeType: isDirectory(item) ? 'directory' : item.mimeType,
       size: isDirectory(item) ? 0 : item.size,
       item,
@@ -193,12 +198,12 @@ const ProjectFilesListWrapped: FC = () => {
       },
     },
     {
-      title: 'Created',
-      field: 'createdAt',
+      title: 'Modified',
+      field: 'modifiedAt',
     },
     {
-      title: 'Uploaded By',
-      field: 'createdBy',
+      title: 'Modified By',
+      field: 'modifiedBy',
     },
     {
       title: 'File Size',