diff --git a/static/resources/js/components/details/retrieve-projects.directive.js b/static/resources/js/components/details/retrieve-projects.directive.js index 6d49b1de2..8ed1d9a53 100644 --- a/static/resources/js/components/details/retrieve-projects.directive.js +++ b/static/resources/js/components/details/retrieve-projects.directive.js @@ -109,9 +109,9 @@ function getCurrentProjectMemberFailed(data, status) { vm.isProjectMember = false; - $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_to_get_project_member')); - $scope.$emit('raiseError', true); +// $scope.$emit('modalTitle', $filter('tr')('error')); +// $scope.$emit('modalMessage', $filter('tr')('failed_to_get_project_member')); +// $scope.$emit('raiseError', true); console.log('Current user has no member for the project:' + status + ', location.url:' + $location.url()); } diff --git a/static/resources/js/components/log/advanced-search.directive.js b/static/resources/js/components/log/advanced-search.directive.js index a27d1dc3a..7757397d2 100644 --- a/static/resources/js/components/log/advanced-search.directive.js +++ b/static/resources/js/components/log/advanced-search.directive.js @@ -15,6 +15,30 @@ vm.close = close; vm.opAll = true; + + $scope.$watch('vm.op', function(current) { + if(current && vm.op[0] === 'all') { + vm.opCreate = true; + vm.opPull = true; + vm.opPush = true; + vm.opDelete = true; + vm.opOthers = true; + vm.others = ""; + } + }, true); + + $scope.$watch('vm.fromDate', function(current) { + if(current) { + vm.fromDate = current; + } + }); + + $scope.$watch('vm.toDate', function(current) { + if(current) { + vm.toDate = current; + } + }); + vm.opCreate = true; vm.opPull = true; vm.opPush = true; @@ -69,6 +93,11 @@ } function close() { + vm.op = []; + vm.op.push('all'); + vm.fromDate = ''; + vm.toDate = ''; + vm.others = ''; vm.isOpen = false; } } diff --git a/static/resources/js/components/log/list-log.directive.js b/static/resources/js/components/log/list-log.directive.js index 3707d1c6e..b395469ae 100644 --- a/static/resources/js/components/log/list-log.directive.js +++ b/static/resources/js/components/log/list-log.directive.js @@ -80,6 +80,18 @@ function listLogComplete(response) { vm.logs = response.data; + + vm.queryParams = { + 'beginTimestamp' : 0, + 'endTimestamp' : 0, + 'keywords' : '', + 'projectId': vm.projectId, + 'username' : '' + }; + vm.op = ['all']; + vm.fromDate = ''; + vm.toDate = ''; + vm.others = ''; vm.isOpen = false; } function listLogFailed(response){ @@ -98,13 +110,8 @@ t.setHours(hour); t.setMinutes(min); t.setSeconds(sec); - var utcTime = new Date(t.getUTCFullYear(), - t.getUTCMonth(), - t.getUTCDate(), - t.getUTCHours(), - t.getUTCMinutes(), - t.getUTCSeconds()); - return utcTime.getTime() / 1000; + + return t.getTime() / 1000; } } diff --git a/static/resources/js/components/replication/list-replication.directive.js b/static/resources/js/components/replication/list-replication.directive.js index 6f1185755..0b38dfe2e 100644 --- a/static/resources/js/components/replication/list-replication.directive.js +++ b/static/resources/js/components/replication/list-replication.directive.js @@ -172,18 +172,11 @@ if(!angular.isDefined(date) || date === '') { return ''; } - var t = new Date(date); t.setHours(hour); t.setMinutes(min); t.setSeconds(sec); - var utcTime = new Date(t.getUTCFullYear(), - t.getUTCMonth(), - t.getUTCDate(), - t.getUTCHours(), - t.getUTCMinutes(), - t.getUTCSeconds()); - return utcTime.getTime() / 1000; + return t.getTime() / 1000; } } diff --git a/static/resources/js/harbor.config.js b/static/resources/js/harbor.config.js index a32afd4f5..0b8cd4abc 100644 --- a/static/resources/js/harbor.config.js +++ b/static/resources/js/harbor.config.js @@ -1,17 +1,38 @@ (function() { - 'use strict'; - angular - .module('harbor.app') - .config(function($interpolateProvider){ - $interpolateProvider.startSymbol('//'); - $interpolateProvider.endSymbol('//'); - }) - .config(function($httpProvider) { - $httpProvider.defaults.headers.common = {'Accept': 'application/json, text/javascript, */*; q=0.01'}; - }) - .factory('getParameterByName', getParameterByName) - .filter('dateL', localizeDate) - .filter('tr', tr); + 'use strict'; + angular + .module('harbor.app') + .config(function($interpolateProvider){ + $interpolateProvider.startSymbol('//'); + $interpolateProvider.endSymbol('//'); + }) + .config(function($httpProvider) { + $httpProvider.defaults.headers.common = {'Accept': 'application/json, text/javascript, */*; q=0.01'}; + $httpProvider.interceptors.push('redirectInterceptor'); + }) + .factory('redirectInterceptor', RedirectInterceptorFactory) + .factory('getParameterByName', getParameterByName) + .filter('dateL', localizeDate) + .filter('tr', tr); + + RedirectInterceptorFactory.$inject = ['$q', '$window']; + + function RedirectInterceptorFactory($q, $window) { + return redirectInterceptor; + function redirectInterceptor() { + return { + 'request' : function(r) { + console.log('global interceptor has being triggered, "Request"'); + }, + 'response': function(r) { + console.log('global interceptor has being triggered, "Response"'); + }, + 'responseError': function(rejection) { + console.log('global interceptor has being triggered. "ResponseError"'); + } + }; + } + } function getParameterByName() { return get;