bastion 3.3.4 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c31f02cdf4d94462b5d10b6a9458538cacf355db
-  data.tar.gz: 75e0398f077c13247f77299ac119025395d14d0a
+  metadata.gz: 05ff44d4550c21ed07abe4397f2cb266157a3bb7
+  data.tar.gz: bc8c1e7414eb123f406dc781543933ba2a695c8f
 SHA512:
-  metadata.gz: 209cd2fb35c1c2240322d8f930753a90f2ed6bad6cdc8363a78536e89fb4f44362dce47436181596ae02470080da29b4393912ccda51c1ffeecb1a9fd8be4232
-  data.tar.gz: 63500714c2b28b1e6e33f78f99fa5c0bd57b2b4eab3735a68b1e0802980a245479e6df4fc8b869165b02287d034a16daf312a8a89abb8b81b198d89dafc8d2ea
+  metadata.gz: fd455b12ca5b6a5dc8489328af7920e7bdd77b105447d9c87e1898143298ecb096d165f1ff0474c9e899267b51fbf5a6596dde3a2a36094aa0e5239e424def2a
+  data.tar.gz: 385d580c66ec06868fc5538d8acdb7551c8554245abdbe042acc638ccdc8cf692892f15dcc6308541124aa4ec72b06f521be2c9287429a8e3bd213289f725f09

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

@@ -83,6 +83,7 @@ angular.module('Bastion').run(['$rootScope', '$state', '$stateParams', 'gettextC
         $rootScope.$state = $state;
         $rootScope.$stateParams = $stateParams;
         $rootScope.transitionTo = $state.transitionTo;
+        $rootScope.$location = $location;
 
         $rootScope.isState = function (stateName) {
             return $state.is(stateName);

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

@@ -24,13 +24,33 @@ angular.module('Bastion.components').directive('bstAlert', ['$animate', '$timeou
             close: '&'
         },
         link: function (scope, element, attrs) {
+            var fadeOutAnimation;
+
+            scope.fadePrevented = true;
             scope.closeable = 'close' in attrs;
 
-            // Fade out success alerts after five seconds
-            if (scope.type === 'success') {
+            scope.startFade = function () {
                 $timeout(function () {
-                    $animate.leave(element.find('.alert'), scope.close);
+                    if (!scope.fadePrevented) {
+                        fadeOutAnimation = $animate.leave(element.find('.alert'));
+                        fadeOutAnimation.then(function () {
+                            scope.close();
+                        });
+                    }
                 }, SUCCESS_FADEOUT);
+            };
+
+            scope.cancelFade = function () {
+                scope.fadePrevented = true;
+                if (fadeOutAnimation) {
+                    $animate.cancel(fadeOutAnimation);
+                }
+            };
+
+            // Automatically fade out success alerts
+            if (scope.type === 'success') {
+                scope.fadePrevented = false;
+                scope.startFade();
             }
         }
     };

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

@@ -269,6 +269,11 @@ angular.module('Bastion.components').factory('Nutupane',
                 }
             };
 
+            self.table.clearSearch = function () {
+                self.table.search(null);
+                self.table.searchCompleted = true;
+            };
+
             // Must be overridden
             self.table.closeItem = function () {
                 if (!self.masterOnly) {

data/app/assets/javascripts/bastion/components/views/bst-alert.html

@@ -1,4 +1,4 @@
-<div class="alert" ng-class='"alert-" + (type || "warning")'>
+<div class="alert" ng-class='"alert-" + (type || "warning")' ng-mouseover="cancelFade()">
   <button ng-show="closeable" type="button" class="close" aria-hidden="true" ng-click="close()">
     <span class="pficon pficon-close"></span>
   </button>

data/app/assets/javascripts/bastion/layouts/404.html

@@ -0,0 +1,14 @@
+<span page-title>{{ '404 - Page Not Found' | translate }}</span>
+
+<section class="col-sm-12">
+  <h1 translate>404 - Page Not Found</h1>
+  <p translate>
+    The requested URL <strong>{{ $location.path() }}</strong> was not found.
+  </p>
+  <p translate>
+    You may have mistyped the address or the page may have moved.
+  </p>
+  <p translate>
+    If you are the application owner check the logs for more information.
+  </p>
+</section>

data/app/assets/javascripts/bastion/layouts/details-nutupane.html

@@ -12,24 +12,33 @@
   <div class="row nutupane-details-bar">
     <div class="col-sm-4">
       <div data-block="search">
-        <div class="input-group input-group">
-
-          <span data-block="search-filter"></span>
-
-          <input type="text"
-                 class="form-control"
-                 placeholder="{{ 'Search...' | translate }}"
-                 ng-model="detailsTable.searchTerm"
-                 bst-on-enter="detailsTable.search(detailsTable.searchTerm)"
-                 ng-trim="false"
-                 typeahead="item.label for item in detailsTable.autocomplete($viewValue)"
-                 typeahead-empty
-                 typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
-
-          <span class="input-group-btn">
-            <button ng-click="detailsTable.search(detailsTable.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
-          </span>
-        </div>
+        <form role="form" class="search-pf has-button">
+          <div class="form-group has-clear">
+            <div class="search-pf-input-group">
+              <span data-block="search-filter"></span>
+
+              <input type="text"
+                     class="form-control"
+                     placeholder="{{ 'Search...' | translate }}"
+                     ng-model="detailsTable.searchTerm"
+                     bst-on-enter="detailsTable.search(detailsTable.searchTerm)"
+                     ng-trim="false"
+                     typeahead="item.label for item in detailsTable.autocomplete($viewValue)"
+                     typeahead-empty
+                     typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
+
+              <button type="button" class="clear" aria-hidden="true" ng-show="detailsTable.searchTerm" ng-click='detailsTable.clearSearch()'>
+                <span class="pficon pficon-close"></span>
+              </button>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <button class="btn btn-default" type="button" ng-click="detailsTable.search(detailsTable.searchTerm)" >
+              <span class="fa fa-search"></span>
+            </button>
+          </div>
+        </form>
       </div>
     </div>
 

data/app/assets/javascripts/bastion/layouts/nutupane.html

@@ -18,35 +18,41 @@
       </div>
     </div>
 
-
     <div class="col-sm-3 nutupane-info">
-      <div class="input-group input-group">
-        <input type="text"
-               class="form-control"
-               placeholder="{{ 'Filter...' | translate }}"
-               bst-on-enter="table.search(table.searchTerm)"
-               ng-model="table.searchTerm"
-               ng-trim="false"
-               typeahead="item.label for item in table.autocomplete($viewValue)"
-               typeahead-empty
-               typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
-        <span class="input-group-btn">
-          <button class="btn btn-default"
-                  type="button"
-                  ng-click='table.search("") && (table.searchCompleted = false)' 
-                  ng-show="table.searchCompleted && table.searchTerm">
-            <i class="fa fa-times"></i>
-          </button>
-          <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button">
-            <i class="fa fa-search"></i>
-            <span translate>Search</span>
+      <form role="form" class="search-pf has-button">
+        <div class="form-group has-clear">
+          <div class="search-pf-input-group">
+            <label for="table-search" class="sr-only" translate>Search</label>
+
+            <input id="table-search"
+                   type="search"
+                   class="form-control"
+                   placeholder="{{ 'Search...' | translate }}"
+                   bst-on-enter="table.search(table.searchTerm)"
+                   ng-model="table.searchTerm"
+                   ng-trim="false"
+                   typeahead="item.label for item in table.autocomplete($viewValue)"
+                   typeahead-empty
+                   typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
+
+            <button type="button" class="clear" aria-hidden="true" ng-show="table.searchTerm" ng-click='table.clearSearch()'>
+              <span class="pficon pficon-close"></span>
+            </button>
+          </div>
+        </div>
+
+        <div class="form-group">
+          <button class="btn btn-default" type="button" ng-click="table.search(table.searchTerm)" >
+            <span class="fa fa-search"></span>
           </button>
+        </div>
+        <div class="form-group">
           <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
             <i class="fa fa-caret-down"></i>
           </button>
           <ul bst-bookmark controller-name="controllerName" query="table.searchTerm" class="dropdown-menu pull-right"></ul>
-        </span>
-      </div>
+        </div>
+      </form>
     </div>
 
     <div class="col-sm-3 nutupane-info">

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

@@ -13,7 +13,7 @@ angular.module('Bastion.routing', ['ui.router']);
      * @description
      *   Routing configuration for Bastion.
      */
-    function bastionRouting($urlRouterProvider, $locationProvider) {
+    function bastionRouting($stateProvider, $urlRouterProvider, $locationProvider) {
         var oldBrowserBastionPath = '/bastion#', getRootPath;
 
         getRootPath = function (path) {
@@ -25,6 +25,11 @@ angular.module('Bastion.routing', ['ui.router']);
             return rootPath;
         };
 
+        $stateProvider.state('404', {
+            permission: null,
+            templateUrl: 'layouts/404.html'
+        });
+
         $urlRouterProvider.rule(function ($injector, $location) {
             var $sniffer = $injector.get('$sniffer'),
                 $window = $injector.get('$window'),
@@ -65,7 +70,7 @@ angular.module('Bastion.routing', ['ui.router']);
             }
 
             if (foundParentState) {
-                $window.location.href = '/404';
+                $state.go('404');
             } else {
                 $window.location.href = url;
             }
@@ -73,9 +78,8 @@ angular.module('Bastion.routing', ['ui.router']);
         });
 
         $locationProvider.html5Mode({enabled: true, requireBase: false});
-
     }
 
     angular.module('Bastion.routing').config(bastionRouting);
-    bastionRouting.$inject = ['$urlRouterProvider', '$locationProvider'];
+    bastionRouting.$inject = ['$stateProvider', '$urlRouterProvider', '$locationProvider'];
 })();

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

@@ -141,10 +141,6 @@ td.row-select {
       margin-bottom: 0;
     }
   }
-
-  .dropdown-menu {
-    min-width: 100%;
-  }
 }
 
 .nutupane-details-bar {

data/bower.json

@@ -12,7 +12,7 @@
     "angular-resource": "=1.5.5",
     "angular-route": "=1.5.5",
     "angular-gettext": "=1.0.0",
-    "angular-ui-router": "=0.2.10",
+    "angular-ui-router": "=0.3.1",
     "angular-blocks": "~>0.1.8",
     "angular-i18n": "1.3.13",
     "underscore": "=1.5.2",

data/grunt/karma.js

@@ -13,6 +13,9 @@ module.exports = {
         preprocessors: {
             'app/assets/javascripts/**/*.html': ['ng-html2js']
         },
+        exclude: [
+            basePath + 'app/assets/javascripts/bastion/bastion-bootstrap.js'
+        ],
         files: [
             basePath + '.tmp/bower_components/jquery/jquery.js',
             basePath + 'vendor/assets/javascripts/bastion/underscore/underscore.js',
@@ -31,7 +34,6 @@ module.exports = {
             basePath + 'vendor/assets/javascripts/bastion/ngInfiniteScroll/ng-infinite-scroll.js',
             basePath + '.tmp/bower_components/angular-mocks/angular-mocks.js',
 
-            basePath + 'app/assets/javascripts/bastion/bastion-bootstrap.js',
             basePath + 'app/assets/javascripts/bastion/bastion.module.js',
             basePath + 'app/assets/javascripts/bastion/routing.module.js',
             basePath + 'app/assets/javascripts/bastion/i18n/i18n.module.js',

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "3.3.4"
+  VERSION = "3.3.5"
 end

data/package.json

@@ -7,7 +7,7 @@
     "generator-bastion": "~0.1.2",
     "grunt": "~0.4.5",
     "grunt-angular-gettext": "~0.2.15",
-    "grunt-bower-task": "~0.3.4",
+    "grunt-bower-task": "yatskevich/grunt-bower-task#v0.5.0",
     "grunt-concurrent": "~1.0.0",
     "grunt-eslint": "~6.0.0",
     "grunt-htmlhint": "~0.4.1",

data/test/components/bst-alert.directive.test.js

@@ -1,39 +1,118 @@
 describe('Directive: bstAlert', function() {
-    var scope,
-        compile,
-        element,
-        elementScope;
+    var $animate, $timeout, scope, compile, element, elementScope;
+
+    function createDirective (providedElement) {
+        element = angular.element('<div bst-alert="info"></div>');
+
+        if (providedElement) {
+            element = providedElement;
+        }
+
+        compile(element)(scope);
+        scope.$digest();
+        elementScope = element.isolateScope();
+    }
 
     beforeEach(module('Bastion.components', 'components/views/bst-alert.html'));
 
+    beforeEach(module(function ($provide) {
+        $animate = {
+            addClass: function () {},
+            removeClass: function () {},
+            cancel: function () {},
+            leave: function () {
+                return {
+                    then: function (callback) {
+                        callback();
+                    }
+                }
+            }
+        };
+
+        $timeout = function (callback) {
+            callback();
+        };
+
+        $provide.value('$animate', $animate);
+        $provide.value('$timeout', $timeout);
+    }));
+
     beforeEach(inject(function(_$compile_, _$rootScope_) {
         compile = _$compile_;
         scope = _$rootScope_;
     }));
 
     beforeEach(function() {
-        element = angular.element('<div bst-alert="info"></div>');
-
-        compile(element)(scope);
-        scope.$digest();
-
-        elementScope = element.isolateScope();
+        createDirective();
     });
 
     it("should display an alert", function() {
-        scope.successMessages = ['hello'];
-        scope.$digest();
-
         expect(element.find('.alert').length).toBe(1);
     });
 
     it("should display a close icon if a close function is provided", function () {
         element = angular.element('<div bst-alert="info" close="close()"></div>');
+        createDirective(element);
+        expect(elementScope.closeable).toBe(true);
+    });
 
-        compile(element)(scope);
-        scope.$digest();
-        elementScope = element.isolateScope();
+    describe("can start the fade", function () {
+        beforeEach(function () {
+            spyOn($animate, 'leave').and.callThrough();
+            spyOn(elementScope, 'close');
+        });
 
-        expect(elementScope.closeable).toBe(true);
+        it("and fades if the fade is not prevented", function () {
+            elementScope.fadePrevented = false;
+            elementScope.startFade();
+
+            expect($animate.leave).toHaveBeenCalled();
+            expect(elementScope.close).toHaveBeenCalled();
+        });
+
+        it("but does not fade if the fade is prevented", function () {
+            elementScope.fadePrevented = true;
+            elementScope.startFade();
+
+            expect($animate.leave).not.toHaveBeenCalled();
+            expect(elementScope.close).not.toHaveBeenCalled();
+        });
+    });
+
+    describe("can cancel the fade", function () {
+        beforeEach(function () {
+            element = angular.element('<div bst-alert="success"></div>');
+            createDirective(element);
+        });
+
+        it("by setting fadePrevented", function () {
+            elementScope.cancelFade();
+            expect(elementScope.fadePrevented).toBe(true);
+        });
+
+        it("by calling $animate.cancel() if the animation is in progress", function () {
+            spyOn($animate, 'cancel');
+            elementScope.cancelFade();
+            expect($animate.cancel).toHaveBeenCalled();
+        });
+    });
+
+    describe("automatically starts the fade", function () {
+        beforeEach(function () {
+            spyOn($animate, 'leave').and.callThrough();
+        });
+
+        it("for success alerts", function () {
+            element = angular.element('<div bst-alert="success"></div>');
+            createDirective(element);
+            expect(elementScope.fadePrevented).toBe(false);
+            expect($animate.leave).toHaveBeenCalled();
+        });
+
+        it("but not for non-success alerts", function () {
+            createDirective();
+            expect(elementScope.fadePrevented).toBe(true);
+            expect($animate.leave).not.toHaveBeenCalled();
+        });
     });
 });

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

@@ -101,6 +101,15 @@ describe('Factory: Nutupane', function() {
             expect($location.search().search).toEqual("Find Me");
         });
 
+        it("can clear the search", function () {
+            spyOn(nutupane.table, 'search');
+
+            nutupane.table.clearSearch();
+
+            expect(nutupane.table.search).toHaveBeenCalledWith(null);
+            expect(nutupane.table.searchCompleted).toBe(true);
+        });
+
         it("enforcing the user of this factory to define a closeItem function", function() {
             expect(nutupane.table.closeItem).toThrow();
         });

data/test/routing.module.test.js

@@ -6,7 +6,7 @@ describe('config: Bastion.routing', function () {
         $rootScope.$digest();
     }
 
-    beforeEach(module('Bastion.routing'));
+    beforeEach(module('Bastion.routing', 'layouts/404.html'));
 
     beforeEach(module(function ($provide) {
         $sniffer = {
@@ -50,14 +50,13 @@ describe('config: Bastion.routing', function () {
         });
 
         describe("handles undefined states by", function () {
-            beforeEach(function () {
-
-            });
-
             it("redirecting to a 404 page if the parent state is found", function () {
                 spyOn($state, 'get').and.returnValue([{url: '/found-state'}]);
+                spyOn($state, 'go');
+
                 goTo('/found_state/does_not_exist');
-                expect($window.location.href).toBe('/404');
+
+                expect($state.go).toHaveBeenCalledWith('404');
             });
 
             it("redirecting to the url if no parent state is found", function () {