PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'devops-staging'

Browse Source 
feat: fixing data table produk and pagination in role admin table

See merge request empatnusabangsa/ppob/ppob-frontend!165
This commit is contained in:
Rahman Efendi 2022-04-13 04:48:40 +00:00
commit fa1f84a53b
3 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/component/ProductComponent.js
View File

@ -297,21 +297,25 @@ export const ProductComponent = observer((props) => {
} }
onRow={handleClickRow} onRow={handleClickRow}
pagination={{ pagination={{
pageSize: store.product.pageSize, pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
total: total:
store.authentication.userData.role === "Admin Partner" store.authentication.userData.role === "Admin Partner"
? store.product.total_data_partner ? store.product.total_data_partner
: store.product.total_data, : store.product.total_data,
current: store.product.page + 1, current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
showSizeChanger: true, showSizeChanger: true,
simple: false, simple: false,
}} }}
onChange={async (page) => { onChange={async (page) => {
let pageNumber = page.current; let pageNumber = page.current;
store.product.pageSize = page.pageSize; store.authentication.userData.role === "Admin" ? store.product.pageSize = page.pageSize : store.product.pageSizeProductPartner = page.pageSize;
store.product.page = pageNumber - 1; store.authentication.userData.role === "Admin" ? store.product.page = pageNumber - 1 : store.product.pageProductPartner = pageNumber - 1
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.product.getData(); store.authentication.userData.role === "Admin Partner"
? await store.product.getProductPartner(
// store.authentication.profileData.id
)
: await store.product.getData();
modalLoader.setLoading(false); modalLoader.setLoading(false);
}} }}
/> />
@ -322,23 +326,29 @@ export const ProductComponent = observer((props) => {
position={"top"} position={"top"}
pagination={{ pagination={{
onChange: async (page, pageSize) => { onChange: async (page, pageSize) => {
store.product.pageSize = pageSize; store.authentication.userData.role === "Admin" ? store.product.pageSize = pageSize : store.product.pageSizeProductPartner = pageSize;
store.product.page = page - 1; store.authentication.userData.role === "Admin" ? store.product.page = page - 1 : store.product.pageProductPartner = page - 1
modalLoader.setLoading(true); modalLoader.setLoading(true);
store.authentication.userData.role === "Admin Partner" store.authentication.userData.role === "Admin Partner"
? await store.product.getProductPartner( ? await store.product.getProductPartner(
store.authentication.profileData.id // store.authentication.profileData.id
) )
: await store.product.getData(); : await store.product.getData();
//await store.product.getData(); //await store.product.getData();
modalLoader.setLoading(false); modalLoader.setLoading(false);
}, },
pageSize: store.product.pageSize, pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
total: store.product.total_data, total: store.authentication.userData.role === "Admin Partner"
current: store.product.page + 1, ? store.product.total_data_partner
: store.product.total_data,
current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
style: { marginBottom: "1rem", marginRight: "1rem" }, style: { marginBottom: "1rem", marginRight: "1rem" },
}} }}
dataSource={store.product.data} dataSource={
store.authentication.userData.role === "Admin Partner"
? store.product.dataProductPartner
: store.product.data
}
style={{ padding: 0 }} style={{ padding: 0 }}
renderItem={(item) => { renderItem={(item) => {
return ( return (

4
src/store/product.js
View File

@ -28,6 +28,7 @@ export class Product {
totalDataPriceHistory = 0; totalDataPriceHistory = 0;
pagePriceHistory = 0; pagePriceHistory = 0;
pageProductPartner = 0; pageProductPartner = 0;
pageSizeProductPartner = 10
pageSizePriceHistory = 10 pageSizePriceHistory = 10
dataDetailProduct = {}; dataDetailProduct = {};
@ -54,6 +55,7 @@ export class Product {
} }
} }
async getDataSubCategories() { async getDataSubCategories() {
try { try {
const response = await http.get(`/product/sub-categories?category=${this.filterCategory}&page=${this.pageSubCategories}&pageSize=${this.pageSizeSubCategories}`); const response = await http.get(`/product/sub-categories?category=${this.filterCategory}&page=${this.pageSubCategories}&pageSize=${this.pageSizeSubCategories}`);
@ -100,7 +102,7 @@ export class Product {
async getProductPartner(id) { async getProductPartner(id) {
try { try {
const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=10&sub-category=${id}`); const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=${id}`);
console.log(response) console.log(response)
this.dataProductPartner = response.body.data this.dataProductPartner = response.body.data
this.total_data_partner = response?.body?.count ?? 0 this.total_data_partner = response?.body?.count ?? 0