-
-
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js
index 2ecada94ad..c700b06199 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js
@@ -248,6 +248,10 @@ $(document).ready(function () {
// Refreshing with success message
$("#user-create-form").addClass("hidden");
$("#user-created-msg").removeClass("hidden");
+ setTimeout(function () {
+ window.location.href = "/devicemgt/users"
+ }, 1000);
+
}
}, function (jqXHR) {
var payload = JSON.parse(jqXHR.responseText);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
index c943c53f2d..bafbd11a41 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
@@ -89,10 +89,11 @@ $("a#invite-user-link").click(function () {
modalDialog.hide();
});
},
- function () {
+ function (data) {
+ var msg = JSON.parse(data.responseText);
modalDialog.header(' Unexpected Error !');
- modalDialog.content('An unexpected error occurred. Try again later.');
+ modalDialog.content(msg.message);
modalDialog.footer('');
$("a#invite-user-error-link").click(function () {
@@ -157,7 +158,7 @@ function resetPassword(username) {
domain = username.substr(0, username.indexOf('/'));
username = username.substr(username.indexOf('/') + 1);
}
- var resetPasswordServiceURL = apiBasePath + "/admin/users/" + username + "/credentials";
+ var resetPasswordServiceURL = apiBasePath + "/admin/users/" + encodeURIComponent(username) + "/credentials";
if (domain) {
resetPasswordServiceURL += '?domain=' + encodeURIComponent(domain);
}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/css/main.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/css/main.css
index 88fbe99a41..2fbb99f134 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/css/main.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/css/main.css
@@ -128,7 +128,7 @@
cursor: pointer;
position: relative;
margin-left: 10px;
- ma
+ margin-bottom: 10px;
}
.tab-actions .action{
float: right;
@@ -142,6 +142,7 @@
}
.tab-actions {
margin: 0px;
+ margin-bottom: 10px;
}
.tab-actions .action-prop{
padding: 10px;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js
index e57001fe29..c1531a6d06 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js
@@ -33,7 +33,6 @@ $(document).ready(function() {
loadPolicyCompliance();
}
-
$("#refresh-policy").click(function() {
$('#policy-spinner').removeClass('hidden');
loadPolicyCompliance();
@@ -44,8 +43,26 @@ $(document).ready(function() {
loadOperationsLog(true);
});
+ $("#refresh-apps").click(function() {
+ $('#apps-spinner').removeClass('hidden');
+ loadApplicationsList();
+ });
+
});
+function getLogStatusIcon(entry) {
+ switch (entry) {
+ case 'COMPLETED':
+ return 'fw-success';
+ case 'PENDING':
+ return 'fw-pending';
+ case 'ERROR':
+ return 'fw-error';
+ default:
+ return 'fw-info'
+ }
+}
+
function loadOperationsLog(update) {
var operationsLogTable = "#operation-log";
if (update) {
@@ -95,7 +112,7 @@ function loadOperationsLog(update) {
data: "status",
class: "text-right extended-log-data log-record-status",
render: function(data, type, full, meta) {
- return ' ' + data + ' ';
+ return ' ' + data + ' ';
},
width: "100%"
}
@@ -146,13 +163,19 @@ function loadOperationsLog(update) {
function renderLogDetails(obj,data) {
var payload = JSON.parse(data);
var logStream = 'Do you really want to remove this group from your Group List?
+Do you really want to remove this group?
';
+ var activityStatus = payload.activityStatus;
+ var responseMsg = null;
+
+ if (activityStatus['0'].status == "ERROR") {
+ responseMsg = activityStatus['0'].responses['0'].response;
+ }
- Object.entries(payload.activityStatus).forEach(
+ Object.entries(activityStatus).forEach(
([key, entry]) => {
logStream += '
' +
'
' +
'' +
'
' +
'' +
- '' + entry.status + '
' +
+ '' + ((responseMsg == null) ? entry.status : responseMsg) + '' +
'
");
+ });
+ });
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js
index 6aaac5dc09..3ef341187c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js
@@ -431,3 +431,76 @@ function viewFence(geoFenceElement,id) {
}
closeAll();
}
+
+function viewFenceByData(geoJson, queryName, areaName, stationeryTime, id) {
+ var matchResults = /(?:"geoFenceGeoJSON"):"{(.*)}"/g.exec(geoJson);
+ if (matchResults && matchResults.length > 1) {
+ geoJson = "{" + matchResults[1] + "}";
+ }
+ geoJson = JSON.parse(geoJson.replace(/'/g, '"'));
+ var geometryShape;
+
+ if(geoJson.type=="Point"){
+
+ var circleOptions = {
+ color: '#ff0043'
+ };
+ geometryShape= new L.circle([geoJson.coordinates[1],geoJson.coordinates[0]], geoJson.radius,circleOptions);
+ // var marker=new L.marker([geoJson.coordinates[1],geoJson.coordinates[0]]);
+ map.addLayer(geometryShape);
+ // map.addLayer(marker);
+ } else if(geoJson.type=="Polygon"){
+ geoJson.coordinates[0].pop(); // popout the last coordinate set(lat,lng pair) due to circular chain
+ var leafletLatLngs = [];
+ $.each(geoJson.coordinates[0], function (idx, pItem) {
+ leafletLatLngs.push({lat: pItem[1], lng: pItem[0]});
+ });
+ geometryShape = new L.Polygon(leafletLatLngs);
+ map.addLayer(geometryShape);
+ }
+
+ var geoPublicUri = $("#geo-charts").data("geo-public-uri");
+
+ if(id=="Stationery"){
+
+ $('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewStationeryAlert", function () {
+ var popupTemplate = $('#templateLoader').find('#viewStationeryAlert');
+ popupTemplate.find('#exportGeoJson').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#hideViewFence').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#viewAreaTime').html(stationeryTime);
+ geometryShape.bindPopup(popupTemplate.html(), {closeButton: true}).openPopup();
+ // transparent the layer .leaflet-popup-content-wrapper
+ $(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
+
+ });
+ } else if(id=="WithIn"){
+
+ $('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewWithinAlert", function () {
+ var popupTemplate = $('#templateLoader').find('#viewWithinAlert');
+ popupTemplate.find('#exportGeoJson').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#hideViewFence').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#viewAreaName').html(areaName);
+ popupTemplate.find('#withinAlertForm').attr('area-name', areaName);
+ popupTemplate.find('#withinAlertForm').attr('query-name', queryName);
+ geometryShape.bindPopup(popupTemplate.html(), {closeButton: true}).openPopup();
+ // transparent the layer .leaflet-popup-content-wrapper
+ $(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
+ });
+ } else if(id=="Exit"){
+
+ $('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewExitAlert", function () {
+ var popupTemplate = $('#templateLoader').find('#viewExitAlert');
+ popupTemplate.find('#exportGeoJson').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#hideViewFence').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#viewAreaName').html(areaName);
+ popupTemplate.find('#exitAlertForm').attr('area-name', areaName);
+ popupTemplate.find('#exitAlertForm').attr('query-name', queryName);
+ geometryShape.bindPopup(popupTemplate.html(), {closeButton: true}).openPopup();
+ // transparent the layer .leaflet-popup-content-wrapper
+ $(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
+ });
+ } else if(id=="Traffic"){
+ }
+ closeAll();
+}
+
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js
index 05f78606c5..a0d755f2a8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js
@@ -264,6 +264,7 @@ function setWithinAlert(leafletId) {
} else {
var ptrn = /(?:)(.*)(?:<\/am\:description>)/g;
var errorTxt;
+ var result = (ptrn.exec(data));
if (result) {
errorTxt = result.length > 1 ? result[1] : data;
} else {
@@ -277,6 +278,7 @@ function setWithinAlert(leafletId) {
responseHandler, function (xhr) {
responseHandler(xhr.responseText, xhr.statusText, xhr);
});
+ viewFenceByData(selectedAreaGeoJson, queryName, areaName, null, 'Within');
}
}
@@ -320,6 +322,7 @@ function setExitAlert(leafletId) {
} else {
var ptrn = /(?:)(.*)(?:<\/am\:description>)/g;
var errorTxt;
+ var result = (ptrn.exec(data));
if (result) {
errorTxt = result.length > 1 ? result[1] : data;
} else {
@@ -333,6 +336,7 @@ function setExitAlert(leafletId) {
responseHandler, function (xhr) {
responseHandler(xhr.responseText, xhr.statusText, xhr);
});
+ viewFenceByData(selectedAreaGeoJson, queryName, areaName, null, 'Exit');
}
}
@@ -391,6 +395,7 @@ function setStationeryAlert(leafletId) {
} else {
var ptrn = /(?:)(.*)(?:<\/am\:description>)/g;
var errorTxt;
+ var result = (ptrn.exec(data));
if (result) {
errorTxt = result.length > 1 ? result[1] : data;
} else {
@@ -404,6 +409,7 @@ function setStationeryAlert(leafletId) {
responseHandler, function (xhr) {
responseHandler(xhr.responseText, xhr.statusText, xhr);
});
+ viewFenceByData(selectedProcessedAreaGeoJson, queryName, areaName, time, 'Stationery');
}
@@ -499,6 +505,7 @@ function setTrafficAlert(leafletId) {
} else {
var ptrn = /(?:)(.*)(?:<\/am\:description>)/g;
var errorTxt;
+ var result = (ptrn.exec(data));
if (result) {
errorTxt = result.length > 1 ? result[1] : data;
} else {
@@ -603,6 +610,7 @@ function setProximityAlert() {
} else {
var ptrn = /(?:)(.*)(?:<\/am\:description>)/g;
var errorTxt;
+ var result = (ptrn.exec(data));
if (result) {
errorTxt = result.length > 1 ? result[1] : data;
} else {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
index 051fb23592..c53f32cce9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
@@ -27,26 +27,37 @@
Platform Configurations
- General and Platform Specific Server Settings for the Tenant + {{#if isCloud}} + iOS Mobile Management Specific Server Settings for the Tenant + {{else}} + General and Platform Specific Server Settings for the Tenant + {{/if}} +
' + entry.updatedTimestamp + '
' +
@@ -166,11 +189,11 @@ function loadOperationsLog(update) {
function getLogStatusIcon(entry) {
switch (entry) {
case 'COMPLETED':
- return 'fw-success'
- break;
+ return 'fw-success';
case 'PENDING':
- return 'fw-pending'
- break;
+ return 'fw-pending';
+ case 'ERROR':
+ return 'fw-error';
default:
return 'fw-info'
}
@@ -254,3 +277,47 @@ function loadPolicyCompliance() {
}
);
}
+
+function loadApplicationsList() {
+ var applicationsList = $("#applications-list");
+ var applicationListingTemplate = applicationsList.attr("src");
+ var deviceId = applicationsList.data("device-id");
+ var deviceType = applicationsList.data("device-type");
+
+ $.template("application-list", applicationListingTemplate, function (template) {
+ var serviceURL = "/api/device-mgt/v1.0/devices/" + deviceType + "/" + deviceId + "/applications";
+ invokerUtil.get(
+ serviceURL,
+ // success-callback
+ function (data, textStatus, jqXHR) {
+ if (jqXHR.status == 200 && data) {
+ data = JSON.parse(data);
+ $("#apps-spinner").addClass("hidden");
+ if (data.length > 0) {
+ for (var i = 0; i < data.length; i++) {
+ data[i]["name"] = decodeURIComponent(data[i]["name"]);
+ data[i]["platform"] = deviceType;
+ }
+
+ var viewModel = {};
+ viewModel["applications"] = data;
+ viewModel["deviceType"] = deviceType;
+ viewModel["deviceId"] = deviceId;
+ viewModel["appContext"] = context;
+ var content = template(viewModel);
+ $("#applications-list-container").html(content);
+ var iconSource = $("#applications-list-container").data("public-uri") + "/img/android_app_icon.png";
+ $("#applications-list-container img").attr("src",iconSource);
+ } else {
+ $("#applications-list-container").html("");
+ }
+ }
+ },
+ // error-callback
+ function () {
+ $("#applications-list-container").html("Loading application list " + + "was not successful. please try refreshing the list in a while.
- General and Platform Specific Server Settings for the Tenant + {{#if isCloud}} + iOS Mobile Management Specific Server Settings for the Tenant + {{else}} + General and Platform Specific Server Settings for the Tenant + {{/if}} +