search pages: got rid of $scope

frontend/bower.json

@@ -31,7 +31,7 b''
     "angular-mocks": "1.5.5",
     "angular-scenario": "1.5.5",
     "angular-bootstrap": "1.3.2",
-    "angular-ui-router": "1.0.0-alpha.5",
+    "angular-ui-router": "1.0.0-beta.3",
     "angular-toArrayFilter" : "1.0.1",
     "d3": "3.5.0",
     "c3": "0.4.11",

frontend/src/controllers/front_dashboard.js

@@ -655,13 +655,4 b' function IndexDashboardController($rootScope, $scope, $location, $cookies, $inte'
         vm.determineStartState();
         vm.refreshData();
     }
-
-    $scope.$on('$locationChangeSuccess', function () {
-        console.log('$locationChangeSuccess IndexDashboardController');
-        if (vm.loading.series === false) {
-            vm.determineStartState();
-            vm.refreshData();
-        }
-    });
-
 }

frontend/src/controllers/logs.js

@@ -19,9 +19,9 b''
 
 angular.module('appenlight.controllers').controller('LogsController', LogsController);
 
-LogsController.$inject = ['$scope', '$location', 'stateHolder', 'typeAheadTagHelper', 'logsNoIdResource', 'sectionViewResource'];
+LogsController.$inject = ['$location', 'stateHolder', 'typeAheadTagHelper', 'logsNoIdResource', 'sectionViewResource'];
 
-function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logsNoIdResource, sectionViewResource) {
+function LogsController($location, stateHolder, typeAheadTagHelper, logsNoIdResource, sectionViewResource) {
     var vm = this;
     vm.logEventsChartConfig = {
         data: {
@@ -87,7 +87,7 b' function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logs'
     vm.logsPage = [];
     vm.itemCount = 0;
     vm.itemsPerPage = 250;
-    vm.searchParams = parseSearchToTags($location.search());
+    vm.page = 1;
     vm.$location = $location;
     vm.isLoading = {
         logs: true,
@@ -161,13 +161,16 b' function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logs'
     vm.aheadFilter = typeAheadTagHelper.aheadFilter;
     vm.removeSearchTag = function (tag) {
         $location.search(tag.type, null);
+        vm.refresh();
     };
     vm.addSearchTag = function (tag) {
         $location.search(tag.type, tag.value);
+        vm.refresh();
     };
 
     vm.paginationChange = function(){
-        $location.search('page', vm.searchParams.page);
+        $location.search('page', vm.page);
+        vm.refresh();
     };
 
 
@@ -185,8 +188,7 b' function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logs'
         var text = vm.filterTypeAhead;
         if (_.isObject(vm.filterTypeAhead)) {
             text = vm.filterTypeAhead.text;
-        }
-        ;
+        };
         if (!vm.filterTypeAhead) {
             return
         }
@@ -222,8 +224,7 b' function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logs'
         }
         vm.showDatePicker = false;
         // aka we selected one of main options
-        $location.search(tag.type, tag.value);
-
+        vm.addSearchTag({type: tag.type, value: tag.value});
         // clear typeahead
         vm.filterTypeAhead = undefined;
     };
@@ -278,22 +279,16 b' function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logs'
 
     vm.filterId = function (log) {
         $location.search('request_id', log.request_id);
+        vm.refresh();
     };
 
-    var params = parseTagsToSearch(vm.searchParams);
-    vm.fetchLogs(params);
-    vm.fetchSeriesData(params);
-
-    $scope.$on('$locationChangeSuccess', function () {
-        console.log('$locationChangeSuccess LogsController');
+    vm.refresh = function(){
         vm.searchParams = parseSearchToTags($location.search());
+        vm.page = Number(vm.searchParams.page) || 1;
         var params = parseTagsToSearch(vm.searchParams);
-        console.log($location.path());
-        if (vm.isLoading.logs === false) {
-            console.log(params);
-            vm.fetchLogs(params);
-            vm.fetchSeriesData(params);
-        }
-    });
-
+        vm.fetchLogs(params);
+        vm.fetchSeriesData(params);
+    };
+    console.info('page load');
+    vm.refresh();
 }

frontend/src/controllers/reports/list.js

@@ -20,10 +20,10 b''
 angular.module('appenlight.controllers')
     .controller('ReportsListController', ReportsListController);
 
-ReportsListController.$inject = ['$scope', '$location', '$cookies',
+ReportsListController.$inject = ['$location', '$cookies',
     'stateHolder', 'typeAheadTagHelper', 'reportsResource'];
 
-function ReportsListController($scope, $location, $cookies, stateHolder,
+function ReportsListController($location, $cookies, stateHolder,
                                typeAheadTagHelper, reportsResource) {
     var vm = this;
     vm.applications = stateHolder.AeUser.applications_map;
@@ -33,11 +33,11 b' function ReportsListController($scope, $location, $cookies, stateHolder,'
     };
     vm.today();
     vm.reportsPage = [];
+    vm.page = 1;
     vm.itemCount = 0;
     vm.itemsPerPage = 250;
     typeAheadTagHelper.tags = [];
     vm.searchParams = {tags: [], page: 1, type: 'report'};
-    vm.searchParams = parseSearchToTags($location.search());
     vm.is_loading = false;
     vm.filterTypeAheadOptions = [
         {
@@ -153,9 +153,11 b' function ReportsListController($scope, $location, $cookies, stateHolder,'
     vm.aheadFilter = typeAheadTagHelper.aheadFilter;
     vm.removeSearchTag = function (tag) {
         $location.search(tag.type, null);
+        vm.refresh();
     };
     vm.addSearchTag = function (tag) {
         $location.search(tag.type, tag.value);
+        vm.refresh();
     };
     vm.notRelativeTime = false;
     if ($cookies.notRelativeTime) {
@@ -164,7 +166,7 b' function ReportsListController($scope, $location, $cookies, stateHolder,'
 
     vm.changeRelativeTime = function () {
         $cookies.notRelativeTime = JSON.stringify(vm.notRelativeTime);
-    }
+    };
 
     _.each(_.range(1, 11), function (priority) {
         vm.filterTypeAheadOptions.push({
@@ -195,7 +197,8 b' function ReportsListController($scope, $location, $cookies, stateHolder,'
     });
 
     vm.paginationChange = function(){
-        $location.search('page', vm.searchParams.page);
+        $location.search('page', vm.page);
+        vm.refresh();
     };
 
     vm.typeAheadTag = function (event) {
@@ -242,10 +245,10 b' function ReportsListController($scope, $location, $cookies, stateHolder,'
         }
         vm.showDatePicker = false;
         // aka we selected one of main options
-        $location.search(tag.type, tag.value);
+        vm.addSearchTag({type: tag.type, value: tag.value});
         // clear typeahead
         vm.filterTypeAhead = undefined;
-    }
+    };
 
     vm.pickerDateChanged = function(){
         if (vm.filterTypeAhead.indexOf('start_date:') == '0') {
@@ -299,22 +302,16 b' function ReportsListController($scope, $location, $cookies, stateHolder,'
             type: "request_id",
             value: log.request_id
         });
+        vm.refresh();
     };
-    // initial load
-    var params = parseTagsToSearch(vm.searchParams);
-    vm.fetchReports(params);
 
-    $scope.$on('$locationChangeSuccess', function () {
-        console.log('$locationChangeSuccess ReportsListController ');
+    vm.refresh = function(){
         vm.searchParams = parseSearchToTags($location.search());
+        vm.page = Number(vm.searchParams.page) || 1;
         var params = parseTagsToSearch(vm.searchParams);
-        console.log($location.path());
-        if (vm.is_loading === false) {
-            console.log(params);
-            vm.fetchReports(params);
-        }
-
-    });
-
-
+        console.log(params);
+        vm.fetchReports(params);
+    };
+    // initial load
+    vm.refresh();
 }

frontend/src/controllers/reports/list_slow.js

@@ -24,10 +24,10 b''
 angular.module('appenlight.controllers')
     .controller('ReportsListSlowController', ReportsListSlowController);
 
-ReportsListSlowController.$inject = ['$scope', '$location', '$cookies',
+ReportsListSlowController.$inject = ['$location', '$cookies',
     'stateHolder', 'typeAheadTagHelper', 'slowReportsResource']
 
-function ReportsListSlowController($scope, $location, $cookies, stateHolder, typeAheadTagHelper, slowReportsResource) {
+function ReportsListSlowController($location, $cookies, stateHolder, typeAheadTagHelper, slowReportsResource) {
     var vm = this;
     vm.applications = stateHolder.AeUser.applications_map;
     stateHolder.section = 'slow_reports';
@@ -36,11 +36,11 b' function ReportsListSlowController($scope, $location, $cookies, stateHolder, typ'
     };
     vm.today();
     vm.reportsPage = [];
+    vm.page = 1;
     vm.itemCount = 0;
     vm.itemsPerPage = 250;
     typeAheadTagHelper.tags = [];
     vm.searchParams = {tags: [], page: 1, type: 'slow_report'};
-    vm.searchParams = parseSearchToTags($location.search());
     vm.is_loading = false;
     vm.filterTypeAheadOptions = [
         {
@@ -134,9 +134,11 b' function ReportsListSlowController($scope, $location, $cookies, stateHolder, typ'
     vm.aheadFilter = typeAheadTagHelper.aheadFilter;
     vm.removeSearchTag = function (tag) {
         $location.search(tag.type, null);
+        vm.refresh();
     };
     vm.addSearchTag = function (tag) {
         $location.search(tag.type, tag.value);
+        vm.refresh();
     };
     vm.manualOpen = false;
     vm.notRelativeTime = false;
@@ -181,8 +183,7 b' function ReportsListSlowController($scope, $location, $cookies, stateHolder, typ'
         var text = vm.filterTypeAhead;
         if (_.isObject(vm.filterTypeAhead)) {
             text = vm.filterTypeAhead.text;
-        }
-        ;
+        };
         if (!vm.filterTypeAhead) {
             return
         }
@@ -217,14 +218,15 b' function ReportsListSlowController($scope, $location, $cookies, stateHolder, typ'
         }
         vm.showDatePicker = false;
         // aka we selected one of main options
-        $location.search(tag.type, tag.value);
+        vm.addSearchTag({type: tag.type, value: tag.value});
         // clear typeahead
         vm.filterTypeAhead = undefined;
-    }
+    };
 
     vm.paginationChange = function(){
-        $location.search('page', vm.searchParams.page);
-    }
+        $location.search('page', vm.page);
+        vm.refresh();
+    };
 
     vm.pickerDateChanged = function(){
         if (vm.filterTypeAhead.indexOf('start_date:') == '0') {
@@ -234,7 +236,7 b' function ReportsListSlowController($scope, $location, $cookies, stateHolder, typ'
             vm.filterTypeAhead = 'end_date:' + moment(vm.pickerDate).utc().hour(23).minute(59).format();
         }
         vm.showDatePicker = false;
-    }
+    };
 
     var reportPresentation = function (report) {
         report.presentation = {};
@@ -255,7 +257,7 b' function ReportsListSlowController($scope, $location, $cookies, stateHolder, typ'
             report.presentation.tooltip = 'New';
         }
         return report;
-    }
+    };
 
     vm.fetchReports = function (searchParams) {
         vm.is_loading = true;
@@ -271,28 +273,22 b' function ReportsListSlowController($scope, $location, $cookies, stateHolder, typ'
         }, function () {
             vm.is_loading = false;
         });
-    }
+    };
 
     vm.filterId = function (log) {
         vm.searchParams.tags.push({
             type: "request_id",
             value: log.request_id
         });
-    }
-    //initial load
-    var params = parseTagsToSearch(vm.searchParams);
-    vm.fetchReports(params);
-
-    $scope.$on('$locationChangeSuccess', function () {
-        console.log('$locationChangeSuccess ReportsListSlowController ');
+        vm.refresh();
+    };
+    vm.refresh = function(){
         vm.searchParams = parseSearchToTags($location.search());
+        vm.page = Number(vm.searchParams.page) || 1;
         var params = parseTagsToSearch(vm.searchParams);
-        console.log($location.path());
-        if (vm.is_loading === false) {
-            console.log(params);
-            vm.fetchReports(params);
-        }
-    });
-
+        vm.fetchReports(params);
+    };
 
+    //initial load
+    vm.refresh();
 }

frontend/src/directives/c3js.js

@@ -105,7 +105,6 b" angular.module('appenlight.directives.c3chart', [])"
                         scope.chart = scope.chart.destroy();
                         delete element;
                         delete scope.chart;
-                        console.log('destroy called');
                     }
                 }
             );

frontend/src/templates/logs.html

@@ -44,7 +44,7 b''
 
 
     <div class="text-center">
-        <uib-pagination total-items="logs.itemCount" items-per-page="logs.itemsPerPage" ng-model="logs.searchParams.page" max-size="10"
+        <uib-pagination total-items="logs.itemCount" items-per-page="logs.itemsPerPage" ng-model="logs.page" max-size="10"
                         ng-change="logs.paginationChange()"
                         class="pagination pagination-sm" boundary-links="true" direction-links="false"></uib-pagination>
     </div>
@@ -88,7 +88,7 b''
     </div>
 
     <div class="text-center">
-        <uib-pagination total-items="logs.itemCount" items-per-page="logs.itemsPerPage" ng-model="logs.searchParams.page" max-size="10"
+        <uib-pagination total-items="logs.itemCount" items-per-page="logs.itemsPerPage" ng-model="logs.page" max-size="10"
                         ng-change="logs.paginationChange()"
                         class="pagination pagination-sm" boundary-links="true" direction-links="false"></uib-pagination>
     </div>

frontend/src/templates/reports/list.html

@@ -32,7 +32,7 b''
 
 
     <div class="text-center">
-        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.searchParams.page" max-size="10"
+        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.page" max-size="10"
                         class="pagination pagination-sm" boundary-links="true" direction-links="false"
                         ng-change="reports_list.paginationChange()"
                         ng-show="!reports_list.is_loading"></uib-pagination>
@@ -80,7 +80,7 b''
 
 
     <div class="text-center">
-        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.searchParams.page" max-size="10"
+        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.page" max-size="10"
                         class="pagination pagination-sm" boundary-links="true" direction-links="false"
                         ng-change="reports_list.paginationChange()"
                         ng-show="!reports_list.is_loading"></uib-pagination>

frontend/src/templates/reports/list_slow.html

@@ -34,7 +34,7 b''
 
 
     <div class="text-center">
-        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.searchParams.page" max-size="10"
+        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.page" max-size="10"
                         class="pagination pagination-sm" boundary-links="true" direction-links="false"
                         ng-change="reports_list.paginationChange()"
                         ng-show="!reports_list.is_loading"></uib-pagination>
@@ -86,7 +86,7 b''
     </div>
 
     <div class="text-center">
-        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.searchParams.page" max-size="10"
+        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.page" max-size="10"
                         class="pagination pagination-sm" boundary-links="true" direction-links="false"
                         ng-change="reports_list.paginationChange()"
                         ng-show="!reports_list.is_loading"></uib-pagination>