Skip to content

Commit 6ff531a

Browse files
udeshrludeshrl
authored
Merge pull request #1209 from srikanthv02/devSrikanth
CAT-2680: Bugs Related to BOTS
2 parents 8b1eefc + 26b157f commit 6ff531a

File tree

6 files changed

+97
-46
lines changed

6 files changed

+97
-46
lines changed

‎client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js‎

Lines changed: 74 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
$scope.isBotLibraryPageLoading = true;
9494
$scope.paginationParams.page = $scope.paginationParams.page + 1;
9595
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
96-
$scope.botLibraryGridView();
96+
$scope.botStatus();
9797
};
9898

9999
$scope.setFirstPageView = function(){
@@ -130,10 +130,8 @@
130130
};
131131

132132
$scope.botsDetails = function(result) {
133-
$scope.botLibGridOptions.data = [];
134133
$scope.showLoadRecord();
135134
$scope.botLibGridOptions.totalItems = result.metaData.totalRecords;
136-
$scope.botLibGridOptions.data = result.bots;
137135
if(result.metaData.totalRecords >= 18) {
138136
$scope.showLoadMore = true;
139137
$scope.showRecords = true;
@@ -206,35 +204,46 @@
206204
}
207205
};
208206

209-
$scope.searchBotNameCategory = function() {
210-
$scope.botLibGridOptions.data = [];
207+
$scope.searchBotNameCategory = function(pageNumber) {
208+
$scope.isBotLibraryPageLoading = true;
211209
$scope.searchString = $scope.botLibrarySearch;
212210
$scope.searchText = true;
213211
lib.gridOptions=[];
212+
if(pageNumber) {
213+
$scope.botLibGridOptions.data = [];
214+
pageNumber = 1;
215+
}
214216
if($scope.totalBotsSelected) {
215217
var param={
216-
url:'/bots?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
218+
inlineLoader: true,
219+
url:'/bots?page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
217220
};
218221
} else if($scope.runningBotsselected) {
219222
var param={
220-
url:'/bots?actionStatus=running&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
223+
inlineLoader: true,
224+
url:'/bots?actionStatus=running&page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
221225
};
222226
} else if($scope.scheduledBotsSelected) {
223227
var param={
224-
url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
228+
inlineLoader: true,
229+
url:'/bots?filterBy=isBotScheduled:true&page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
225230
};
226231
} else if($scope.failedBotsselected) {
227232
var param={
228-
url:'/bots?actionStatus=failed&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
233+
inlineLoader: true,
234+
url:'/bots?actionStatus=failed&page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
229235
};
230236
}
231237
genSevs.promiseGet(param).then(function (result) {
232-
$scope.botsDetails(result);
233238
if($scope.isCardViewActive){
239+
$scope.botLibGridOptions.data = result.bots;
234240
for(var i=0;i<result.bots.length;i++){
235241
$scope.imageForCard(result.bots[i]);
236242
}
243+
} else {
244+
$scope.botLibGridOptions.data = result.bots;
237245
}
246+
$scope.botsDetails(result);
238247
$scope.isBotLibraryPageLoading = false;
239248
}, function(error) {
240249
$scope.isBotLibraryPageLoading = false;
@@ -245,6 +254,7 @@
245254
$scope.clearBotSearchText = function() {
246255
$scope.botLibrarySearch = '';
247256
$scope.botLibGridOptions.data = [];
257+
$scope.isBotLibraryPageLoading = true;
248258
$scope.searchText = false;
249259
$scope.paginationParams.page = 1;
250260
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
@@ -308,15 +318,17 @@
308318
});
309319
};*/
310320

311-
$scope.setCardView = function() {
321+
$scope.setCardView = function(pageReset) {
312322
$scope.isBotLibraryPageLoading = true;
313323
$scope.showLoadRecord();
314-
$scope.botLibGridOptions.data = [];
315324
$scope.isCardViewActive = true;
316325
$scope.botsCardViewSelection = "bots-tab-active";
317326
$scope.botsTableViewSelection = "";
318-
$scope.paginationParams.page = 1;
319-
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
327+
if(pageReset) {
328+
$scope.botLibGridOptions.data = [];
329+
$scope.paginationParams.page = 1;
330+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
331+
}
320332
$scope.paginationParams.pageSize = 18;
321333
if($scope.botLibrarySearch){
322334
$scope.searchBotNameCategory();
@@ -428,6 +440,8 @@
428440
$scope.showLoadRecord();
429441
$scope.isBotLibraryPageLoading = true;
430442
$scope.botLibGridOptions.data = [];
443+
$scope.paginationParams.page = 1;
444+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
431445
if($scope.botLibrarySearch){
432446
$scope.searchBotNameCategory();
433447
} else {
@@ -447,13 +461,15 @@
447461

448462
$scope.RefreshBotsLibrary = function() {
449463
$scope.isBotDetailsLoading = true;
464+
$scope.isBotLibraryPageLoading = true;
450465
$scope.botLibGridOptions.data = [];
451466
$scope.showLoadRecord();
452467
$scope.botLibAction = '';
453468
$scope.botLibCategory = '';
454469
$scope.botLibType = '';
455470
$scope.numofCardPages = 0;
456471
$scope.paginationParams.page = 1;
472+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
457473
$scope.paginationParams.pageSize = 18;
458474
$scope.paginationParams.sortBy = 'lastRunTime';
459475
$scope.paginationParams.sortOrder = 'desc';
@@ -465,74 +481,109 @@
465481
$scope.clearSearchString();
466482
$scope.isBotLibraryPageLoading = true;
467483
$scope.botLibGridOptions.data = [];
484+
$scope.showLoadRecord();
485+
$scope.paginationParams.page = 1;
468486
$scope.totalBotsSelected = true;
469487
$scope.runningBotsselected = false;
470488
$scope.failedBotsselected = false;
471489
$scope.scheduledBotsSelected = false;
472490
lib.summary();
473491
$scope.botLibraryGridView();
474492
};
475-
$scope.showBotsRunning = function() {
493+
$scope.showBotsRunning = function(resetPage) {
476494
$scope.clearSearchString();
477495
lib.summary();
496+
$scope.isBotLibraryPageLoading = true;
497+
$scope.showLoadRecord();
478498
$scope.runningBotsselected = true;
479499
$scope.totalBotsSelected = false;
480500
$scope.failedBotsselected = false;
481501
$scope.scheduledBotsSelected = false;
482502
lib.gridOptions.data=[];
503+
if(resetPage){
504+
$scope.botLibGridOptions.data = [];
505+
$scope.paginationParams.page = 1;
506+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
507+
}
483508
var param={
484509
inlineLoader:true,
485-
url:'/bots?actionStatus=running&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
510+
url:'/bots?actionStatus=running&page=' + $scope.botLibGridOptions.paginationCurrentPage +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
486511
};
487512
genSevs.promiseGet(param).then(function (result) {
488-
$scope.botsDetails(result);
489513
if($scope.isCardViewActive){
514+
$scope.botLibGridOptions.data = $scope.botLibGridOptions.data.concat(result.bots);
490515
for(var i=0;i<result.bots.length;i++){
491516
$scope.imageForCard(result.bots[i]);
492517
}
518+
} else {
519+
$scope.botLibGridOptions.data = result.bots;
493520
}
521+
$scope.botsDetails(result);
522+
$scope.statusBar = "Showing " + ($scope.botLibGridOptions.data.length === 0 ? "0" : "1") + " to " + $filter('number')($scope.botLibGridOptions.data.length) + " of " + $filter('number')(result.metaData.totalRecords) + " entries";
494523
});
495524
};
496-
$scope.showFailedBots = function() {
525+
$scope.showFailedBots = function(resetPage) {
497526
$scope.clearSearchString();
498527
lib.summary();
528+
$scope.isBotLibraryPageLoading = true;
529+
$scope.showLoadRecord();
499530
$scope.failedBotsselected = true;
500531
$scope.runningBotsselected = false;
501532
$scope.totalBotsSelected = false;
502533
$scope.scheduledBotsSelected = false;
503534
lib.gridOptions.data=[];
535+
if(resetPage){
536+
$scope.botLibGridOptions.data = [];
537+
$scope.paginationParams.page = 1;
538+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
539+
}
504540
var param={
505541
inlineLoader:true,
506-
url:'/bots?actionStatus=failed&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
542+
url:'/bots?actionStatus=failed&page=' + $scope.botLibGridOptions.paginationCurrentPage +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
507543
};
508544
genSevs.promiseGet(param).then(function (result) {
509-
$scope.botsDetails(result);
510545
if($scope.isCardViewActive){
546+
$scope.botLibGridOptions.data = $scope.botLibGridOptions.data.concat(result.bots);
511547
for(var i=0;i<result.bots.length;i++){
512548
$scope.imageForCard(result.bots[i]);
513549
}
550+
} else {
551+
$scope.botLibGridOptions.data = result.bots;
514552
}
553+
$scope.botsDetails(result);
554+
$scope.statusBar = "Showing " + ($scope.botLibGridOptions.data.length === 0 ? "0" : "1") + " to " + $filter('number')($scope.botLibGridOptions.data.length) + " of " + $filter('number')(result.metaData.totalRecords) + " entries";
515555
});
516556
};
517-
$scope.showScheduledBots = function() {
557+
$scope.showScheduledBots = function(resetPage) {
518558
$scope.clearSearchString();
519559
lib.summary();
560+
$scope.isBotLibraryPageLoading = true;
561+
$scope.showLoadRecord();
520562
$scope.failedBotsselected = false;
521563
$scope.runningBotsselected = false;
522564
$scope.totalBotsSelected = false;
523565
$scope.scheduledBotsSelected = true;
524566
lib.gridOptions.data=[];
567+
if(resetPage){
568+
$scope.botLibGridOptions.data = [];
569+
$scope.paginationParams.page = 1;
570+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
571+
}
525572
var param={
526573
inlineLoader:true,
527-
url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
574+
url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.botLibGridOptions.paginationCurrentPage +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
528575
};
529576
genSevs.promiseGet(param).then(function (result) {
530-
$scope.botsDetails(result);
531577
if($scope.isCardViewActive){
578+
$scope.botLibGridOptions.data = $scope.botLibGridOptions.data.concat(result.bots);
532579
for(var i=0;i<result.bots.length;i++){
533580
$scope.imageForCard(result.bots[i]);
534581
}
582+
} else {
583+
$scope.botLibGridOptions.data = result.bots;
535584
}
585+
$scope.botsDetails(result);
586+
$scope.statusBar = "Showing " + ($scope.botLibGridOptions.data.length === 0 ? "0" : "1") + " to " + $filter('number')($scope.botLibGridOptions.data.length) + " of " + $filter('number')(result.metaData.totalRecords) + " entries";
536587
});
537588
};
538589
lib.summary = function() {

‎client/cat3/src/partials/sections/dashboard/bots/tabs/param.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</td>
5858
</tr>
5959
<tr>
60-
<td class="td-padding">Bot Type</td>
60+
<td class="td-padding">BOT Type</td>
6161
<td>
6262
{{botInfo.botType}}
6363
</td>
@@ -118,13 +118,13 @@
118118
</td>
119119
</tr>
120120
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
121-
<td class="td-padding">Bot Parameter Type</td>
121+
<td class="td-padding">BOT Parameter Type</td>
122122
<td>
123123
{{botInfo.botConfig.parameterized[0].parameterName}}
124124
</td>
125125
</tr>
126126
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
127-
<td class="td-padding">Bot Parameter Name</td>
127+
<td class="td-padding">BOT Parameter Name</td>
128128
<td>
129129
{{botInfo.botConfig.parameterized[0].name}}
130130
</td>
@@ -136,13 +136,13 @@
136136
</td>
137137
</tr> -->
138138
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length === 1">
139-
<td class="td-padding">Bot Parameter Values</td>
139+
<td class="td-padding">BOT Parameter Values</td>
140140
<td>
141141
{{botInfo.botConfig.parameterized[0].defaultValue}}
142142
</td>
143143
</tr>
144144
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
145-
<td class="td-padding">Bot Parameter Description</td>
145+
<td class="td-padding">BOT Parameter Description</td>
146146
<td>
147147
{{botInfo.botConfig.parameterized[0].description}}
148148
</td>

‎client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ <h4 class="modal-title">
44
<span class="close" ng-click="$dismiss('cancel')">×</span>
55
<span>
66
<i class="fa fa-history"></i>&nbsp;
7-
Bot History For - {{botDetail.botName}}
7+
BOT History For - {{botDetail.botName}}
88
</span>
99
</h4>
1010
</div>

‎client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h4 class="modal-title">
3939
<div class="modal-header">
4040
<span class="close" ng-click="cancel()">×</span>
4141
<h4 class="modal-title">
42-
<i class="fa fa-bar-chart-o"></i> Bot Info - {{botInfo.botName}}
42+
<i class="fa fa-bar-chart-o"></i> BOT Info - {{botInfo.botName}}
4343
</h4>
4444
</div>
4545

@@ -78,7 +78,7 @@ <h4 class="modal-title">
7878
</td>
7979
</tr>
8080
<tr>
81-
<td class="td-padding">Bot Type</td>
81+
<td class="td-padding">BOT Type</td>
8282
<td>
8383
{{botInfo.botType}}
8484
</td>
@@ -139,13 +139,13 @@ <h4 class="modal-title">
139139
</td>
140140
</tr>
141141
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
142-
<td class="td-padding">Bot Parameter Type</td>
142+
<td class="td-padding">BOT Parameter Type</td>
143143
<td>
144144
{{botInfo.botConfig.parameterized[0].parameterName}}
145145
</td>
146146
</tr>
147147
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
148-
<td class="td-padding">Bot Parameter Name</td>
148+
<td class="td-padding">BOT Parameter Name</td>
149149
<td>
150150
{{botInfo.botConfig.parameterized[0].name}}
151151
</td>
@@ -157,13 +157,13 @@ <h4 class="modal-title">
157157
</td>
158158
</tr> -->
159159
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length === 1">
160-
<td class="td-padding">Bot Parameter Values</td>
160+
<td class="td-padding">BOT Parameter Values</td>
161161
<td>
162162
{{botInfo.botConfig.parameterized[0].defaultValue}}
163163
</td>
164164
</tr>
165165
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
166-
<td class="td-padding">Bot Parameter Description</td>
166+
<td class="td-padding">BOT Parameter Description</td>
167167
<td>
168168
{{botInfo.botConfig.parameterized[0].description}}
169169
</td>

‎client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div id="botsDescriptionPage">
33
<div class="page-name">
44
BOTs Description&nbsp;
5-
<button style="padding:4px 10px;font-size:13px;margin-right:15px;" type="button" title="Bots List" class="btn cat-btn-update btn-primary pull-right" ui-sref="dashboard.bots.library">
5+
<button style="padding:4px 10px;font-size:13px;margin-right:19px;" type="button" title="Bots List" class="btn cat-btn-update btn-primary pull-right" ui-sref="dashboard.bots.library">
66
<i class="fa fa-chevron-left" style="color: #fff"></i><span style="margin-left:5px;">Back</span>
77
</button>
88
<!-- <button type="button" title="Refresh" class="btn btn-xs cat-btn-update pull-right refresh-btn" ng-click="RefreshBotsLibrary();">
@@ -25,7 +25,7 @@ <h3 title="{{templateSelected.botName}}">{{templateSelected.botName}}</h3>
2525
</div>
2626
<div class="pull-right" style="margin-top:-26px;">
2727
<!--<span style="margin-left:10px;" title="Edit"><i class="fa fa-pencil font-size-20"></i></span> -->
28-
<button style="margin-right:4px;" type="button" class="btn btn-danger btnPadding" title="Delete" ng-click="deleteBot(templateSelected)"><i class="fa fa-trash font-size-16 white"></i>&nbsp;Delete</button>
28+
<button style="margin-right:10px;" type="button" class="btn btn-danger btnPadding" title="Delete" ng-click="deleteBot(templateSelected)"><i class="fa fa-trash font-size-16 white"></i>&nbsp;Delete</button>
2929
<!-- <button type="button" class="btn cat-btn-update btnPadding" style="margin-right:10px;" ng-click="launchInstance(templateSelected);" title="Execute"><i class="fa fa-play font-size-16 white"></i>&nbsp;Execute</button> -->
3030
</div>
3131
</div>

0 commit comments

Comments
 (0)