From 933e0d16a4eb82f41f85f9d9ce39434763abe96e Mon Sep 17 00:00:00 2001 From: shamalka Date: Tue, 26 Nov 2019 16:03:24 +0530 Subject: [PATCH] Store UI pagination fix --- .../apps/release/SubscriptionDetails.js | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/SubscriptionDetails.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/SubscriptionDetails.js index be71eb4e8f..9152e9f58b 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/SubscriptionDetails.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/SubscriptionDetails.js @@ -194,10 +194,9 @@ class SubscriptionDetails extends React.Component { `/admin/subscription/${this.props.uuid}?` + encodedExtraParams, ).then(res => { if (res.status === 200) { - console.log(res.data.data.data); this.setState({ loading: false, - data: res.data.data.data + data: res.data.data }); } @@ -216,6 +215,21 @@ class SubscriptionDetails extends React.Component { }); }; + handleTableChange = (pagination, filters, sorter) => { + const pager = {...this.state.pagination}; + pager.current = pagination.current; + this.setState({ + pagination: pager, + }); + this.fetch({ + results: pagination.pageSize, + page: pagination.current, + sortField: sorter.field, + sortOrder: sorter.order, + ...filters, + }); + }; + render() { const {data, pagination, loading, selectedRows} = this.state; return ( @@ -240,14 +254,16 @@ class SubscriptionDetails extends React.Component { (record.device.deviceIdentifier + record.device.enrolmentInfo.owner + record.device.enrolmentInfo.ownership)} - dataSource={data} + dataSource={data.data} pagination={{ ...pagination, size: "small", // position: "top", + total: data.recordsTotal, showTotal: (total, range) => `showing ${range[0]}-${range[1]} of ${total} devices` // showQuickJumper: true }} + onChange={this.handleTableChange} loading={loading} scroll={{x: 1000}} />