feat(web): support sort files of storage & fix monitor data undefined (…

…#1819) * feat(web): add storage sort & fix monitor data undefind * fix icon
labring · Jan 23, 2024 · 55360e9 · 55360e9
1 parent f72e024
commit 55360e9
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 13 deletions.
diff --git a/web/src/components/CommonIcon/index.tsx b/web/src/components/CommonIcon/index.tsx
@@ -771,4 +771,21 @@ export const DownIcon = (props: any) => {
 
     </svg>
   );
-};
+};
+export const AscendingIcon = createIcon({
+  displayName: "AscendingIcon",
+  viewBox: "0 0 1024 1024",
+  d: "M666.656 452.992l45.888-44.608-258.24-265.664v782.816h64V300.352z"
+});
+
+export const DescendingIcon = createIcon({
+  displayName: "DescendingIcon",
+  viewBox: "0 0 1024 1024",
+  d: "M372.16 615.264l-45.888 44.608 258.272 265.664V142.72h-64v625.152z"
+});
+
+export const SortingIcon = createIcon({
+  displayName: "SortingIcon",
+  viewBox: "0 0 1024 1024",
+  d: "M610.624 128l258.24 265.664-45.856 44.608-148.384-152.64v625.184h-64V128zM160 659.84l45.888-44.576 148.384 152.64V142.72h64v782.816L160 659.872z"
+});
diff --git a/web/src/hooks/useAwsS3.ts b/web/src/hooks/useAwsS3.ts
@@ -27,7 +27,7 @@ function useAwsS3() {
 
     const files = res.Contents || [];
     const dirs = res.CommonPrefixes || [];
-    // console.log(files, dirs)
+
     return { data: [...files, ...dirs], marker: res.NextMarker };
   };
 

diff --git a/web/src/pages/app/setting/SysSetting/AppMonitor/AreaCard/index.tsx b/web/src/pages/app/setting/SysSetting/AppMonitor/AreaCard/index.tsx
@@ -64,7 +64,7 @@ function mergeArrays(dataArrays: (DataPoint[] | null)[]): DataPoint[] {
       if (matchingPoint) {
         mergedPoint[`value${index}`] = matchingPoint[`value${index}`] ?? 0;
       } else {
-        mergedPoint[`value${index}`] = 0;
+        mergedPoint[`value${index}`] = undefined;
       }
     });
     return mergedPoint;
@@ -203,9 +203,9 @@ export default function AreaCard(props: {
               <Tooltip
                 formatter={(value, index) => [
                   podsArray[extractNumber(index as string) + 1] +
-                    ": " +
-                    Number(value).toFixed(3) +
-                    unit,
+                  ": " +
+                  Number(value).toFixed(3) +
+                  unit,
                 ]}
                 labelFormatter={(value) => formatDate(new Date(value)).split(" ")[1]}
                 labelStyle={{ color: "#24282C" }}

diff --git a/web/src/pages/app/setting/SysSetting/DatabaseMonitor/AreaCard/index.tsx b/web/src/pages/app/setting/SysSetting/DatabaseMonitor/AreaCard/index.tsx
@@ -71,7 +71,7 @@ function mergeArrays(dataArrays: (DataPoint[] | null)[]): DataPoint[] {
       } else {
         Object.keys(arr[0]).forEach((key) => {
           if (key !== "xData") {
-            mergedPoint[key] = 0;
+            mergedPoint[key] = undefined;
           }
         });
       }

diff --git a/web/src/pages/app/storages/mods/FileList/index.tsx b/web/src/pages/app/storages/mods/FileList/index.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import {
   Button,
@@ -21,10 +21,13 @@ import { t } from "i18next";
 import { Key } from "ts-key-enum";
 
 import {
+  AscendingIcon,
+  DescendingIcon,
   LinkIcon,
   OutlineViewOnIcon,
   RecycleDeleteIcon,
   RefreshIcon,
+  SortingIcon,
   UploadIcon,
 } from "@/components/CommonIcon";
 import ConfirmButton from "@/components/ConfirmButton";
@@ -45,6 +48,33 @@ import UploadButton from "../UploadButton";
 
 import useAwsS3 from "@/hooks/useAwsS3";
 import useGlobalStore from "@/pages/globalStore";
+
+type TOrderType = null | "ascFilename" | "descFilename" | "ascFileType" | "descFileType" | "ascSize" | "descSize" | "ascDate" | "descDate"
+
+const SortIcon = ({ currentOrderType, orderTypeAsc, orderTypeDesc, onSort }: {
+  currentOrderType: TOrderType,
+  orderTypeAsc: TOrderType,
+  orderTypeDesc: TOrderType,
+  onSort: () => void
+}) => {
+  const isAsc = currentOrderType === orderTypeAsc;
+  const isDesc = currentOrderType === orderTypeDesc;
+
+  let icon = <SortingIcon boxSize={3} className="absolute top-[1.5px]" />;
+
+  if (isAsc) {
+    icon = <AscendingIcon boxSize={3} className="absolute top-[1.5px]" />;
+  } else if (isDesc) {
+    icon = <DescendingIcon boxSize={3} className="absolute top-[1.5px]" />;
+  }
+
+  return (
+    <span onClick={onSort} className="cursor-pointer relative">
+      {icon}
+    </span>
+  );
+};
+
 export default function FileList() {
   const { getList, getFileUrl, deleteFile } = useAwsS3();
   const { currentStorage, prefix, setPrefix, markerArray, setMarkerArray, getFilePath } =
@@ -60,6 +90,8 @@ export default function FileList() {
   const confirmDialog = useConfirmDialog();
   const { showError, showLoading, showSuccess } = useGlobalStore();
 
+  const [orderType, setOrderType] = useState<TOrderType>(null);
+
   const {
     data: queryData,
     refetch,
@@ -77,6 +109,74 @@ export default function FileList() {
     },
   );
 
+  const compareFilename = (a: any, b: any) => {
+    if (a.Key && b.Key) {
+      return a.Key.localeCompare(b.Key);
+    } else if (a.Key) {
+      return 1;
+    } else if (b.Key) {
+      return -1;
+    } else {
+      return a.Prefix.localeCompare(b.Prefix);
+    }
+  }
+
+  const compareFileType = (a: any, b: any) => {
+    const fileNameA = a.Key?.split('/');
+    const fileNameB = b.Key?.split('/');
+
+    if (!fileNameA && fileNameB) return 1;
+    if (fileNameA && !fileNameB) return -1;
+    if (!fileNameA && !fileNameB) return 0;
+
+    return formateType(fileNameA[fileNameA.length - 1])
+      .localeCompare(formateType(fileNameB[fileNameB.length - 1]));
+  }
+
+  const compareDate = (a: any, b: any) => {
+    const dateA = new Date(a.LastModified);
+    const dateB = new Date(b.LastModified);
+
+    if (dateA > dateB) {
+      return 1;
+    } else if (dateA < dateB) {
+      return -1;
+    } else {
+      return 0;
+    }
+  }
+
+  const sortData = (data: any, orderType: TOrderType) => {
+    if (!data) return [];
+
+    const sorted = [...data].sort((a, b) => {
+      switch (orderType) {
+        case 'ascFilename':
+          return compareFilename(a, b);
+        case 'descFilename':
+          return compareFilename(b, a);
+        case 'ascFileType':
+          return compareFileType(a, b);
+        case 'descFileType':
+          return compareFileType(b, a);
+        case 'ascSize':
+          return (a.Size || 0) - (b.Size || 0);
+        case 'descSize':
+          return (b.Size || 0) - (a.Size || 0);
+        case 'ascDate':
+          return compareDate(a, b);
+        case 'descDate':
+          return compareDate(b, a);
+        default:
+          return 0;
+      }
+    });
+
+    return sorted;
+  }
+
+  const renderData = useMemo(() => sortData(queryData?.data, orderType), [queryData, orderType]);
+
   useHotkeys(
     ["ctrl+a", "meta+a"],
     (e) => {
@@ -260,17 +360,49 @@ export default function FileList() {
                     })}
                   >
                     <Tr>
-                      <Th>{t("StoragePanel.FileName")}</Th>
-                      <Th>{t("StoragePanel.FileType")}</Th>
-                      <Th>{t("StoragePanel.Size")}</Th>
-                      <Th>{t("StoragePanel.Time")}</Th>
+                      <Th>
+                        <span>{t("StoragePanel.FileName")}</span>
+                        <SortIcon
+                          currentOrderType={orderType}
+                          orderTypeAsc="ascFilename"
+                          orderTypeDesc="descFilename"
+                          onSort={() => setOrderType(orderType === "ascFilename" ? "descFilename" : "ascFilename")}
+                        />
+                      </Th>
+                      <Th>
+                        <span>{t("StoragePanel.FileType")}</span>
+                        <SortIcon
+                          currentOrderType={orderType}
+                          orderTypeAsc="ascFileType"
+                          orderTypeDesc="descFileType"
+                          onSort={() => setOrderType(orderType === "ascFileType" ? "descFileType" : "ascFileType")}
+                        />
+                      </Th>
+                      <Th>
+                        <span>{t("StoragePanel.Size")}</span>
+                        <SortIcon
+                          currentOrderType={orderType}
+                          orderTypeAsc="ascSize"
+                          orderTypeDesc="descSize"
+                          onSort={() => setOrderType(orderType === "ascSize" ? "descSize" : "ascSize")}
+                        />
+                      </Th>
+                      <Th>
+                        <span>{t("StoragePanel.Time")}</span>
+                        <SortIcon
+                          currentOrderType={orderType}
+                          orderTypeAsc="ascDate"
+                          orderTypeDesc="descDate"
+                          onSort={() => setOrderType(orderType === "ascDate" ? "descDate" : "ascDate")}
+                        />
+                      </Th>
                       <Th isNumeric>
                         <span className="mr-2">{t("Operation")}</span>
                       </Th>
                     </Tr>
                   </Thead>
                   <Tbody className="text-grayModern-500">
-                    {queryData.data.map((file: TFile) => {
+                    {renderData?.map((file: TFile) => {
                       const fileName = file.Key?.split("/");
                       const dirName = file.Prefix?.split("/") || [];
                       const fileType = file.Prefix