Skip to content

Audit Trail Issues Resolved #1204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 9, 2017
Merged

Audit Trail Issues Resolved #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5df882
Put loader for individual cards
srikanthv02 Feb 9, 2017
a8f763c
Merge remote-tracking branch 'upstream/dev' into devSrikanth
srikanthv02 Feb 9, 2017
c6feefd
jenkins issue in audit trail resolved
srikanthv02 Feb 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions client/cat3/src/partials/globals/loader/loaderModule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<h1 class='catloader block'><i class='fa fa-cog fa-spin black'></i> Loading...</h1>";
template = "<h1 class='catloader block'><i class='fa fa-cog fa-spin "+extraClasses+"'></i> Loading...</h1>";
break;
case 'inline':
template = "<span class='catloader inline'><i class='fa fa-spinner fa-spin black'></i></span>";
template = "<span class='catloader inline'><i class='fa fa-spinner fa-spin "+extraClasses+"'></i></span>";
break;
default:
template = "<h1 class='catloader block'><i class='fa fa-cog fa-spin black'></i> Loading...</h1>";
template = "<h1 class='catloader block'><i class='fa fa-cog fa-spin "+extraClasses+"'></i> Loading...</h1>";
break;
}
return template;
Expand All @@ -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;
Expand Down
13 changes: 10 additions & 3 deletions client/cat3/src/partials/sections/dashboard/bots/bots.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@
/* background-color: #8A8E93;*/
}

.agent-card .image-cell + * {
.agent-card .info-cell, .agent-card .desc-cell {
width: 282px;
}

Expand All @@ -450,15 +450,22 @@
}

.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;
text-overflow: ellipsis;
margin-bottom: -2px;
}

.agent-card .description {
width: 220px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}


.agent-card .publisher {
padding-bottom: 5px;
Expand Down
3 changes: 2 additions & 1 deletion client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 4 additions & 0 deletions client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,9 @@
};

$scope.RefreshBotsLibrary = function() {
$scope.isBotDetailsLoading = true;
$scope.botLibGridOptions.data = [];
$scope.showLoadRecord();
$scope.botLibAction = '';
$scope.botLibCategory = '';
$scope.botLibType = '';
Expand Down Expand Up @@ -534,6 +536,7 @@
});
};
lib.summary = function() {
$scope.isBotDetailsLoading = true;
$scope.botSummary=[];
var param={
inlineLoader:true,
Expand All @@ -542,6 +545,7 @@
genSevs.promiseGet(param).then(function (response) {
$scope.botSummary = response;
$scope.totalSavedTimeForBots = parseInt($scope.botSummary.totalSavedTimeForBots);
$scope.isBotDetailsLoading = false;
});
};
lib.summary();
Expand Down
4 changes: 2 additions & 2 deletions client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
</div>
</div>

<loading size="large" name="isBotAuditTrailPageLoading" type="block"></loading>
<div class="alert alert-info text-center" ng-if="!botAuditTrailGridOptions.data.length > 0">
<loading size="large" name="isBotAuditTrailPageLoading" type="block" align="center"></loading>
<div class="alert alert-info text-center" ng-if="!botAuditTrailGridOptions.data.length > 0 && !isBotAuditTrailPageLoading">
No data Available
</div>

Expand Down
17 changes: 11 additions & 6 deletions client/cat3/src/partials/sections/dashboard/bots/view/library.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
</div>
<div class="circle-tile-content dark-blue" ng-click="showAllBots()">
<div class="circle-tile-number text-faded ng-binding">
{{botSummary.totalNoOfBots}}
<loading size="medium" name="isBotDetailsLoading" type="inline" classes='white' class="ng-scope"></loading>
<span ng-if="!isBotDetailsLoading">{{botSummary.totalNoOfBots}}</span>
</div>
<div class="circle-tile-description text-faded">
Total BOTs
Expand All @@ -81,7 +82,8 @@
</div>
<div class="circle-tile-content green" ng-click=" showBotsRunning()">
<div class="circle-tile-number text-faded ng-binding">
{{botSummary.totalNoOfRunningBots}}
<loading size="medium" name="isBotDetailsLoading" type="inline" classes='white' class="ng-scope"></loading>
<span ng-if="!isBotDetailsLoading">{{botSummary.totalNoOfRunningBots}}</span>
</div>
<div class="circle-tile-description text-faded">
Running BOTs
Expand All @@ -98,7 +100,8 @@
</div>
<div class="circle-tile-content orange">
<div class="circle-tile-number text-faded ng-binding">
{{botSummary.totalSavedTimeForBots.hours}}h {{botSummary.totalSavedTimeForBots.minutes}}m
<loading size="medium" name="isBotDetailsLoading" type="inline" classes='white' class="ng-scope"></loading>
<span ng-if="!isBotDetailsLoading">{{botSummary.totalSavedTimeForBots.hours ? botSummary.totalSavedTimeForBots.hours : 0}}h {{botSummary.totalSavedTimeForBots.minutes ? botSummary.totalSavedTimeForBots.minutes : 0}}m </span>
</div>
<div class="circle-tile-description text-faded">
Time saved
Expand All @@ -115,7 +118,8 @@
</div>
<div class="circle-tile-content bg-blue" ng-click="showScheduledBots()">
<div class="circle-tile-number text-faded ng-binding">
{{botSummary.totalNoOfScheduledBots}}
<loading size="medium" name="isBotDetailsLoading" type="inline" classes='white' class="ng-scope"></loading>
<span ng-if="!isBotDetailsLoading">{{botSummary.totalNoOfScheduledBots}}</span>
</div>
<div class="circle-tile-description text-faded">
Scheduled BOTs
Expand All @@ -133,7 +137,8 @@
</div>
<div class="circle-tile-content redcard" ng-click="showFailedBots()">
<div class="circle-tile-number text-faded ng-binding">
{{botSummary.totalNoOfFailedBots}}
<loading size="medium" name="isBotDetailsLoading" type="inline" classes='white' class="ng-scope"></loading>
<span ng-if="!isBotDetailsLoading">{{botSummary.totalNoOfFailedBots}}</span>
</div>
<div class="circle-tile-description text-faded">
Failed BOTs
Expand Down Expand Up @@ -192,7 +197,7 @@
<div class="desc-cell">
<div title="{{botsDetails.botDesc}}" class="description">{{botsDetails.botDesc}}</div>
</div>
<div class="pull-right" style="margin-top:24px;">
<div class="pull-right" style="margin-top:5px;">
<a class="margin10 cursor" ng-click="launchInstance(botsDetails);" title="Execute"><i class="fa fa-play font-size-20"></i></a>
</div>
</a>
Expand Down