Skip to content

Commit a7358a7

Browse files
udeshrludeshrl
authored
Merge pull request #1211 from RLOpenCatalyst/dev
UI bug fixes
2 parents 93018f3 + bf1488d commit a7358a7

File tree

6 files changed

+97
-48
lines changed

6 files changed

+97
-48
lines changed

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

Lines changed: 74 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
$scope.showLoadMore = false;
3333
$scope.showRecords = false;
3434
};
35-
3635
$scope.showLoadRecord();
37-
3836
$scope.initGrids = function(){
3937
$scope.botLibGridOptions={};
4038
$scope.botLibGridOptions.columnDefs= [
@@ -93,7 +91,7 @@
9391
$scope.isBotLibraryPageLoading = true;
9492
$scope.paginationParams.page = $scope.paginationParams.page + 1;
9593
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
96-
$scope.botLibraryGridView();
94+
$scope.botStatus();
9795
};
9896

9997
$scope.setFirstPageView = function(){
@@ -130,10 +128,8 @@
130128
};
131129

132130
$scope.botsDetails = function(result) {
133-
$scope.botLibGridOptions.data = [];
134131
$scope.showLoadRecord();
135132
$scope.botLibGridOptions.totalItems = result.metaData.totalRecords;
136-
$scope.botLibGridOptions.data = result.bots;
137133
if(result.metaData.totalRecords >= 18) {
138134
$scope.showLoadMore = true;
139135
$scope.showRecords = true;
@@ -206,35 +202,46 @@
206202
}
207203
};
208204

209-
$scope.searchBotNameCategory = function() {
210-
$scope.botLibGridOptions.data = [];
205+
$scope.searchBotNameCategory = function(pageNumber) {
206+
$scope.isBotLibraryPageLoading = true;
211207
$scope.searchString = $scope.botLibrarySearch;
212208
$scope.searchText = true;
213209
lib.gridOptions=[];
210+
if(pageNumber) {
211+
$scope.botLibGridOptions.data = [];
212+
pageNumber = 1;
213+
}
214214
if($scope.totalBotsSelected) {
215215
var param={
216-
url:'/bots?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
216+
inlineLoader: true,
217+
url:'/bots?page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
217218
};
218219
} else if($scope.runningBotsselected) {
219220
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
221+
inlineLoader: true,
222+
url:'/bots?actionStatus=running&page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
221223
};
222224
} else if($scope.scheduledBotsSelected) {
223225
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
226+
inlineLoader: true,
227+
url:'/bots?filterBy=isBotScheduled:true&page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
225228
};
226229
} else if($scope.failedBotsselected) {
227230
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
231+
inlineLoader: true,
232+
url:'/bots?actionStatus=failed&page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
229233
};
230234
}
231235
genSevs.promiseGet(param).then(function (result) {
232-
$scope.botsDetails(result);
233236
if($scope.isCardViewActive){
237+
$scope.botLibGridOptions.data = result.bots;
234238
for(var i=0;i<result.bots.length;i++){
235239
$scope.imageForCard(result.bots[i]);
236240
}
241+
} else {
242+
$scope.botLibGridOptions.data = result.bots;
237243
}
244+
$scope.botsDetails(result);
238245
$scope.isBotLibraryPageLoading = false;
239246
}, function(error) {
240247
$scope.isBotLibraryPageLoading = false;
@@ -245,6 +252,7 @@
245252
$scope.clearBotSearchText = function() {
246253
$scope.botLibrarySearch = '';
247254
$scope.botLibGridOptions.data = [];
255+
$scope.isBotLibraryPageLoading = true;
248256
$scope.searchText = false;
249257
$scope.paginationParams.page = 1;
250258
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
@@ -308,15 +316,17 @@
308316
});
309317
};*/
310318

311-
$scope.setCardView = function() {
319+
$scope.setCardView = function(pageReset) {
312320
$scope.isBotLibraryPageLoading = true;
313321
$scope.showLoadRecord();
314-
$scope.botLibGridOptions.data = [];
315322
$scope.isCardViewActive = true;
316323
$scope.botsCardViewSelection = "bots-tab-active";
317324
$scope.botsTableViewSelection = "";
318-
$scope.paginationParams.page = 1;
319-
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
325+
if(pageReset) {
326+
$scope.botLibGridOptions.data = [];
327+
$scope.paginationParams.page = 1;
328+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
329+
}
320330
$scope.paginationParams.pageSize = 18;
321331
if($scope.botLibrarySearch){
322332
$scope.searchBotNameCategory();
@@ -428,6 +438,8 @@
428438
$scope.showLoadRecord();
429439
$scope.isBotLibraryPageLoading = true;
430440
$scope.botLibGridOptions.data = [];
441+
$scope.paginationParams.page = 1;
442+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
431443
if($scope.botLibrarySearch){
432444
$scope.searchBotNameCategory();
433445
} else {
@@ -447,13 +459,15 @@
447459

448460
$scope.RefreshBotsLibrary = function() {
449461
$scope.isBotDetailsLoading = true;
462+
$scope.isBotLibraryPageLoading = true;
450463
$scope.botLibGridOptions.data = [];
451464
$scope.showLoadRecord();
452465
$scope.botLibAction = '';
453466
$scope.botLibCategory = '';
454467
$scope.botLibType = '';
455468
$scope.numofCardPages = 0;
456469
$scope.paginationParams.page = 1;
470+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
457471
$scope.paginationParams.pageSize = 18;
458472
$scope.paginationParams.sortBy = 'lastRunTime';
459473
$scope.paginationParams.sortOrder = 'desc';
@@ -465,74 +479,109 @@
465479
$scope.clearSearchString();
466480
$scope.isBotLibraryPageLoading = true;
467481
$scope.botLibGridOptions.data = [];
482+
$scope.showLoadRecord();
483+
$scope.paginationParams.page = 1;
468484
$scope.totalBotsSelected = true;
469485
$scope.runningBotsselected = false;
470486
$scope.failedBotsselected = false;
471487
$scope.scheduledBotsSelected = false;
472488
lib.summary();
473489
$scope.botLibraryGridView();
474490
};
475-
$scope.showBotsRunning = function() {
491+
$scope.showBotsRunning = function(resetPage) {
476492
$scope.clearSearchString();
477493
lib.summary();
494+
$scope.isBotLibraryPageLoading = true;
495+
$scope.showLoadRecord();
478496
$scope.runningBotsselected = true;
479497
$scope.totalBotsSelected = false;
480498
$scope.failedBotsselected = false;
481499
$scope.scheduledBotsSelected = false;
482500
lib.gridOptions.data=[];
501+
if(resetPage){
502+
$scope.botLibGridOptions.data = [];
503+
$scope.paginationParams.page = 1;
504+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
505+
}
483506
var param={
484507
inlineLoader:true,
485-
url:'/bots?actionStatus=running&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
508+
url:'/bots?actionStatus=running&page=' + $scope.botLibGridOptions.paginationCurrentPage +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
486509
};
487510
genSevs.promiseGet(param).then(function (result) {
488-
$scope.botsDetails(result);
489511
if($scope.isCardViewActive){
512+
$scope.botLibGridOptions.data = $scope.botLibGridOptions.data.concat(result.bots);
490513
for(var i=0;i<result.bots.length;i++){
491514
$scope.imageForCard(result.bots[i]);
492515
}
516+
} else {
517+
$scope.botLibGridOptions.data = result.bots;
493518
}
519+
$scope.botsDetails(result);
520+
$scope.statusBar = "Showing " + ($scope.botLibGridOptions.data.length === 0 ? "0" : "1") + " to " + $filter('number')($scope.botLibGridOptions.data.length) + " of " + $filter('number')(result.metaData.totalRecords) + " entries";
494521
});
495522
};
496-
$scope.showFailedBots = function() {
523+
$scope.showFailedBots = function(resetPage) {
497524
$scope.clearSearchString();
498525
lib.summary();
526+
$scope.isBotLibraryPageLoading = true;
527+
$scope.showLoadRecord();
499528
$scope.failedBotsselected = true;
500529
$scope.runningBotsselected = false;
501530
$scope.totalBotsSelected = false;
502531
$scope.scheduledBotsSelected = false;
503532
lib.gridOptions.data=[];
533+
if(resetPage){
534+
$scope.botLibGridOptions.data = [];
535+
$scope.paginationParams.page = 1;
536+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
537+
}
504538
var param={
505539
inlineLoader:true,
506-
url:'/bots?actionStatus=failed&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
540+
url:'/bots?actionStatus=failed&page=' + $scope.botLibGridOptions.paginationCurrentPage +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
507541
};
508542
genSevs.promiseGet(param).then(function (result) {
509-
$scope.botsDetails(result);
510543
if($scope.isCardViewActive){
544+
$scope.botLibGridOptions.data = $scope.botLibGridOptions.data.concat(result.bots);
511545
for(var i=0;i<result.bots.length;i++){
512546
$scope.imageForCard(result.bots[i]);
513547
}
548+
} else {
549+
$scope.botLibGridOptions.data = result.bots;
514550
}
551+
$scope.botsDetails(result);
552+
$scope.statusBar = "Showing " + ($scope.botLibGridOptions.data.length === 0 ? "0" : "1") + " to " + $filter('number')($scope.botLibGridOptions.data.length) + " of " + $filter('number')(result.metaData.totalRecords) + " entries";
515553
});
516554
};
517-
$scope.showScheduledBots = function() {
555+
$scope.showScheduledBots = function(resetPage) {
518556
$scope.clearSearchString();
519557
lib.summary();
558+
$scope.isBotLibraryPageLoading = true;
559+
$scope.showLoadRecord();
520560
$scope.failedBotsselected = false;
521561
$scope.runningBotsselected = false;
522562
$scope.totalBotsSelected = false;
523563
$scope.scheduledBotsSelected = true;
524564
lib.gridOptions.data=[];
565+
if(resetPage){
566+
$scope.botLibGridOptions.data = [];
567+
$scope.paginationParams.page = 1;
568+
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
569+
}
525570
var param={
526571
inlineLoader:true,
527-
url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
572+
url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.botLibGridOptions.paginationCurrentPage +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
528573
};
529574
genSevs.promiseGet(param).then(function (result) {
530-
$scope.botsDetails(result);
531575
if($scope.isCardViewActive){
576+
$scope.botLibGridOptions.data = $scope.botLibGridOptions.data.concat(result.bots);
532577
for(var i=0;i<result.bots.length;i++){
533578
$scope.imageForCard(result.bots[i]);
534579
}
580+
} else {
581+
$scope.botLibGridOptions.data = result.bots;
535582
}
583+
$scope.botsDetails(result);
584+
$scope.statusBar = "Showing " + ($scope.botLibGridOptions.data.length === 0 ? "0" : "1") + " to " + $filter('number')($scope.botLibGridOptions.data.length) + " of " + $filter('number')(result.metaData.totalRecords) + " entries";
536585
});
537586
};
538587
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)