Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java

@@ -420,5 +420,12 @@ public interface DeviceDAO {
      */
     List<EnrolmentInfo> getEnrolmentsByStatus(List<DeviceIdentifier> deviceIds, Status status,
                                               int tenantId) throws DeviceManagementDAOException;
+
+    /**
+     * Retrieving the tenants which are have device enrolled.
+     * @return
+     * @throws DeviceManagementDAOException
+     */
+    List<Integer> getDeviceEnrolledTenants() throws DeviceManagementDAOException;
 }
 

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

@@ -1062,4 +1062,26 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         return devices;
     }
 
+    public List<Integer> getDeviceEnrolledTenants() throws DeviceManagementDAOException {
+        Connection conn;
+        PreparedStatement stmt = null;
+        ResultSet rs = null;
+        List<Integer> tenants = new ArrayList<>();
+        try {
+            conn = this.getConnection();
+            String sql = "SELECT distinct(TENANT_ID) FROM DM_DEVICE";
+            stmt = conn.prepareStatement(sql);
+            rs = stmt.executeQuery();
+            while (rs.next()) {
+                tenants.add(rs.getInt("TENANT_ID"));
+            }
+        } catch (SQLException e) {
+            throw new DeviceManagementDAOException("Error occurred while retrieving tenants which have " +
+                    "device registered.", e);
+        } finally {
+            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+        }
+        return tenants;
+    }
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java

@@ -307,4 +307,6 @@ public interface DeviceManagementProviderService {
 
     PolicyMonitoringManager getPolicyMonitoringManager(String deviceType);
 
+    List<Integer> getDeviceEnrolledTenants() throws DeviceManagementException;
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java

@@ -316,6 +316,22 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     }
 
     @Override
+    public List<Integer> getDeviceEnrolledTenants() throws DeviceManagementException {
+        try {
+            DeviceManagementDAOFactory.openConnection();
+            return deviceDAO.getDeviceEnrolledTenants();
+        } catch (DeviceManagementDAOException e) {
+            throw new DeviceManagementException("Error occurred while retrieving the tenants " +
+                    "which have device enrolled.", e);
+        } catch (SQLException e) {
+            throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
+        } finally {
+            DeviceManagementDAOFactory.closeConnection();
+        }
+    }
+
+
+        @Override
     public boolean disenrollDevice(DeviceIdentifier deviceId) throws DeviceManagementException {
         DeviceManager deviceManager = this.getDeviceManager(deviceId.getType());
         if (deviceManager == null) {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceDetailsRetrieverTask.java

@@ -30,6 +30,8 @@ import org.wso2.carbon.device.mgt.core.task.DeviceTaskManager;
 import org.wso2.carbon.ntask.core.Task;
 import org.wso2.carbon.user.api.Tenant;
 import org.wso2.carbon.user.api.UserStoreException;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import java.util.List;
 
 import java.util.Map;
 
@@ -58,20 +60,22 @@ public class DeviceDetailsRetrieverTask implements Task {
 
     @Override
     public void execute() {
-
         if (log.isDebugEnabled()) {
             log.debug("Device details retrieving task started to run.");
         }
         try {
-            Tenant tenants[] = DeviceManagementDataHolder.getInstance().
+//            Tenant tenants[] = DeviceManagementDataHolder.getInstance().
-                    getRealmService().getTenantManager().getAllTenants();
+//                    getRealmService().getTenantManager().getAllTenants();
-
+
-            for (Tenant tenant : tenants) {
+            List<Integer> tenants = DeviceManagementDataHolder.getInstance().
-
+                    getDeviceManagementProvider().getDeviceEnrolledTenants();
+            for (Integer tenant : tenants) {
+                String tenantDomain = DeviceManagementDataHolder.getInstance().
+                        getRealmService().getTenantManager().getDomain(tenant);
                 try {
                     PrivilegedCarbonContext.startTenantFlow();
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenant.getDomain());
+                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenantDomain);
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant.getId());
+                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant);
                     DeviceTaskManager deviceTaskManager = new DeviceTaskManagerImpl(deviceType,
                             operationMonitoringTaskConfig);
                     //pass the configurations also from here, monitoring tasks
@@ -87,8 +91,12 @@ public class DeviceDetailsRetrieverTask implements Task {
             }
         } catch (UserStoreException e) {
             log.error("Error occurred while trying to get the available tenants", e);
+        } catch (DeviceManagementException e) {
+            log.error("Error occurred while trying to get the available tenants " +
+                    "from device manager provider service.", e);
         }
 
+
     }
 
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js

@@ -315,7 +315,7 @@ function loadDevices(searchType, searchParam) {
         {
             targets: 6,
             data: 'status',
-            class: 'text-right content-fill text-left-on-grid-view no-wrap',
+            class: 'text-right content-fill text-left-on-grid-view no-wrap tooltip-overflow-fix',
             render: function (status, type, row, meta) {
                 var deviceType = row.deviceType;
                 var deviceIdentifier = row.deviceIdentifier;
@@ -326,7 +326,7 @@ function loadDevices(searchType, searchParam) {
                     if (analyticsEnabled(row.deviceType)) {
                         html += '<a href="' + context + '/device/' + deviceType + '/analytics?deviceId=' +
                                 deviceIdentifier + '&deviceName=' + row.name + '" ' + 'data-click-event="remove-form"' +
-                                ' class="btn padding-reduce-on-grid-view" data-placement="bottom" data-toggle="tooltip" data-original-title="Analytics"><span class="fw-stack">' +
+                                ' class="btn padding-reduce-on-grid-view" data-placement="top" data-toggle="tooltip" data-original-title="Analytics"><span class="fw-stack">' +
                                 '<i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>' +
                                 '<span class="hidden-xs hidden-on-grid-view">Analytics</span>';
                     }
@@ -337,7 +337,7 @@ function loadDevices(searchType, searchParam) {
                                 +
                                 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
                                 + '" data-devicename="' +
-                                row.name + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Group"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>' +
+                                row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Group"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>' +
                                 '<i class="fw fw-group fw-stack-1x"></i></span>' +
                                 '<span class="hidden-xs hidden-on-grid-view">Group</span></a>';
                     }
@@ -345,7 +345,7 @@ function loadDevices(searchType, searchParam) {
                     html +=
                             '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view edit-device-link" '
                             + 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
-                            + '" data-devicename="' + row.name + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Edit">'
+                            + '" data-devicename="' + row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Edit">'
                             + '<span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>'
                             + '<i class="fw fw-edit fw-stack-1x"></i></span>'
                             + '<span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
@@ -354,7 +354,7 @@ function loadDevices(searchType, searchParam) {
                         html +=
                                 '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view remove-device-link" '
                                 + 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
-                                + '" data-devicename="' + row.name + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Remove from group">'
+                                + '" data-devicename="' + row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Remove from group">'
                                 + '<span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>'
                                 + '<i class="fw fw-delete fw-stack-1x"></i></span>'
                                 + '<span class="hidden-xs hidden-on-grid-view">Remove from group</span>';
@@ -362,7 +362,7 @@ function loadDevices(searchType, searchParam) {
                         html +=
                                 '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view remove-device-link" '
                                 + 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
-                                + '" data-devicename="' + row.name + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Delete">'
+                                + '" data-devicename="' + row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Delete">'
                                 + '<span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>'
                                 + '<i class="fw fw-delete fw-stack-1x"></i></span>'
                                 + '<span class="hidden-xs hidden-on-grid-view">Delete</span>';
@@ -919,4 +919,4 @@ function getSelectedDevices() {
     });
 
     return deviceList;
-}
+}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js

@@ -180,13 +180,13 @@ function loadGroups() {
         {
             targets: 4,
             data: 'id',
-            class: 'text-right content-fill text-left-on-grid-view no-wrap',
+            class: 'text-right content-fill text-left-on-grid-view no-wrap tooltip-overflow-fix',
             render: function (id, type, row, meta) {
                 var html = '';
                 if ($.hasPermission("VIEW_GROUP_DEVICES")) {
                     html += '<a href="group/' + row.groupId
                             + '/analytics" data-click-event="remove-form" class="btn padding-reduce-on-grid-view" ' +
-                            'data-placement="bottom" data-toggle="tooltip" data-original-title="Analytics">' +
+                            'data-placement="top" data-toggle="tooltip" data-original-title="Analytics">' +
                             '<span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>'
                             +
                             '<span class="hidden-xs hidden-on-grid-view">Analytics</span></a>';
@@ -197,7 +197,7 @@ function loadGroups() {
                                 '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view share-group-link" data-group-id="'
                                 + row.groupId + '" ' +
                                 'data-group-owner="' + row.owner
-                                + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Share"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-share fw-stack-1x"></i></span>'
+                                + '" data-placement="top" data-toggle="tooltip" data-original-title="Share"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-share fw-stack-1x"></i></span>'
                                 +
                                 '<span class="hidden-xs hidden-on-grid-view">Share</span></a>';
                     }
@@ -207,7 +207,7 @@ function loadGroups() {
                                 + row.name + '" ' +
                                 'data-group-owner="' + row.owner + '" data-group-description="' + row.description
                                 + '" data-group-id="' + row.groupId
-                                + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Edit"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>' +
+                                + '" data-placement="top" data-toggle="tooltip" data-original-title="Edit"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>' +
                                 '<i class="fw fw-edit fw-stack-1x"></i></span><span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
                     }
                     if ($.hasPermission("REMOVE_GROUP")) {
@@ -215,7 +215,7 @@ function loadGroups() {
                                 '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view remove-group-link" data-group-id="'
                                 + row.groupId + '" ' +
                                 'data-group-owner="' + row.owner
-                                + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Delete"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-delete fw-stack-1x"></i>'
+                                + '" data-placement="top" data-toggle="tooltip" data-original-title="Delete"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-delete fw-stack-1x"></i>'
                                 +
                                 '</span><span class="hidden-xs hidden-on-grid-view">Delete</span></a>';
                     }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js

@@ -337,31 +337,31 @@ function loadUsers() {
             }
         },
         {
-            class: "text-right content-fill text-left-on-grid-view no-wrap",
+            class: "text-right content-fill text-left-on-grid-view no-wrap tooltip-overflow-fix",
             data: null,
             render: function (data, type, row, meta) {
-                var editbtn = '<a data-toggle="tooltip" data-placement="bottom" title="Edit User"href="' + context +
+                var editbtn = '<a data-toggle="tooltip" data-placement="top" title="Edit User"href="' + context +
                     '/user/edit?username=' + encodeURIComponent(data.filter) + '" data-username="' + data.filter + '" ' +
                     'data-click-event="edit-form" ' +
-                    'class="btn padding-reduce-on-grid-view edit-user-link" data-placement="bottom" data-toggle="tooltip" data-original-title="Edit"> ' +
+                    'class="btn padding-reduce-on-grid-view edit-user-link" data-placement="top" data-toggle="tooltip" data-original-title="Edit"> ' +
                     '<span class="fw-stack"> ' +
                     '<i class="fw fw-circle-outline fw-stack-2x"></i>' +
                     '<i class="fw fw-edit fw-stack-1x"></i>' +
                     '</span><span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
 
-                var resetPasswordbtn = '<a data-toggle="tooltip" data-placement="bottom" title="Reset Password" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
+                var resetPasswordbtn = '<a data-toggle="tooltip" data-placement="top" title="Reset Password" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
                     'data-click-event="edit-form" ' +
                     'onclick="javascript:resetPassword(\'' + data.filter + '\')" ' +
-                    'class="btn padding-reduce-on-grid-view remove-user-link" data-placement="bottom" data-toggle="tooltip" data-original-title="Reset Password">' +
+                    'class="btn padding-reduce-on-grid-view remove-user-link" data-placement="top" data-toggle="tooltip" data-original-title="Reset Password">' +
                     '<span class="fw-stack">' +
                     '<i class="fw fw-circle-outline fw-stack-2x"></i>' +
                     '<i class="fw fw-key fw-stack-1x"></i>' +
                     '</span><span class="hidden-xs hidden-on-grid-view">Reset Password</span></a>';
 
-                var removebtn = '<a data-toggle="tooltip" data-placement="bottom" title="Remove User" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
+                var removebtn = '<a data-toggle="tooltip" data-placement="top" title="Remove User" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
                     'data-click-event="remove-form" ' +
                     'onclick="javascript:removeUser(\'' + data.filter + '\')" ' +
-                    'class="btn padding-reduce-on-grid-view remove-user-link" data-placement="bottom" data-toggle="tooltip" data-original-title="Remove">' +
+                    'class="btn padding-reduce-on-grid-view remove-user-link" data-placement="top" data-toggle="tooltip" data-original-title="Remove">' +
                     '<span class="fw-stack">' +
                     '<i class="fw fw-circle-outline fw-stack-2x"></i>' +
                     '<i class="fw fw-delete fw-stack-1x"></i>' +

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java

@@ -30,8 +30,9 @@ import org.wso2.carbon.ntask.core.Task;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
 import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
 import org.wso2.carbon.policy.mgt.core.mgt.MonitoringManager;
-import org.wso2.carbon.user.api.Tenant;
 import org.wso2.carbon.user.api.UserStoreException;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,15 +62,19 @@ public class MonitoringTask implements Task {
         }
 
         try {
-            Tenant tenants[] = PolicyManagementDataHolder.getInstance().
-                    getRealmService().getTenantManager().getAllTenants();
 
-            for (Tenant tenant : tenants) {
+            PolicyManagementDataHolder.getInstance().
+                    getRealmService().getTenantManager().getAllTenants();
+            DeviceManagementProviderService deviceManagementService = new DeviceManagementProviderServiceImpl();
+            List<Integer> tenants = deviceManagementService.getDeviceEnrolledTenants();
 
+            for (Integer tenant : tenants) {
+                String tenantDomain = PolicyManagementDataHolder.getInstance().
+                        getRealmService().getTenantManager().getDomain(tenant);
                 try {
                     PrivilegedCarbonContext.startTenantFlow();
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenant.getDomain());
+                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenantDomain);
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant.getId());
+                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant);
 
                     MonitoringManager monitoringManager = PolicyManagementDataHolder.getInstance().getMonitoringManager();
                     List<String> deviceTypes = new ArrayList<>();
@@ -142,6 +147,8 @@ public class MonitoringTask implements Task {
 
         } catch (UserStoreException e) {
             log.error("Error occurred while trying to get the available tenants", e);
+        } catch (DeviceManagementException e) {
+            log.error("Error occurred while trying to get the available tenants from device manager service ", e);
         }
 
     }