bastion 5.0.6 → 5.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55ce63226df9c06562642aa39364a46785888216
-  data.tar.gz: 48c6b2e715be10035d0ba914a870e54fb75a726a
+  metadata.gz: 7a7c9431ed0078114c6e171f08c6235a6aee2c1a
+  data.tar.gz: 607f23ed40b6038579e001f4e7e42012756b0359
 SHA512:
-  metadata.gz: d46fd5672f7ae4b25f0716db49ca56e379837794b644d3dc3d040615a889e466722b12dab2b4fb202ad8faae71a762d877cb17a0f66174b64d1f50badebdaf8a
-  data.tar.gz: 3512a2a5f503a670e097b5d13d505a7a5ce72cf82317366016caf0546b68dc203a56394fe973f7dba8618d2eb2ad83ebfc87a780738b8b116300e5ef47b5c95d
+  metadata.gz: cae3c0c52a6875f8af22f7f328b66dfc81cfc08565066e808f4143906b7fe1a7c6ea6b6ad90ea92442d235a569441551e9973a03aea724d6b44a5742d90f1c56
+  data.tar.gz: b8fa098368c81edc55caf68cf30a97d64c3ece7dba71135ca783e0dc0e7fdcb7e9ac5fc3794dd26ad5aac90f60a8134532383e7926a7e525a35d6cf0b0c0c32f

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

@@ -31,7 +31,7 @@
  */
 angular.module('Bastion.components').factory('Nutupane',
     ['$location', '$q', 'entriesPerPage', 'TableCache', 'GlobalNotification', function ($location, $q, entriesPerPage, TableCache, GlobalNotification) {
-        var Nutupane = function (resource, params, action) {
+        var Nutupane = function (resource, params, action, nutupaneParams) {
             var self = this;
 
             function getTableName() {
@@ -62,6 +62,8 @@ angular.module('Bastion.components').factory('Nutupane',
             params.page = $location.search().page || 1;
             params['per_page'] = $location.search()['per_page'] || entriesPerPage;
 
+            nutupaneParams = nutupaneParams || {};
+            self.disableAutoLoad = nutupaneParams.disableAutoLoad || false;
             self.searchKey = action ? action + 'Search' : 'search';
 
             self.table = {
@@ -138,6 +140,9 @@ angular.module('Bastion.components').factory('Nutupane',
                     table.working = false;
                     table.refreshing = false;
                     table.initialLoad = false;
+                }).$promise.catch(function() {
+                    table.working = false;
+                    table.refreshing = false;
                 });
 
                 return deferred.promise;
@@ -341,6 +346,11 @@ angular.module('Bastion.components').factory('Nutupane',
                 self.table.resource.total += 1;
             };
 
+            self.table.hasPagination = function () {
+                return self.table.resource && self.table.resource.subtotal && self.table.resource.page &&
+                    self.table.resource.per_page && self.table.resource.offset;
+            };
+
             self.table.onFirstPage = function () {
                 return self.table.resource.page === 1;
             };
@@ -464,8 +474,9 @@ angular.module('Bastion.components').factory('Nutupane',
                 self.table.searchTerm = $location.search()[self.searchKey];
             };
 
-            // Load initial set of results
-            self.load();
+            if (!self.disableAutoLoad) {
+                self.load();
+            }
         };
 
         return Nutupane;

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

@@ -70,7 +70,7 @@
         <div data-block="table"></div>
 
         <form class="content-view-pf-pagination table-view-pf-pagination clearfix">
-          <div class="form-group">
+          <div class="form-group" ng-show="table.hasPagination()">
             <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">
@@ -78,7 +78,7 @@
             </div>
             <span translate>per page</span>
           </div>
-          <div class="form-group">
+          <div class="form-group" ng-show="table.hasPagination()">
             <span>
               <span class="pagination-pf-items-current" translate>Showing {{ table.getPageStart() }} - {{ table.getPageEnd() }}</span>
               <span translate>of </span>

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

@@ -1,3 +1,5 @@
+@import 'patternfly/variables';
+
 .required {
   .control-label {
     color: inherit;

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

@@ -1,4 +1,9 @@
 @import "variables";
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+@import "bootstrap/alerts";
+@import "patternfly/variables";
+@import "patternfly/alerts";
 
 .table {
   table-layout: fixed;

data/lib/bastion/engine.rb

@@ -20,6 +20,7 @@ module Bastion
 
     initializer "bastion.configure_assets", :group => :all do |app|
       SETTINGS[:bastion] = {:assets => {}} if SETTINGS[:bastion].nil?
+      SETTINGS[:bastion][:assets] = {} if SETTINGS[:bastion][:assets].nil?
 
       SETTINGS[:bastion][:assets][:precompile] = [
         'bastion/bastion.css',
@@ -42,6 +43,12 @@ module Bastion
       app.config.angular_templates.ignore_prefix = %w([bastion]*\/+)
     end
 
+    initializer 'bastion.register_plugin', :before => :finisher_hook do
+      Foreman::Plugin.register :bastion do
+        requires_foreman '>= 1.16'
+      end
+    end
+
     rake_tasks do
       load "#{Bastion::Engine.root}/Rakefile"
     end

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "5.0.6"
+  VERSION = "5.0.7"
 end

data/test/components/nutupane.factory.test.js

@@ -2,6 +2,7 @@ describe('Factory: Nutupane', function() {
     var $timeout,
         $location,
         $rootScope,
+        $q,
         Resource,
         TableCache,
         entriesPerPage,
@@ -26,18 +27,32 @@ describe('Factory: Nutupane', function() {
         $provide.value('TableCache', TableCache);
     }));
 
-    beforeEach(module(function() {
+    beforeEach(inject(function(_$location_, _$timeout_, _Nutupane_, _$rootScope_, _$q_) {
+        $location = _$location_;
+        $timeout = _$timeout_;
+        Nutupane = _Nutupane_;
+        $rootScope = _$rootScope_;
+        $q = _$q_;
+
         expectedResult = [{id: 2, value: "value2"}, {id:3, value: "value3"},
             {id: 4, value: "value4"}, {id:5, value: "value5"}];
         Resource = {
             queryPaged: function(params, callback) {
-                var result = {page: 1, results: expectedResult, subtotal: 8, per_page: 2};
+                var result = {
+                  page: 1,
+                  results: expectedResult,
+                  subtotal: 8,
+                  per_page: 2,
+                  $promise: $q.resolve()
+                };
                 if (callback) {
                     callback(result);
                 }
                 return result;
             },
-            customAction: function() {},
+            customAction: function(params, callback) {
+                return {$promise: $q.resolve()};
+            },
             page: 1,
             per_page: 2,
             total: 10,
@@ -50,13 +65,6 @@ describe('Factory: Nutupane', function() {
         };
     }));
 
-    beforeEach(inject(function(_$location_, _$timeout_, _Nutupane_, _$rootScope_) {
-        $location = _$location_;
-        $timeout = _$timeout_;
-        Nutupane = _Nutupane_;
-        $rootScope = _$rootScope_;
-    }));
-
     describe("adds additional functionality to the Nutupane table by", function() {
         var nutupane;
 
@@ -144,7 +152,7 @@ describe('Factory: Nutupane', function() {
         });
 
         it("providing a method to perform a search", function() {
-            spyOn(Resource, 'queryPaged');
+            spyOn(Resource, 'queryPaged').and.callThrough();
 
             nutupane.table.search();
 
@@ -203,6 +211,12 @@ describe('Factory: Nutupane', function() {
                expect(nutupane.table.numSelected).toBe(0);
         });
 
+        it("provides a way to check if the table supports pagination", function () {
+            expect(nutupane.table.hasPagination()).toBeTruthy();
+            nutupane.table.resource.subtotal = null;
+            expect(nutupane.table.hasPagination()).toBeFalsy();
+        });
+
         it("provides a way to tell if on the first page", function () {
             nutupane.table.firstPage();
             expect(nutupane.table.onFirstPage()).toBe(true);
@@ -391,11 +405,11 @@ describe('Factory: Nutupane', function() {
         });
 
         describe("provides a way to sort the table", function() {
-            it ("defaults the sort to ascending if the previous sort does not match the new sort.", function() {
+            it("defaults the sort to ascending if the previous sort does not match the new sort.", function() {
                 var expectedParams = {sort_by: 'name', sort_order: 'ASC', search: '', paged: true, page: 1, per_page: entriesPerPage};
                 nutupane.table.resource.sort = {};
 
-                spyOn(Resource, 'queryPaged');
+                spyOn(Resource, 'queryPaged').and.callThrough();
                 nutupane.table.sortBy({id: "name"});
 
                 expect(Resource.queryPaged).toHaveBeenCalledWith(expectedParams, jasmine.any(Function));
@@ -408,7 +422,7 @@ describe('Factory: Nutupane', function() {
                     order: 'ASC'
                 };
 
-                spyOn(Resource, 'queryPaged');
+                spyOn(Resource, 'queryPaged').and.callThrough();
                 nutupane.table.sortBy({id: "name"});
 
                 expect(Resource.queryPaged).toHaveBeenCalledWith(expectedParams, jasmine.any(Function));
@@ -439,14 +453,13 @@ describe('Factory: Nutupane', function() {
         });
 
         it("provide a method to fetch records for the table via a custom action", function() {
-            spyOn(Resource, 'customAction');
+            spyOn(Resource, 'customAction').and.callThrough();
             nutupane.query();
 
             expect(Resource.customAction).toHaveBeenCalled();
         });
 
         it("naming the URL search field based off the action", function() {
-            spyOn(Resource, 'customAction');
             nutupane.table.search('*');
 
             expect($location.search()['customActionSearch']).toBe('*');
@@ -457,7 +470,48 @@ describe('Factory: Nutupane', function() {
 
             expect(nutupane.getParams()['test']).toBe('ABC');
         });
-    });
 
+        it("be able to disable auto-load", function() {
+            spyOn(Resource, 'customAction')
+            nutupane = new Nutupane(Resource, {}, 'customAction', {'disableAutoLoad': true});
+            expect(nutupane.disableAutoLoad).toBe(true);
+            expect(Resource.customAction).not.toHaveBeenCalled();
+        });
+
+        it("be able to load results after initialization", function() {
+            spyOn(Resource, 'customAction').and.callThrough();
+            nutupane = new Nutupane(Resource, {}, 'customAction', {'disableAutoLoad': true});
+            expect(nutupane.disableAutoLoad).toBe(true);
+            nutupane.refresh();
+            expect(Resource.customAction).toHaveBeenCalled();
+        });
+
+        it("be able to enable autoload", function() {
+            spyOn(Resource, 'customAction').and.callThrough();
+            nutupane = new Nutupane(Resource, {}, 'customAction', {'disableAutoLoad': false});
+            expect(nutupane.disableAutoLoad).toBe(false);
+            expect(Resource.customAction).toHaveBeenCalled();
+        });
+
+        describe("when there was an error loading the resource", function() {
+            beforeEach(function() {
+                spyOn(Resource, 'customAction').and.callFake(function() {
+                      return {
+                        $promise: $q.reject('internal server error')
+                      };
+                });
+                nutupane.load();
+                $rootScope.$apply();
+            });
+
+            it("ensures the table is not in 'refreshing' state", function() {
+                expect(nutupane.table.refreshing).toBe(false);
+            });
+
+            it("ensures the table is not in 'working' state", function() {
+                expect(nutupane.table.working).toBe(false);
+            });
+        });
+    });
 });
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 5.0.7
 platform: ruby
 authors:
 - Eric D Helms
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates
@@ -1760,47 +1760,47 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: UI library of AngularJS based components for Foreman
 test_files:
-- test/features/bst-feature-flag.directive.test.js
-- test/features/feature-flag.service.test.js
 - test/auth/authorization.service.test.js
+- test/bastion/test-constants.js
+- test/components/bst-alert.directive.test.js
+- test/components/bst-alerts.directive.test.js
+- test/components/bst-bookmark.directive.test.js
+- test/components/bst-bookmark.factory.test.js
+- test/components/bst-dropdown.directive.test.js
+- test/components/bst-edit.directive.test.js
+- test/components/bst-flyout.directive.test.js
+- test/components/bst-form-buttons.directive.test.js
 - test/components/bst-form-group.directive.test.js
-- test/components/bst-table.directive.test.js
-- test/components/page-title.directive.test.js
+- test/components/bst-global-notification.directive.test.js
 - test/components/bst-menu.directive.test.js
-- test/components/bst-alerts.directive.test.js
-- test/components/nutupane.factory.test.js
-- test/components/path-selector.directive.test.js
+- test/components/bst-modal.directive.test.js
+- test/components/bst-table.directive.test.js
 - test/components/formatters/array-to-string.filter.test.js
-- test/components/formatters/unlimited-filter.filter.test.js
+- test/components/formatters/boolean-to-yes-no.filter.test.js
 - test/components/formatters/capitalize.filter.test.js
 - test/components/formatters/key-value-to-string.filter.test.js
-- test/components/formatters/boolean-to-yes-no.filter.test.js
+- test/components/formatters/unlimited-filter.filter.test.js
+- test/components/global-notification.service.test.js
+- test/components/nutupane.factory.test.js
+- test/components/page-title.directive.test.js
 - test/components/page-title.service.test.js
-- test/components/bst-bookmark.factory.test.js
-- test/components/bst-alert.directive.test.js
-- test/components/bst-bookmark.directive.test.js
-- test/components/bst-global-notification.directive.test.js
-- test/components/bst-flyout.directive.test.js
+- test/components/path-selector.directive.test.js
 - test/components/table-cache.service.test.js
-- test/components/bst-dropdown.directive.test.js
 - test/components/typeahead-empty.directive.test.js
-- test/components/bst-form-buttons.directive.test.js
-- test/components/global-notification.service.test.js
-- test/components/bst-edit.directive.test.js
-- test/components/bst-modal.directive.test.js
+- test/features/bst-feature-flag.directive.test.js
+- test/features/feature-flag.service.test.js
+- test/i18n/translate.service.test.js
+- test/menu/menu-expander.service.test.js
 - test/routing.module.test.js
 - test/test-mocks.module.js
-- test/menu/menu-expander.service.test.js
-- test/i18n/translate.service.test.js
-- test/bastion/test-constants.js
-- test/utils/form-utils.service.test.js
+- test/utils/bastion-resource.factory.test.js
 - test/utils/disable-link.directive.test.js
+- test/utils/form-utils.service.test.js
+- test/utils/round-up.filter.test.js
 - test/utils/stop-event.directive.test.js
-- test/utils/bastion-resource.factory.test.js
 - test/utils/urlencode.filter.test.js
-- test/utils/round-up.filter.test.js