Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop

src/pages/Membership/Membership.js

@@ -41,8 +41,8 @@ export const Membership = observer(() => {
     const init = async () => {
       try {
         setIsLoading(true);
-        await store.membership.getData();
-        await store.role.getData();
+        await getData();
+        store.role.getData();
         setIsLoading(false);
       } catch (e) {
         setIsLoading(false);
@@ -52,9 +52,18 @@ export const Membership = observer(() => {
     init();
   }, []);
 
+  const getData = () => {
+    (store.authentication.userData.role === "Admin")
+          ? store.membership.getData()
+          : store.membership.getDataBySuperior();
+  }
+
   const changeStatus = async (id, isActive) => {
     const status = isActive ? "inactive" : "active";
     const status2 = isActive ? "Inactivating" : "Activating";
+
+    console.log(status);
+
     try {
       const response = await store.membership.changeStatus(id, status);
 
@@ -96,17 +105,21 @@ export const Membership = observer(() => {
       dataIndex: "username",
       key: "username",
     },
+    {
+      title: "Role",
+      dataIndex: "roleName",
+      key: "role",
+    },
     {
       title: "Status",
       dataIndex: "status",
       key: "status",
       render: (text, record) => (
         <Tag
-          color={record?.status === true ? "processing" : "#E3E8EE"}
-          style={{ color: "#4F566B", cursor: "pointer" }}
-          onClick={() => changeStatus(record?.id, record?.status)}
+          color={record?.isActive === true ? "processing" : "#E3E8EE"}
+          style={{ color: "#4F566B" }}
         >
-          {record?.status === true ? " ACTIVE" : "INACTIVE"}
+          {record?.isActive === true ? " ACTIVE" : "INACTIVE"}
         </Tag>
       ),
     },
@@ -115,27 +128,45 @@ export const Membership = observer(() => {
       key: "action",
       render: (text, record) => (
         <Space size="middle">
+          <Button onClick={() => changeStatus(record?.id, record?.isActive)}>
+            {record?.isActive === true ? "Inactive" : "Active"}
+          </Button>
           <Button
             onClick={() => {
-              setVisibleModal(true);
+              let record2 = record;
+              delete record2.password;
+              record2.isChangePassword = false;
+
               setInitialData({
-                ...record,
-                roleId: record.roles.id,
+                ...record2,
+                // roleId: record.roles.id,
               });
+              setVisibleModal(true);
             }}
           >
             Edit
           </Button>
           <Button
+            onClick={() => {
+              let record2 = record;
+              delete record2.password;
+              record2.isChangePassword = true;
+
+              setInitialData({
+                ...record2,
+                // roleId: record.roles.id,
+              });
+              setVisibleModal(true);
+            }}
+          >
+            Ganti Password
+          </Button>
+          {/* <Button
             onClick={async () => {
               handleDelete(record.id);
             }}
           >
             Delete
-          </Button>
-          {/* <Button onClick={showModal}
-          >
-            Role
           </Button> */}
         </Space>
       ),
@@ -154,16 +185,26 @@ export const Membership = observer(() => {
   ];
 
   const onSubmit = async (data) => {
+    data.superior = true;
+
     if (initialData.id) {
       setInitialData({});
       setConfirmLoading(true);
       try {
         console.log(data);
         await store.membership.update(initialData.id, data);
-        message.success("Success Update Data Member");
-        await store.membership.getData();
+        message.success(
+          initialData.isChangePassword
+            ? "Success Change Member Password"
+            : "Success Update Data Member"
+        );
+        await getData();
       } catch (e) {
-        message.error("Failed Update Data Member");
+        message.error(
+          initialData.isChangePassword
+            ? "Failed Update Member Password"
+            : "Failed Update Data Member"
+        );
       }
       setConfirmLoading(false);
       setVisibleModal(false);
@@ -173,7 +214,7 @@ export const Membership = observer(() => {
       try {
         await store.membership.create(data);
         message.success("Success Add New Member");
-        await store.membership.getData();
+        await getData();
       } catch (e) {
         console.log(e, "apa errornya");
         message.error("Failed Add Member");
@@ -195,7 +236,7 @@ export const Membership = observer(() => {
           //TODO: minta apinya ke ka ilham ya, jangan di uncomment kalo pake api reconcile, nanti beneran ke apus datanya
           await store.membership.delete(record);
           message.success("Success Delete Data");
-          await store.membership.getData();
+          await getData();
         } catch (e) {
           message.error("Failed Delete Data");
         }
@@ -273,7 +314,7 @@ export const Membership = observer(() => {
                 store.membership.pageSize = page.pageSize;
                 store.membership.page = pageNumber - 1;
                 // store.membership.isLoading = true;
-                await store.membership.getData();
+                await getData();
                 // store.membership.isLoading = false;
               }}
             />
@@ -287,7 +328,7 @@ export const Membership = observer(() => {
                 onChange: (page) => {
                   store.membership.pageSize = page.pageSize;
                   store.membership.page = page.current;
-                  store.membership.getData();
+                  getData();
                 },
                 pageSize: store.membership.pageSize,
                 total: store.membership.total_data,

src/pages/Membership/MembershipModal.js

@@ -17,7 +17,13 @@ export const MembershipModal = ({
   return (
     <Modal
       visible={visible}
-      title={initialData.id ? "Edit Member" : "Create a new Membership"}
+      title={
+        initialData.isChangePassword
+          ? "Change Member Password"
+          : initialData.id
+          ? "Edit Member"
+          : "Create a new Membership"
+      }
       okText={initialData.id ? "Edit" : "Create"}
       cancelText="Cancel"
       onCancel={() => {
@@ -28,7 +34,10 @@ export const MembershipModal = ({
         form
           .validateFields()
           .then((values) => {
-            onCreate(values);
+            let input = values;
+            input.username = initialData.username;
+
+            onCreate(input);
             form.resetFields();
           })
           .catch((info) => {
@@ -42,58 +51,39 @@ export const MembershipModal = ({
         name="form_in_modal"
         initialValues={initialData}
       >
-        <Form.Item
-          name="username"
-          label="Username"
-          rules={[{ required: true, message: "Please input Username!" }]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          name="password"
-          label="Password"
-          rules={[{ required: false, message: "Please input password!" }]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          name="roleId"
-          label="Role"
-          rules={[{ required: true, message: "Please input role id!" }]}
-        >
-          <Select>
-            {store.role.data.map((item) => (
-              <Option key={item.id} value={item.id}>
-                {item.name}
-              </Option>
-            ))}
-          </Select>
-        </Form.Item>
-        <Form.Item
-          name="superior"
-          label="Superior"
-          rules={[
-            { required: true, message: "Please select superior status!" },
-          ]}
-        >
-          <Select
-            showSearch
-            placeholder="Select Status"
-            optionFilterProp="children"
-            filterOption={(input, option) =>
-              option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-            }
-            filterSort={(optionA, optionB) =>
-              optionA.children
-                .toLowerCase()
-                .localeCompare(optionB.children.toLowerCase())
-            }
+        {((initialData.id && !initialData.isChangePassword) || !initialData.id) && (
+          <Form.Item
+            name="username"
+            label="Username"
+            rules={[{ required: true, message: "Please input Username!" }]}
           >
-            {dataStatus.map((it, idx) => {
-              return <Option value={it} key={idx}>{capitalize(it)}</Option>;
-            })}
-          </Select>
-        </Form.Item>
+            <Input />
+          </Form.Item>
+        )}
+        {((initialData.id && initialData.isChangePassword) || !initialData.id) && (
+          <Form.Item
+            name="password"
+            label="Password"
+            rules={[{ required: false, message: "Please input password!" }]}
+          >
+            <Input />
+          </Form.Item>
+        )}
+        {((initialData.id && !initialData.isChangePassword) || !initialData.id) && (
+          <Form.Item
+            name="roleId"
+            label="Role"
+            rules={[{ required: true, message: "Please input role id!" }]}
+          >
+            <Select>
+              {store.role.data.map((item) => (
+                <Option key={item.id} value={item.id}>
+                  {item.name}
+                </Option>
+              ))}
+            </Select>
+          </Form.Item>
+        )}
       </Form>
     </Modal>
   );