Merge branch 'develop' into 'devops-staging'
Bug Fixing PPOB See merge request empatnusabangsa/ppob/ppob-frontend!75
This commit is contained in:
commit
33b7b313b8
|
@ -273,21 +273,36 @@ export const ProductComponent = observer((props) => {
|
||||||
</Button>,
|
</Button>,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const handleClickRow = (record, index) => ({
|
||||||
|
onClick: (event) => {
|
||||||
|
history.push(LINKS.PRODUCT_DETAIL.replace(":id", record.product_id));
|
||||||
|
},
|
||||||
|
});
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
{store.ui.mediaQuery.isDesktop && (
|
{store.ui.mediaQuery.isDesktop && (
|
||||||
<Table
|
<Table
|
||||||
style={{
|
style={
|
||||||
textAlign: "center",
|
store.authentication.userData.role === "Admin"
|
||||||
width: store.ui.mediaQuery.isMobile ? 250 : "",
|
? {
|
||||||
}}
|
cursor: "pointer",
|
||||||
|
textAlign: "center",
|
||||||
|
width: store.ui.mediaQuery.isMobile ? 250 : "",
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
textAlign: "center",
|
||||||
|
width: store.ui.mediaQuery.isMobile ? 250 : "",
|
||||||
|
}
|
||||||
|
}
|
||||||
columns={columns}
|
columns={columns}
|
||||||
dataSource={
|
dataSource={
|
||||||
store.authentication.userData.role === "Admin Partner"
|
store.authentication.userData.role === "Admin Partner"
|
||||||
? store.product.dataProductPartner
|
? store.product.dataProductPartner
|
||||||
: store.product.data
|
: store.product.data
|
||||||
}
|
}
|
||||||
bordered
|
onRow={
|
||||||
|
store.authentication.userData.role === "Admin" ? handleClickRow : ""
|
||||||
|
}
|
||||||
pagination={{
|
pagination={{
|
||||||
pageSize: store.product.pageSize,
|
pageSize: store.product.pageSize,
|
||||||
total:
|
total:
|
||||||
|
@ -313,7 +328,7 @@ export const ProductComponent = observer((props) => {
|
||||||
itemLayout="horizontal"
|
itemLayout="horizontal"
|
||||||
position={"top"}
|
position={"top"}
|
||||||
pagination={{
|
pagination={{
|
||||||
onChange: async (page,pageSize) => {
|
onChange: async (page, pageSize) => {
|
||||||
store.product.pageSize = pageSize;
|
store.product.pageSize = pageSize;
|
||||||
store.product.page = page - 1;
|
store.product.page = page - 1;
|
||||||
modalLoader.setLoading(true);
|
modalLoader.setLoading(true);
|
||||||
|
|
|
@ -80,3 +80,6 @@ code {
|
||||||
.ant-menu-item-divider{
|
.ant-menu-item-divider{
|
||||||
border-style: transparent !important;
|
border-style: transparent !important;
|
||||||
}
|
}
|
||||||
|
.ant-table-tbody > tr.ant-table-row-level-0:hover > td {
|
||||||
|
background: #f0faf8 !important;
|
||||||
|
}
|
|
@ -256,7 +256,7 @@ export const Membership = observer(() => {
|
||||||
const dataRoute = [
|
const dataRoute = [
|
||||||
{
|
{
|
||||||
route: LINKS.MEMBERSHIP,
|
route: LINKS.MEMBERSHIP,
|
||||||
name: "Keanggotaan"
|
name: "Keanggotaan",
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
const onSubmit = async (data, image, imageStore) => {
|
const onSubmit = async (data, image, imageStore) => {
|
||||||
|
@ -329,6 +329,11 @@ export const Membership = observer(() => {
|
||||||
form.resetFields();
|
form.resetFields();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
const handleClickRow = (record, index) => ({
|
||||||
|
onClick: (event) => {
|
||||||
|
history.push(LINKS.USER_DETAIL.replace(":id", record.id));
|
||||||
|
},
|
||||||
|
});
|
||||||
return (
|
return (
|
||||||
<div className={["ppob-container"].join(" ")}>
|
<div className={["ppob-container"].join(" ")}>
|
||||||
<BreadcumbComponent
|
<BreadcumbComponent
|
||||||
|
@ -374,7 +379,9 @@ export const Membership = observer(() => {
|
||||||
<Table
|
<Table
|
||||||
key="1"
|
key="1"
|
||||||
hasEmpty
|
hasEmpty
|
||||||
|
onRow={handleClickRow}
|
||||||
columns={columns}
|
columns={columns}
|
||||||
|
style={{ cursor: "pointer" }}
|
||||||
dataSource={
|
dataSource={
|
||||||
store.authentication.userData.role === "Admin"
|
store.authentication.userData.role === "Admin"
|
||||||
? store.membership.dataMember
|
? store.membership.dataMember
|
||||||
|
|
Loading…
Reference in New Issue
Block a user