diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js index 845dd0693..95fd8119a 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -153,6 +153,7 @@ } } var param={ + inlineLoader:true, url:'/bots/' + items.botId + '/execute', data: reqBody }; 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 c9212cc2b..90be8efd4 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -28,9 +28,13 @@ $scope.paginationParams.sortBy = 'createdOn'; $scope.paginationParams.sortOrder = 'desc'; $scope.botLibrarySearch = ''; - $scope.showLoadMore = false; - $scope.showRecords = false; - + $scope.showLoadRecord = function() { + $scope.showLoadMore = false; + $scope.showRecords = false; + }; + + $scope.showLoadRecord(); + $scope.initGrids = function(){ $scope.botLibGridOptions={}; $scope.botLibGridOptions.columnDefs= [ @@ -127,6 +131,7 @@ $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) { @@ -134,10 +139,10 @@ $scope.showRecords = true; } if(result.metaData.totalRecords == $scope.botLibGridOptions.data.length) { - $scope.showLoadMore = false; - $scope.showRecords = false; + $scope.showLoadRecord(); } $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.isBotLibraryPageLoading = false; }; $scope.clearSearchString = function() { @@ -147,10 +152,12 @@ $scope.botLibraryGridView = function() { lib.gridOptions=[]; var param={ + inlineLoader:true, url:'/bots?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (result) { $timeout(function() { + $scope.showLoadRecord(); $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; if(result.metaData.totalRecords >= 18) { $scope.showLoadMore = true; @@ -168,9 +175,9 @@ $scope.botLibGridOptions.data = result.bots; } $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.isBotLibraryPageLoading = false; //$scope.filterBy(); }, 100); - $scope.isBotLibraryPageLoading = false; }, function(error) { $scope.isBotLibraryPageLoading = false; toastr.error(error); @@ -222,14 +229,12 @@ }; } genSevs.promiseGet(param).then(function (result) { - $timeout(function() { - $scope.botsDetails(result); - if($scope.isCardViewActive){ - for(var i=0;i -
+
No data Available