From b031687c5c33b47703e94e5decdd768b83e8fc2d Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Mon, 9 May 2022 20:52:03 +0700
Subject: [PATCH] feat: fixing filter admin partner

---
 src/component/ProductComponent.js | 15 ++++++---------
 src/store/product.js              | 27 ++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index d7d14cf..393c078 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -210,17 +210,16 @@ export const ProductComponent = observer((props) => {
   };
 
   const handleRemoveFilter = async () => {
+    store.product.visibleModalFilterProduct = false;
     store.product.filterSupplier = null;
     store.product.filterSubCategory = null;
     setFilterSupplier([]);
     setFilterSubCategories([]);
     store.authentication.userData.role === "Admin Partner"
-      ? await store.product.getProductPartner(
-        store.authentication.profileData.id
-      )
+      ? await store.product.getProductPartner()
       : await store.product.getData();
     //await store.product.getData();
-    store.product.visibleModalFilterProduct = false;
+    modalLoader.setLoading(false);
   };
 
   const handleCancelFilter = async () => {
@@ -228,25 +227,23 @@ export const ProductComponent = observer((props) => {
     store.product.filterSupplier = null;
     store.product.visibleModalFilterProduct = false;
     store.authentication.userData.role === "Admin Partner"
-      ? await store.product.getProductPartner(
-        store.authentication.profileData.id
-      )
+      ? await store.product.getProductPartner()
       : await store.product.getData();
     //await store.product.getData();
   };
 
   const handleSubmitFilter = async () => {
+    store.product.visibleModalFilterProduct = false;
     store.product.filterSupplier = filterSupplier;
     store.product.filterSubCategory = filterSubCategories;
     modalLoader.setLoading(true);
     store.authentication.userData.role === "Admin Partner"
       ? await store.product.getProductPartner(
-        store.authentication.profileData.id
+        filterSubCategories
       )
       : await store.product.getData();
     //await store.product.getData();
     modalLoader.setLoading(false);
-    store.product.visibleModalFilterProduct = false;
     //store.product.page=1
   };
 
diff --git a/src/store/product.js b/src/store/product.js
index 46caacb..057db3f 100644
--- a/src/store/product.js
+++ b/src/store/product.js
@@ -101,14 +101,27 @@ export class Product {
     }
 
     async getProductPartner(id) {
-        try {
-            const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=${id}`);
-            console.log(response)
-            this.dataProductPartner = response.body.data
-            this.total_data_partner = response?.body?.count ?? 0
-        } catch (e) {
-            console.error(e);
+
+        if (id === undefined) {
+            try {
+                const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=`);
+                console.log(response)
+                this.dataProductPartner = response.body.data
+                this.total_data_partner = response?.body?.count ?? 0
+            } catch (e) {
+                console.error(e);
+            }
+        } else {
+            try {
+                const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=${id}`);
+                console.log(response)
+                this.dataProductPartner = response.body.data
+                this.total_data_partner = response?.body?.count ?? 0
+            } catch (e) {
+                console.error(e);
+            }
         }
+
     }
 
     async create(data) {