From 98a39535e9418cc90c5a989f938638422b82998c Mon Sep 17 00:00:00 2001
From: Julie Plantey <julie.plantey@gmail.com>
Date: Thu, 22 Dec 2022 10:13:06 +0100
Subject: [PATCH] tooltip for every table headers + fix asset count displayed

---
 .../admin/src/components/TableList/index.js      | 16 ++++++++--------
 .../admin/src/pages/App/MediaLibrary/index.js    |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/core/upload/admin/src/components/TableList/index.js b/packages/core/upload/admin/src/components/TableList/index.js
index 248bd1d5db..6daad4bcda 100644
--- a/packages/core/upload/admin/src/components/TableList/index.js
+++ b/packages/core/upload/admin/src/components/TableList/index.js
@@ -80,8 +80,8 @@ export const TableList = ({
                 }
                 key={key}
               >
-                {isSortable ? (
-                  <Tooltip label={sortLabel}>
+                <Tooltip label={isSortable ? sortLabel : tableHeaderLabel}>
+                  {isSortable ? (
                     <Typography
                       onClick={() => handleClickSort(isSorted, name)}
                       as={isSorted ? 'span' : 'button'}
@@ -91,12 +91,12 @@ export const TableList = ({
                     >
                       {tableHeaderLabel}
                     </Typography>
-                  </Tooltip>
-                ) : (
-                  <Typography textColor="neutral600" variant="sigma">
-                    {tableHeaderLabel}
-                  </Typography>
-                )}
+                  ) : (
+                    <Typography textColor="neutral600" variant="sigma">
+                      {tableHeaderLabel}
+                    </Typography>
+                  )}
+                </Tooltip>
               </Th>
             );
           })}
diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js
index ab4e31c851..d374b89073 100644
--- a/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js
+++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js
@@ -136,6 +136,7 @@ export const MediaLibrary = () => {
     assetsData?.results?.map((asset) => ({ ...asset, type: 'asset', isSelectable: canUpdate })) ||
     [];
   const assetCount = assets?.length ?? 0;
+  const totalAssetCount = assetsData?.pagination?.total;
 
   const isLoading = isCurrentFolderLoading || foldersLoading || permissionsLoading || assetsLoading;
   const [showUploadAssetDialog, setShowUploadAssetDialog] = useState(false);
@@ -458,7 +459,7 @@ export const MediaLibrary = () => {
                           id: getTrad('list.assets.title'),
                           defaultMessage: 'Assets ({count})',
                         },
-                        { count: assetCount }
+                        { count: totalAssetCount }
                       )) ||
                     ''
                   }