Revert "Merge branch 'PBI-6-Ray' into 'master'"

This reverts commit 0a5a7921, reversing
changes made to 980c3fbe.

package.json

@@ -9,16 +9,18 @@
   "@material-ui/core": "^4.9.11",
     "@material-ui/icons": "^4.9.1",
     "@reach/router": "^1.3.3",
+    "@types/react": "^16.14.2",
     "bootstrap": "^4.4.1",
+    "caniuse-lite": "^1.0.30001161",
     "downloadjs": "^1.4.7",
     "jquery": "^3.5.0",
     "moment": "^2.26.0",
     "moment-timezone": "^0.5.28",
     "node-fetch": "^2.6.1",
     "popper.js": "^1.16.1",
-    "react": "^16.13.1",
+    "react": "^16.14.0",
     "react-datepicker": "^3.2.2",
-    "react-dom": "^16.13.1",
+    "react-dom": "^16.14.0",
     "react-hook-form": "^5.7.2",
     "react-moment": "^0.9.7",
     "react-number-format": "^4.4.1",
@@ -74,6 +76,7 @@
     "jest-sonar-reporter": "^2.0.0",
     "mutationobserver-shim": "^0.3.5",
     "parcel": "2.0.0-beta.1",
+    "parcel-bundler": "^1.12.4",
     "prettier": "^2.0.5",
     "regenerator-runtime": "^0.13.5"
   },

src/component/TableComponent.jsx

@@ -41,6 +41,7 @@ const TableComponent = ({
   link,
   argument,
   filter,
+  sort,
 }) => {
   const [
     results,
@@ -59,7 +60,26 @@ const TableComponent = ({
     handleSubmit: handleSubmitFilter,
     reset: resetFilter,
   } = useForm();
+  const getCategory = (c) => {
+    switch (c){
+      case "transaksi":
+        return "total_transactions"
+      case "donasi-barang":
+        return "total_program_donations_goods"
+      case "donasi-uang":
+        return "total_program_donations_cash" 
+    }
+  }
+  const sortResults = (s) => {
+    const category = getCategory(s);
+    results.sort((a, b) => b[category] - a[category]);
+
+  }
   const [filterTab, setFilterTab] = useState(false);
+  if (sort !== "" && sort !== null){
+    sortResults(sort);
+  }
+
   return (
     <div
       css={css`

src/page/pengguna/ListPengguna.jsx

@@ -25,10 +25,11 @@ const ListPengguna = () => {
       ["full_name", "Nama Lengkap"],
       ["username", "Username"],
       ["total_transactions", "Jumlah Transaksi"],
-      ["total_program_donations", "Jumlah Donasi"],
+      ["total_program_donations_goods", "Jumlah Donasi Barang"],
+      ["total_program_donations_cash", "Jumlah Donasi Uang"],
     ],
     link: "",
-    sort: sortBy
+    sort: sortBy,
   };
 
   const handleClickOpen = () => {