nipuni
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix App NOT installed report API query

Browse Source
feature/appm-store/pbac
shamalka 5 years ago
parent 84906b8a09
commit 45939832e2
3 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File

4
components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/scenes/AppNotInstalledDevices/index.js vendored
Unescape View File

@ -23,7 +23,7 @@ import { Link } from 'react-router-dom';
import { withConfigContext } from '../../../../../../components/ConfigContext'; import { withConfigContext } from '../../../../../../components/ConfigContext';
import AppListDropDown from './components/AppListDropDown'; import AppListDropDown from './components/AppListDropDown';
import ReportDevicesTable from '../../components/DevicesTable'; import DevicesTable from './../../components/DevicesTable';
import AppVersionDropDown from './components/AppVersionDropDown'; import AppVersionDropDown from './components/AppVersionDropDown';
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
@ -121,7 +121,7 @@ class AppNotInstalledDevicesReport extends React.Component {
</Button> </Button>
</div> </div>
<div style={{ backgroundColor: '#ffffff', borderRadius: 5 }}> <div style={{ backgroundColor: '#ffffff', borderRadius: 5 }}>
<ReportDevicesTable apiUrl={apiUrl} /> <DevicesTable apiUrl={apiUrl} />
</div> </div>
</div> </div>
</PageHeader> </PageHeader>

50
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
Unescape View File

@ -45,7 +45,6 @@ import org.wso2.carbon.device.mgt.common.EnrolmentInfo.Status;
import org.wso2.carbon.device.mgt.common.PaginationRequest; import org.wso2.carbon.device.mgt.common.PaginationRequest;
import org.wso2.carbon.device.mgt.common.configuration.mgt.DevicePropertyInfo; import org.wso2.carbon.device.mgt.common.configuration.mgt.DevicePropertyInfo;
import org.wso2.carbon.device.mgt.common.device.details.DeviceData; import org.wso2.carbon.device.mgt.common.device.details.DeviceData;
import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
import org.wso2.carbon.device.mgt.common.device.details.DeviceLocationHistory; import org.wso2.carbon.device.mgt.common.device.details.DeviceLocationHistory;
import org.wso2.carbon.device.mgt.core.dao.DeviceDAO; import org.wso2.carbon.device.mgt.core.dao.DeviceDAO;
import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
@ -54,7 +53,6 @@ import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.core.dto.DeviceType;
import org.wso2.carbon.device.mgt.core.geo.GeoCluster; import org.wso2.carbon.device.mgt.core.geo.GeoCluster;
import org.wso2.carbon.device.mgt.core.geo.geoHash.GeoCoordinate; import org.wso2.carbon.device.mgt.core.geo.geoHash.GeoCoordinate;
import org.wso2.carbon.device.mgt.core.report.mgt.Constants;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -1919,24 +1917,24 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
boolean isVersionProvided = false; boolean isVersionProvided = false;
String sql = "SELECT " + String sql = "SELECT " +
"d.ID AS DEVICE_ID, " + "d.ID AS DEVICE_ID, " +
"d.DESCRIPTION,d.NAME AS DEVICE_NAME, " + "d.DESCRIPTION, " +
"t.NAME AS DEVICE_TYPE, " + "d.NAME AS DEVICE_NAME, " +
"d.DEVICE_IDENTIFICATION, " + "t.NAME AS DEVICE_TYPE, " +
"e.OWNER, " + "d.DEVICE_IDENTIFICATION, " +
"e.OWNERSHIP, " + "e.OWNER, " +
"e.STATUS, " + "e.OWNERSHIP, " +
"e.DATE_OF_LAST_UPDATE, " + "e.STATUS, " +
"e.DATE_OF_ENROLMENT, " + "e.DATE_OF_LAST_UPDATE, " +
"e.ID AS ENROLMENT_ID " + "e.DATE_OF_ENROLMENT, " +
"FROM DM_DEVICE AS d " + "e.ID AS ENROLMENT_ID " +
"INNER JOIN DM_ENROLMENT AS e ON d.ID = e.DEVICE_ID " + "FROM DM_DEVICE AS d " +
"INNER JOIN DM_DEVICE_TYPE AS t ON d.DEVICE_TYPE_ID = t.ID " + "INNER JOIN DM_ENROLMENT AS e ON d.ID = e.DEVICE_ID " +
"WHERE t.NAME = ? AND e.TENANT_ID = ? AND d.ID " + "INNER JOIN DM_DEVICE_TYPE AS t ON d.DEVICE_TYPE_ID = t.ID " +
"NOT IN (SELECT m.DEVICE_ID " + "WHERE " +
"FROM DM_DEVICE_APPLICATION_MAPPING AS m " + "t.NAME = ? AND e.TENANT_ID = ? AND d.ID " +
"INNER JOIN DM_APPLICATION AS a ON m.APPLICATION_ID=a.ID " + "NOT IN " +
"WHERE a.APP_IDENTIFIER = ?"; "(SELECT a.DEVICE_ID FROM DM_APPLICATION AS a WHERE a.APP_IDENTIFIER = ?";
if (!StringUtils.isBlank(version)) { if (!StringUtils.isBlank(version)) {
sql = sql + " AND a.VERSION = ? "; sql = sql + " AND a.VERSION = ? ";
@ -1985,14 +1983,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
String sql = "SELECT " + String sql = "SELECT " +
"COUNT(d.ID) AS DEVICE_COUNT " + "COUNT(d.ID) AS DEVICE_COUNT " +
"FROM DM_DEVICE AS d " + "FROM DM_DEVICE AS d " +
"INNER JOIN DM_ENROLMENT AS e ON d.ID = e.DEVICE_ID " + "INNER JOIN DM_ENROLMENT AS e ON d.ID = e.DEVICE_ID " +
"INNER JOIN DM_DEVICE_TYPE AS t ON d.DEVICE_TYPE_ID = t.ID " + "INNER JOIN DM_DEVICE_TYPE AS t ON d.DEVICE_TYPE_ID = t.ID " +
"WHERE t.NAME = ? AND e.TENANT_ID = ? AND d.ID " + "WHERE " +
"t.NAME = ? AND e.TENANT_ID = ? AND d.ID " +
"NOT IN " + "NOT IN " +
"(SELECT m.DEVICE_ID " + "(SELECT a.DEVICE_ID FROM DM_APPLICATION AS a WHERE a.APP_IDENTIFIER = ?";
"FROM DM_DEVICE_APPLICATION_MAPPING AS m " +
"INNER JOIN DM_APPLICATION AS a ON m.APPLICATION_ID=a.ID " +
"WHERE a.APP_IDENTIFIER = ?";
if (!StringUtils.isBlank(version)) { if (!StringUtils.isBlank(version)) {
sql = sql + " AND a.VERSION = ? "; sql = sql + " AND a.VERSION = ? ";

4
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/ApplicationDAOImpl.java
Unescape View File

@ -29,9 +29,7 @@ import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -322,7 +320,7 @@ public class ApplicationDAOImpl implements ApplicationDAO {
@Override @Override
public List<String> getAppVersions(int tenantId, String packageName) throws DeviceManagementDAOException { public List<String> getAppVersions(int tenantId, String packageName) throws DeviceManagementDAOException {
String sql = "SELECT " + String sql = "SELECT DISTINCT " +
"VERSION " + "VERSION " +
"FROM DM_APPLICATION " + "FROM DM_APPLICATION " +
"WHERE TENANT_ID=? " + "WHERE TENANT_ID=? " +

Write Preview
Loading…
Cancel
Save