Merge branch 'fix/appm-store/device-install' into 'master'

Load both active & inactive devices in APPM device installation

Closes product-iots#318

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

@ -138,7 +138,6 @@ class DeviceInstall extends React.Component {
const extraParams = {
offset: 10 * (currentPage - 1), // calculate the offset
limit: 10,
status: 'ACTIVE',
requireDeviceInfo: true,
};
@ -146,11 +145,11 @@ class DeviceInstall extends React.Component {
extraParams.type = deviceType;
}
// note: encode with '%26' not '&'
const encodedExtraParams = Object.keys(extraParams)
let encodedExtraParams = Object.keys(extraParams)
.map(key => key + '=' + extraParams[key])
.join('&');
encodedExtraParams += '&status=ACTIVE&status=INACTIVE'; // fetch only active and inactive devices
// send request to the invoker
axios
.get(

@ -136,18 +136,18 @@ class DeviceUninstall extends React.Component {
const extraParams = {
offset: 10 * (currentPage - 1), // calculate the offset
limit: 10,
status: 'ACTIVE',
};
if (deviceType !== 'ANY') {
extraParams.type = deviceType;
}
// note: encode with '%26' not '&'
const encodedExtraParams = Object.keys(extraParams)
let encodedExtraParams = Object.keys(extraParams)
.map(key => key + '=' + extraParams[key])
.join('&');
encodedExtraParams += '&status=ACTIVE&status=INACTIVE'; // fetch only active and inactive devices
const uuid = this.props.uuid;
axios
.get(

Loading…
Cancel
Save