From e5ce4605fc77999d40a767c2b411add3a1accd8d Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Tue, 14 Feb 2017 16:35:58 +0530
Subject: [PATCH 1/2] Fixes for stage

---
 .../dashboard/bots/controller/libraryCtrl.js  | 96 ++++++++++++++-----
 .../sections/dashboard/bots/tabs/param.html   | 10 +-
 .../dashboard/bots/view/botHistory.html       |  2 +-
 .../sections/dashboard/bots/view/botInfo.html | 12 +--
 .../dashboard/bots/view/botsDescription.html  |  4 +-
 .../sections/dashboard/bots/view/library.html | 18 ++--
 6 files changed, 96 insertions(+), 46 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index bf660d73d..681112ddf 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -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(){
@@ -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;
@@ -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;
@@ -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;
@@ -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();    
@@ -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 {
@@ -447,6 +461,7 @@
 
         $scope.RefreshBotsLibrary = function() {
             $scope.isBotDetailsLoading = true;
+            $scope.isBotLibraryPageLoading = true;
             $scope.botLibGridOptions.data = [];
             $scope.showLoadRecord();
             $scope.botLibAction = '';
@@ -465,6 +480,8 @@
             $scope.clearSearchString();
             $scope.isBotLibraryPageLoading = true;
             $scope.botLibGridOptions.data = [];
+            $scope.showLoadRecord();
+            $scope.paginationParams.page = 1;
             $scope.totalBotsSelected = true;
             $scope.runningBotsselected = false;
             $scope.failedBotsselected = false;
@@ -472,67 +489,100 @@
             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() {
diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html
index bebd7eb44..34fbe708c 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html
@@ -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>
@@ -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>
@@ -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>
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html
index 6afafff3e..58a820e90 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html
@@ -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>
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html
index bf26197c9..2647f2c08 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html
@@ -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>
 
@@ -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>
@@ -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>
@@ -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>
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html b/client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html
index 345619721..04c2460d8 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html
@@ -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();">
@@ -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>
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html
index 12b7a580b..71284665d 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html
@@ -75,12 +75,12 @@
 
            <div class="col-lg-2 col-sm-6 width20">
                <div class="circle-tile cursor">
-                  <div ng-click="showBotsRunning()">
+                  <div ng-click="showBotsRunning('resetPage')">
                     <div class="circle-tile-heading green">
                         <i class="fa fa-cogs fa-fw fa-2x white"></i>
                     </div>
                   </div>
-                   <div class="circle-tile-content green" ng-click=" showBotsRunning()">
+                   <div class="circle-tile-content green" ng-click=" showBotsRunning('resetPage')">
                        <div class="circle-tile-number text-faded ng-binding">
                         <loading size="medium" name="isBotDetailsLoading" type="inline" classes='white' class="ng-scope"></loading>
                         <span ng-if="!isBotDetailsLoading">{{botSummary.totalNoOfRunningBots}}</span>
@@ -111,12 +111,12 @@
            </div>
            <div class="col-lg-2 col-sm-6 width20">
                <div class="circle-tile cursor">
-                    <div ng-click="showScheduledBots()">
+                    <div ng-click="showScheduledBots('resetPage')">
                        <div class="circle-tile-heading bg-blue">
                            <i class="fa fa-calendar fa-2x white"></i>
                        </div>
                     </div>
-                   <div class="circle-tile-content bg-blue" ng-click="showScheduledBots()">
+                   <div class="circle-tile-content bg-blue" ng-click="showScheduledBots('resetPage')">
                      <div class="circle-tile-number text-faded ng-binding">
                         <loading size="medium" name="isBotDetailsLoading" type="inline" classes='white' class="ng-scope"></loading>
                            <span ng-if="!isBotDetailsLoading">{{botSummary.totalNoOfScheduledBots}}</span>
@@ -130,12 +130,12 @@
            </div>  
             <div class="col-lg-2 col-sm-6 width20">
                <div class="circle-tile cursor">
-                    <div ng-click="showFailedBots()">
+                    <div ng-click="showFailedBots('resetPage')">
                        <div class="circle-tile-heading redcard">
                            <i class="fa fa-remove fa-fw fa-2x white"></i>
                        </div>
                     </div>                   
-                   <div class="circle-tile-content redcard" ng-click="showFailedBots()">
+                   <div class="circle-tile-content redcard" ng-click="showFailedBots('resetPage')">
                      <div class="circle-tile-number text-faded ng-binding">
                         <loading size="medium" name="isBotDetailsLoading" type="inline" classes='white' class="ng-scope"></loading>
                            <span ng-if="!isBotDetailsLoading">{{botSummary.totalNoOfFailedBots}}</span>
@@ -154,7 +154,7 @@
    <div  class="botsWidth">
       <div class="marginleft35 botsWidth boxBots box-infobox" style="border-top-color:floralwhite"></div>
       <div class="gallery-header top-stats marginCheck">
-          <button type="button" class="font-size-16 tabReadme btn btn-link {{botsCardViewSelection}}" title="Card View" ng-click="setCardView()"  >
+          <button type="button" class="font-size-16 tabReadme btn btn-link {{botsCardViewSelection}}" title="Card View" ng-click="setCardView('pageReset')"  >
               <i class="fa fa-th black"></i>
               Grid
           </button>
@@ -171,11 +171,11 @@
          <span ng-if="botLibType" class="marginleft10 box-title font-size-16"><span>Type</span>
          <span class="badge">{{botLibType}}<span title="Clear" class="filterClear" ng-click="clearFilter(botLibType)">×</span></span>
          </span>
-         <form class="pull-right firefoxForm" novalidate name="library-form" ng-submit="searchBotNameCategory()">
+         <form class="pull-right firefoxForm" novalidate name="library-form" ng-submit="searchBotNameCategory('pageNumber')">
             <span class="bot-library-search">
                <label>&nbsp;
                   <input type="search" ng-model="botLibrarySearch" class="bot-search" placeholder="Search">
-                  <i class="fa fa-search search-icon" ng-show="!searchText" ng-click="searchBotNameCategory()"></i>
+                  <i class="fa fa-search search-icon" ng-show="!searchText" ng-click="searchBotNameCategory('pageNumber')"></i>
                   <i title="Clear Search" class="fa fa-close search-icon cancel-icon ng-hide" ng-show="searchText" ng-click="clearBotSearchText()"></i>
                </label>
             </span>

From 26b157fa87ee4b8670c6a02bb0cfb061e2393eed Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Tue, 14 Feb 2017 16:38:06 +0530
Subject: [PATCH 2/2] Fix for refresh

---
 .../partials/sections/dashboard/bots/controller/libraryCtrl.js   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index 681112ddf..b12bd9029 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -469,6 +469,7 @@
             $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';