Added sort functionality to ame, last modified & size columns in obje…

…ct browser list (#1151) Signed-off-by: Benjamin Perez <benjamin@bexsoft.net> Co-authored-by: Benjamin Perez <benjamin@bexsoft.net>
minio · Oct 26, 2021 · cd47b0c · cd47b0c
1 parent 972ea65
commit cd47b0c
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 3 deletions.
diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
@@ -57,7 +57,7 @@ import {
   Route,
 } from "../../../../ObjectBrowser/reducers";
 import CreateFolderModal from "./CreateFolderModal";
-import { download, extensionPreview } from "../utils";
+import { download, extensionPreview, sortListObjects } from "../utils";
 import {
   setErrorSnackMessage,
   setLoadingProgress,
@@ -265,6 +265,10 @@ const ListObjects = ({
     null
   );
   const [shareFileModalOpen, setShareFileModalOpen] = useState<boolean>(false);
+  const [sortDirection, setSortDirection] = useState<
+    "ASC" | "DESC" | undefined
+  >("ASC");
+  const [currentSortField, setCurrentSortField] = useState<string>("name");
 
   const internalPaths = get(match.params, "subpaths", "");
   const bucketName = match.params["bucketName"];
@@ -842,17 +846,26 @@ const ListObjects = ({
     return elements;
   };
 
+  const sortChange = (sortData: any) => {
+    const newSortDirection = get(sortData, "sortDirection", "DESC");
+    setCurrentSortField(sortData.sortBy);
+    setSortDirection(newSortDirection);
+    setLoading(true);
+  };
+
   const listModeColumns = [
     {
       label: "Name",
       elementKey: "name",
       renderFunction: displayName,
+      enableSort: true,
     },
     {
       label: "Last Modified",
       elementKey: "last_modified",
       renderFunction: displayParsedDate,
       renderFullObject: true,
+      enableSort: true,
     },
     {
       label: "Size",
@@ -861,6 +874,7 @@ const ListObjects = ({
       renderFullObject: true,
       width: 60,
       contentTextAlign: "right",
+      enableSort: true,
     },
   ];
 
@@ -869,12 +883,14 @@ const ListObjects = ({
       label: "Name",
       elementKey: "name",
       renderFunction: displayName,
+      enableSort: true,
     },
     {
       label: "Object Date",
       elementKey: "last_modified",
       renderFunction: displayParsedDate,
       renderFullObject: true,
+      enableSort: true,
     },
     {
       label: "Size",
@@ -883,6 +899,7 @@ const ListObjects = ({
       renderFullObject: true,
       width: 60,
       contentTextAlign: "right",
+      enableSort: true,
     },
     {
       label: "Deleted",
@@ -896,6 +913,18 @@ const ListObjects = ({
   const pageTitle = decodeFileName(internalPaths);
   const currentPath = pageTitle.split("/").filter((i: string) => i !== "");
 
+  const plSelect = rewindEnabled ? rewind : filteredRecords;
+
+  const sortASC = plSelect.sort(sortListObjects(currentSortField));
+
+  let payload = [];
+
+  if (sortDirection === "ASC") {
+    payload = sortASC;
+  } else {
+    payload = sortASC.reverse();
+  }
+
   return (
     <React.Fragment>
       {shareFileModalOpen && selectedPreview && (
@@ -1094,13 +1123,18 @@ const ListObjects = ({
             loadingMessage={loadingMessage}
             entityName="Objects"
             idField="name"
-            records={rewindEnabled ? rewind : filteredRecords}
+            records={payload}
             customPaperHeight={classes.browsePaper}
             selectedItems={selectedObjects}
             onSelect={selectListObjects}
             customEmptyMessage={`This location is empty${
               !rewindEnabled ? ", please try uploading a new file" : ""
             }`}
+            sortConfig={{
+              currentSort: currentSortField,
+              currentDirection: sortDirection,
+              triggerSort: sortChange,
+            }}
           />
         </Grid>
       </Grid>

diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/utils.ts b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/utils.ts
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import { BucketObject, RewindObject } from "./ListObjects/types";
+
 export const download = (
   bucketName: string,
   objectPath: string,
@@ -89,3 +91,18 @@ export const extensionPreview = (
 
   return "none";
 };
+
+export const sortListObjects = (fieldSort: string) => {
+  switch (fieldSort) {
+    case "name":
+      return (a: BucketObject | RewindObject, b: BucketObject | RewindObject) =>
+        a.name.localeCompare(b.name);
+    case "last_modified":
+      return (a: BucketObject | RewindObject, b: BucketObject | RewindObject) =>
+        new Date(a.last_modified).getTime() -
+        new Date(b.last_modified).getTime();
+    case "size":
+      return (a: BucketObject | RewindObject, b: BucketObject | RewindObject) =>
+        (a.size || -1) - (b.size || -1);
+  }
+};
diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx
@@ -692,8 +692,9 @@ const TableWrapper = ({
                       {hasSelect && (
                         <Column
                           headerRenderer={() => <Fragment>Select</Fragment>}
-                          dataKey={idField}
+                          dataKey={`select-${idField}`}
                           width={selectWidth}
+                          disableSort
                           cellRenderer={({ rowData }) => {
                             const isSelected = selectedItems
                               ? selectedItems.includes(