Skip to content

CAT-2680: Bugs Related to BOTS #1209

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 2 commits into from
Feb 14, 2017
Merged

CAT-2680: Bugs Related to BOTS #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5ce460
Fixes for stage
srikanthv02 Feb 14, 2017
26b157f
Fix for refresh
srikanthv02 Feb 14, 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
97 changes: 74 additions & 23 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 @@ -93,7 +93,7 @@
$scope.isBotLibraryPageLoading = true;
$scope.paginationParams.page = $scope.paginationParams.page + 1;
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
$scope.botLibraryGridView();
$scope.botStatus();
};

$scope.setFirstPageView = function(){
Expand Down Expand Up @@ -130,10 +130,8 @@
};

$scope.botsDetails = function(result) {
$scope.botLibGridOptions.data = [];
$scope.showLoadRecord();
$scope.botLibGridOptions.totalItems = result.metaData.totalRecords;
$scope.botLibGridOptions.data = result.bots;
if(result.metaData.totalRecords >= 18) {
$scope.showLoadMore = true;
$scope.showRecords = true;
Expand Down Expand Up @@ -206,35 +204,46 @@
}
};

$scope.searchBotNameCategory = function() {
$scope.botLibGridOptions.data = [];
$scope.searchBotNameCategory = function(pageNumber) {
$scope.isBotLibraryPageLoading = true;
$scope.searchString = $scope.botLibrarySearch;
$scope.searchText = true;
lib.gridOptions=[];
if(pageNumber) {
$scope.botLibGridOptions.data = [];
pageNumber = 1;
}
if($scope.totalBotsSelected) {
var param={
url:'/bots?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
inlineLoader: true,
url:'/bots?page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
};
} else if($scope.runningBotsselected) {
var param={
url:'/bots?actionStatus=running&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
inlineLoader: true,
url:'/bots?actionStatus=running&page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
};
} else if($scope.scheduledBotsSelected) {
var param={
url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
inlineLoader: true,
url:'/bots?filterBy=isBotScheduled:true&page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
};
} else if($scope.failedBotsselected) {
var param={
url:'/bots?actionStatus=failed&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
inlineLoader: true,
url:'/bots?actionStatus=failed&page=' + pageNumber +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString
};
}
genSevs.promiseGet(param).then(function (result) {
$scope.botsDetails(result);
if($scope.isCardViewActive){
$scope.botLibGridOptions.data = result.bots;
for(var i=0;i<result.bots.length;i++){
$scope.imageForCard(result.bots[i]);
}
} else {
$scope.botLibGridOptions.data = result.bots;
}
$scope.botsDetails(result);
$scope.isBotLibraryPageLoading = false;
}, function(error) {
$scope.isBotLibraryPageLoading = false;
Expand All @@ -245,6 +254,7 @@
$scope.clearBotSearchText = function() {
$scope.botLibrarySearch = '';
$scope.botLibGridOptions.data = [];
$scope.isBotLibraryPageLoading = true;
$scope.searchText = false;
$scope.paginationParams.page = 1;
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
Expand Down Expand Up @@ -308,15 +318,17 @@
});
};*/

$scope.setCardView = function() {
$scope.setCardView = function(pageReset) {
$scope.isBotLibraryPageLoading = true;
$scope.showLoadRecord();
$scope.botLibGridOptions.data = [];
$scope.isCardViewActive = true;
$scope.botsCardViewSelection = "bots-tab-active";
$scope.botsTableViewSelection = "";
$scope.paginationParams.page = 1;
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
if(pageReset) {
$scope.botLibGridOptions.data = [];
$scope.paginationParams.page = 1;
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
}
$scope.paginationParams.pageSize = 18;
if($scope.botLibrarySearch){
$scope.searchBotNameCategory();
Expand Down Expand Up @@ -428,6 +440,8 @@
$scope.showLoadRecord();
$scope.isBotLibraryPageLoading = true;
$scope.botLibGridOptions.data = [];
$scope.paginationParams.page = 1;
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
if($scope.botLibrarySearch){
$scope.searchBotNameCategory();
} else {
Expand All @@ -447,13 +461,15 @@

$scope.RefreshBotsLibrary = function() {
$scope.isBotDetailsLoading = true;
$scope.isBotLibraryPageLoading = true;
$scope.botLibGridOptions.data = [];
$scope.showLoadRecord();
$scope.botLibAction = '';
$scope.botLibCategory = '';
$scope.botLibType = '';
$scope.numofCardPages = 0;
$scope.paginationParams.page = 1;
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
$scope.paginationParams.pageSize = 18;
$scope.paginationParams.sortBy = 'lastRunTime';
$scope.paginationParams.sortOrder = 'desc';
Expand All @@ -465,74 +481,109 @@
$scope.clearSearchString();
$scope.isBotLibraryPageLoading = true;
$scope.botLibGridOptions.data = [];
$scope.showLoadRecord();
$scope.paginationParams.page = 1;
$scope.totalBotsSelected = true;
$scope.runningBotsselected = false;
$scope.failedBotsselected = false;
$scope.scheduledBotsSelected = false;
lib.summary();
$scope.botLibraryGridView();
};
$scope.showBotsRunning = function() {
$scope.showBotsRunning = function(resetPage) {
$scope.clearSearchString();
lib.summary();
$scope.isBotLibraryPageLoading = true;
$scope.showLoadRecord();
$scope.runningBotsselected = true;
$scope.totalBotsSelected = false;
$scope.failedBotsselected = false;
$scope.scheduledBotsSelected = false;
lib.gridOptions.data=[];
if(resetPage){
$scope.botLibGridOptions.data = [];
$scope.paginationParams.page = 1;
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
}
var param={
inlineLoader:true,
url:'/bots?actionStatus=running&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
url:'/bots?actionStatus=running&page=' + $scope.botLibGridOptions.paginationCurrentPage +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
};
genSevs.promiseGet(param).then(function (result) {
$scope.botsDetails(result);
if($scope.isCardViewActive){
$scope.botLibGridOptions.data = $scope.botLibGridOptions.data.concat(result.bots);
for(var i=0;i<result.bots.length;i++){
$scope.imageForCard(result.bots[i]);
}
} else {
$scope.botLibGridOptions.data = result.bots;
}
$scope.botsDetails(result);
$scope.statusBar = "Showing " + ($scope.botLibGridOptions.data.length === 0 ? "0" : "1") + " to " + $filter('number')($scope.botLibGridOptions.data.length) + " of " + $filter('number')(result.metaData.totalRecords) + " entries";
});
};
$scope.showFailedBots = function() {
$scope.showFailedBots = function(resetPage) {
$scope.clearSearchString();
lib.summary();
$scope.isBotLibraryPageLoading = true;
$scope.showLoadRecord();
$scope.failedBotsselected = true;
$scope.runningBotsselected = false;
$scope.totalBotsSelected = false;
$scope.scheduledBotsSelected = false;
lib.gridOptions.data=[];
if(resetPage){
$scope.botLibGridOptions.data = [];
$scope.paginationParams.page = 1;
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
}
var param={
inlineLoader:true,
url:'/bots?actionStatus=failed&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
url:'/bots?actionStatus=failed&page=' + $scope.botLibGridOptions.paginationCurrentPage +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
};
genSevs.promiseGet(param).then(function (result) {
$scope.botsDetails(result);
if($scope.isCardViewActive){
$scope.botLibGridOptions.data = $scope.botLibGridOptions.data.concat(result.bots);
for(var i=0;i<result.bots.length;i++){
$scope.imageForCard(result.bots[i]);
}
} else {
$scope.botLibGridOptions.data = result.bots;
}
$scope.botsDetails(result);
$scope.statusBar = "Showing " + ($scope.botLibGridOptions.data.length === 0 ? "0" : "1") + " to " + $filter('number')($scope.botLibGridOptions.data.length) + " of " + $filter('number')(result.metaData.totalRecords) + " entries";
});
};
$scope.showScheduledBots = function() {
$scope.showScheduledBots = function(resetPage) {
$scope.clearSearchString();
lib.summary();
$scope.isBotLibraryPageLoading = true;
$scope.showLoadRecord();
$scope.failedBotsselected = false;
$scope.runningBotsselected = false;
$scope.totalBotsSelected = false;
$scope.scheduledBotsSelected = true;
lib.gridOptions.data=[];
if(resetPage){
$scope.botLibGridOptions.data = [];
$scope.paginationParams.page = 1;
$scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page;
}
var param={
inlineLoader:true,
url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.botLibGridOptions.paginationCurrentPage +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
};
genSevs.promiseGet(param).then(function (result) {
$scope.botsDetails(result);
if($scope.isCardViewActive){
$scope.botLibGridOptions.data = $scope.botLibGridOptions.data.concat(result.bots);
for(var i=0;i<result.bots.length;i++){
$scope.imageForCard(result.bots[i]);
}
} else {
$scope.botLibGridOptions.data = result.bots;
}
$scope.botsDetails(result);
$scope.statusBar = "Showing " + ($scope.botLibGridOptions.data.length === 0 ? "0" : "1") + " to " + $filter('number')($scope.botLibGridOptions.data.length) + " of " + $filter('number')(result.metaData.totalRecords) + " entries";
});
};
lib.summary = function() {
Expand Down
10 changes: 5 additions & 5 deletions client/cat3/src/partials/sections/dashboard/bots/tabs/param.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</td>
</tr>
<tr>
<td class="td-padding">Bot Type</td>
<td class="td-padding">BOT Type</td>
<td>
{{botInfo.botType}}
</td>
Expand Down Expand Up @@ -118,13 +118,13 @@
</td>
</tr>
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
<td class="td-padding">Bot Parameter Type</td>
<td class="td-padding">BOT Parameter Type</td>
<td>
{{botInfo.botConfig.parameterized[0].parameterName}}
</td>
</tr>
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
<td class="td-padding">Bot Parameter Name</td>
<td class="td-padding">BOT Parameter Name</td>
<td>
{{botInfo.botConfig.parameterized[0].name}}
</td>
Expand All @@ -136,13 +136,13 @@
</td>
</tr> -->
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length === 1">
<td class="td-padding">Bot Parameter Values</td>
<td class="td-padding">BOT Parameter Values</td>
<td>
{{botInfo.botConfig.parameterized[0].defaultValue}}
</td>
</tr>
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
<td class="td-padding">Bot Parameter Description</td>
<td class="td-padding">BOT Parameter Description</td>
<td>
{{botInfo.botConfig.parameterized[0].description}}
</td>
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h4 class="modal-title">
<span class="close" ng-click="$dismiss('cancel')">×</span>
<span>
<i class="fa fa-history"></i>&nbsp;
Bot History For - {{botDetail.botName}}
BOT History For - {{botDetail.botName}}
</span>
</h4>
</div>
Expand Down
12 changes: 6 additions & 6 deletions client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h4 class="modal-title">
<div class="modal-header">
<span class="close" ng-click="cancel()">×</span>
<h4 class="modal-title">
<i class="fa fa-bar-chart-o"></i> Bot Info - {{botInfo.botName}}
<i class="fa fa-bar-chart-o"></i> BOT Info - {{botInfo.botName}}
</h4>
</div>

Expand Down Expand Up @@ -78,7 +78,7 @@ <h4 class="modal-title">
</td>
</tr>
<tr>
<td class="td-padding">Bot Type</td>
<td class="td-padding">BOT Type</td>
<td>
{{botInfo.botType}}
</td>
Expand Down Expand Up @@ -139,13 +139,13 @@ <h4 class="modal-title">
</td>
</tr>
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
<td class="td-padding">Bot Parameter Type</td>
<td class="td-padding">BOT Parameter Type</td>
<td>
{{botInfo.botConfig.parameterized[0].parameterName}}
</td>
</tr>
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
<td class="td-padding">Bot Parameter Name</td>
<td class="td-padding">BOT Parameter Name</td>
<td>
{{botInfo.botConfig.parameterized[0].name}}
</td>
Expand All @@ -157,13 +157,13 @@ <h4 class="modal-title">
</td>
</tr> -->
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length === 1">
<td class="td-padding">Bot Parameter Values</td>
<td class="td-padding">BOT Parameter Values</td>
<td>
{{botInfo.botConfig.parameterized[0].defaultValue}}
</td>
</tr>
<tr ng-show="botInfo.botConfig && botInfo.botConfig.parameterized && botInfo.botConfig.parameterized.length">
<td class="td-padding">Bot Parameter Description</td>
<td class="td-padding">BOT Parameter Description</td>
<td>
{{botInfo.botConfig.parameterized[0].description}}
</td>
Expand Down
4 changes: 2 additions & 2 deletions client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="botsDescriptionPage">
<div class="page-name">
BOTs Description&nbsp;
<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">
<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">
<i class="fa fa-chevron-left" style="color: #fff"></i><span style="margin-left:5px;">Back</span>
</button>
<!-- <button type="button" title="Refresh" class="btn btn-xs cat-btn-update pull-right refresh-btn" ng-click="RefreshBotsLibrary();">
Expand All @@ -25,7 +25,7 @@ <h3 title="{{templateSelected.botName}}">{{templateSelected.botName}}</h3>
</div>
<div class="pull-right" style="margin-top:-26px;">
<!--<span style="margin-left:10px;" title="Edit"><i class="fa fa-pencil font-size-20"></i></span> -->
<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>
<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>
<!-- <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> -->
</div>
</div>
Expand Down
Loading