feat: add modal loader for each API request

This commit is contained in:
Hasta Ragil Saputra
2021-12-21 09:00:31 +07:00
parent 178d52f5cc
commit 47578366a8
21 changed files with 1094 additions and 1110 deletions

View File

@@ -1,18 +1,17 @@
import React, {useState} from "react";
import React, {useContext, useState} from "react";
import {Button, Form, Input, message, Modal, Select, Space, Table,} from "antd";
import {observer} from "mobx-react-lite";
import {useHistory} from "react-router-dom";
import {useStore} from "../utils/useStore";
import {LINKS} from "../routes/app";
import {ModalLoaderContext} from "../utils/modal";
export const CategoryComponent = observer((props) => {
const store = useStore();
const [form] = Form.useForm();
const {Option} = Select;
const history = useHistory();
const [idData, setIdData] = useState("");
const [confirmLoading, setConfirmLoading] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const modalLoader = useContext(ModalLoaderContext);
const handleEditButton = (data) => {
console.log(data, "isi data");
@@ -75,7 +74,9 @@ export const CategoryComponent = observer((props) => {
const deleteData = async (id) => {
try {
console.log(id);
modalLoader.setLoading(true);
await store.category.delete(id);
modalLoader.setLoading(true);
message.success("Data Berhasil Dihapus");
history.push(LINKS.PRODUCT);
} catch (err) {
@@ -92,19 +93,19 @@ export const CategoryComponent = observer((props) => {
const handleSubmit = async (data) => {
console.log(data, "isi data2");
if (idData !== "") {
setConfirmLoading(true);
modalLoader.setLoading(true);
try {
await store.category.update(idData, data);
message.success("Success Update Data Category");
} catch (e) {
message.error("Failed Update Data Category");
}
setConfirmLoading(false);
modalLoader.setLoading(false);
store.category.visibleModalCategory = false;
setIdData("");
form.resetFields();
} else {
setConfirmLoading(true);
modalLoader.setLoading(true);
try {
await store.category.create(data);
message.success("Success Add New Category");
@@ -112,7 +113,7 @@ export const CategoryComponent = observer((props) => {
console.log(e, "apa errornya");
message.error("Failed Add Category");
}
setConfirmLoading(false);
modalLoader.setLoading(false);
store.category.visibleModalCategory = false;
setIdData("");
form.resetFields();
@@ -122,7 +123,7 @@ export const CategoryComponent = observer((props) => {
return (
<div>
<Table
style={{ textAlign: "center" }}
style={{textAlign: "center"}}
columns={columns}
dataSource={store.category.data}
bordered
@@ -137,9 +138,9 @@ export const CategoryComponent = observer((props) => {
let pageNumber = page.current;
store.category.pageSize = page.pageSize;
store.category.page = pageNumber - 1;
// store.membership.isLoading = true;
modalLoader.setLoading(true);
await store.category.getData();
// store.membership.isLoading = false;
modalLoader.setLoading(false);
}}
/>
@@ -169,16 +170,16 @@ export const CategoryComponent = observer((props) => {
<Form.Item
name="code"
label="Code"
rules={[{ required: true, message: "Please input name code!" }]}
rules={[{required: true, message: "Please input name code!"}]}
>
<Input />
<Input/>
</Form.Item>
<Form.Item
name="name"
label="Name"
rules={[{ required: true, message: "Please input name category!" }]}
rules={[{required: true, message: "Please input name category!"}]}
>
<Input />
<Input/>
</Form.Item>
</Form>
</Modal>

View File

@@ -1,32 +1,17 @@
import React, {useEffect, useState} from "react";
import React, {useContext, useEffect, useState} from "react";
import {Button, Form, Input, message, Modal, Select, Space, Table,} from "antd";
import {observer} from "mobx-react-lite";
import {useHistory} from "react-router-dom";
import {useStore} from "../utils/useStore";
import {LINKS} from "../routes/app";
import {ModalLoaderContext} from "../utils/modal";
export const CommissionComponent = observer((props) => {
const store = useStore();
const [form] = Form.useForm();
const {Option} = Select;
const history = useHistory();
const [idData, setIdData] = useState("");
const [confirmLoading, setConfirmLoading] = useState(false);
const [isLoading, setIsLoading] = useState(false);
useEffect(() => {
const init = async () => {
try {
setIsLoading(true);
//await store.product.getDataSubCategories();
setIsLoading(false);
} catch (e) {
setIsLoading(false);
}
};
init();
}, []);
const modalLoader = useContext(ModalLoaderContext);
const handleEditButton = (data) => {
console.log(data, "isi data");
@@ -59,32 +44,20 @@ export const CommissionComponent = observer((props) => {
},
];
const deleteData = async (id) => {
try {
console.log(id);
await store.commission.delete(id);
message.success("Data Berhasil Dihapus");
history.push(LINKS.PRODUCT);
} catch (err) {
console.log("error", err);
message.error("Gagal menghapus");
}
};
const handleCancel = () => {
setIdData("");
store.commission.visibleModalCommission = false;
};
const handleSubmit = async (data) => {
setConfirmLoading(true);
modalLoader.setLoading(true);
try {
await store.commission.update(idData, data);
message.success("Success Update Data Member");
} catch (e) {
message.error("Failed Update Data Member");
}
setConfirmLoading(false);
modalLoader.setLoading(false);
store.commission.visibleModalCommission = false;
setIdData("");
form.resetFields();
@@ -93,7 +66,7 @@ export const CommissionComponent = observer((props) => {
return (
<div>
<Table
style={{ textAlign: "center" }}
style={{textAlign: "center"}}
columns={columns}
dataSource={store.commission.data}
bordered
@@ -108,41 +81,41 @@ export const CommissionComponent = observer((props) => {
let pageNumber = page.current;
store.commission.pageSize = page.pageSize;
store.commission.page = pageNumber - 1;
// store.membership.isLoading = true;
modalLoader.setLoading(true);
await store.commission.getData();
// store.membership.isLoading = false;
modalLoader.setLoading(false);
}}
/>
<Modal
visible={store.commission.visibleModalCommission}
title={"Edit Commission"}
okText={"Edit"}
cancelText="Cancel"
onCancel={() => {
form.resetFields();
handleCancel();
}}
onOk={() => {
form
.validateFields()
.then((values) => {
console.log(values, "isi form");
handleSubmit(values);
form.resetFields();
})
.catch((info) => {
console.error("Validate Failed:", info);
});
}}
visible={store.commission.visibleModalCommission}
title={"Edit Commission"}
okText={"Edit"}
cancelText="Cancel"
onCancel={() => {
form.resetFields();
handleCancel();
}}
onOk={() => {
form
.validateFields()
.then((values) => {
console.log(values, "isi form");
handleSubmit(values);
form.resetFields();
})
.catch((info) => {
console.error("Validate Failed:", info);
});
}}
>
<Form form={form} layout="vertical">
<Form.Item
name="value"
label="Commission"
rules={[{ required: true, message: "Please input commission!" }]}
rules={[{required: true, message: "Please input commission!"}]}
>
<Input />
<Input/>
</Form.Item>
</Form>
</Modal>

View File

@@ -1,41 +1,27 @@
import React, {useEffect, useState} from "react";
import React, {useContext, useEffect, useState} from "react";
import {Button, Form, Input, message, Modal, Select, Space, Table, Tag,} from "antd";
import {observer} from "mobx-react-lite";
import {ExclamationCircleOutlined} from "@ant-design/icons";
import {useHistory} from "react-router-dom";
import {useStore} from "../utils/useStore";
import {LINKS} from "../routes/app";
import {ModalLoaderContext} from "../utils/modal";
export const PartnerComponent = observer((props) => {
const store = useStore();
const [form] = Form.useForm();
const {Option} = Select;
const history = useHistory();
const [idData, setIdData] = useState("");
const [isChangePassword, setIsChangePassword] = useState(false);
const [confirmLoading, setConfirmLoading] = useState(false);
const [isLoading, setIsLoading] = useState(false);
useEffect(() => {
const init = async () => {
try {
setIsLoading(true);
await store.partner.getData();
setIsLoading(false);
} catch (e) {
setIsLoading(false);
}
};
init();
}, []);
const modalLoader = useContext(ModalLoaderContext);
const changeStatus = async (id, isActive) => {
const status = isActive ? "inactive" : "active";
const status2 = isActive ? "Inactivating" : "Activating";
modalLoader.setLoading(true);
try {
const response = await store.partner.changeStatus(id, status);
modalLoader.setLoading(false);
response?.body?.statusCode === 201
? message.success(`Success ${status2} Partner`)
: message.error(`Failed ${status2} Partner`);
@@ -92,7 +78,7 @@ export const PartnerComponent = observer((props) => {
render: (text, record) => (
<Tag
color={record?.status === true ? "processing" : "#E3E8EE"}
style={{ color: "#4F566B", cursor: "pointer" }}
style={{color: "#4F566B", cursor: "pointer"}}
>
{record?.status === true ? " ACTIVE" : "INACTIVE"}
</Tag>
@@ -121,8 +107,9 @@ export const PartnerComponent = observer((props) => {
const deleteData = async (id) => {
try {
console.log(id);
modalLoader.setLoading(true);
await store.partner.delete(id);
modalLoader.setLoading(false);
message.success("Data Berhasil Dihapus");
history.push(LINKS.PARTNER);
} catch (err) {
@@ -134,7 +121,7 @@ export const PartnerComponent = observer((props) => {
const handleDelete = (id) => {
Modal.confirm({
title: "Are you sure delete this record?",
icon: <ExclamationCircleOutlined />,
icon: <ExclamationCircleOutlined/>,
okText: "Yes",
okType: "primary",
cancelText: "Cancel",
@@ -155,9 +142,10 @@ export const PartnerComponent = observer((props) => {
const handleSubmit = async (data) => {
console.log(data, "isi data2");
if (idData !== "") {
setConfirmLoading(true);
modalLoader.setLoading(true);
try {
await store.partner.update(idData, data);
modalLoader.setLoading(false);
message.success(
isChangePassword
? "Failed Change Partner Password"
@@ -165,27 +153,27 @@ export const PartnerComponent = observer((props) => {
);
//await store.partner.getData()
} catch (e) {
modalLoader.setLoading(true);
message.error(
isChangePassword
? "Failed Change Partner Password"
: "Failed Update Data Partner"
);
}
setConfirmLoading(false);
store.partner.visibleModalPartner = false;
setIdData("");
form.resetFields();
} else {
setConfirmLoading(true);
modalLoader.setLoading(true);
try {
await store.partner.create(data);
message.success("Success Add New Partner");
//await store.partner.getData()
modalLoader.setLoading(false);
} catch (e) {
console.log(e, "apa errornya");
message.error("Failed Add Partner");
}
setConfirmLoading(false);
modalLoader.setLoading(false);
store.partner.visibleModalPartner = false;
setIdData("");
form.resetFields();
@@ -194,7 +182,7 @@ export const PartnerComponent = observer((props) => {
return (
<div>
<Table
style={{ textAlign: "center" }}
style={{textAlign: "center"}}
columns={columns}
dataSource={store.partner.data}
bordered
@@ -209,9 +197,9 @@ export const PartnerComponent = observer((props) => {
let pageNumber = page.current;
store.partner.pageSize = page.pageSize;
store.partner.page = pageNumber - 1;
//store.membership.isLoading = true;
modalLoader.setLoading(true);
await store.partner.getData();
// store.membership.isLoading = false;
modalLoader.setLoading(false);
}}
/>
@@ -221,8 +209,8 @@ export const PartnerComponent = observer((props) => {
isChangePassword
? "Change Member Password"
: idData
? "Edit Partner"
: "Create a new partner"
? "Edit Partner"
: "Create a new partner"
}
okText={idData ? "Edit" : "Create"}
cancelText="Cancel"
@@ -250,11 +238,11 @@ export const PartnerComponent = observer((props) => {
label="Name"
rules={[
idData
? { required: false }
: { required: true, message: "Please input password name!" },
? {required: false}
: {required: true, message: "Please input password name!"},
]}
>
<Input />
<Input/>
</Form.Item>
)}
{!idData && (
@@ -263,11 +251,11 @@ export const PartnerComponent = observer((props) => {
label="Owner"
rules={[
idData
? { required: false }
: { required: true, message: "Please input password owner!" },
? {required: false}
: {required: true, message: "Please input password owner!"},
]}
>
<Input />
<Input/>
</Form.Item>
)}
{((idData && isChangePassword) || !idData) && (
@@ -276,27 +264,27 @@ export const PartnerComponent = observer((props) => {
label="Password Account"
rules={[
idData
? { required: false }
? {required: false}
: {
required: true,
message: "Please input password account!",
},
required: true,
message: "Please input password account!",
},
]}
>
<Input />
<Input/>
</Form.Item>
)}
{!idData && (
{!idData && (
<Form.Item
name="phone_number"
label="Phone Number"
rules={[
idData
? { required: false }
: { required: true, message: "Please input password phone number!" },
? {required: false}
: {required: true, message: "Please input password phone number!"},
]}
>
<Input />
<Input/>
</Form.Item>
)}
{!isChangePassword && (
@@ -306,25 +294,25 @@ export const PartnerComponent = observer((props) => {
label="Npwp"
rules={[
idData
? { required: false }
: { required: true, message: "Please input npwp!" },
? {required: false}
: {required: true, message: "Please input npwp!"},
]}
>
<Input />
<Input/>
</Form.Item>
<Form.Item
name="address"
label="Address"
rules={[
idData
? { required: false }
? {required: false}
: {
required: true,
message: "Please input address!",
},
required: true,
message: "Please input address!",
},
]}
>
<Input />
<Input/>
</Form.Item>
</>
)}

View File

@@ -1,4 +1,4 @@
import React, {useState} from "react";
import React, {useContext, useState} from "react";
import {Button, Col, Form, Input, message, Modal, Row, Select, Table, Tag, Typography} from "antd";
import {observer} from "mobx-react-lite";
import {ExclamationCircleOutlined} from "@ant-design/icons";
@@ -6,346 +6,348 @@ import {useHistory} from "react-router-dom";
import {capitalize} from "lodash";
import {useStore} from "../utils/useStore";
import {LINKS} from "../routes/app";
import {ModalLoaderContext} from "../utils/modal";
const {Title, Text} = Typography;
export const ProductComponent = observer((props) => {
const store = useStore();
const [form] = Form.useForm();
const {Option} = Select;
const history = useHistory();
const [idData, setIdData] = useState('');
const [confirmLoading, setConfirmLoading] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const [filterSupplier, setFilterSupplier] = useState(null);
const [filterCategories, setFilterCategories] = useState(null);
const [filterSubCategories, setFilterSubCategories] = useState(null);
const store = useStore();
const [form] = Form.useForm();
const {Option} = Select;
const history = useHistory();
const [idData, setIdData] = useState('');
const [filterSupplier, setFilterSupplier] = useState(null);
const [filterCategories, setFilterCategories] = useState(null);
const [filterSubCategories, setFilterSubCategories] = useState(null);
const modalLoader = useContext(ModalLoaderContext);
const handleEditButton = (data) => {
console.log(data, "isi data")
form.setFieldsValue({
name: data.name,
price: data.price,
markUpPrice: data.basePrice,
code: data.code,
status: data.status,
subCategoriesId: data.sub_categories.id,
});
store.product.visibleModalProduct = true;
setIdData(data.id);
const handleEditButton = (data) => {
console.log(data, "isi data")
form.setFieldsValue({
name: data.name,
price: data.price,
markUpPrice: data.basePrice,
code: data.code,
status: data.status,
subCategoriesId: data.sub_categories.id,
});
store.product.visibleModalProduct = true;
setIdData(data.id);
}
const columns = [
{
title: "Kode",
dataIndex: "code",
key: "code",
},
{
title: "Produk",
dataIndex: ["name"],
key: "name",
},
{
title: "Harga Beli",
dataIndex: ["currentPrice", "price"],
key: ["currentPrice", "price"],
},
{
title: "Harga Jual",
dataIndex: ["currentPrice", "mark_up_price"],
key: ["currentPrice", "mark_up_price"],
},
// {
// title: "Gangguan",
// dataIndex: "status",
// key: "status",
// render: (text, record) => (
// <Tag
// color={record?.status === "ACTIVE" ? "blue" : "#E3E8EE"}
// style={{color: "#4F566B"}}
// >
// {capitalize(record?.status)}
// </Tag>
// ),
// },
{
title: "Tersedia",
dataIndex: "tersedia",
key: "tersedia",
render: (text, record) => (
<Tag
color={record?.status === "ACTIVE" ? "blue" : "#E3E8EE"}
style={{color: "#4F566B"}}
>
{record?.status === "ACTIVE" ? " Tersedia" : "Tidak"}
</Tag>
),
}
];
const columns = [
{
title: "Kode",
dataIndex: "code",
key: "code",
},
{
title: "Produk",
dataIndex: ["name"],
key: "name",
},
{
title: "Harga Beli",
dataIndex: ["currentPrice","price"],
key: ["currentPrice","price"],
},
{
title: "Harga Jual",
dataIndex: ["currentPrice","mark_up_price"],
key: ["currentPrice","mark_up_price"],
},
// {
// title: "Gangguan",
// dataIndex: "status",
// key: "status",
// render: (text, record) => (
// <Tag
// color={record?.status === "ACTIVE" ? "blue" : "#E3E8EE"}
// style={{color: "#4F566B"}}
// >
// {capitalize(record?.status)}
// </Tag>
// ),
// },
{
title: "Tersedia",
dataIndex: "tersedia",
key: "tersedia",
render: (text, record) => (
<Tag
color={record?.status === "ACTIVE" ? "blue" : "#E3E8EE"}
style={{color: "#4F566B"}}
>
{record?.status === "ACTIVE" ? " Tersedia" : "Tidak"}
</Tag>
),
}
];
const deleteData = async (id) => {
try {
console.log(id);
await store.product.delete(id);
message.success("Data Berhasil Dihapus");
history.push(LINKS.PRODUCT);
} catch (err) {
console.log("error", err);
message.error("Gagal menghapus");
}
};
const handleDelete = (id) => {
Modal.confirm({
title: "Are you sure delete this record?",
icon: <ExclamationCircleOutlined/>,
okText: "Yes",
okType: "primary",
cancelText: "Cancel",
onOk() {
return deleteData(id);
},
onCancel() {
console.log("Cancel");
},
});
};
const handleCancel = () => {
setIdData('')
store.product.visibleModalProduct = false;
const deleteData = async (id) => {
try {
console.log(id);
await store.product.delete(id);
message.success("Data Berhasil Dihapus");
history.push(LINKS.PRODUCT);
} catch (err) {
console.log("error", err);
message.error("Gagal menghapus");
}
};
const handleSubmit = async (data) => {
console.log(data, "isi data2")
if (idData !== '') {
setConfirmLoading(true);
try {
await store.product.update(idData, data)
message.success("Success Update Data Member")
} catch (e) {
message.error("Failed Update Data Member")
}
setConfirmLoading(false);
store.product.visibleModalProduct = false;
setIdData('');
form.resetFields();
} else {
setConfirmLoading(true);
try {
await store.product.create(data)
message.success("Success Add New Member")
} catch (e) {
console.log(e, "apa errornya")
message.error("Failed Add Member")
}
setConfirmLoading(false);
store.product.visibleModalProduct = false;
setIdData('');
form.resetFields();
}
const handleDelete = (id) => {
Modal.confirm({
title: "Are you sure delete this record?",
icon: <ExclamationCircleOutlined/>,
okText: "Yes",
okType: "primary",
cancelText: "Cancel",
onOk() {
return deleteData(id);
},
onCancel() {
console.log("Cancel");
},
});
};
const handleCancel = () => {
setIdData('')
store.product.visibleModalProduct = false;
}
const handleSubmit = async (data) => {
console.log(data, "isi data2")
if (idData !== '') {
modalLoader.setLoading(true);
try {
await store.product.update(idData, data)
message.success("Success Update Data Member")
} catch (e) {
message.error("Failed Update Data Member")
}
modalLoader.setLoading(false);
store.product.visibleModalProduct = false;
setIdData('');
form.resetFields();
} else {
modalLoader.setLoading(true);
try {
await store.product.create(data)
message.success("Success Add New Member")
} catch (e) {
console.log(e, "apa errornya")
message.error("Failed Add Member")
}
modalLoader.setLoading(false);
store.product.visibleModalProduct = false;
setIdData('');
form.resetFields();
}
}
const handleRemoveFilter = async () => {
store.product.filterSupplier = null;
store.product.filterSubCategory = null;
setFilterSupplier(null);
setFilterCategories(null);
setFilterSubCategories(null);
await store.product.getData();
store.product.visibleModalFilterProduct = false;
};
const handleRemoveFilter = async () => {
store.product.filterSupplier = null;
store.product.filterSubCategory = null;
setFilterSupplier(null);
setFilterCategories(null);
setFilterSubCategories(null);
await store.product.getData();
store.product.visibleModalFilterProduct = false;
};
const handleCancelFilter = () => {
setFilterSupplier(null);
setFilterCategories(null);
setFilterSubCategories(null);
store.product.visibleModalFilterProduct = false;
};
const handleCancelFilter = () => {
setFilterSupplier(null);
setFilterCategories(null);
setFilterSubCategories(null);
store.product.visibleModalFilterProduct = false;
};
const handleSubmitFilter = async () => {
store.product.filterSupplier = filterSupplier;
store.product.filterSubCategory = filterSubCategories;
await store.product.getData();
store.product.visibleModalFilterProduct = false;
};
const handleSubmitFilter = async () => {
store.product.filterSupplier = filterSupplier;
store.product.filterSubCategory = filterSubCategories;
modalLoader.setLoading(true);
await store.product.getData();
modalLoader.setLoading(false);
store.product.visibleModalFilterProduct = false;
};
const footerLayoutFilter = [
<Button key={'remove'} onClick={handleRemoveFilter} style={{
backgroundColor: '#e74e5e', color: '#fff'
}}>Remove Filter</Button>,
<Button key={'cancel'} onClick={handleCancelFilter}>Cancel</Button>,
<Button key={'submit'} onClick={handleSubmitFilter} style={{
backgroundColor: '#4e79e7', color: '#fff'
}}>Apply</Button>
]
const footerLayoutFilter = [
<Button key={'remove'} onClick={handleRemoveFilter} style={{
backgroundColor: '#e74e5e', color: '#fff'
}}>Remove Filter</Button>,
<Button key={'cancel'} onClick={handleCancelFilter}>Cancel</Button>,
<Button key={'submit'} onClick={handleSubmitFilter} style={{
backgroundColor: '#4e79e7', color: '#fff'
}}>Apply</Button>
]
return (
<div>
<Table
style={{textAlign: "center"}}
columns={columns}
dataSource={store.product.data}
bordered
pagination={{
pageSize: store.product.pageSize,
total: store.product.total_data,
current: store.product.page + 1,
showSizeChanger: true,
simple: false
}}
onChange={async (page) => {
let pageNumber = page.current;
store.product.pageSize = page.pageSize;
store.product.page = pageNumber - 1;
// store.membership.isLoading = true;
await store.product.getData();
// store.membership.isLoading = false;
}}
/>
return (
<div>
<Table
style={{textAlign: "center"}}
columns={columns}
dataSource={store.product.data}
bordered
pagination={{
pageSize: store.product.pageSize,
total: store.product.total_data,
current: store.product.page + 1,
showSizeChanger: true,
simple: false
}}
onChange={async (page) => {
let pageNumber = page.current;
store.product.pageSize = page.pageSize;
store.product.page = pageNumber - 1;
modalLoader.setLoading(true);
await store.product.getData();
modalLoader.setLoading(false);
}}
/>
<Modal
visible={store.product.visibleModalProduct}
title={idData ? "Edit Product" : "Create a new Product"}
okText={idData ? "Edit" : "Create"}
cancelText="Cancel"
onCancel={() => {
form.resetFields();
handleCancel();
}}
onOk={() => {
form
.validateFields()
.then((values) => {
console.log(values, "isi form")
handleSubmit(values);
form.resetFields();
})
.catch((info) => {
console.error("Validate Failed:", info);
});
}}
<Modal
visible={store.product.visibleModalProduct}
title={idData ? "Edit Product" : "Create a new Product"}
okText={idData ? "Edit" : "Create"}
cancelText="Cancel"
onCancel={() => {
form.resetFields();
handleCancel();
}}
onOk={() => {
form
.validateFields()
.then((values) => {
console.log(values, "isi form")
handleSubmit(values);
form.resetFields();
})
.catch((info) => {
console.error("Validate Failed:", info);
});
}}
>
<Form
form={form}
layout="vertical"
>
<Form.Item
name="name"
label="Name"
rules={[{required: true, message: "Please input name!"}]}
>
<Input/>
</Form.Item>
<Form.Item
name="price"
label="Price"
rules={[{required: true, message: "Please input price!"}]}
>
<Input/>
</Form.Item>
<Form.Item
name="markUpPrice"
label="Mark Up Price"
rules={[{required: true, message: "Please input mark up price!"}]}
>
<Input/>
</Form.Item>
<Form.Item
name="code"
label="Code"
rules={[{required: true, message: "Please input code!"}]}
>
<Input/>
</Form.Item>
<Form.Item
name="status"
label="Status"
rules={[{required: true, message: "Please select Status!"}]}
>
<Select placeholder="Select Sub Category" allowClear>
<Option value="ACTIVE">ACTIVE</Option>
<Option value="INACTIVE">INACTIVE</Option>
</Select>
</Form.Item>
<Form.Item
name="subCategoriesId"
label="Sub categories"
rules={[{required: true, message: "Please select sub categories!"}]}
>
<Select placeholder="Select Sub Category" allowClear>
{store.product.dataSubCategories.map((item) => (
<Option value={item.id} key={item.id}>
{item.name}
</Option>
))}
</Select>
</Form.Item>
</Form>
</Modal>
<Modal
visible={store.product.visibleModalFilterProduct}
title={"Filter"}
footer={footerLayoutFilter}
>
<Row>
<Col span={24}>
<Title level={5} type={"secondary"} strong>Filter Supplier</Title>
<Select
mode={"multiple"}
placeholder="Choose Supplier"
onChange={(val) => {
setFilterSupplier(val);
}}
style={{marginBottom: "20px", width: "100%"}}
>
<Form
form={form}
layout="vertical"
>
<Form.Item
name="name"
label="Name"
rules={[{required: true, message: "Please input name!"}]}
>
<Input/>
</Form.Item>
<Form.Item
name="price"
label="Price"
rules={[{required: true, message: "Please input price!"}]}
>
<Input/>
</Form.Item>
<Form.Item
name="markUpPrice"
label="Mark Up Price"
rules={[{required: true, message: "Please input mark up price!"}]}
>
<Input/>
</Form.Item>
<Form.Item
name="code"
label="Code"
rules={[{required: true, message: "Please input code!"}]}
>
<Input/>
</Form.Item>
<Form.Item
name="status"
label="Status"
rules={[{required: true, message: "Please select Status!"}]}
>
<Select placeholder="Select Sub Category" allowClear>
<Option value="ACTIVE">ACTIVE</Option>
<Option value="INACTIVE">INACTIVE</Option>
</Select>
</Form.Item>
<Form.Item
name="subCategoriesId"
label="Sub categories"
rules={[{required: true, message: "Please select sub categories!"}]}
>
<Select placeholder="Select Sub Category" allowClear>
{store.product.dataSubCategories.map((item) => (
<Option value={item.id} key={item.id}>
{item.name}
</Option>
))}
</Select>
</Form.Item>
</Form>
</Modal>
<Modal
visible={store.product.visibleModalFilterProduct}
title={"Filter"}
footer={footerLayoutFilter}
{store.supplier.data.map((item) => (
<Option value={item.id} key={item.id}>
{item.name}
</Option>
))}
</Select>
</Col>
<Col span={24}>
<Title level={5} type={"secondary"} strong>Filter Categories</Title>
<Select
mode={"multiple"}
placeholder="Choose Category"
onChange={async (val) => {
setFilterCategories(val);
store.product.filterByCategory = val;
await store.product.getDataSubCategories();
}}
style={{marginBottom: "20px", width: "100%"}}
>
<Row>
<Col span={24}>
<Title level={5} type={"secondary"} strong>Filter Supplier</Title>
<Select
mode={"multiple"}
placeholder="Choose Supplier"
onChange={(val) => {
setFilterSupplier(val);
}}
style={{marginBottom: "20px", width: "100%"}}
>
{store.supplier.data.map((item) => (
<Option value={item.id} key={item.id}>
{item.name}
</Option>
))}
</Select>
</Col>
<Col span={24}>
<Title level={5} type={"secondary"} strong>Filter Categories</Title>
<Select
mode={"multiple"}
placeholder="Choose Category"
onChange={async (val) => {
setFilterCategories(val);
store.product.filterByCategory = val;
await store.product.getDataSubCategories();
}}
style={{marginBottom: "20px", width: "100%"}}
>
{store.category.data.map((item) => (
<Option value={item.id} key={item.id}>
{item.name}
</Option>
))}
</Select>
</Col>
<Col span={24}>
<Title level={5} type={"secondary"} strong>Filter Sub-Categories</Title>
<Select
mode={"multiple"}
placeholder="Choose Sub-Category"
onChange={(val) => {
setFilterSubCategories(val);
}}
style={{marginBottom: "20px", width: "100%"}}
>
{store.product.dataSubCategories.map((item) => (
<Option value={item.id} key={item.id}>
{item.name}
</Option>
))}
</Select>
</Col>
</Row>
</Modal>
</div>
);
{store.category.data.map((item) => (
<Option value={item.id} key={item.id}>
{item.name}
</Option>
))}
</Select>
</Col>
<Col span={24}>
<Title level={5} type={"secondary"} strong>Filter Sub-Categories</Title>
<Select
mode={"multiple"}
placeholder="Choose Sub-Category"
onChange={(val) => {
setFilterSubCategories(val);
}}
style={{marginBottom: "20px", width: "100%"}}
>
{store.product.dataSubCategories.map((item) => (
<Option value={item.id} key={item.id}>
{item.name}
</Option>
))}
</Select>
</Col>
</Row>
</Modal>
</div>
);
});

View File

@@ -1,17 +1,16 @@
import React, {useState} from "react";
import React, {useContext, useState} from "react";
import {Button, Form, Input, message, Modal, Select, Space, Table,} from "antd";
import {observer} from "mobx-react-lite";
import {useHistory} from "react-router-dom";
import {useStore} from "../utils/useStore";
import {ModalLoaderContext} from "../utils/modal";
export const SubcategoryComponent = observer((props) => {
const store = useStore();
const [form] = Form.useForm();
const {Option} = Select;
const history = useHistory();
const [idData, setIdData] = useState("");
const [confirmLoading, setConfirmLoading] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const modalLoader = useContext(ModalLoaderContext);
const getData = async () => {
await store.category.getData();
@@ -64,7 +63,7 @@ export const SubcategoryComponent = observer((props) => {
const handleSubmit = async (data) => {
console.log(data, "isi data2");
if (idData !== "") {
setConfirmLoading(true);
modalLoader.setLoading(true);
try {
await store.subcategory.update(idData, data);
await getData();
@@ -72,12 +71,12 @@ export const SubcategoryComponent = observer((props) => {
} catch (e) {
message.error("Failed Update Data Category");
}
setConfirmLoading(false);
modalLoader.setLoading(false);
store.subcategory.visibleModalSubcategory = false;
setIdData("");
form.resetFields();
} else {
setConfirmLoading(true);
modalLoader.setLoading(true);
try {
await store.subcategory.create(data);
await getData();
@@ -86,7 +85,7 @@ export const SubcategoryComponent = observer((props) => {
console.log(e, "apa errornya");
message.error("Failed Add Category");
}
setConfirmLoading(false);
modalLoader.setLoading(false);
store.subcategory.visibleModalSubcategory = false;
setIdData("");
form.resetFields();
@@ -96,7 +95,7 @@ export const SubcategoryComponent = observer((props) => {
return (
<div>
<Table
style={{ textAlign: "center" }}
style={{textAlign: "center"}}
columns={columns}
dataSource={store.subcategory.data}
bordered
@@ -107,13 +106,13 @@ export const SubcategoryComponent = observer((props) => {
showSizeChanger: true,
simple: false,
}}
onChange={(page) => {
onChange={async (page) => {
let pageNumber = page.current;
store.subcategory.pageSize = page.pageSize;
store.subcategory.page = pageNumber - 1;
// store.membership.isLoading = true;
getData();
// store.membership.isLoading = false;
modalLoader.setLoading(true);
await getData();
modalLoader.setLoading(false);
}}
/>
@@ -145,24 +144,24 @@ export const SubcategoryComponent = observer((props) => {
name="code"
label="Code"
rules={[
{ required: true, message: "Please input code category!" },
{required: true, message: "Please input code category!"},
]}
>
<Input />
<Input/>
</Form.Item>
)}
<Form.Item
name="name"
label="Name"
rules={[{ required: true, message: "Please input name category!" }]}
rules={[{required: true, message: "Please input name category!"}]}
>
<Input />
<Input/>
</Form.Item>
{!idData && (
<Form.Item
name="categoryId"
label="Categories"
rules={[{ required: true, message: "Please input category id!" }]}
rules={[{required: true, message: "Please input category id!"}]}
>
<Select placeholder="Select Category" allowClear>
{store.category.data.map((item) => (

View File

@@ -1,4 +1,4 @@
import React, {useState} from "react";
import React, {useContext, useState} from "react";
import {Button, Form, Input, message, Modal, Space, Table, Tag} from "antd";
import {observer} from "mobx-react-lite";
import {ExclamationCircleOutlined} from "@ant-design/icons";
@@ -6,12 +6,14 @@ import {useHistory} from "react-router-dom";
import {useStore} from "../utils/useStore";
import {LINKS} from "../routes/app";
import {TopupsaldoModal} from "./TopupsaldoModal";
import {ModalLoaderContext} from "../utils/modal";
export const SupplierComponent = observer((props) => {
const store = useStore();
const [form] = Form.useForm();
const history = useHistory();
const [idData, setIdData] = useState("");
const modalLoader = useContext(ModalLoaderContext);
const handleEditButton = (data) => {
console.log(data, "isi data");
@@ -37,12 +39,14 @@ export const SupplierComponent = observer((props) => {
const status = isActive ? "inactive" : "active";
const status2 = isActive ? "Inactivating" : "Activating";
try {
modalLoader.setLoading(true);
const response = await store.supplier.changeStatus(id, status);
modalLoader.setLoading(false);
response?.body?.statusCode === 201
? message.success(`Success ${status2} Supplier`)
: message.error(`Failed ${status2} Supplier`);
} catch (err) {
modalLoader.setLoading(false);
console.log("error", err);
message.error(`Failed ${status2} Supplier`);
}
@@ -66,10 +70,10 @@ export const SupplierComponent = observer((props) => {
key: ["coa", "amount"],
width: "20%",
render: (text, record) =>
new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(text)
new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(text)
},
{
title: "Status",
@@ -79,7 +83,7 @@ export const SupplierComponent = observer((props) => {
render: (text, record) => (
<Tag
color={record?.status === true ? "processing" : "#E3E8EE"}
style={{ color: "#4F566B" }}
style={{color: "#4F566B"}}
>
{record?.status === true ? " ACTIVE" : "INACTIVE"}
</Tag>
@@ -107,10 +111,13 @@ export const SupplierComponent = observer((props) => {
const deleteData = async (id) => {
try {
console.log(id);
modalLoader.setLoading(true);
await store.supplier.delete(id);
modalLoader.setLoading(false);
message.success("Data Berhasil Dihapus");
history.push(LINKS.PRODUCT);
} catch (err) {
modalLoader.setLoading(false);
console.log("error", err);
message.error("Gagal menghapus");
}
@@ -119,7 +126,7 @@ export const SupplierComponent = observer((props) => {
const handleDelete = (id) => {
Modal.confirm({
title: "Are you sure delete this record?",
icon: <ExclamationCircleOutlined />,
icon: <ExclamationCircleOutlined/>,
okText: "Yes",
okType: "primary",
cancelText: "Cancel",
@@ -141,18 +148,21 @@ export const SupplierComponent = observer((props) => {
console.log(data, "isi data2");
if (idData !== "") {
try {
modalLoader.setLoading(true);
await store.supplier.update(idData, data);
message.success("Success Update Data Member");
await store.supplier.getData();
} catch (e) {
modalLoader.setLoading(false);
message.error("Failed Update Data Member");
}
modalLoader.setLoading(false);
store.supplier.visibleModalSupplier = false;
setIdData("");
form.resetFields();
} else {
try {
modalLoader.setLoading(true);
await store.supplier.create(data);
message.success("Success Add New Member");
} catch (e) {
@@ -160,6 +170,7 @@ export const SupplierComponent = observer((props) => {
message.error("Failed Add Member");
}
modalLoader.setLoading(false);
store.supplier.visibleModalSupplier = false;
setIdData("");
form.resetFields();
@@ -169,7 +180,7 @@ export const SupplierComponent = observer((props) => {
return (
<div>
<Table
style={{ textAlign: "center" }}
style={{textAlign: "center"}}
columns={columns}
dataSource={store.supplier.data}
bordered
@@ -184,7 +195,9 @@ export const SupplierComponent = observer((props) => {
let pageNumber = page.current;
store.supplier.pageSize = page.pageSize;
store.supplier.page = pageNumber - 1;
modalLoader.setLoading(true);
await store.supplier.getData();
modalLoader.setLoading(false);
}}
/>
<Modal
@@ -213,22 +226,22 @@ export const SupplierComponent = observer((props) => {
<Form.Item
name="name"
label="Name"
rules={[{ required: true, message: "Please input name!" }]}
rules={[{required: true, message: "Please input name!"}]}
>
<Input />
<Input/>
</Form.Item>
{!idData && (
<Form.Item
name="code"
label="Kode"
rules={[{ required: true, message: "Please input kode!" }]}
rules={[{required: true, message: "Please input kode!"}]}
>
<Input />
<Input/>
</Form.Item>
)}
</Form>
</Modal>
<TopupsaldoModal code={store.supplier.code} />
<TopupsaldoModal code={store.supplier.code}/>
</div>
);
});

View File

@@ -1,20 +1,21 @@
import React from "react";
import React, {useContext} from "react";
import {Form, Input, message, Modal} from "antd";
import {observer} from "mobx-react-lite";
import {useStore} from "../utils/useStore";
import {ModalLoaderContext} from "../utils/modal";
export const TopupsaldoModal = observer((props) => {
const store = useStore();
const [form] = Form.useForm();
const modalLoader = useContext(ModalLoaderContext);
const handleCancelTransaction = () => {
store.supplier.visibleModalTransaction = false;
};
const handleSubmitTransaction = async (data) => {
console.log(data, "isi data2");
try {
modalLoader.setLoading(true);
await store.supplier.createTransaction(data);
message.success("Success Top Up");
} catch (e) {
@@ -22,9 +23,11 @@ export const TopupsaldoModal = observer((props) => {
message.error("Failed Top Up");
}
modalLoader.setLoading(false);
store.supplier.visibleModalTransaction = false;
form.resetFields();
};
return (
<div>
<Modal
@@ -50,23 +53,23 @@ export const TopupsaldoModal = observer((props) => {
}}
>
<Form
form={form}
layout="vertical"
initialValues={{supplier: store.supplier.code}}
form={form}
layout="vertical"
initialValues={{supplier: store.supplier.code}}
>
<Form.Item
name="supplier"
label="Supplier"
rules={[{required: true, message: "Please input supplier!"}]}
name="supplier"
label="Supplier"
rules={[{required: true, message: "Please input supplier!"}]}
>
<Input disabled={true} />
<Input disabled={true}/>
</Form.Item>
<Form.Item
name="amount"
name="amount"
label="Amount"
rules={[{ required: true, message: "Please input amount!" }]}
rules={[{required: true, message: "Please input amount!"}]}
>
<Input />
<Input/>
</Form.Item>
</Form>
</Modal>