Merge branch 'master' into 'master'

Fix pagination in store UI install/uninstall

Closes product-iots#283

See merge request entgra/carbon-device-mgt!400
feature/appm-store/pbac
Dharmakeerthi Lasantha 5 years ago
commit a109725d88

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

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

Loading…
Cancel
Save