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

Load both active & inactive devices in APPM device installation

Browse Source
This commit is contained in:
Jayasanka Weerasinghe 2020-01-29 14:56:39 +05:30
parent cee3ef55d1
commit 3bf3dfd2e7
2 changed files with 5 additions and 6 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

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

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

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