bastion 2.0.4 → 2.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDM5ZTg3NDNkNDIzNmQwMjk5Yjg1MDY4ZTFkN2IwZDRiNTMyZjU4Mg==
-  data.tar.gz: !binary |-
-    OGUyMzQ1ZWQxODI1NTE0MmQ2YWY0N2Q3YmJiM2E3OWI5MjcyMmRhYQ==
+SHA1:
+  metadata.gz: 2b5c8f13cfb5327ac09ecd123a93eafd564affa1
+  data.tar.gz: 1e385621752b7030f54cc6883237c9b891c5e1cc
 SHA512:
-  metadata.gz: !binary |-
-    ZWQ3YWM5N2FmOTAyMmQ1YTU3MDA1NmYxNTJmMzUxYjkxNmEyODAxMzgxZjNm
-    NTNhODE3MGY1ZDJiOTUxYWQ1YTY5MWQxMGM3NDU0YWY3NTg1YjgyYzk4Zjc0
-    MTQyNzYzNTk3ZDFhMmRiMTcwZDU3MjQ2YTE2OGFhMWU3MDIzNTY=
-  data.tar.gz: !binary |-
-    NjlkZDg2Y2IwMzM4YmQ1N2IwMTI4MzJhNmVhOGJhYzVjNzEzYzQ5M2JmYjc1
-    ODUxNDY4MTVjMjVlNThhOWEyYmVjNzViMjQ1NTViNjkxN2ZiOTQ4YjQyMjg0
-    YzA2MDFlY2IzNTY4YWY2ZjI2YmU1YTJjMmVlZjMxYTBkMjAzZGY=
+  metadata.gz: d45c125536689e914b9669634864ecf76b610adbea30f68a93c24856dd3e179ee590fad0edd58167d786734391b64e122b9e40ba9917a715270e141326b20a4e
+  data.tar.gz: 39f6aaec0260871e53a94350f22cb0097e7fd0b6a9cbed0831283b1a4e13839985cc09cab5db0a436ff9fc8341bdf651b2d8236e35207d7ac0705cb2434bddfe

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

@@ -0,0 +1,62 @@
+/**
+* @ngdoc directive
+* @name Bastion.components.directive:bookmark
+*
+* @requires BstBookmark
+*
+* @description
+* Provides the bookmarked items for a dropdown menu
+*/
+angular.module('Bastion.components').directive('bstBookmark', ['BstBookmark', function (BstBookmark) {
+    return {
+        scope: {
+            controllerName: '=',
+            query: '='
+        },
+        templateUrl: 'components/views/bst-bookmark.html',
+        controller: ['$scope', 'translate', function ($scope, translate) {
+            $scope.newBookmark = {};
+
+            $scope.load = function () {
+                BstBookmark.queryPaged({search: 'controller=' + $scope.controllerName}, function (response) {
+                    $scope.bookmarks = response.results;
+                });
+            };
+
+            $scope.add = function () {
+                if (angular.isDefined($scope.query)) {
+                    $scope.newBookmark.query = $scope.query.trim();
+                }
+                $scope.openModal();
+            };
+
+            $scope.save = function () {
+                var params, success, error;
+
+                params = {
+                    name: $scope.newBookmark.name,
+                    query: $scope.newBookmark.query,
+                    public: $scope.newBookmark.public,
+                    controller: $scope.controllerName
+                };
+
+                success = function () {
+                    $scope.bookmarks = $scope.load();
+                    $scope.$parent.successMessages = [translate('Bookmark was successfully created.')];
+                };
+
+                error = function (response) {
+                    $scope.$parent.errorMessages = [response.data.error.full_messages];
+                };
+
+                BstBookmark.create(params, success, error);
+            };
+
+            $scope.setQuery = function (bookmark) {
+                $scope.query = bookmark.query;
+            };
+
+            $scope.load();
+        }]
+    };
+}]);

data/app/assets/javascripts/bastion/components/bst-bookmark.factory.js

@@ -0,0 +1,19 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.components.service:BstBookmark
+ *
+ * @requires BastionResource
+ *
+ * @description
+ *   Provides a BastionResource for bst-bookmarks.
+ */
+angular.module('Bastion.components').factory('BstBookmark',
+    ['BastionResource', function (BastionResource) {
+
+        return BastionResource('/api/v2/bookmarks', {id: '@id'},
+            {
+                create: { method: 'POST' }
+            }
+        );
+    }]
+);

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

@@ -12,52 +12,54 @@
 angular.module('Bastion.components').directive('bstModal',
     ['$templateCache', '$modal', function ($templateCache, $modal) {
     return {
-        transclude: true,
         scope: {
             action: '&bstModal',
             modelName: '@model',
             model: '='
         },
-        link: function (scope, iElement, iAttrs, nullCtrl, transclude) {
-            var modalInstance, modalController, modalId;
+        compile: function(tElement) {
+            var template = angular.element('<div extend-template="components/views/bst-modal.html"></div>'), modalId;
+
+            template.append(tElement.children());
+            tElement.html('');
+            tElement = angular.element(template);
 
             modalId = 'bstModal%d.html'.replace('%d', Math.random().toString());
+            $templateCache.put(modalId, tElement);
 
-            modalController = ['$scope', '$modalInstance', 'model', function ($scope, $modalInstance, model) {
-                $scope[scope.modelName] = model;
+            return function (scope) {
+                var modalInstance, modalController;
 
-                $scope.ok = function () {
-                    $modalInstance.close();
-                };
+                modalController = ['$scope', '$modalInstance', 'model', function ($scope, $modalInstance, model) {
+                    $scope[scope.modelName] = model;
 
-                $scope.cancel = function () {
-                    $modalInstance.dismiss('cancel');
-                };
-            }];
-
-            scope.openModal = function () {
-                modalInstance = $modal.open({
-                    templateUrl: modalId,
-                    controller: modalController,
-                    resolve: {
-                        model: function () {
-                            return scope[scope.modelName];
-                        }
-                    }
-                });
+                    $scope.ok = function () {
+                        $modalInstance.close();
+                    };
 
-                modalInstance.result.then(function () {
-                    scope.action();
-                });
-            };
+                    $scope.cancel = function () {
+                        $modalInstance.dismiss('cancel');
+                    };
+                }];
 
-            scope.$parent.openModal = scope.openModal;
+                scope.openModal = function () {
+                    modalInstance = $modal.open({
+                        templateUrl: modalId,
+                        controller: modalController,
+                        resolve: {
+                            model: function () {
+                                return scope.model;
+                            }
+                        }
+                    });
+
+                    modalInstance.result.then(function () {
+                        scope.action();
+                    });
+                };
 
-            transclude(function (clone) {
-                var template = angular.element('<div extend-template="components/views/bst-modal.html"></div>');
-                template.append(clone);
-                $templateCache.put(modalId, template);
-            });
+                scope.$parent.openModal = scope.openModal;
+            };
         }
     };
 }]);

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

@@ -0,0 +1,46 @@
+<li ng-show="bookmarks.length === 0">
+  <a translate>No Bookmarks</a>
+</li>
+<li ng-repeat="bookmark in bookmarks">
+  <a ng-click="setQuery(bookmark)" class="ng-scope">{{ bookmark.name }}</a>
+</li>
+<li class="divider"></li>
+<li>
+  <a ng-click="add()" translate class="ng-scope">Bookmark this search</a>
+</li>
+
+<div bst-modal="save()" model="newBookmark">
+  <span>{{ bookmark.query }}</span>
+  <div data-block="modal-header" translate>Add Bookmark</div>
+  <div data-block="modal-body">
+    <form name="bookmarkForm" class="form-horizontal" novalidate role="form">
+      <div bst-form-group label="{{ 'Name' | translate }}">
+        <input id="name"
+               name="name"
+               ng-model="newBookmark.name"
+               type="text"
+               tabindex="1"
+               autofocus
+               required/>
+      </div>
+      <div bst-form-group label="{{ 'Search query' | translate }}">
+        <input id="query"
+               name="query"
+               ng-model="newBookmark.query"
+               type="text"
+               tabindex="1"
+               autofocus
+               required/>
+      </div>
+      <div bst-form-group label="{{ 'Public' | translate }}">
+        <input id="public"
+               name="public"
+               ng-model="newBookmark.public"
+               type="checkbox"
+               tabindex="1"
+               autofocus/>
+      </div>
+    </form>
+  </div>
+  <div data-block="modal-confirm-button" translate>Save</div>
+</div>

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

@@ -23,7 +23,7 @@
       <div class="input-group input-group">
         <input type="text"
                class="form-control"
-               placeholder="{{ 'Search...' | translate }}"
+               placeholder="{{ 'Filter...' | translate }}"
                bst-on-enter="table.search(table.searchTerm)"
                ng-model="table.searchTerm"
                ng-trim="false"
@@ -31,7 +31,14 @@
                typeahead-empty
                typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
         <span class="input-group-btn">
-          <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></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>
+          </button>
+          <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>

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "2.0.4"
+  VERSION = "2.1.0"
 end

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

@@ -0,0 +1,145 @@
+describe('Directive: bstBookmark', function() {
+    var scope,
+        compile,
+        compileDirective,
+        element,
+        elementScope,
+        BstBookmark,
+        bookmarks,
+        $modal;
+
+    compileDirective = function () {
+        compile(element)(scope);
+        scope.$digest();
+    };
+
+    beforeEach(module('Bastion.test-mocks', 'Bastion.components', 'components/views/bst-bookmark.html'));
+
+    beforeEach(module(function($provide) {
+        var translate = function() {
+            this.$get = function() {
+                return function() {};
+            };
+
+            return this;
+        };
+
+        $modal = {
+            $get: function() {
+                return this;
+            }
+        };
+
+        bookmarks = ['bookmark'];
+
+        BstBookmark = {
+            failed: false,
+
+            $get: function() {
+                return this;
+            },
+
+            queryPaged: function (params, callback) {
+                callback({results: bookmarks});
+            },
+
+            create: function (params, success, error) {
+                if (this.failed) {
+                    var response = {
+                        data: {
+                            error: {
+                                full_message: ''
+                            }
+                        }
+                    };
+                    error(response);
+                } else {
+                    success();
+                }
+            }
+        };
+
+        $provide.provider('$modal', $modal);
+        $provide.provider('translate', translate);
+        $provide.provider('BstBookmark', BstBookmark);
+    }));
+
+    beforeEach(inject(function(_$compile_, _$rootScope_) {
+        compile = _$compile_;
+        scope = _$rootScope_;
+    }));
+
+    beforeEach(function() {
+        scope.controllerName = 'controller';
+        element = angular.element('<ul bst-bookmark controller-name="controllerName"></ul>');
+        compileDirective();
+        elementScope = element.isolateScope();
+    });
+
+    it("should set bookmarks on the scope", function () {
+        spyOn(BstBookmark, 'queryPaged').andCallThrough();
+        compileDirective();
+        expect(BstBookmark.queryPaged).toHaveBeenCalled();
+        expect(elementScope.bookmarks).toEqual(['bookmark']);
+    });
+
+    it("should display a <li>", function() {
+        expect(element.find('li').length).toBe(4);
+    });
+
+    it("should open a modal upon triggering", function() {
+        spyOn(elementScope, 'openModal');
+        elementScope.add();
+        expect(elementScope.openModal).toHaveBeenCalled();
+    });
+
+    describe("should save the bookmark", function () {
+        var expectedParams;
+
+        beforeEach(function () {
+            var bookmark = {
+                name: 'a bookmark',
+                query: 'query',
+                public: true
+            };
+
+            elementScope.newBookmark = bookmark;
+
+            expectedParams = {
+                name: bookmark.name,
+                query: bookmark.query,
+                public: bookmark.public,
+                controller: scope.controllerName
+            };
+
+            spyOn(BstBookmark, 'create').andCallThrough();
+            spyOn(BstBookmark, 'queryPaged');
+        });
+
+        afterEach(function () {
+            expect(BstBookmark.create).toHaveBeenCalledWith(expectedParams, jasmine.any(Function), jasmine.any(Function));
+        });
+
+        it("and succeed", function () {
+            elementScope.save();
+
+            expect(BstBookmark.queryPaged).toHaveBeenCalled();
+            expect(elementScope.$parent.successMessages.length).toBe(1);
+        });
+
+        it("and fail", function () {
+            BstBookmark.failed = true;
+
+            elementScope.save();
+
+            expect(BstBookmark.queryPaged).not.toHaveBeenCalled();
+            expect(elementScope.$parent.errorMessages.length).toBe(1);
+        });
+    });
+
+    it("sets the query on bookmark selection", function () {
+        var bookmark = {query: 'blah'};
+        elementScope.setQuery(bookmark);
+        expect(elementScope.query).toBe(bookmark.query);
+    });
+});

data/test/components/bst-bookmark.factory.test.js

@@ -0,0 +1,31 @@
+describe('Factory: BstBookmark', function() {
+    var $httpBackend,
+        bookmarks,
+        BstBookmark;
+
+    beforeEach(module('Bastion', 'Bastion.components'));
+
+    beforeEach(module(function() {
+        bookmarks = {
+            results: [{name:"search1",
+                       controller:"controller1",
+                       query:"name  =  ak1",
+                       public:null}],
+            total: 1,
+            subtotal: 1
+        };
+    }));
+
+    beforeEach(inject(function($injector) {
+        $httpBackend = $injector.get('$httpBackend');
+        BstBookmark = $injector.get('BstBookmark');
+    }));
+
+    it('provides a way to create a bookmark', function() {
+        $httpBackend.expectPOST('/api/v2/bookmarks').respond(bookmarks.results[0]);
+
+        BstBookmark.create(function(bookmarks) {
+            expect(response).toBeDefined();
+        });
+    });
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Eric D Helms
@@ -29,28 +29,28 @@ dependencies:
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: less-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
 description: Bastion provides a UI library of AngularJS based components designed
@@ -62,8 +62,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .eslintignore
-- .jshintrc
+- ".eslintignore"
+- ".jshintrc"
 - Gruntfile.js
 - LICENSE
 - README.md
@@ -76,6 +76,8 @@ files:
 - app/assets/javascripts/bastion/bastion.module.js
 - app/assets/javascripts/bastion/components/bst-alert.directive.js
 - app/assets/javascripts/bastion/components/bst-alerts.directive.js
+- app/assets/javascripts/bastion/components/bst-bookmark.directive.js
+- app/assets/javascripts/bastion/components/bst-bookmark.factory.js
 - app/assets/javascripts/bastion/components/bst-container-scroll.directive.js
 - app/assets/javascripts/bastion/components/bst-dropdown.directive.js
 - app/assets/javascripts/bastion/components/bst-edit.directive.js
@@ -104,6 +106,7 @@ files:
 - app/assets/javascripts/bastion/components/views/autocomplete-scoped-search.html
 - app/assets/javascripts/bastion/components/views/bst-alert.html
 - app/assets/javascripts/bastion/components/views/bst-alerts.html
+- app/assets/javascripts/bastion/components/views/bst-bookmark.html
 - app/assets/javascripts/bastion/components/views/bst-dropdown.html
 - app/assets/javascripts/bastion/components/views/bst-edit-add-item.html
 - app/assets/javascripts/bastion/components/views/bst-edit-add-remove-cancel.html
@@ -186,6 +189,8 @@ files:
 - 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-container-scroll.directive.test.js
 - test/components/bst-dropdown.directive.test.js
 - test/components/bst-edit.directive.test.js
@@ -1146,50 +1151,53 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: UI library of AngularJS based components for Foreman
 test_files:
-- test/bastion/bastion-resource.factory.test.js
-- test/bastion/test-constants.js
 - test/features/bst-feature-flag.directive.test.js
 - test/features/feature-flag.service.test.js
 - test/auth/authorization.service.test.js
-- test/i18n/translate.service.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-nutupane-table.directive.test.js
-- test/components/bst-dropdown.directive.test.js
-- test/components/bst-form-buttons.directive.test.js
-- test/components/typeahead-empty.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/page-title.directive.test.js
-- test/components/bst-table.directive.test.js
-- test/components/bst-container-scroll.directive.test.js
-- test/components/formatters/capitalize.filter.test.js
+- test/components/path-selector.directive.test.js
 - test/components/formatters/array-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/formatters/capitalize.filter.test.js
 - test/components/formatters/key-value-to-string.filter.test.js
-- test/components/bst-menu.directive.test.js
-- test/components/bst-edit.directive.test.js
-- test/components/bst-modal.directive.test.js
-- test/components/bst-form-group.directive.test.js
-- test/components/bst-flyout.directive.test.js
+- test/components/formatters/boolean-to-yes-no.filter.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/path-selector.directive.test.js
-- test/utils/as.filter.test.js
-- test/utils/form-utils.service.test.js
+- test/components/bst-container-scroll.directive.test.js
+- test/components/bst-bookmark.directive.test.js
+- test/components/bst-flyout.directive.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/bst-edit.directive.test.js
+- test/components/bst-modal.directive.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/bastion/bastion-resource.factory.test.js
+- test/utils/form-utils.service.test.js
+- test/utils/as.filter.test.js
+has_rdoc: