feat: enable audit sort order at api level

Chia-Network · Apr 7, 2022 · 2bead29 · 2bead29
1 parent 4a5e02d
commit 2bead29
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/src/pages/Audit/index.js b/src/pages/Audit/index.js
@@ -95,12 +95,23 @@ const Audit = withRouter(() => {
   const { audit, organizations } = useSelector(store => store.climateWarehouse);
   const [selectedOrgUid, setSelectedOrgUid] = useState(null);
   const [selectedAuditItem, setSelectedAuditItem] = useState(null);
-  const [isAscendingSorted, setIsAscendingSorted] = useState(false);
+  const [auditSortOrder, setAuditSortOrder] = useState('DESC');
 
   useEffect(() => {
     dispatch(getOrganizationData());
+    const storageAuditSortOrder = localStorage.getItem('auditSortOrder');
+    console.log('storageAuditSortOrder', storageAuditSortOrder);
+    if (storageAuditSortOrder) {
+      setAuditSortOrder(storageAuditSortOrder);
+    }
   }, []);
 
+  const changeSortOrder = () => {
+    const newSortOrder = auditSortOrder === 'DESC' ? 'ASC' : 'DESC';
+    localStorage.setItem('auditSortOrder', newSortOrder);
+    setAuditSortOrder(newSortOrder);
+  };
+
   const onOrganizationSelect = selectedOption => {
     const orgUid = selectedOption[0].orgUid;
     setSelectedOrgUid(orgUid);
@@ -110,7 +121,7 @@ const Audit = withRouter(() => {
         page: 1,
         limit: constants.MAX_AUDIT_TABLE_SIZE,
         useMockedResponse: true,
-        order: isAscendingSorted ? 'ASC' : 'DESC',
+        order: auditSortOrder,
       }),
     );
   };
@@ -129,10 +140,8 @@ const Audit = withRouter(() => {
           width="200px"
           onChange={onOrganizationSelect}
         />
-        <StyledSortButtonContainer
-          onClick={() => setIsAscendingSorted(!isAscendingSorted)}
-        >
-          {isAscendingSorted ? (
+        <StyledSortButtonContainer onClick={changeSortOrder}>
+          {auditSortOrder === 'ASC' ? (
             <>
               <Body>
                 <FormattedMessage id="sort-descending" />
@@ -163,7 +172,7 @@ const Audit = withRouter(() => {
                   page: val + 1,
                   limit: constants.MAX_AUDIT_TABLE_SIZE,
                   useMockedResponse: true,
-                  order: isAscendingSorted ? 'ASC' : 'DESC',
+                  order: auditSortOrder,
                 }),
               )
             }

diff --git a/src/translations/tokens/en-US.json b/src/translations/tokens/en-US.json
@@ -357,5 +357,4 @@
   "invalid-uid": "Enter valid UID",
   "sort-ascending": "Sort ascending",
   "sort-descending": "Sort descending"
-  "invalid-uid": "Enter valid UID"
 }
diff --git a/src/translations/tokens/es.json b/src/translations/tokens/es.json
@@ -339,5 +339,4 @@
   "invalid-uid": "Ingrese UID válido",
   "sort-ascending": "Orden ascendente",
   "sort-descending": "Orden descendiente"
-  "invalid-uid": "Ingrese UID válido"
 }
diff --git a/src/translations/tokens/ja.json b/src/translations/tokens/ja.json
@@ -339,5 +339,4 @@
   "invalid-uid": "有効なUIDを入力してください",
   "sort-ascending": "ソート昇順",
   "sort-descending": "降順で並べ替える"
-  "invalid-uid": "有効なUIDを入力してください"
 }