cronapp-framework-js 2.8.23 → 2.8.24

package/dist/js/upload.service.js

@@ -1 +1 @@
-(function(){function a(a){var b=[].slice.call(arguments,1),c=0;return a.replace(/%s/g,function(){return b[c++]})}angular.module("upload.services",[]).service("UploadService",["$http","$compile","$modal","Upload",function(a,b,c){var d=$("body"),e=angular.element(d.get(0)).scope();this.ensureProps=a=>(a.filter&&(a.filter=a.filter.replace(/\s/g,"")),a),this.upload=function(a){let b=this.ensureProps(a);c.open({templateUrl:"node_modules/cronapp-framework-js/components/upload/upload.html",controller:"UploadController",resolve:{data:function(){return b}}})}.bind(this)}]),angular.module("custom.controllers").controller("UploadController",["$scope","$http","$translate","$stateParams","$location","$http","$modalInstance","data",function(b,c,d,e,f,c,g,h){app.registerEventsCronapi(b,d),b.params=e,b.$http=c;var i=f.search();for(var j in i)i.hasOwnProperty(j)&&(b.params[j]=i[j]);b.files=[],b.uploading=!1,b.uploaded=!0,b.progress=0,b.data=h,b.message=d.instant("Upload.oneFile"),"true"==h.multiple&&(b.message=d.instant("Upload.multipleFile")),h.description&&(b.message=h.description),b.safeApply=safeApply,b.uploadFile=function(e){var f=b.data.scope,g="api/cronapi/upload/"+h.id,j=new FormData;if(0==e.length)this.Notification.error(a(d.instant("Upload.errorValidation"),h.maxSize,h.filter));else{for(var k=0;k<e.length;k++)j.append("file",e[k]),console.log(e[k].$valid);var l=JSON.parse(localStorage.getItem("_u"));this.$promise=c({method:"POST",url:(window.hostApp||"")+g,data:j,headers:{"Content-Type":void 0,"X-AUTH-TOKEN":l?l.token:""},onProgress:function(a){this.safeApply(function(){if(a.lengthComputable){var c=0|100*(a.loaded/a.total);b.progress=c}b.uploading=!0,console.log(c)})}.bind(this)}).success(function(a){f.cronapi.evalInContext(JSON.stringify(a)).then(()=>{b.uploaded=!0,b.uploading=!1,b.close()})}.bind(this)).error(function(a){this.Notification.error(a.error),b.uploading=!1,b.close()}.bind(this))}}.bind(b),b.close=function(){g.dismiss("cancel")}}])})(app);
+(function(){function a(a){var b=[].slice.call(arguments,1),c=0;return a.replace(/%s/g,function(){return b[c++]})}angular.module("upload.services",[]).service("UploadService",["$http","$compile","$modal","Upload",function(a,b,c){var d=$("body"),e=angular.element(d.get(0)).scope();this.ensureProps=a=>(a.filter&&(a.filter=a.filter.replace(/\s/g,"")),a),this.upload=function(a){let b=this.ensureProps(a);c.open({templateUrl:"node_modules/cronapp-framework-js/components/upload/upload.html",controller:"UploadController",resolve:{data:function(){return b}}})}.bind(this)}]),angular.module("custom.controllers").controller("UploadController",["$scope","$http","$translate","$stateParams","$location","$http","$modalInstance","data",function(b,c,d,e,f,c,g,h){app.registerEventsCronapi(b,d),b.params=e,b.$http=c;var i=f.search();for(var j in i)i.hasOwnProperty(j)&&(b.params[j]=i[j]);b.files=[],b.uploading=!1,b.uploaded=!0,b.progress=0,b.data=h,b.message=d.instant("Upload.oneFile"),"true"==h.multiple&&(b.message=d.instant("Upload.multipleFile")),h.description&&(b.message=h.description),b.safeApply=safeApply,b.uploadFile=function(e){var f=b.data.scope,g="api/cronapi/upload/"+h.id,j=new FormData;if(0==e.length)this.Notification.error(a(d.instant("Upload.errorValidation"),h.maxSize,h.filter));else{for(var k=0;k<e.length;k++)j.append("file",e[k]),console.log(e[k].$valid);var l=JSON.parse(localStorage.getItem("_u"));this.$promise=c({method:"POST",url:(window.hostApp||"")+g,data:j,headers:{"Content-Type":void 0,"X-AUTH-TOKEN":l?l.token:""},onProgress:function(a){this.safeApply(function(){if(a.lengthComputable){var c=0|100*(a.loaded/a.total);b.progress=c}b.uploading=!0,console.log(c)})}.bind(this)}).then(function(a){f.cronapi.evalInContext(JSON.stringify(a)).then(()=>{b.uploaded=!0,b.uploading=!1,b.close()})}.bind(this)).catch(function(a){let c=a.error;a&&a.data&&(c=a.data.error),this.Notification.error(c),b.uploading=!1,b.close()}.bind(this))}}.bind(b),b.close=function(){g.dismiss("cancel")}}])})(app);

package/js/app.js

@@ -30,6 +30,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)
@@ -41,6 +49,9 @@ var app = (function() {
         'preferredLocale': 'pt_br',
         'urlPrefix': ''
       })
+      .config(['$locationProvider', function($locationProvider) {
+        $locationProvider.hashPrefix('');
+      }])
       .config([
         '$httpProvider',
         function($httpProvider) {
@@ -127,6 +138,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');
 
@@ -246,7 +259,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>
@@ -254,26 +267,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('loginReturnUrl', { "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() : '';
 
@@ -320,7 +334,11 @@ var app = (function() {
 
             $rootScope.renderFinished = true;
           });
-        });
+        };
+
+        $transitions.onSuccess({}, (transition) => $stateChangeSuccess(transition.to()));
+        $state.defaultErrorHandler(error =>  $stateChangeError(error));
+
       });
 
 }(window));
@@ -419,9 +437,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({});
       });
 

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,12 +52,12 @@
           '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 => Notification.error(data));
       //
     }
   });
@@ -160,7 +161,7 @@
         url : 'auth',
         data : $.param(user),
         headers : headerValues
-      }).success(handleSuccess).error(handleError);
+      }).then(handleSuccess).catch(handleError);
     };
 
     $scope.forgotPassword = function () {
@@ -181,14 +182,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") {
@@ -212,6 +214,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);
@@ -311,9 +315,10 @@
         headers : {
           'Content-Type' : 'application/json'
         }
-      }).success(clean).error(clean);
+      }).then(clean).catch(clean);
 
       function clean(result) {
+        result = getRequestData(result);
         $rootScope.session = {};
         if(typeof (Storage) !== "undefined") {
           localStorage.removeItem("_u");
@@ -343,7 +348,7 @@
           headers : {
             'Content-Type' : 'application/x-www-form-urlencoded'
           }
-        }).success(changeSuccess).error(changeError);
+        }).then(changeSuccess).catch(changeError);
       }
 
       function changeSuccess(data, status, headers, config) {
@@ -352,6 +357,8 @@
       }
 
       function changeError(data, status, headers, config) {
+        status = status || data.status;
+        data = getRequestData(data);
         var error;
 
         if (status === 422) {
@@ -439,7 +446,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;
@@ -448,7 +455,7 @@
         }
 
         function changeError(data, status, headers, config) {
-          var error = data;
+          var error = getRequestData(data);
           Notification.error(error);
         }
       }

package/js/directives.js

@@ -4466,12 +4466,16 @@
           require: 'ngModel',
           link: function(scope, elem, attrs, ngModelCtrl) {
 
-            attrs.theme = $(elem).find('i').attr('xattr-theme');
-            attrs.iconOn = $(elem).find('i').attr('class');
-
             var $elem = $(elem);
             var starArray = [];
 
+            var icon = $elem.find('i');
+
+            attrs.iconSize = icon[0].dataset.size;
+            attrs.iconTheme = icon[0].dataset.theme;
+            attrs.iconOn = icon[0].className;            
+            attrs.iconOn = attrs.iconOn.replace(attrs.iconSize).replace(attrs.iconTheme);            
+
             if (attrs.xattrDefaultValue) {
               ngModelCtrl.$viewValue = 0; //set new view value
               ngModelCtrl.$commitViewValue();
@@ -4479,6 +4483,7 @@
 
             for (var i=1;i<=5;i++) {
               starArray.push($(elem).find('i').get(i - 1));
+              $(starArray[i-1]).removeClass(attrs.iconOn);
               $(starArray[i-1]).addClass(attrs.iconOff || "fa fa-star-o");
             }
 
@@ -4507,13 +4512,16 @@
               for (var i=1;i<=5;i++) {
                 stars[i-1].removeClass(attrs.iconOff || 'fa fa-star-o');
                 stars[i-1].removeClass(attrs.iconOn);
-                stars[i-1].removeClass(attrs.theme);
+                stars[i-1].removeClass(attrs.iconSize);
+                stars[i-1].removeClass(attrs.iconTheme);
                 if (i <= value) {
                   stars[i-1].addClass(attrs.iconOn);
-                  stars[i-1].addClass(attrs.theme);
+                  stars[i-1].addClass(attrs.iconSize);
+                stars[i-1].addClass(attrs.iconTheme);
                 } else {
                   stars[i-1].addClass(attrs.iconOff || 'fa fa-star-o');
-                  stars[i-1].addClass(attrs.theme);
+                  stars[i-1].addClass(attrs.iconSize);
+                stars[i-1].addClass(attrs.iconTheme);
                 }
               }
               return value;
@@ -4640,7 +4648,7 @@
               //Somente fica na vertical se for o menu principal da IDE (E estiver configurado para isso)
               let isVertical = element.closest('.crn-navigator-vertical').length;
   
-              var TEMPLATE_MAIN = '<ul  class="nav navbar-nav ' + (isVertical ? 'col-md-12 padding-0' : '') + ' " style="float:left"></ul>';
+              var TEMPLATE_MAIN = '<ul  class="nav navbar-nav ' + (isVertical ? 'col-md-12 padding-0' : '') + ' "></ul>';
               var options = {};
               try {
                 options = JSON.parse(attrs.options);

package/js/upload.service.js

@@ -98,14 +98,18 @@
                   console.log(complete);
                 });
               }.bind(this)
-            }).success(function(data, status, headers, config) {
+            }).then(function(data, status, headers, config) {
               pageScope.cronapi.evalInContext(JSON.stringify(data)).then((result) => {
                 $scope.uploaded = true;
                 $scope.uploading = false;
                 $scope.close();
               });
-            }.bind(this)).error(function(data, status, errorThrown) {
-              this.Notification.error(data.error);
+            }.bind(this)).catch(function(data, status, errorThrown) {
+              let error = data.error;
+              if (data && data.data) {
+                error = data.data.error;
+              }
+              this.Notification.error(error);
               $scope.uploading = false;
               $scope.close();
             }.bind(this));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronapp-framework-js",
-  "version": "2.8.23",
+  "version": "2.8.24",
   "description": "Javascript library for CronApp's projects",
   "main": "cronapp.framework.js",
   "scripts": {
@@ -43,10 +43,10 @@
     "pace": "HubSpot/pace#v0.7.8",
     "raphael": "DmitryBaranovskiy/raphael#v2.1.4",
     "ui-select-infinity": "hyzhak/ui-select-infinity#v0.1.5",
-    "angular-ui-router": "angular-ui/ui-router#0.2.15",
+    "angular-ui-router": "1.0.29",
     "eonasdan-bootstrap-datetimepicker": "^4.17.49",
     "natives": "1.1.6",
-    "angular": "1.5.9",
+    "angular": "1.8.2",
     "angular-ui-bootstrap": "0.13.0",
     "angular-chart.js": "1.1.1",
     "angular-cookies": "1.5.8",
@@ -54,21 +54,21 @@
     "angular-i18n": "1.4.5",
     "angular-resource": "1.3.15",
     "angular-sanitize": "1.3.15",
-    "angular-translate": "2.11.1",
-    "angular-translate-handler-log": "2.11.1",
-    "angular-translate-loader-static-files": "2.11.1",
-    "angular-translate-storage-cookie": "2.11.1",
-    "angular-translate-storage-local": "2.11.1",
+    "angular-translate": "2.19.0",
+    "angular-translate-handler-log": "2.19.0",
+    "angular-translate-loader-static-files": "2.19.0",
+    "angular-translate-storage-cookie": "2.19.0",
+    "angular-translate-storage-local": "2.19.0",
     "angular-ui-notification": "0.3.6",
     "ui-select": "0.18.1",
-    "bootstrap": "3.3.4",
+    "bootstrap": "3.4.1",
     "chart.js": "2.7.0",
     "cpf_cnpj": "0.2.0",
     "font-awesome": "4.4.0",
     "jquery": "3.5.1",
     "justgage": "1.3.5",
-    "moment": "2.9.0",
-    "moment-timezone": "0.4.0",
+    "moment": "2.29.1",
+    "moment-timezone": "0.5.33",
     "ng-file-upload": "12.2.13"
   }
 }