mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Add UI feature to delete multiple devices permanently
This commit is contained in:
Dharmakeerthi Lasantha
commit
1abc701f20
@ -161,6 +161,7 @@
|
||||
"perm:device:enroll",
|
||||
"perm:geo-service:analytics-view",
|
||||
"perm:geo-service:alerts-manage",
|
||||
"perm:devices:permanent-delete",
|
||||
"appm:read"
|
||||
],
|
||||
"isOAuthEnabled": true,
|
||||
|
||||
@ -623,6 +623,9 @@ var userModule = function () {
|
||||
if (publicMethods.isAuthorized("/permission/admin/device-mgt/admin/devices/update-enrollment")) {
|
||||
permissions["UPDATE_ENROLLMENT"] = true;
|
||||
}
|
||||
if (publicMethods.isAuthorized("/permission/admin/device-mgt/admin/devices/permanent-delete")) {
|
||||
permissions["PERMANENT_DELETE"] = true;
|
||||
}
|
||||
|
||||
return permissions;
|
||||
};
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
{{#equal enrolmentInfo.status "ACTIVE"}}<span><i class="fw fw-success icon-success"></i> Active</span>{{/equal}}
|
||||
{{#equal enrolmentInfo.status "INACTIVE"}}<span><i class="fw fw-warning icon-warning"></i> Inactive</span>{{/equal}}
|
||||
{{#equal enrolmentInfo.status "BLOCKED"}}<span><i class="fw fw-remove icon-danger"></i> Blocked</span>{{/equal}}
|
||||
{{#equal enrolmentInfo.status "REMOVED"}}<span><i class="fw fw-delete icon-danger"></i> Removed</span>{{/equal}}
|
||||
{{#equal enrolmentInfo.status "REMOVED"}}<span><i class="fw fw-disabled icon-danger"></i> Removed</span>{{/equal}}
|
||||
</td>
|
||||
<td class="remove-padding-top" data-search="{{type}}" data-display="{{type}}" data-grid-label="Type">{{type}}</td>
|
||||
<td class="remove-padding-top" data-search="{{enrolmentInfo.ownership}}" data-display="{{enrolmentInfo.ownership}}" data-grid-label="Ownership">{{enrolmentInfo.ownership}}</td>
|
||||
|
||||
@ -218,15 +218,31 @@
|
||||
data-toggle="modal" data-target="#modalDemo">
|
||||
<span class="icon fw-stack">
|
||||
<i class="fw fw-circle-outline fw-stack-2x"></i>
|
||||
<i class="fw fw-delete fw-stack-1x"></i>
|
||||
<i class="fw fw-disabled fw-stack-1x"></i>
|
||||
</span>
|
||||
{{#if group}}
|
||||
Remove from group
|
||||
{{else}}
|
||||
Remove Device
|
||||
Dis-enroll Device
|
||||
{{/if}}
|
||||
</a>
|
||||
</li>
|
||||
<!--permanent delete-->
|
||||
{{#if permissions.permanentDelete}}
|
||||
<li>
|
||||
<a href="#"
|
||||
data-click-event="remove-form"
|
||||
class="btn square-element delete-device-link"
|
||||
data-toggle="modal" data-target="#modalDemo">
|
||||
<span class="icon fw-stack">
|
||||
<i class="fw fw-circle-outline fw-stack-2x"></i>
|
||||
<i class="fw fw-delete fw-stack-1x"></i>
|
||||
</span>
|
||||
Delete Device
|
||||
</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
<!--/permanent delete-->
|
||||
<!--update enrollment-->
|
||||
{{#if permissions.updateEnrollment}}
|
||||
<li>
|
||||
@ -423,6 +439,58 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="delete-device-modal-content" class="hide">
|
||||
<div class="modal-header">
|
||||
<h3 class="pull-left modal-title">
|
||||
{{#if group}}
|
||||
Do you really want to permanently delete this device(s) from '{{group.name}}' group?
|
||||
{{else}}
|
||||
Do you really want to permanently delete this device(s) from your Devices?
|
||||
{{/if}}
|
||||
</h3>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
|
||||
class="fw fw-cancel"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<div class="buttons">
|
||||
<a href="#" id="delete-device-yes-link" class="btn-operations">
|
||||
Yes
|
||||
</a>
|
||||
|
||||
<a href="#" id="delete-device-cancel-link" class="btn-operations">
|
||||
Cancel
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="delete-device-200-content" class="hide">
|
||||
<div class="modal-header">
|
||||
<h3 class="pull-left modal-title">
|
||||
{{#if group}}
|
||||
Successfully deleted from '{{group.name}}' group.
|
||||
{{else}}
|
||||
Successfully deleted.
|
||||
{{/if}}
|
||||
</h3>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
|
||||
class="fw fw-cancel"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<div class="buttons">
|
||||
<a href="javascript:hidePopup()" class="btn-operations">Ok</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="edit-device-modal-content" class="hide">
|
||||
<div class="modal-header">
|
||||
<h3 class="pull-left modal-title">
|
||||
@ -475,6 +543,22 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="enrolled-device-delete-content" class="hide">
|
||||
<div class="modal-header">
|
||||
<h3 class="pull-left modal-title">Could not delete devices since some are still
|
||||
enrolled.</h3>
|
||||
</div>
|
||||
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<div class="buttons">
|
||||
<a href="#" id="enrolled-device-delete-link" class="btn-operations">
|
||||
Ok
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="device-400-content" class="hide">
|
||||
<div class="modal-content">
|
||||
<div class="row">
|
||||
|
||||
@ -46,6 +46,9 @@ function onRequest(context) {
|
||||
if (uiPermissions.UPDATE_ENROLLMENT) {
|
||||
viewModel.permissions.updateEnrollment = true;
|
||||
}
|
||||
if (uiPermissions.PERMANENT_DELETE) {
|
||||
viewModel.permissions.permanentDelete = true;
|
||||
}
|
||||
viewModel.currentUser = currentUser;
|
||||
var deviceCount = 0;
|
||||
if (groupId) {
|
||||
|
||||
@ -70,7 +70,7 @@ function InitiateViewOption(url) {
|
||||
var deviceCheckbox = "#ast-container .ctrl-wr-asset .itm-select input[type='checkbox']";
|
||||
var assetContainer = "#ast-container";
|
||||
|
||||
var deviceListing, currentUser, groupId;
|
||||
var deviceListing, currentUser, groupId, hasDeletePermission;
|
||||
|
||||
/*
|
||||
* DOM ready functions.
|
||||
@ -87,8 +87,8 @@ $(document).ready(function () {
|
||||
};
|
||||
|
||||
deviceListing = $("#device-listing");
|
||||
hasDeletePermission = $("#permission").data("permission")['PERMANENT_DELETE'];
|
||||
currentUser = deviceListing.data("current-user");
|
||||
|
||||
groupId = getParameterByName("groupId");
|
||||
|
||||
/* Adding selected class for selected devices */
|
||||
@ -320,7 +320,7 @@ function loadDevices(searchType, searchParam) {
|
||||
html = '<span><i class="fw fw-remove icon-danger"></i> Blocked</span>';
|
||||
break;
|
||||
case 'REMOVED' :
|
||||
html = '<span><i class="fw fw-delete icon-danger"></i> Removed</span>';
|
||||
html = '<span><i class="fw fw-disabled icon-danger"></i> Removed</span>';
|
||||
break;
|
||||
case 'UNREACHABLE' :
|
||||
html = '<span><i class="fw fw-warning icon-warning"></i> Unreachable</span>';
|
||||
@ -361,12 +361,12 @@ function loadDevices(searchType, searchParam) {
|
||||
var portalUrl = $("#device-listing").data("portal-url");
|
||||
var serverUrl = $("#device-listing").data("server-url");
|
||||
var userDomain = $("#device-listing").data("userDomain");
|
||||
var statusCode = row.status;
|
||||
var statURL;
|
||||
if (status != 'REMOVED') {
|
||||
if (statusCode != 'REMOVED') {
|
||||
html = '';
|
||||
|
||||
if (analyticsEnabled(row.deviceType)) {
|
||||
|
||||
// redirecting to respective analytics view depending on device configs
|
||||
switch (getAnalyticsView(deviceType)) {
|
||||
case "DAS" : { statURL =portalUrl + "/portal/t/"+ userDomain+ "/dashboards/android-iot/battery?owner=" +currentUser+"&deviceId=";break;}
|
||||
@ -405,17 +405,115 @@ function loadDevices(searchType, searchParam) {
|
||||
+ 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
|
||||
+ '" 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>'
|
||||
+ '<i class="fw fw-disabled fw-stack-1x"></i></span>'
|
||||
+ '<span class="hidden-xs hidden-on-grid-view">Remove from group</span>';
|
||||
} else {
|
||||
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="top" data-toggle="tooltip" data-original-title="Dis-enroll">'
|
||||
+ '<span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>'
|
||||
+ '<i class="fw fw-disabled fw-stack-1x"></i></span>'
|
||||
+ '<span class="hidden-xs hidden-on-grid-view">Dis-enroll</span>';
|
||||
}
|
||||
} else if (statusCode == 'REMOVED' && hasDeletePermission) {
|
||||
html = '';
|
||||
|
||||
if (analyticsEnabled(row.deviceType)) {
|
||||
// redirecting to respective analytics view depending on device configs
|
||||
switch (getAnalyticsView(deviceType)) {
|
||||
case "DAS" : {
|
||||
statURL = portalUrl + "/portal/t/" + userDomain + "/dashboards/android-iot/battery?owner=" + currentUser + "&deviceId=";
|
||||
break;
|
||||
}
|
||||
default : {
|
||||
statURL = context + "/device/" + row.deviceType + "/analytics?deviceId="
|
||||
}
|
||||
}
|
||||
|
||||
html += '<a href="' + statURL +
|
||||
deviceIdentifier + '&deviceName=' + row.name + '" ' + 'data-click-event="remove-form"' +
|
||||
' 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>';
|
||||
}
|
||||
|
||||
if (!groupId && groupingEnabled(row.deviceType)) {
|
||||
html +=
|
||||
'<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view group-device-link" '
|
||||
+
|
||||
'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
|
||||
+ '" data-devicename="' +
|
||||
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>';
|
||||
}
|
||||
|
||||
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="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 groupOwner = $('#group_owner').text();
|
||||
if (groupId && groupOwner != "wso2.system.user") {
|
||||
html +=
|
||||
'<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view delete-device-link" '
|
||||
+ 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
|
||||
+ '" 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>';
|
||||
} else {
|
||||
html +=
|
||||
'<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view delete-device-link" '
|
||||
+ 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
|
||||
+ '" 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>';
|
||||
}
|
||||
} else {
|
||||
html = '';
|
||||
|
||||
if (analyticsEnabled(row.deviceType)) {
|
||||
// redirecting to respective analytics view depending on device configs
|
||||
switch (getAnalyticsView(deviceType)) {
|
||||
case "DAS" : {
|
||||
statURL = portalUrl + "/portal/t/" + userDomain + "/dashboards/android-iot/battery?owner=" + currentUser + "&deviceId=";
|
||||
break;
|
||||
}
|
||||
default : {
|
||||
statURL = context + "/device/" + row.deviceType + "/analytics?deviceId="
|
||||
}
|
||||
}
|
||||
|
||||
html += '<a href="' + statURL +
|
||||
deviceIdentifier + '&deviceName=' + row.name + '" ' + 'data-click-event="remove-form"' +
|
||||
' 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>';
|
||||
}
|
||||
|
||||
if (!groupId && groupingEnabled(row.deviceType)) {
|
||||
html +=
|
||||
'<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view group-device-link" '
|
||||
+
|
||||
'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
|
||||
+ '" data-devicename="' +
|
||||
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>';
|
||||
}
|
||||
|
||||
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="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>';
|
||||
}
|
||||
return html;
|
||||
}
|
||||
@ -423,6 +521,11 @@ function loadDevices(searchType, searchParam) {
|
||||
];
|
||||
|
||||
var fnCreatedRow = function (row, data, dataIndex) {
|
||||
if (data.status != "REMOVED") {
|
||||
$(row).attr('data-type', 'selectable');
|
||||
} else {
|
||||
$(row).attr('data-type', 'non-selectable');
|
||||
}
|
||||
var model = htmlspecialchars(getPropertyValue(data.properties, 'DEVICE_MODEL'));
|
||||
var vendor = htmlspecialchars(getPropertyValue(data.properties, 'VENDOR'));
|
||||
var owner = htmlspecialchars(data.userPattern);
|
||||
@ -787,6 +890,57 @@ function attachDeviceEvents() {
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* Following click function would execute
|
||||
* when a user clicks on "Delete" link
|
||||
* on Device Management page in Entgra MDM Console.
|
||||
*/
|
||||
$("a.delete-device-link").click(function () {
|
||||
var deviceIdentifiers = [];
|
||||
var deviceId = $(this).data("deviceid");
|
||||
if (deviceId) {
|
||||
deviceIdentifiers = [deviceId];
|
||||
} else {
|
||||
var selectedDevices = getSelectedDevices();
|
||||
if (selectedDevices.length == 0) {
|
||||
$(modalPopupContent).html($('#no-device-selected').html());
|
||||
$("a#no-device-selected-link").click(function () {
|
||||
hidePopup();
|
||||
});
|
||||
showPopup();
|
||||
return;
|
||||
} else {
|
||||
var hasEnrolledDevice;
|
||||
for (var i = 0; i < selectedDevices.length; i++) {
|
||||
if (selectedDevices[i].selectability == 'selectable') {
|
||||
hasEnrolledDevice = true;
|
||||
break;
|
||||
} else {
|
||||
deviceIdentifiers.push(selectedDevices[i].id);
|
||||
}
|
||||
}
|
||||
if (hasEnrolledDevice) {
|
||||
$(modalPopupContent).html($('#enrolled-device-delete-content').html());
|
||||
$("a#enrolled-device-delete-link").click(function () {
|
||||
hidePopup();
|
||||
});
|
||||
showPopup();
|
||||
} else {
|
||||
$(modalPopupContent).html($('#delete-device-modal-content').html());
|
||||
showPopup();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$("a#delete-device-yes-link").click(function () {
|
||||
deleteDevices(deviceIdentifiers);
|
||||
});
|
||||
|
||||
$("a#delete-device-cancel-link").click(function () {
|
||||
hidePopup();
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* Following click function would execute
|
||||
* when a user clicks on "Edit" link
|
||||
@ -1100,6 +1254,19 @@ function removeDevices(deviceIdentifiers) {
|
||||
});
|
||||
}
|
||||
|
||||
function deleteDevices(deviceIdentifiers) {
|
||||
var serviceURL = "/api/device-mgt/v1.0/admin/devices/permanent-delete";
|
||||
invokerUtil.put(serviceURL, deviceIdentifiers, function (message) {
|
||||
$(modalPopupContent).html($('#delete-device-200-content').html());
|
||||
setTimeout(function () {
|
||||
hidePopup();
|
||||
location.reload(false);
|
||||
}, 2000);
|
||||
}, function (jqXHR) {
|
||||
displayDeviceErrors(jqXHR);
|
||||
});
|
||||
}
|
||||
|
||||
function displayDeviceErrors(jqXHR) {
|
||||
showPopup();
|
||||
if (jqXHR.status == 400) {
|
||||
@ -1144,7 +1311,8 @@ function getSelectedDevices() {
|
||||
deviceList.push(
|
||||
{
|
||||
"id": $(thisTable.api().row(this).node()).data('deviceid'),
|
||||
"type": $(thisTable.api().row(this).node()).data('devicetype')
|
||||
"type": $(thisTable.api().row(this).node()).data('devicetype'),
|
||||
"selectability": $(thisTable.api().row(this).node()).data('type')
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user