cronapp-framework-js 2.9.0-SNAPSHOT.1 → 2.9.0-SNAPSHOT.2

package/img/img-user.svg

@@ -1 +1,10 @@
-<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25.14 25.14"><defs><style>.cls-1{fill:none;stroke:#fff;stroke-miterlimit:10;}</style></defs><title>img-user</title><path class="cls-1" d="M3.14,7.51a11.08,11.08,0,0,1,4-4,10.59,10.59,0,0,1,5.45-1.47A10.59,10.59,0,0,1,18,3.53a11,11,0,0,1,4,4A10.56,10.56,0,0,1,23.47,13,10.55,10.55,0,0,1,22,18.4a11,11,0,0,1-4,4,10.59,10.59,0,0,1-5.45,1.47,10.59,10.59,0,0,1-5.45-1.47,11.08,11.08,0,0,1-4-4A10.55,10.55,0,0,1,1.67,13,10.56,10.56,0,0,1,3.14,7.51ZM8.2,21.39a9.54,9.54,0,0,0,8.74,0,9.27,9.27,0,0,0,3.37-2.9,3,3,0,0,0-.73-1.56,2.9,2.9,0,0,0-1.47-.9l-1.41-.39a6.34,6.34,0,0,1-8.26,0L7,16a2.9,2.9,0,0,0-1.47.9,3,3,0,0,0-.72,1.56A9.32,9.32,0,0,0,8.2,21.39Zm.11-8.08a4.92,4.92,0,0,0,8.52,0,4.91,4.91,0,0,0,0-4.92,4.91,4.91,0,0,0-6.72-1.81,5,5,0,0,0-2.46,4.27A4.83,4.83,0,0,0,8.31,13.31Z"/></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Camada_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 25.1 25.1" style="enable-background:new 0 0 25.1 25.1;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M0,0v25.1h25.1V0H0z M12.5,19.3H5.8c0-3.1,2-5.6,4.7-6.4C9.5,12.2,8.7,11,8.7,9.6c0-2.1,1.7-3.8,3.8-3.8
+	c2.1,0,3.8,1.7,3.8,3.8c0,1.4-0.7,2.6-1.8,3.3c2.7,0.8,4.7,3.3,4.7,6.4H12.5z"/>
+</svg>

package/js/app.js

@@ -15,9 +15,11 @@ var cronappModules = [
   'ui.bootstrap',
   'ngFileUpload',
   'report.services',
+  'dashboard.services',
   'upload.services',
   'ui.tinymce',
-  'ngCookies'
+  'ngCookies',
+  'kendo.directives'
 ];
 
 if (window.customModules) {
@@ -29,6 +31,14 @@ var onloadCallback = function() {
   window.grecaptcha.reset();
 };
 
+var getRequestData = data => {
+  let result = data || {};
+  if (data.data && typeof data.data === 'object') {
+    result = data.data;
+  }
+  return result;
+};
+
 var app = (function() {
 
   return angular.module('MyApp', cronappModules)
@@ -40,6 +50,9 @@ var app = (function() {
         'preferredLocale': 'pt_br',
         'urlPrefix': ''
       })
+      .config(['$locationProvider', function($locationProvider) {
+        $locationProvider.hashPrefix('');
+      }])
       .config([
         '$httpProvider',
         function($httpProvider) {
@@ -126,6 +139,8 @@ var app = (function() {
 
         var locale = (window.navigator.userLanguage || window.navigator.language).replace('-', '_').toLowerCase();
         $translateProvider.use(locale);
+        $translateProvider.preferredLanguage(locale);
+        $translateProvider.fallbackLanguage('en_us');
 
         $translateProvider.useSanitizeValueStrategy('escaped');
 
@@ -190,7 +205,7 @@ var app = (function() {
         }
       ])
       // General controller
-      .controller('PageController', function($controller, $scope, $stateParams, $location, $http, $rootScope, $translate, Notification, UploadService, $timeout, $state, ReportService) {
+      .controller('PageController', function($controller, $scope, $stateParams, $location, $http, $rootScope, $translate, Notification, UploadService, $timeout, $state, ReportService, DashboardService) {
         // save state params into scope
         $scope.params = $stateParams;
         $scope.$http = $http;
@@ -198,12 +213,23 @@ var app = (function() {
         $scope.UploadService = UploadService;
         $scope.$state = $state;
 
-        app.registerEventsCronapi($scope, $translate);
+        app.registerEventsCronapi($scope, $translate, $location);
+
+        $("form").kendoValidator({
+            errorTemplate: '<span class="k-widget k-tooltip-validation k-x-invalid-msg-block">#=message#</span>',
+            messages:{
+                required: ''
+            }
+        });
 
         $rootScope.getReport = function(reportName, params, config) {
           ReportService.openReport(reportName, params, config);
         };
 
+        $rootScope.getDashboard = function(dashboardName, params, config) {
+          DashboardService.getDashboard(dashboardName, params, config);
+        };
+
         // Query string params
         var queryStringParams = $location.search();
         for (var key in queryStringParams) {
@@ -212,18 +238,6 @@ var app = (function() {
           }
         }
 
-        //Components personalization jquery
-        $scope.registerComponentScripts = function() {
-          //carousel slider
-          $('.carousel-indicators li').on('click', function() {
-            var currentCarousel = '#' + $(this).parent().parent().parent().attr('id');
-            var index = $(currentCarousel + ' .carousel-indicators li').index(this);
-            $(currentCarousel + ' #carousel-example-generic').carousel(index);
-          });
-        };
-
-        $scope.registerComponentScripts();
-
         try {
           var contextAfterPageController = $controller('AfterPageController', { $scope: $scope });
           app.copyContext(contextAfterPageController, this, 'AfterPageController');
@@ -238,7 +252,7 @@ var app = (function() {
 
       })
 
-      .run(function($rootScope, $state, $stateParams, $timeout) {
+      .run(function($rootScope, $state, $stateParams, $timeout, $transitions) {
         // It's very handy to add references to $state and $stateParams to the $rootScope
         // so that you can access them from any scope within your applications.For example,
         // <li ng-class="{ active: $state.includes('contacts.list') }"> will set the <li>
@@ -246,26 +260,27 @@ var app = (function() {
         $rootScope.$state = $state;
         $rootScope.$stateParams = $stateParams;
 
-        $rootScope.$on('$stateChangeError', function() {
-          if (arguments.length >= 6) {
-            var requestObj = arguments[5];
-            if (requestObj.status === 404 || requestObj.status === 403 || requestObj.status === 401) {
-              if (requestObj.status === 404) {
-                $state.go('404');
-              }
-              else if (requestObj.status === 403) {
-                $state.go('403');
-              }
-              else {
-                localStorage.removeItem('_u');
-                $state.go('login',{ "returnUrl": window.location.hash });
-              }
+        const $stateChangeError = function(error) {
+          if (error) {
+            const errorMessage = error.toString();
+            if (errorMessage.includes('=404')) {
+              $state.go('404');
+            }
+            else if (errorMessage.includes('=403')) {
+              $state.go('403');
+            }
+            else if (errorMessage.includes('=401')) {
+              localStorage.removeItem('_u');
+              $state.go('loginReturnUrl', { "returnUrl" : window.location.hash });
+            } else {
+              $state.go('404');
             }
           } else {
             $state.go('404');
           }
-        });
-        $rootScope.$on('$stateChangeSuccess', function(event, currentRoute, previousRoute) {
+        };
+
+        const $stateChangeSuccess = function(currentRoute) {
           $timeout(() => {
             let systemName = $('#projectName').length ? $('#projectName').val() : $('h1:first').length && $('h1:first').text().trim().length ? $('h1:first').text().trim() : '';
 
@@ -311,8 +326,13 @@ var app = (function() {
             }
 
             $rootScope.renderFinished = true;
+            registerComponentScripts();
           });
-        });
+        };
+
+        $transitions.onSuccess({}, (transition) => $stateChangeSuccess(transition.to()));
+        $state.defaultErrorHandler(error =>  $stateChangeError(error));
+
       });
 
 }(window));
@@ -339,7 +359,23 @@ app.bindScope = function($scope, obj) {
   return newObj;
 };
 
-app.registerEventsCronapi = function($scope, $translate) {
+app.registerEventsCronapi = function($scope, $translate, $location) {
+
+  let $stateParams = $scope.params || {};
+  let queryStringParams = $location && $location.search() || {};
+  $scope.params = {};
+
+  let makeCopy = (from, to) => {
+      for (let key in from) {
+          if (from.hasOwnProperty(key)) {
+              to[key] = from[key];
+          }
+      }
+  };
+  makeCopy($stateParams, $scope.params);
+  makeCopy(queryStringParams, $scope.params);
+
+
   for (var x in app.userEvents)
     $scope[x] = app.userEvents[x].bind($scope);
 
@@ -411,9 +447,9 @@ app.factory('customTranslateLoader', function ($http, $q) {
         ].join(''),
         method: 'GET',
         params: ''
-      }, options.$http)).success(function (data) {
-        deferred.resolve(data);
-      }).error(function () {
+      }, options.$http)).then(function (data) {
+        deferred.resolve(getRequestData(data));
+      }).catch(function () {
         deferred.resolve({});
       });
 
@@ -494,4 +530,14 @@ const keyCodeFormActions = {
   handle: (e) => !keyCodeFormActions[e.keyCode || e.which] || keyCodeFormActions[e.keyCode || e.which](e),
   13: (e) => e.preventDefault()
 };
-keyCodeFormActions.initialize();
+keyCodeFormActions.initialize();
+
+//Components personalization jquery
+var registerComponentScripts = function() {
+  //carousel slider
+  $('.carousel-indicators li').on('click', function() {
+    var currentCarousel = '#' + $(this).parent().parent().parent().attr('id');
+    var index = $(currentCarousel + ' .carousel-indicators li').index(this);
+    $(currentCarousel + ' > div').carousel(index);
+  });
+};

package/js/controllers.js

@@ -6,7 +6,8 @@
     $http({
       method: 'GET',
       url: 'auth/refresh'
-    }).success(function (data, status, headers, config) {
+    }).then(function (data, status, headers, config) {
+      data = getRequestData(data);
       //Keeping the user information, the auth/refresh only has name and username info
       if (localStorage.getItem("_u")) {
         let currentSession = JSON.parse(localStorage.getItem("_u"));
@@ -21,7 +22,7 @@
         // refresh time
       }, (1800 * 1000));
       success();
-    }).error(function () {
+    }).catch(function () {
       error();
     });
   };
@@ -51,28 +52,33 @@
           'Content-Type': 'application/x-www-form-urlencoded',
           'X-AUTH-TOKEN': $location.search().token
         }
-      }).success(() => {
+      }).then(() => {
         Notification.info($translate.instant('ResetPasswordSuccess'));
         passwordNew.value = "";
         passwordConfirmation.value = "";
         $state.go('login');
-      }).error(data => Notification.error(data));
-      //
+      }).catch(data =>  {
+        let errorMessage = $translate.instant('ResetPasswordDoesNotMatch');
+        if (data && data.data) {
+          errorMessage = data.data.message || data.data.error;
+        }
+        Notification.error(errorMessage);
+      });
     }
   });
 
   app.controller('SignupController' , function($controller, $scope, $stateParams, $location, $http, $rootScope, $translate, Notification, UploadService, $timeout, $state, ReportService) {
-    
+
     app.registerEventsCronapi($scope, $translate);
 
     $scope.cronapi.screen.changeValueOfField('vars.signupEmail','');
     $scope.cronapi.screen.changeValueOfField('vars.signupUsername','');
     $scope.cronapi.screen.changeValueOfField('vars.signupPassword','');
     $scope.cronapi.screen.changeValueOfField('vars.signupConfirmPassword','');
-    
+
   });
 
-  app.controller('LoginController', function($controller, $scope, $http, $rootScope, $window, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout, $cookies, $templateCache) {
+  app.controller('LoginController', function($controller, $scope, $http, $rootScope, $window, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout, $cookies, $templateCache, DashboardService) {
 
     $http.get(window.NotificationProviderOptions.templateUrl, {cache: true})
         .then((response) => $templateCache.put(window.NotificationProviderOptions.templateUrl, response.data));
@@ -91,7 +97,7 @@
     $scope.$http = $http;
     $scope.params = $stateParams;
     $scope.$state = $state;
-    app.registerEventsCronapi($scope, $translate);
+    app.registerEventsCronapi($scope, $translate, $location);
 
     $rootScope.http = $http;
     $rootScope.Notification = Notification;
@@ -101,12 +107,10 @@
       ReportService.openReport(reportName, params, config);
     };
 
-    var queryStringParams = $location.search();
-    for (var key in queryStringParams) {
-      if (queryStringParams.hasOwnProperty(key)) {
-        $scope.params[key] = queryStringParams[key];
-      }
-    }
+    $rootScope.getDashboard = function(dashboardName, params, config) {
+      DashboardService.openDashboard(dashboardName, params, config);
+    };
+
     $scope.redirectToLogin = function() {
       $scope.cronapi.social.ssoLogin();
     };
@@ -171,7 +175,7 @@
         url : 'auth',
         data : $.param(user),
         headers : headerValues
-      }).success(handleSuccess).error(handleError);
+      }).then(handleSuccess).catch(handleError);
     };
 
     $scope.forgotPassword = function () {
@@ -192,14 +196,15 @@
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded'
         }
-      }).success(() => {
+      }).then(() => {
         Notification.info($translate.instant('ForgotPasswordSent'));
         forgotPasswordEmail.value = "";
         $("#forgotPasswordModal").modal("hide");
-      }).error(data => Notification.error(data));
+      }).catch(data => Notification.error(data));
     };
 
     function handleSuccess(data, status, headers, config) {
+      data = getRequestData(data);
       // Store data response on session storage
       // The local storage will be cleaned when the browser window is closed
       if(typeof (Storage) !== "undefined") {
@@ -223,6 +228,8 @@
     }
 
     function handleError(data, status, headers, config) {
+      status = status || data.status;
+      data = getRequestData(data);
       let error;
       if (data !== null && data.message) {
         let message = JSON.parse(data.message);
@@ -252,12 +259,12 @@
 
   });
 
-  app.controller('HomeController', function($controller, $scope, $http, $rootScope, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout) {
+  app.controller('HomeController', function($controller, $scope, $http, $rootScope, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout, DashboardService) {
 
     $scope.$http = $http;
     $scope.params = $stateParams;
     $scope.$state = $state;
-    app.registerEventsCronapi($scope, $translate);
+    app.registerEventsCronapi($scope, $translate, $location);
 
     $rootScope.http = $http;
     $rootScope.Notification = Notification;
@@ -267,12 +274,56 @@
       ReportService.openReport(reportName, params, config);
     };
 
-    var queryStringParams = $location.search();
-    for (var key in queryStringParams) {
-      if (queryStringParams.hasOwnProperty(key)) {
-        $scope.params[key] = queryStringParams[key];
-      }
-    }
+    $rootScope.getDashboard = function(dashboardName, params, config) {
+      DashboardService.openDashboard(dashboardName, params, config);
+    };
+
+    var idleMonitor = function(timer){
+        let userIsIdle = false;
+        let userIdleTime = new Date().getTime();
+
+        var notifyIdle = function() {
+           if (!userIsIdle) {
+             userIsIdle = true;
+             console.log("User is Idle");
+             try {
+               $scope.logout();
+             } catch (e) {
+               console.log(e)
+             }
+           }
+         }
+
+         var resetIdleTimer = function() {
+           userIdleTime = new Date().getTime();
+           if (userIsIdle) {
+             console.log("User is Back");
+           }
+           userIsIdle = false;
+         }
+
+         var monitorIdleWindow = function(win) {
+           win.onload = resetIdleTimer;
+           win.onmousemove = resetIdleTimer;
+           win.onmousedown = resetIdleTimer;
+           win.ontouchstart = resetIdleTimer;
+           win.onclick = resetIdleTimer;
+           win.onkeypress = resetIdleTimer;
+           win.addEventListener('scroll', resetIdleTimer, true);
+           resetIdleTimer();
+         }
+
+         if(timer && timer > 0){
+           monitorIdleWindow(window);
+           setInterval(() => {
+             if (new Date().getTime() - userIdleTime > (60000 * timer)) {
+               notifyIdle();
+             }
+           }, 1000);
+         }
+     }
+
+    cronapp.ioc.getInstance(cronapp.configuration.IConfigurationService).getValue("cronapp.framework.auth.idletime").then(idleMonitor);
 
     $scope.message = {};
 
@@ -322,14 +373,21 @@
         headers : {
           'Content-Type' : 'application/json'
         }
-      }).success(clean).error(clean);
+      }).then(clean).catch(clean);
 
-      function clean() {
+      function clean(result) {
+        result = getRequestData(result);
         $rootScope.session = {};
         if(typeof (Storage) !== "undefined") {
           localStorage.removeItem("_u");
         }
-        window.location.href = "";
+
+        // In case a logoutUri is defined, after Cronapp logout user is redirected to the logoutUri
+        if (result && result.logoutUri) {
+          window.location.href = result.logoutUri;
+        } else {
+          window.location.href = "";
+        }
       }
     };
 
@@ -348,7 +406,7 @@
           headers : {
             'Content-Type' : 'application/x-www-form-urlencoded'
           }
-        }).success(changeSuccess).error(changeError);
+        }).then(changeSuccess).catch(changeError);
       }
 
       function changeSuccess(data, status, headers, config) {
@@ -357,6 +415,8 @@
       }
 
       function changeError(data, status, headers, config) {
+        status = status || data.status;
+        data = getRequestData(data);
         var error;
 
         if (status === 422) {
@@ -444,7 +504,7 @@
           headers : {
             'Content-Type' : 'application/x-www-form-urlencoded'
           }
-        }).success(changeSuccess).error(changeError);
+        }).then(changeSuccess).catch(changeError);
 
         function changeSuccess(data, status, headers, config) {
           $rootScope.session.theme = theme;
@@ -453,7 +513,7 @@
         }
 
         function changeError(data, status, headers, config) {
-          var error = data;
+          var error = getRequestData(data);
           Notification.error(error);
         }
       }
@@ -493,6 +553,14 @@
       }
     }
 
+    let logoutUri = params["logoutUri"];
+
+    if (logoutUri) {
+      window.localStorage.setItem("logoutUri", logoutUri);
+    } else {
+      window.localStorage.removeItem("logoutUri");
+    }
+
     $scope.login("#OAUTH#", "#OAUTH#", params["_ctk"]);
   });