bastion 4.3.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d51f22893a276196b2ddf87221c5f4d3690a9b13
-  data.tar.gz: 6fc3afe5f918a577dab6860644f87cc6364ebfde
+  metadata.gz: 53eb3be4777021eaac12603429045c2b6a75dfcc
+  data.tar.gz: 00a4c50f7065293da92e5f921713c2e0b1579964
 SHA512:
-  metadata.gz: fa1bf691ed2d238091e8f59f83d044bbbf5d5e288dbdfcf221181f4f3ea25e99249dd9262210ef64b4b6b7de1c646e6bfb9f682a22af2a75b9afd4c63df7330d
-  data.tar.gz: ed1f7879352f95741e8ca93ee8cf0799b93adf20fa1a3fc25d0a09b0e777d4a18a7965abca3734606dd79e20b172a8224eb4e4125b17fc27c033a5773bdeab61
+  metadata.gz: aec99b88057a13f935fa09711fe332585a229937685cff963f384c327323b5b4c991883ce8764b8ae1391addbbf037095ff119465f2a0b633d5b145397d064c0
+  data.tar.gz: ad1e8891be0ba0a795ce733630ade101b0a326c595d40e1b70802b528a9247ef5dcf836070ffb60cb7ca409f8b36bf137e17e08b5c26ca6c7162da62d7736f16

data/app/assets/javascripts/bastion/bastion-bootstrap.js

@@ -6,7 +6,6 @@ BASTION_MODULES = [
     'angular-blocks',
     'ngAnimate',
     'ngSanitize',
-    'infinite-scroll',
     'templates',
     'ui.bootstrap',
     'ui.bootstrap.tpls',

data/app/assets/javascripts/bastion/bastion.js

@@ -5,7 +5,6 @@
 //= require "bastion/angular-ui-router/angular-ui-router"
 //= require "bastion/angular-uuid4/angular-uuid4.js"
 //= require "bastion/ngUpload/ng-upload"
-//= require "bastion/ngInfiniteScroll/ng-infinite-scroll.js"
 //= require "bastion/angular-gettext/angular-gettext"
 //= require "bastion/angular-blocks/angular-blocks"
 //= require "bastion/angular-breadcrumb/angular-breadcrumb"

data/app/assets/javascripts/bastion/components/bst-on-enter.directive.js

@@ -15,6 +15,7 @@
                 element.bind('keydown keypress', function (event) {
                     if (event.which === 13) {
                         scope.$apply(attrs.bstOnEnter);
+                        event.preventDefault();
                     }
                 });
             }

data/app/assets/javascripts/bastion/components/nutupane.factory.js

@@ -4,8 +4,7 @@
  *
  * @requires $location
  * @requires $q
- * @requires $timeout
- * @requires $rootScope
+ * @requires entriesPerPage
  * @requires TableCache
  * @requires GlobalNotification
  *
@@ -31,10 +30,9 @@
     </pre>
  */
 angular.module('Bastion.components').factory('Nutupane',
-    ['$location', '$q', '$timeout', '$rootScope', 'TableCache', 'GlobalNotification', function ($location, $q, $timeout, $rootScope, TableCache, GlobalNotification) {
+    ['$location', '$q', 'entriesPerPage', 'TableCache', 'GlobalNotification', function ($location, $q, entriesPerPage, TableCache, GlobalNotification) {
         var Nutupane = function (resource, params, action) {
-            var self = this,
-                orgSwitcherRegex = new RegExp("/(organizations|locations)/(.+/)*(select|clear)");
+            var self = this;
 
             // TODO: remove me
             // http://projects.theforeman.org/issues/18079
@@ -44,7 +42,29 @@ angular.module('Bastion.components').factory('Nutupane',
                 return $location.path().split('/').join('-').slice(1);
             }
 
+            function setQueryStrings() {
+                if (params.paged) {
+                    $location.search("page", params.page).replace();
+                    $location.search("per_page", params['per_page']).replace();
+                }
+
+                if (params.search) {
+                    $location.search(self.searchKey, params.search).replace();
+                }
+
+                if (params.sort_by) {
+                    $location.search("sortBy", params['sort_by']).replace();
+                }
+
+                if (params['sort_order']) {
+                    $location.search("sortOrder", params['sort_order']).replace();
+                }
+            }
+
             params = params || {};
+            params.paged = true;
+            params.page = $location.search().page || 1;
+            params['per_page'] = $location.search().perPage || entriesPerPage;
 
             self.searchKey = action ? action + 'Search' : 'search';
 
@@ -57,17 +77,10 @@ angular.module('Bastion.components').factory('Nutupane',
                 initialLoad: true
             };
 
-            // Set default resource values
-            resource.page = 0;
-            resource.subtotal = "0";
-            resource.total = "0";
-            resource.results = [];
-
-            self.load = function (replace) {
+            self.load = function () {
                 var deferred = $q.defer(),
                     table = self.table;
 
-                replace = replace || false;
                 table.working = true;
 
                 if (table.initialLoad) {
@@ -76,7 +89,6 @@ angular.module('Bastion.components').factory('Nutupane',
                     table.searchCompleted = false;
                 }
 
-                params.page = table.resource.page + 1;
                 params.search = table.searchTerm || "";
                 params.search = self.searchTransform(params.search);
 
@@ -90,11 +102,7 @@ angular.module('Bastion.components').factory('Nutupane',
                         row.selected = table.allResultsSelected;
                     });
 
-                    if (replace) {
-                        table.rows = response.results;
-                    } else {
-                        table.rows = table.rows.concat(response.results);
-                    }
+                    table.rows = response.results;
                     table.resource.page = parseInt(response.page, 10);
 
                     if (table.initialSelectAll) {
@@ -102,21 +110,23 @@ angular.module('Bastion.components').factory('Nutupane',
                         table.initialSelectAll = false;
                     }
 
-                    // This $timeout is necessary to cause a digest cycle
-                    // in order to prevent loading two sets of results.
-                    $timeout(function () {
-                        deferred.resolve(response);
-                        table.resource = response;
-                        table.resource.page = parseInt(response.page, 10);
+                    deferred.resolve(response);
+                    table.resource = response;
+                    table.resource.page = parseInt(response.page, 10);
 
-                        if (self.selectAllMode) {
-                            table.selectAll(true);
-                        }
-                        table.resource.offset = table.rows.length;
+                    if (self.selectAllMode) {
+                        table.selectAll(true);
+                    }
+
+                    if (table.resource.page > 1) {
+                        table.resource.offset = (table.resource.page - 1) * table.resource['per_page'] + 1;
+                    } else {
+                        table.resource.offset = 1;
+                    }
+
+                    TableCache.setTable(getTableName(), table);
+                    setQueryStrings();
 
-                        TableCache.setTable(getTableName(), table);
-                        $rootScope.$emit('nutupane:loaded');
-                    }, 0);
                     table.working = false;
                     table.refreshing = false;
                 });
@@ -271,8 +281,8 @@ angular.module('Bastion.components').factory('Nutupane',
                 $location.search(self.searchKey, searchTerm);
                 self.table.searchTerm = searchTerm;
                 self.table.resource.page = 1;
+                self.table.params.page = 1;
                 self.table.rows = [];
-                self.table.closeItem();
                 self.table.selectAllResults(false);
 
                 if (!self.table.working) {
@@ -291,13 +301,6 @@ angular.module('Bastion.components').factory('Nutupane',
                 self.table.searchCompleted = true;
             };
 
-            // Must be overridden
-            self.table.closeItem = function () {
-                if (!self.masterOnly) {
-                    throw "Nutupane closeItem not implemented. If you are using Nutupane functionality with master-detail please pass 'masterOnly' to your Nutupane declaration";
-                }
-            };
-
             self.table.replaceRow = function (row) {
                 var index, selected;
                 index = null;
@@ -320,27 +323,60 @@ angular.module('Bastion.components').factory('Nutupane',
                 self.table.resource.total += 1;
             };
 
-            self.table.nextPage = function () {
-                var table = self.table;
-                if (table.working || !table.hasMore()) {
-                    return false;
+            self.table.onFirstPage = function () {
+                return self.table.resource.page === 1;
+            };
+
+            self.table.onLastPage = function () {
+                return self.table.resource.page >= self.table.resource.subtotal / self.table.resource.per_page;
+            };
+
+            self.table.getPageEnd = function () {
+                var table = self.table, pageEnd;
+
+                pageEnd = table.resource.offset + table.rows.length - 1;
+
+                if (pageEnd > table.resource.subtotal) {
+                    pageEnd = table.resource.subtotal;
                 }
-                return self.query();
+
+                return pageEnd;
             };
 
-            self.table.hasMore = function () {
-                var length = self.table.rows.length,
-                    subtotal = self.table.resource.subtotal,
-                    hasMore = false,
-                    justBegun;
+            self.table.firstPage = function () {
+                return self.table.changePage(1);
+            };
 
-                if (!subtotal) {
-                    hasMore = false;
-                } else {
-                    justBegun = (length === 0 && subtotal !== 0);
-                    hasMore = (length < subtotal) || justBegun;
+            self.table.previousPage = function () {
+                var previousPage = parseInt(params.page, 10) - 1;
+                return self.table.changePage(previousPage);
+            };
+
+            self.table.nextPage = function () {
+                var nextPage = parseInt(params.page, 10) + 1;
+                return self.table.changePage(nextPage);
+            };
+
+            self.table.lastPage = function () {
+                var table = self.table,
+                    lastPage = Math.ceil(table.resource.subtotal / table.resource.per_page);
+                return table.changePage(lastPage);
+            };
+
+            self.table.changePage = function (pageNumber) {
+                if (pageNumber) {
+                    params.page = pageNumber;
+                    self.table.resource.page = pageNumber;
                 }
-                return hasMore;
+
+                return self.load();
+            };
+
+            self.table.pageSizes = _.uniq(_([25, 50, 75, 100, entriesPerPage]).sortBy().value());
+
+            self.table.updatePageSize = function () {
+                params.page = 1;
+                self.query();
             };
 
             // Wraps the table.selectAll() function if selectAllResultsEnabled is not set
@@ -394,12 +430,10 @@ angular.module('Bastion.components').factory('Nutupane',
                 self.table.searchTerm = $location.search()[self.searchKey];
             };
 
-            $rootScope.$on('$locationChangeStart', function (event, newUrl) {
-                if (newUrl.match(orgSwitcherRegex)) {
-                    self.table.closeItem();
-                }
-            });
+            // Load initial set of results
+            self.load();
         };
+
         return Nutupane;
     }]
 );

data/app/assets/javascripts/bastion/layouts/partials/table.html

@@ -1,11 +1,11 @@
 <div class="row toolbar-pf table-view-pf-toolbar-external" ng-class="{'empty-table': table.rows.length === 0}">
   <div class="col-sm-12">
     <form class="toolbar-pf-actions">
-      <div class="form-group toolbar-pf-filter">
-        <div class="form-group toolbar-pf-search-filter">
-          <span data-block="search-filter"></span>
-        </div>
+      <div class="form-group toolbar-pf-search-filter">
+        <span data-block="search-filter"></span>
+      </div>
 
+      <div class="form-group toolbar-pf-filter">
         <div data-block="search">
           <div class="input-group">
             <input type="text"
@@ -23,7 +23,7 @@
             <button class="btn btn-default"
                     type="button"
                     ng-click='table.search("") && (table.searchCompleted = false)'
-                    ng-show="table.searchCompleted && table.searchTerm">
+                    ng-show="table.searchTerm">
               <i class="fa fa-times"></i>
             </button>
             <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button">
@@ -48,25 +48,17 @@
     </form>
 
     <div class="row toolbar-pf-results" ng-show="table.rows.length > 0">
-      <div class="col-sm-9">
-        <span translate>Showing {{ table.rows.length }} of {{ table.resource.subtotal }} ({{ table.resource.total }} Total)</span>
-      </div>
-
+      <div class="col-sm-9"></div>
       <div class="col-sm-3 table-view-pf-select-results" ng-show="table.rowSelect">
-        <span translate>{{ table.numSelected }} Selected</span>
+        <span translate>{{ table.numSelected }} of {{ table.resource.total }} Selected</span>
       </div>
     </div>
   </div>
 </div>
 
-<div bst-table="table" nutupane-table>
+<div bst-table="table">
   <div class="row">
     <div class="col-sm-12">
-      <div class="loading-mask" ng-show="table.refreshing || table.working" >
-        <i class="fa fa-spinner fa-spin"></i>
-        <span>{{ "Loading..." | translate }}</span>
-      </div>
-
       <p bst-alert="info" ng-show="table.rows.length === 0 && !table.working && !table.searchTerm && !table.searchCompleted">
         <span data-block="no-rows-message"></span>
       </p>
@@ -74,11 +66,61 @@
         <span data-block="no-search-results-message"></span>
       </p>
 
-      <div ng-show="table.rows.length > 0 && !(table.refreshing || table.working)" bst-container-scroll data="table.rows">
-        <div infinite-scroll="table.nextPage()" infinite-scroll-container="'.container-scroll-wrapper'"
-             infinite-scroll-listen-for-event="nutupane:loaded">
-          <div data-block="table"></div>
-        </div>
+      <div ng-show="table.rows.length > 0" ng-class="{'table-mask': table.refreshing || table.working}">
+        <div data-block="table"></div>
+
+        <form class="content-view-pf-pagination table-view-pf-pagination clearfix">
+          <div class="form-group">
+            <div class="pagination-pf-pagesize">
+              <select class="form-control" ng-model="table.params.per_page" ng-change="table.updatePageSize()"
+                      ng-options="value for value in table.pageSizes">
+              </select>
+            </div>
+            <span translate>per page</span>
+          </div>
+          <div class="form-group">
+            <span>
+              <span class="pagination-pf-items-current">{{ table.resource.offset }} - {{ table.getPageEnd() }}</span>
+              <span translate>of </span>
+              <span class="pagination-pf-items-total">{{ table.resource.subtotal }}</span>
+            </span>
+            <ul class="pagination pagination-pf-back">
+              <li ng-class="{ disabled: table.onFirstPage() }">
+                <a ng-click="table.onFirstPage() || table.firstPage()" title="{{ 'First Page' | translate }}">
+                  <span class="i fa fa-angle-double-left"></span>
+                </a>
+              </li>
+              <li ng-class="{ disabled: table.onFirstPage() }">
+                <a ng-click="table.onFirstPage() || table.previousPage()" title="{{ 'Previous Page' | translate }}">
+                  <span class="i fa fa-angle-left"></span>
+                </a>
+              </li>
+            </ul>
+
+            <label for="currentPage" class="sr-only" translate>
+              Current Page
+            </label>
+            <input id="currentPage" class="pagination-pf-page" type="text" ng-model="table.params.page" ng-blur="table.changePage()" bst-on-enter="table.changePage()"/>
+
+            <span translate>of
+              <span class="pagination-pf-pages">{{ (table.resource.subtotal / table.resource.per_page) | roundUp }}</span>
+            </span>
+
+            <ul class="pagination pagination-pf-forward">
+              <li ng-class="{ disabled: table.onLastPage() }">
+                <a ng-click="table.onLastPage() || table.nextPage()" title=" {{ 'Next Page' | translate }}">
+                  <span class="i fa fa-angle-right"></span>
+                </a>
+              </li>
+
+              <li ng-class="{ disabled: table.onLastPage() }">
+                <a ng-click="table.onLastPage() || table.lastPage()" title="{{ 'Last Page' | translate }}">
+                  <span class="i fa fa-angle-double-right"></span>
+                </a>
+              </li>
+            </ul>
+          </div>
+        </form>
       </div>
     </div>
   </div>

data/app/assets/javascripts/bastion/utils/round-up.filter.js

@@ -0,0 +1,20 @@
+(function () {
+    /**
+     * @ngdoc filter
+     * @name Bastion.utils.filter:roundUp
+     *
+     * @description
+     *  Converts an ng-model to a number.
+     *
+     * @example
+     *   {{ 107.5 | roundUp }}
+     */
+
+    function roundUp() {
+        return function (value) {
+            return Math.ceil(value);
+        };
+    }
+
+    angular.module('Bastion.utils').filter('roundUp', roundUp);
+})();

data/app/assets/stylesheets/bastion/nutupane.scss

@@ -28,10 +28,6 @@
   overflow-y: auto;
 }
 
-.table-mask {
-  opacity: 0.4;
-}
-
 th.row-select,
 td.row-select {
   width: 25px;

data/app/assets/stylesheets/bastion/overrides.scss

@@ -79,4 +79,9 @@ html .toolbar-pf.table-view-pf-toolbar-external .toolbar-pf-filter {
 .modal-body {
   overflow-x: hidden;
   overflow-y: scroll;
+}
+
+// Add some margin to the bottom of the table footer
+.content-view-pf-pagination {
+  margin-bottom: 20px;
 }

data/app/assets/stylesheets/bastion/tables.scss

@@ -59,3 +59,11 @@
     width: 150px;
   }
 }
+
+.table-mask {
+  opacity: 0.4;
+}
+
+.pagination-pf-pagesize {
+  margin-right: 5px;
+}

data/app/views/bastion/layouts/assets.html.erb

@@ -18,6 +18,7 @@
     angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
     angular.module('Bastion').value('contentAccessMode', "<%= Organization.current.try(:content_access_mode) if Organization.current %>");
     angular.module('Bastion').value('markActiveMenu', mark_active_menu);
+    angular.module('Bastion').value('entriesPerPage', "<%= Setting[:entries_per_page] %>");
     angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));
     angular.module('Bastion.auth').value('CurrentUser', {
         id: <%= User.current.id %>,

data/bower.json

@@ -17,7 +17,6 @@
     "angular-ui-router": "=0.3.1",
     "angular-uuid4": "0.1.0",
     "json3": "~3.2.4",
-    "ngInfiniteScroll": "1.2.1",
     "ngUpload": "0.5.18"
   },
   "devDependencies": {
@@ -79,9 +78,6 @@
     },
     "ngUpload": {
       "javascripts/bastion/ngUpload": "ng-upload.js"
-    },
-    "ngInfiniteScroll": {
-      "javascripts/bastion/ngInfiniteScroll": "build/ng-infinite-scroll.js"
     }
   }
 }

data/grunt/karma.js

@@ -29,7 +29,6 @@ module.exports = {
             basePath + 'vendor/assets/javascripts/bastion/angular-ui-router/angular-ui-router.js',
             basePath + 'vendor/assets/javascripts/bastion/angular-gettext/angular-gettext.js',
             basePath + 'vendor/assets/javascripts/bastion/ngUpload/ng-upload.js',
-            basePath + 'vendor/assets/javascripts/bastion/ngInfiniteScroll/ng-infinite-scroll.js',
             basePath + 'vendor/assets/javascripts/bastion/angular-breadcrumb/angular-breadcrumb.js',
             basePath + '.tmp/bower_components/angular-mocks/angular-mocks.js',
             basePath + '.tmp/bower_components/lodash/lodash.js',

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "4.3.1"
+  VERSION = "5.0.0"
 end