feat: Add the file type to shared files info as a column in a nested …

…grid.
techmatters · Mar 19, 2024 · f3ec8e2 · f3ec8e2
1 parent a3cad26
commit f3ec8e2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 17 deletions.
diff --git a/src/sharedData/components/SharedDataEntryBase.js b/src/sharedData/components/SharedDataEntryBase.js
@@ -54,7 +54,8 @@ const SharedDataEntryBase = props => {
     EntryTypeIcon,
     DownloadComponent,
     ShareComponent,
-    info,
+    fileSize,
+    resourceType,
     deleteTooltip,
   } = props;
   const [isEditingName, setIsEditingName] = useState(false);
@@ -203,26 +204,28 @@ const SharedDataEntryBase = props => {
             />
           </Restricted>
         </Grid>
-        <Grid item xs={1} order={{ xs: 5 }} display={{ md: 'none' }} />
-        <Grid
-          item
-          xs={11}
-          md={1}
-          order={{ xs: 6, md: 4 }}
-          sx={{ wordWrap: 'break-word' }}
-        >
-          {info}
-        </Grid>
-        <Grid item xs={1} order={{ xs: 7 }} display={{ md: 'none' }} />
-        <Grid item xs={11} md={3} order={{ xs: 8, md: 4 }}>
-          {formatDate(i18n.resolvedLanguage, dataEntry.createdAt)}, by{' '}
-          {t('user.full_name', { user: dataEntry.createdBy })}
+
+        <Grid item xs={12} md={4} order={{ xs: 5, md: 3 }}>
+          <Grid container>
+            <Grid item xs={11} md={2} sx={{ wordWrap: 'break-word' }}>
+              {resourceType}
+            </Grid>
+            <Grid item xs={11} md={2} sx={{ wordWrap: 'break-word' }}>
+              {fileSize}
+            </Grid>
+            <Grid item xs={1} order={{ xs: 7 }} display={{ md: 'none' }} />
+            <Grid item xs={11} md={8}>
+              {formatDate(i18n.resolvedLanguage, dataEntry.createdAt)}, by{' '}
+              {t('user.full_name', { user: dataEntry.createdBy })}
+            </Grid>
+          </Grid>
         </Grid>
+
         <Grid
           item
           xs={4}
           md={2}
-          order={{ xs: 3, md: 4 }}
+          order={{ xs: 3, md: 6 }}
           component={StackRow}
           justifyContent="flex-end"
           display={isEditingName ? 'none' : 'inherit'}

diff --git a/src/sharedData/components/SharedDataEntryFile.js b/src/sharedData/components/SharedDataEntryFile.js
@@ -359,7 +359,13 @@ const SharedDataEntryFile = props => {
       EntryTypeIcon={SharedFileIcon}
       DownloadComponent={DownloadComponent}
       ShareComponent={ShareComponent}
-      info={filesize(sharedResource.dataEntry.size, { round: 0 })}
+      fileSize={filesize(sharedResource.dataEntry.size, { round: 0 })}
+      resourceType={sharedResource.dataEntry.resourceType.toUpperCase()}
+      // TODO-cknipe: Just add resourceType to info, maybe?
+      // Hmm but Base does have to know about info regardless I guess
+      // we want it to be another
+      // Could just be info1 and info2 I guess
+      // but iono
     >
       <Visualizations file={sharedResource.dataEntry} />
     </SharedDataEntryBase>