Merge branch 'master' into 'master'

Fix pagination in store UI install/uninstall

Closes product-iots#283

See merge request entgra/carbon-device-mgt!400
4.x.x
Dharmakeerthi Lasantha 5 years ago
commit a109725d88

@ -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
}} }}

@ -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}

Loading…
Cancel
Save