Skip to content

Bots UI changes for scheduler, execute & history. #1042

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
Dec 19, 2016
Merged

Bots UI changes for scheduler, execute & history. #1042

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
f5e55e4
Bots UI new changes.
divakarkonakalla Dec 19, 2016
f8c3151
Merge remote-tracking branch 'upstream/topic-sevice-delivery' into to…
divakarkonakalla Dec 19, 2016
01cebcc
UI changes for BOT.
divakarkonakalla Dec 19, 2016
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
1 change: 0 additions & 1 deletion client/cat3/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
<script src="src/partials/sections/dashboard/bots/controller/libraryCtrl.js"></script>
<script src="src/partials/sections/dashboard/bots/controller/editParamsCtrl.js"></script>
<script src="src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js"></script>
<script src="src/partials/sections/dashboard/bots/controller/botHistoryLogsCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/aDesignCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/controllers/appUrlCreateCtrl.js"></script>
Expand Down
109 changes: 86 additions & 23 deletions 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 @@ -8,19 +8,21 @@
(function (angular) {
"use strict";
angular.module('dashboard.bots')
.controller('audittrailCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', '$modal',
function ($scope, $rootScope, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils, $modal) {
.controller('audittrailCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', '$modal', 'uiGridOptionsService', '$timeout',
function ($scope, $rootScope, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils, $modal, uiGridOptionsService, $timeout) {
var treeNames = ['BOTs','Audit Trail'];
$rootScope.$emit('treeNameUpdate', treeNames);
var audit=this;
audit.gridOptions={
gridOption:{
paginationPageSizes: [10, 25, 50, 75],
paginationPageSize: 10,
enableColumnMenus:false,
multiSelect :false,
},
columnDefs: [
var botAuditTrailUIGridDefaults = uiGridOptionsService.options();
$scope.paginationParams = botAuditTrailUIGridDefaults.pagination;
$scope.paginationParams=[];
$scope.paginationParams.page = 1;
$scope.paginationParams.pageSize = 10;
$scope.paginationParams.sortBy = 'startedOn';
$scope.paginationParams.sortOrder = 'desc';
$scope.initGrids = function(){
$scope.botAuditTrailGridOptions={};
$scope.botAuditTrailGridOptions.columnDefs = [
{ name: 'Start Time',field:'startedOn',
cellTemplate:'<span title="{{row.entity.startedOn | timestampToLocaleTime}}">{{row.entity.startedOn | timestampToLocaleTime}}</span>', cellTooltip: true},
{ name: 'End Time',field:'endedOn',
Expand All @@ -32,22 +34,77 @@
'<img src="images/devops-roles/devopsRole1.png" ng-show="row.entity.action==\'BOTs Blueprint Execution\'" alt="row.entity.botType" title="Blueprint" class="task-type-img" />',cellTooltip: true},
{ name: 'BOT Name',displayName: 'BOT Name',field:'auditTrailConfig.name',cellTooltip: true},
{ name: 'Status',field:'status',
cellTemplate:'<img class="bots-status-icon" src="images/instance-states/aws-started.png" ng-show="row.entity.status === \'success\'" title="{{row.entity.status}}">' +
'<img class="bots-status-icon" src="images/instance-states/aws-stopped.png" ng-show="row.entity.status === \'failed\'" title="{{row.entity.status}}">' +
'<img class="bots-status-icon" src="images/instance-states/aws-inactive.png" ng-show="row.entity.status === \'running\'" title="{{row.entity.status}}">',
cellTemplate:'<img class="bot-status-icon" src="images/instance-states/aws-started.png" ng-show="row.entity.status === \'success\'" title="{{row.entity.status}}">' +
'<img class="bot-status-icon" src="images/instance-states/aws-stopped.png" ng-show="row.entity.status === \'failed\'" title="{{row.entity.status}}">' +
'<img class="bot-status-icon" src="images/instance-states/aws-inactive.png" ng-show="row.entity.status === \'running\'" title="{{row.entity.status}}">',
cellTooltip: true},
{ name: 'Org',field:'masterDetails.orgName'},
{ name: 'BU',field:'masterDetails.bgName'},
{ name: 'Project',field:'masterDetails.projectName'},
{ name: 'Env',field:'masterDetails.envName'},
{ name: 'User',field:'user'},
{ name: 'Logs',cellTemplate: '<span class="btn cat-btn-update control-panel-button" title="Logs" ng-click="grid.appScope.botAuditTrailLogs(row.entity);"><i class="fa fa-info white"></i></span>'}
],
data:[]
]
$scope.botAuditTrailGridOptions.data=[];
angular.extend($scope.botAuditTrailGridOptions,botAuditTrailUIGridDefaults.gridOption);
};
$scope.initGrids();

var gridBottomSpace = 40;
$scope.gridHeight = workzoneUIUtils.makeTabScrollable('botAuditTrailPage') - gridBottomSpace;

//for server side(external) pagination.
angular.extend($scope.botAuditTrailGridOptions,botAuditTrailUIGridDefaults.gridOption, {
onRegisterApi :function(gridApi) {
$scope.gridApi = gridApi;
gridApi.core.on.sortChanged($scope, function(grid, sortColumns) {
if (sortColumns[0] && sortColumns[0].field && sortColumns[0].sort && sortColumns[0].sort.direction) {
$scope.paginationParams.sortBy = sortColumns[0].field;
$scope.paginationParams.sortOrder = sortColumns[0].sort.direction;
$scope.botAuditTrailGridView();
}
});
//Pagination for page and pageSize
gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) {
$scope.paginationParams.page = newPage;
$scope.paginationParams.pageSize = pageSize;
$scope.botAuditTrailGridView();
});
},
});
/*angular.extend($scope.botAuditTrailGridOptions,botAuditTrailUIGridDefaults.gridOption, {
onRegisterApi :function(gridApi) {
$scope.gridApi = gridApi;
gridApi.core.on.sortChanged($scope, function(grid, sortColumns) {
if (sortColumns[0] && sortColumns[0].field && sortColumns[0].sort && sortColumns[0].sort.direction) {
$scope.paginationParams.sortBy = sortColumns[0].field;
$scope.paginationParams.sortOrder = sortColumns[0].sort.direction;
$scope.botAuditTrailGridView();
}
});
//Pagination for page and pageSize
gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) {
console.log(newPage);
$scope.paginationParams.page = newPage;
$scope.paginationParams.pageSize = pageSize;
$scope.botAuditTrailGridView();
});
},
});*/
/*$scope.setFirstPageView = function(){
$scope.botAuditTrailGridOptions.paginationCurrentPage = $scope.paginationParams.page = 1;
};
$scope.setPaginationDefaults = function() {
$scope.paginationParams.sortBy = 'createdOn';
$scope.paginationParams.sortOrder = 'desc';
if($scope.paginationParams.page !== 1){
$scope.setFirstPageView();//if current page is not 1, then ui grid will trigger a call when set to 1.
}else{
//$scope.init();
}
};
$scope.setPaginationDefaults();*/

$scope.botAuditTrailLogs=function(hist) {
var modalInstance = $modal.open({
animation: true,
Expand All @@ -69,20 +126,26 @@
};

$scope.RefreshBotsAuditTrail = function() {
audit.init();
$scope.botAuditTrailGridView();
};

audit.init =function(){
audit.gridOptions.data=[];
$scope.botAuditTrailGridView =function(){
$scope.botAuditTrailGridOptions.data=[];
var param={
url:'/audit-trail?filterBy=auditType:BOTs'
url:'/audit-trail?filterBy=auditType:BOTs&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
};
genSevs.promiseGet(param).then(function (response) {
angular.forEach(response,function () {
audit.gridOptions.data=response.auditTrails;
});
$timeout(function() {
$scope.botAuditTrailGridOptions.data=response.auditTrails;
$scope.botAuditTrailGridOptions.totalItems = response.metaData.totalRecords;
}, 100);
$scope.isBotAuditTrailPageLoading = false;
}, function(error) {
$scope.isBotAuditTrailPageLoading = false;
console.log(error);
$scope.errorMessage = "No Records found";
});
};
audit.init();
$scope.botAuditTrailGridView();
}]);
})(angular);
Loading