appenlight Commit - r73:305f1ad6 · RhodeCode Free Hosting

search pages: got rid of $scope

ergo -

r73:305f1ad6

parent child

The requested changes are too big and content was truncated. Show full diff

backend/src/appenlight/static/js/appenlight.js

0 0 0

	1		NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

frontend/bower.json

0 +1 -1

                  "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

0 0 -9

                      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

0 +17 -22

              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: {
                  vm.logsPage = [];
                  vm.itemCount = 0;
                  vm.itemsPerPage = 250;
-                 vm.searchParams = parseSearchToTags($location.search());
+                 vm.page = 1;
                  vm.$location = $location;
                  vm.isLoading = {
                      logs: true,
                  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();
                  };
                      var text = vm.filterTypeAhead;
                      if (_.isObject(vm.filterTypeAhead)) {
                          text = vm.filterTypeAhead.text;
+                     }
+                     ;
+                     };
                      if (!vm.filterTypeAhead) {
                          return
                      }
                      }
                      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.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

0 +18 -21

              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;
                  };
                  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 = [
                      {
                  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) {
                  vm.changeRelativeTime = function () {
                      $cookies.notRelativeTime = JSON.stringify(vm.notRelativeTime);
+                 }
+                 };
                  _.each(_.range(1, 11), function (priority) {
                      vm.filterTypeAheadOptions.push({
                  });
                  vm.paginationChange = function(){
-                     $location.search('page', vm.searchParams.page);
+                     $location.search('page', vm.page);
+                     vm.refresh();
                  };
                  vm.typeAheadTag = function (event) {
                      }
                      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') {
                          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

0 +22 -26

              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';
                  };
                  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 = [
                      {
                  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;
                      var text = vm.filterTypeAhead;
                      if (_.isObject(vm.filterTypeAhead)) {
                          text = vm.filterTypeAhead.text;
+                     }
+                     ;
+                     };
                      if (!vm.filterTypeAhead) {
                          return
                      }
                      }
                      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') {
                          vm.filterTypeAhead = 'end_date:' + moment(vm.pickerDate).utc().hour(23).minute(59).format();
                      }
                      vm.showDatePicker = false;
+                 }
+                 };
                  var reportPresentation = function (report) {
                      report.presentation = {};
                          report.presentation.tooltip = 'New';
                      }
                      return report;
+                 }
+                 };
                  vm.fetchReports = function (searchParams) {
                      vm.is_loading = true;
                      }, 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

0 0 -1

                                      scope.chart = scope.chart.destroy();
                                      delete element;
                                      delete scope.chart;
-                                     console.log('destroy called');
                                  }
                              }
                          );

frontend/src/templates/logs.html

0 +2 -2

                  <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>
                  </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

0 +2 -2

                  <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>
                  <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

0 +2 -2

                  <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>
                  </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>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages