diff --git a/client/cat3/src/partials/globals/loader/loaderModule.js b/client/cat3/src/partials/globals/loader/loaderModule.js index 903fc505e..479720085 100644 --- a/client/cat3/src/partials/globals/loader/loaderModule.js +++ b/client/cat3/src/partials/globals/loader/loaderModule.js @@ -9,17 +9,17 @@ 'use strict'; angular.module('directive.loading', []) .directive('loading', ['$compile',function($compile) { - var getTemplate = function(type) { + var getTemplate = function(type, extraClasses) { var template = ''; switch (type) { case 'block': - template = "

Loading...

"; + template = "

Loading...

"; break; case 'inline': - template = ""; + template = ""; break; default: - template = "

Loading...

"; + template = "

Loading...

"; break; } return template; @@ -35,7 +35,8 @@ } }); var type = attrs.type; - var template = getTemplate(type); + var extraClasses = (attrs.classes)?attrs.classes:'black'; + var template = getTemplate(type,extraClasses); elm.html('').append($compile(template)(scope)); scope.$watch(scope.dirLoading, function(v) { var size = attrs.size; diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index 688370f1e..50d8073bd 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -435,7 +435,7 @@ /* background-color: #8A8E93;*/ } -.agent-card .image-cell + * { +.agent-card .info-cell, .agent-card .desc-cell { width: 282px; } @@ -450,8 +450,8 @@ } .agent-card .title { - /* font-family: "Segoe UI", sans-serif; */ - font-size: 22px; + font-family: "Segoe UI", sans-serif; + font-size: 20px; overflow: hidden; line-height: 1.5; white-space: nowrap; @@ -459,6 +459,13 @@ margin-bottom: -2px; } +.agent-card .description { + width: 220px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + .agent-card .publisher { padding-bottom: 5px; diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js index a88e4abf1..40b50d9c8 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js @@ -118,6 +118,7 @@ }; $scope.botAuditTrailGridView =function(){ + $scope.isBotAuditTrailPageLoading = true; $scope.botAuditTrailGridOptions.data=[]; var param={ url:'/audit-trail?filterBy=auditType:BOTs&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder @@ -126,8 +127,8 @@ $timeout(function() { $scope.botAuditTrailGridOptions.data=response.auditTrails; $scope.botAuditTrailGridOptions.totalItems = response.metaData.totalRecords; + $scope.isBotAuditTrailPageLoading = false; }, 100); - $scope.isBotAuditTrailPageLoading = false; }, function(error) { $scope.isBotAuditTrailPageLoading = false; toastr.error(error); diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js index c97c3dbd0..27e349070 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js @@ -17,6 +17,7 @@ } $scope.taskType = items.auditTrailConfig.executionType; $scope.nodeIdsWithActionLog = items.auditTrailConfig.nodeIdsWithActionLog; + $scope.jenkinsJobName = items.auditTrailConfig.jenkinsJobName; $scope.isBotLogsLoading = true; if($scope.taskType === 'jenkins') { $scope.jenkinsActionLogId = items.actionLogId; @@ -73,7 +74,7 @@ if($scope.taskType === 'jenkins') { var param={ inlineLoader: true, - url:'/jenkins/' + $scope.jenkinsActionLogId + '/jobs/testmail/builds/' + $scope.jenkinsBuildNumber + '/output' + url:'/jenkins/' + $scope.jenkinsActionLogId + '/jobs/' + $scope.jenkinsJobName + '/builds/' + $scope.jenkinsBuildNumber + '/output' }; genSevs.promiseGet(param).then(function (response) { if (response) { diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js index 90be8efd4..917cc35c5 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -446,7 +446,9 @@ }; $scope.RefreshBotsLibrary = function() { + $scope.isBotDetailsLoading = true; $scope.botLibGridOptions.data = []; + $scope.showLoadRecord(); $scope.botLibAction = ''; $scope.botLibCategory = ''; $scope.botLibType = ''; @@ -534,6 +536,7 @@ }); }; lib.summary = function() { + $scope.isBotDetailsLoading = true; $scope.botSummary=[]; var param={ inlineLoader:true, @@ -542,6 +545,7 @@ genSevs.promiseGet(param).then(function (response) { $scope.botSummary = response; $scope.totalSavedTimeForBots = parseInt($scope.botSummary.totalSavedTimeForBots); + $scope.isBotDetailsLoading = false; }); }; lib.summary(); diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html index 4a3083cd1..3bb718ebd 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html @@ -20,8 +20,8 @@ - -
+ +
No data Available
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html index 0509b5360..12b7a580b 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -62,7 +62,8 @@
- {{botSummary.totalNoOfBots}} + + {{botSummary.totalNoOfBots}}
Total BOTs @@ -81,7 +82,8 @@
- {{botSummary.totalNoOfRunningBots}} + + {{botSummary.totalNoOfRunningBots}}
Running BOTs @@ -98,7 +100,8 @@
- {{botSummary.totalSavedTimeForBots.hours}}h {{botSummary.totalSavedTimeForBots.minutes}}m + + {{botSummary.totalSavedTimeForBots.hours ? botSummary.totalSavedTimeForBots.hours : 0}}h {{botSummary.totalSavedTimeForBots.minutes ? botSummary.totalSavedTimeForBots.minutes : 0}}m
Time saved @@ -115,7 +118,8 @@
- {{botSummary.totalNoOfScheduledBots}} + + {{botSummary.totalNoOfScheduledBots}}
Scheduled BOTs @@ -133,7 +137,8 @@
- {{botSummary.totalNoOfFailedBots}} + + {{botSummary.totalNoOfFailedBots}}
Failed BOTs @@ -192,7 +197,7 @@
{{botsDetails.botDesc}}
-
+