community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fix pagination in store UI install/uninstall

Closes product-iots#283

See merge request entgra/carbon-device-mgt!400
This commit is contained in:
Dharmakeerthi Lasantha 2019-12-10 13:27:46 +00:00
commit a109725d88
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js vendored
View File

@ -158,7 +158,7 @@ class DeviceInstall extends React.Component {
const pagination = {...this.state.pagination}; const pagination = {...this.state.pagination};
this.setState({ this.setState({
loading: false, loading: false,
data: res.data.data.devices, data: res.data.data,
pagination, pagination,
}); });
} }
@ -224,11 +224,12 @@ class DeviceInstall extends React.Component {
style={{paddingTop: 20}} style={{paddingTop: 20}}
columns={columns} columns={columns}
rowKey={record => record.deviceIdentifier} rowKey={record => record.deviceIdentifier}
dataSource={data} dataSource={data.devices}
pagination={{ pagination={{
...pagination, ...pagination,
size: "small", size: "small",
// position: "top", // position: "top",
total: data.count,
showTotal: (total, range) => `showing ${range[0]}-${range[1]} of ${total} devices` showTotal: (total, range) => `showing ${range[0]}-${range[1]} of ${total} devices`
// showQuickJumper: true // showQuickJumper: true
}} }}

5
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js vendored
View File

@ -155,7 +155,7 @@ class DeviceUninstall extends React.Component {
const pagination = {...this.state.pagination}; const pagination = {...this.state.pagination};
this.setState({ this.setState({
loading: false, loading: false,
data: res.data.data.devices, data: res.data.data,
pagination, pagination,
}); });
} }
@ -220,10 +220,11 @@ class DeviceUninstall extends React.Component {
style={{paddingTop: 20}} style={{paddingTop: 20}}
columns={columns} columns={columns}
rowKey={record => record.deviceIdentifier} rowKey={record => record.deviceIdentifier}
dataSource={data} dataSource={data.devices}
pagination={{ pagination={{
...pagination, ...pagination,
size: "small", size: "small",
total: data.count,
showTotal: (total, range) => `showing ${range[0]}-${range[1]} of ${total} devices` showTotal: (total, range) => `showing ${range[0]}-${range[1]} of ${total} devices`
}} }}
loading={loading} loading={loading}