Merge pull request #1158 from Kamidu/master

validation improvements

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

@@ -75,9 +75,12 @@ function getTileServers() {
 
      });*/
     $.getJSON("/api/controllers/tile_servers?serverId=all", function (data) {
-        console.log(JSON.stringify(data));
+
         $.each(data, function (key, val) {
-            noty({text: 'Loading... <span style="color: #ccfcff">' + val.NAME + '</span>', type: 'info'});
+            noty({
+                text: 'Loading... <span style="color: #ccfcff">' + val.NAME + '</span>',
+                type: 'info'
+            });
             //baseLayers[val.name]
             var newTileLayer = L.tileLayer(
                 val.URL, {
@@ -152,8 +155,10 @@ function addWmsEndPoint() {
         var serverUrl = "/api/controllers/wms_endpoints";
         // TODO: If failure happens notify user about the error message
         $.post(serverUrl, data, function (response) {
-            console.log("------->><wms_endpoints>"+ response);
-            noty({text: '<span style="color: dodgerblue">' + response + '</span>',type: 'success'});
+            noty({
+                text: '<span style="color: dodgerblue">' + response + '</span>',
+                type: 'success'
+            });
             closeAll();
         });
     }
@@ -235,10 +240,11 @@ function setWithinAlert(leafletId) {
     if (areaName == null || areaName === undefined || areaName == "") {
         var message = "Area Name cannot be empty.";
         noty({text: message, type: 'error'});
-    } else if (areaName.indexOf(" ") > -1) {
+    } else if ($.trim(areaName).indexOf(" ") > -1) {
         var message = "Area Name cannot contain spaces.";
         noty({text: message, type: 'error'});
     } else {
+        areaName = $.trim(areaName);
         var data = {
             'parseData': JSON.stringify({
                 'geoFenceGeoJSON': selectedAreaGeoJson,
@@ -293,10 +299,11 @@ function setExitAlert(leafletId) {
     if (areaName == null || areaName === undefined || areaName == "") {
         var message = "Area Name cannot be empty.";
         noty({text: message, type: 'error'});
-    } else if (areaName.indexOf(" ") > -1) {
+    } else if ($.trim(areaName).indexOf(" ") > -1) {
         var message = "Area Name cannot contain spaces.";
         noty({text: message, type: 'error'});
     } else {
+        areaName = $.trim(areaName);
         var data = {
             'parseData': JSON.stringify({
                 'geoFenceGeoJSON': selectedAreaGeoJson,
@@ -358,7 +365,7 @@ function setStationeryAlert(leafletId) {
     if (stationeryName == null || stationeryName === undefined || stationeryName == "") {
         var message = "Stationery Name cannot be empty.";
         noty({text: message, type: 'error'});
-    } else if (stationeryName.indexOf(" ") > -1) {
+    } else if ($.trim(stationeryName).indexOf(" ") > -1) {
         var message = "Stationery Name cannot contain spaces.";
         noty({text: message, type: 'error'});
     } else if (fluctuationRadius == null || fluctuationRadius === undefined || fluctuationRadius == "") {
@@ -368,6 +375,7 @@ function setStationeryAlert(leafletId) {
         var message = "Time cannot be empty.";
         noty({text: message, type: 'error'});
     } else {
+        stationeryName = $.trim(stationeryName);
         var data = {
             'parseData': JSON.stringify({
                 'geoFenceGeoJSON': selectedProcessedAreaGeoJson,
@@ -458,7 +466,6 @@ function setTrafficAlert(leafletId) {
      * this is against JSON standards so has been re-replaced when getting the data from governance registry
      * (look in get_alerts for .replace() method)
      * */
-    console.log("leafletId: " + leafletId);
     var selectedAreaGeoJson = map._layers[leafletId].toGeoJSON().geometry;
 
     //if a circle is drawn adding radius for the object
@@ -477,10 +484,11 @@ function setTrafficAlert(leafletId) {
     if (areaName == null || areaName === undefined || areaName == "") {
         var message = "Area Name cannot be empty.";
         noty({text: message, type: 'error'});
-    } else if (areaName.indexOf(" ") > -1) {
+    } else if ($.trim(areaName).indexOf(" ") > -1) {
         var message = "Area Name cannot contain spaces.";
         noty({text: message, type: 'error'});
     } else {
+        areaName = $.trim(areaName);
         var data = {
             'parseData': JSON.stringify({
                 'geoFenceGeoJSON': selectedProcessedAreaGeoJson,
@@ -493,7 +501,7 @@ function setTrafficAlert(leafletId) {
             'cepAction': 'deploy',
             'deviceId': deviceId
         };
-        console.log(JSON.stringify(data));
+
         var serviceUrl = '/api/device-mgt/v1.0/geo-services/alerts/Traffic/' + deviceType + '/' + deviceId;
         var responseHandler = function (data, textStatus, xhr) {
             closeTools(leafletId);
@@ -541,7 +549,6 @@ function removeGeoFence(geoFenceElement, id) {
 }
 
 
-
 function getAlertsHistory(deviceType, deviceId, timeFrom, timeTo) {
     var timeRange = '';
     if (timeFrom && timeTo) {
@@ -589,9 +596,11 @@ function setProximityAlert() {
         var message = "Proximity Time cannot be empty.";
         noty({text: message, type: 'error'});
     } else {
-
         var data = {
-            'parseData': JSON.stringify({'proximityTime': proximityTime, 'proximityDistance': proximityDistance}),
+            'parseData': JSON.stringify({
+                'proximityTime': proximityTime,
+                'proximityDistance': proximityDistance
+            }),
             'proximityTime': proximityTime,
             'proximityDistance': proximityDistance,
             'executionPlan': 'Proximity',