From ac13d366c854b2ccdc42425dafae153a72b9355a Mon Sep 17 00:00:00 2001
From: rarsyansyahr <rarsyansyahr@gmail.com>
Date: Thu, 16 Dec 2021 21:39:31 +0700
Subject: [PATCH] fix: membership create & update

---
 src/component/Subcategory.js            |  5 +++++
 src/pages/Membership/Membership.js      |  1 -
 src/pages/Membership/MembershipModal.js | 22 ++++++++++++++++++----
 src/store/category.js                   | 19 +++++++++++++++----
 src/store/membership.js                 |  2 ++
 src/store/subcategory.js                | 13 +++++++++++--
 6 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/component/Subcategory.js b/src/component/Subcategory.js
index fbb1f71..0da7987 100644
--- a/src/component/Subcategory.js
+++ b/src/component/Subcategory.js
@@ -68,6 +68,11 @@ export const SubcategoryComponent = observer((props) => {
       dataIndex: "name",
       key: "name",
     },
+    {
+      title: "Category",
+      dataIndex: "categoryName",
+      key: "categoryName",
+    },
     {
       title: "Action",
       key: "action",
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 93a5010..e1641dc 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -212,7 +212,6 @@ export const Membership = observer(() => {
       setInitialData({});
       setConfirmLoading(true);
       try {
-        console.log(data);
         await store.membership.update(initialData.id, data);
         message.success(
           initialData.isChangePassword
diff --git a/src/pages/Membership/MembershipModal.js b/src/pages/Membership/MembershipModal.js
index bf8225d..df67074 100644
--- a/src/pages/Membership/MembershipModal.js
+++ b/src/pages/Membership/MembershipModal.js
@@ -35,7 +35,8 @@ export const MembershipModal = ({
           .validateFields()
           .then((values) => {
             let input = values;
-            input.username = initialData.username;
+            if (initialData.id)
+              input.username = initialData.username;
 
             onCreate(input);
             form.resetFields();
@@ -51,7 +52,8 @@ export const MembershipModal = ({
         name="form_in_modal"
         initialValues={initialData}
       >
-        {((initialData.id && !initialData.isChangePassword) || !initialData.id) && (
+        {((initialData.id && !initialData.isChangePassword) ||
+          !initialData.id) && (
           <Form.Item
             name="name"
             label="Name"
@@ -69,7 +71,8 @@ export const MembershipModal = ({
             <Input />
           </Form.Item>
         )}
-        {((initialData.id && initialData.isChangePassword) || !initialData.id) && (
+        {((initialData.id && initialData.isChangePassword) ||
+          !initialData.id) && (
           <Form.Item
             name="password"
             label="Password"
@@ -78,7 +81,18 @@ export const MembershipModal = ({
             <Input />
           </Form.Item>
         )}
-        {((initialData.id && !initialData.isChangePassword) || !initialData.id) && (
+        {((initialData.id && !initialData.isChangePassword) ||
+          !initialData.id) && (
+          <Form.Item
+            name="phone_number"
+            label="Phone Number"
+            rules={[{ required: true, message: "Please input Phone Number!" }]}
+          >
+            <Input />
+          </Form.Item>
+        )}
+        {((initialData.id && !initialData.isChangePassword) ||
+          !initialData.id) && (
           <Form.Item
             name="roleId"
             label="Role"
diff --git a/src/store/category.js b/src/store/category.js
index 895de03..113b210 100644
--- a/src/store/category.js
+++ b/src/store/category.js
@@ -26,21 +26,32 @@ export class Category {
 
     async getData() {
         const response = await http.get(`/product/categories?page=${this.page}&pageSize=${this.pageSize}`);
-        console.log(response)
-        this.data = response.body.data ?? []
+        this.data = response.body.data.map((item, idx) => {
+            item.key = idx;
+            return item
+        }) ?? []
+
         this.total_data = response.body.total_data ?? 0
     }
 
     async getDataSubCategories() {
         const response = await http.get(`/product/sub-categories?page=${this.pageSubCategories}&pageSize=${this.pageSizeSubCategories}`);
-        this.dataSubCategories = response.body.data ?? []
+        this.dataSubCategories = response.body.data.map((item, idx) => {
+            item.key = idx;
+            return item
+        }) ?? []
+
         this.total_dataSubCategories = response.body.count ?? 0
     }
 
     async getDataCategories() {
         const response = await http.get(`/product/categories?page=${this.pageCategories}&pageSize=${this.pageSizeCategories}`);
 
-        this.dataCategories = response.body.data ?? []
+        this.dataCategories = response.body.data.map((item, idx) => {
+            item.key = idx;
+            return item
+        }) ?? []
+        
         this.total_dataCategories = response.body.total_data ?? 0
         if (this.dataCategories.length > 0) {
             this.filterCategory = this.dataCategories[0].id
diff --git a/src/store/membership.js b/src/store/membership.js
index 989bbf2..ad56942 100644
--- a/src/store/membership.js
+++ b/src/store/membership.js
@@ -18,6 +18,7 @@ export class Membership {
         this.data = response.body.data.map((item, idx) => {
             item.key = idx;
             item.name = item?.user_detail?.name;
+            item.phone_number = item?.user_detail?.phone_number;
             item.roleId = item?.roles.id;
             item.roleName = item?.roles.name;
             return item
@@ -33,6 +34,7 @@ export class Membership {
         this.data = response.body.data.map((item, idx) => {
             item.key = idx;
             item.name = item?.user_detail?.name;
+            item.phone_number = item?.user_detail?.phone_number;
             item.roleId = item?.roles.id;
             item.roleName = item?.roles?.name;
             return item
diff --git a/src/store/subcategory.js b/src/store/subcategory.js
index 64e4bae..282dc39 100644
--- a/src/store/subcategory.js
+++ b/src/store/subcategory.js
@@ -26,13 +26,22 @@ export class Subcategory {
 
     async getData() {
         const response = await http.get(`/product/sub-categories?page=${this.page}&pageSize=${this.pageSize}`);
-        this.data = response.body.data ?? []
+        this.data = response.body.data.map((item, idx) => {
+            item.key = idx;
+            item.categoryName = item.category.name;
+            return item
+        }) ?? []
+
         this.total_data = response.body.total_data ?? 0
     }
 
     async getDataSubCategories() {
         const response = await http.get(`/product/sub-categories?page=${this.pageSubCategories}&pageSize=${this.pageSizeSubCategories}`);
-        this.dataSubCategories = response.body.data ?? []
+        this.dataSubCategories = response.body.data.map((item, idx) => {
+            item.key = idx;
+            return item
+        }) ?? []
+        
         this.total_dataSubCategories = response.body.count ?? 0
     }