bastion 3.4.4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a229fca51784b8e24bb42906003c5f22179f5e25
-  data.tar.gz: 290ec8bd5ef199dfde416ba44a6c92c1735f62db
+  metadata.gz: 63a08480ce9af5a24a9dbfde880112f349598c8e
+  data.tar.gz: 8f663bd988ae4e38f1f5b19184ede517a0a27066
 SHA512:
-  metadata.gz: 9e5e9e402171c6a0671b1e9b2ec79b54222f5b59225b0736cca7536d71ec96b08bab6508aa92ded37627aeee241345b114fd154d856be033e158d442fed1d9e0
-  data.tar.gz: 7a86014b79b32e81f8f8853b96d5a4e3cbb76c7afe056a8b2172f2af4463ca92b09b56d625d27f20ed9ee1a6d637acf8378960146e32f8556c99cbc2a615d9de
+  metadata.gz: 585adde75417edb16b62fb9ec477582e4c803c8b56cff3a46e15c2707e38ef86f644e6890777d3cd08890aa38e0a8421b648f4eea194791a1fdaa4e48121f3e3
+  data.tar.gz: 9c7e4415c5251dab68fd32e25d9976d5dbe3530f6dfd89c5f770ef5f354a7428fcf97e69e71d8fa397f3ed763c33f344e490e30b44486bd4cb79e295bb960a1c

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

@@ -4,13 +4,13 @@
  * @restrict A
  *
  * @requires $templateCache
- * @requires $modal
+ * @requires $uibModal
  *
  * @description
  *   Provides a wrapper around angular-ui's modal dialog service.
  */
 angular.module('Bastion.components').directive('bstModal',
-    ['$templateCache', '$modal', function ($templateCache, $modal) {
+    ['$templateCache', '$uibModal', function ($templateCache, $uibModal) {
     return {
         scope: {
             action: '&bstModal',
@@ -30,20 +30,20 @@ angular.module('Bastion.components').directive('bstModal',
             return function (scope) {
                 var modalInstance, modalController;
 
-                modalController = ['$scope', '$modalInstance', 'model', function ($scope, $modalInstance, model) {
+                modalController = ['$scope', '$uibModalInstance', 'model', function ($scope, $uibModalInstance, model) {
                     $scope[scope.modelName] = model;
 
                     $scope.ok = function () {
-                        $modalInstance.close();
+                        $uibModalInstance.close();
                     };
 
                     $scope.cancel = function () {
-                        $modalInstance.dismiss('cancel');
+                        $uibModalInstance.dismiss('cancel');
                     };
                 }];
 
                 scope.openModal = function () {
-                    modalInstance = $modal.open({
+                    modalInstance = $uibModal.open({
                         templateUrl: modalId,
                         controller: modalController,
                         resolve: {

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

@@ -8,7 +8,11 @@
      * @description
      *   Cross application re-usable components
      */
-    angular
-        .module('Bastion.components', ['ngResource', 'Bastion.utils']);
+    angular.module('Bastion.components', [
+        'ngResource',
+        'Bastion.utils',
+        'ui.bootstrap.alert',
+        'ui.bootstrap.tpls'
+    ]);
 
 })();

data/app/assets/javascripts/bastion/components/nutupane-table.directive.js

@@ -70,6 +70,7 @@ angular.module('Bastion.components').directive('nutupaneTable', ['$compile', '$w
             });
 
             buildTable();
+            windowElement.trigger('resize');
         }
     };
 }]);

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

@@ -6,6 +6,7 @@
  * @requires $q
  * @requires $timeout
  * @requires $rootScope
+ * @requires TableCache
  * @requires GlobalNotification
  *
  * @description
@@ -30,15 +31,20 @@
     </pre>
  */
 angular.module('Bastion.components').factory('Nutupane',
-    ['$location', '$q', '$timeout', '$rootScope', 'GlobalNotification', function ($location, $q, $timeout, $rootScope, GlobalNotification) {
+    ['$location', '$q', '$timeout', '$rootScope', 'TableCache', 'GlobalNotification', function ($location, $q, $timeout, $rootScope, TableCache, GlobalNotification) {
         var Nutupane = function (resource, params, action) {
             var self = this,
                 orgSwitcherRegex = new RegExp("/(organizations|locations)/(.+/)*(select|clear)");
+
+            function getTableName() {
+                return $location.path().split('/').join('-');
+            }
+
             params = params || {};
 
             self.searchKey = action ? action + 'Search' : 'search';
 
-            self.table = {
+            self.table = TableCache.getTable(getTableName()) || {
                 action: action || 'queryPaged',
                 params: params,
                 resource: resource,
@@ -104,6 +110,7 @@ angular.module('Bastion.components').factory('Nutupane',
                         }
                         table.resource.offset = table.rows.length;
 
+                        TableCache.setTable(getTableName(), table);
                         $rootScope.$emit('nutupane:loaded');
                     }, 0);
                     table.working = false;

data/app/assets/javascripts/bastion/components/table-cache.service.js

@@ -0,0 +1,24 @@
+(function () {
+    /**
+     * @ngdoc service
+     * @name Bastion.components:TableCache
+     *
+     * @description
+     *   Used to save the table between states so that the search, etc. can be remembered
+     *   upon revisiting the state.
+     **/
+    function TableCache($cacheFactory) {
+        var cache = $cacheFactory('bst-table');
+
+        this.setTable = function (tableName, table) {
+            cache.put(tableName, table);
+        };
+
+        this.getTable = function (tableName) {
+            return cache.get(tableName);
+        };
+    }
+
+    angular.module('Bastion.components').service('TableCache', TableCache);
+    TableCache.$inject = ['$cacheFactory'];
+})();

data/app/assets/javascripts/bastion/components/views/autocomplete-scoped-search.html

@@ -6,5 +6,7 @@
   <i class='ui-autocomplete-completed'>
     {{ match.model.completed }}
   </i>
-  {{ match.model.label }}
+  <span ng-bind-html="match.label | uibTypeaheadHighlight:query">
+    {{ match.model.label }}
+  </span>
 </a>

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

@@ -1,16 +1,12 @@
-<div class="alert" ng-class='"alert-" + (type || "warning")' ng-mouseover="cancelFade()">
+<div uib-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>
-  <span class="pficon-layered">
-      <span ng-show="type === 'danger'" class="pficon pficon-error-circle-o"></span>
 
-      <span ng-show="type === 'warning'" class="pficon pficon-warning-circle-o"></span>
+  <span ng-show="type === 'danger'" class="pficon pficon-error-circle-o"></span>
+  <span ng-show="type === 'warning'" class="pficon pficon-warning-triangle-o"></span>
+  <span ng-show="type === 'info'" class="pficon pficon-info"></span>
+  <span ng-show="type === 'success'" class="pficon pficon-ok"></span>
 
-      <span ng-show="type === 'info'" class="pficon pficon-info"></span>
-
-      <span ng-show="type === 'success'" class="pficon pficon-ok"></span>
-  </span>
-
-  <div ng-transclude></div>
+  <span ng-transclude></span>
 </div>

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

@@ -1,5 +1,4 @@
-<ul class="dropdown"
-    ng-class="{ 'dropdown-right' : isRight(dropdown.direction), 'dropdown-active' : dropdown.show }">
+<ul uib-dropdown ng-class="{ 'dropdown-right' : isRight(dropdown.direction), 'dropdown-active' : dropdown.show }">
   <li class="dropdown-item"
       ng-repeat="item in dropdown"
       ng-mouseenter="setHover(item, true)"

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

@@ -1,10 +1,8 @@
-<div class="form-group">
-  <div class="col-sm-offset-2 col-sm-4">
-    <div bst-save-control
-         on-cancel="handleCancel()"
-         on-save="handleSave()"
-         invalid="isInvalid()"
-         working="working">
-    </div>
+<div>
+  <div bst-save-control
+       on-cancel="handleCancel()"
+       on-save="handleSave()"
+       invalid="isInvalid()"
+       working="working">
   </div>
 </div>

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

@@ -1,9 +1,7 @@
 <div class="form-group" ng-class="{ 'has-error' : hasErrors() }">
-  <label for="{{ field }}" class="control-label col-sm-2">{{ label }}</label>
-  <div class="col-sm-5 input"> 
-    <span ng-transclude></span>
-    <span class="help-block" ng-show="error.messages">
-      <ul><li ng-repeat="message in error.messages">{{ message }}</li></ul>
-    </span>
-  </div>
+  <label for="{{ field }}">{{ label }}</label>
+  <div ng-transclude></div>
+  <span class="help-block" ng-show="error.messages">
+    <ul><li ng-repeat="message in error.messages">{{ message }}</li></ul>
+  </span>
 </div>

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

@@ -1,12 +1,4 @@
 <div class="control-group buttons">
-  <button class="btn btn-default"
-          type="button"
-          ng-click="handleCancel()"
-          ng-disabled="working"
-          translate>
-    Cancel
-  </button>
-
   <button class="btn btn-primary"
           ng-click="handleSave(); working = true"
           ng-disabled="invalid || working">
@@ -15,4 +7,12 @@
     <span ng-show="working" translate>Saving...</span>
     <span ng-hide="working" translate>Save</span>
   </button>
+
+  <button class="btn btn-default"
+          type="button"
+          ng-click="handleCancel()"
+          ng-disabled="working"
+          translate>
+    Cancel
+  </button>
 </div>

data/app/assets/javascripts/bastion/components/views/current-tasks.html

@@ -9,7 +9,7 @@
         <i class="fa fa-caret-down"></i>
       </a>
 
-      <span class="dropdown current-tasks"
+      <span uib-dropdown class="current-tasks"
             ng-class="{'dropdown-active': visible}"
             ng-show="visible">
         <ul class="active-tasks">

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

@@ -23,8 +23,7 @@
                      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
+                     uib-typeahead="item.label for item in detailsTable.autocomplete($viewValue)"
                      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()'>

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

@@ -31,8 +31,7 @@
                    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
+                   uib-typeahead="item.label for item in table.autocomplete($viewValue)"
                    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()'>
@@ -46,11 +45,11 @@
             <span class="fa fa-search"></span>
           </button>
         </div>
-        <div class="form-group">
-          <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+        <div uib-dropdown class="form-group">
+          <button uib-dropdown-toggle class="btn btn-default">
             <i class="fa fa-caret-down"></i>
           </button>
-          <ul bst-bookmark controller-name="controllerName" query="table.searchTerm" class="dropdown-menu pull-right"></ul>
+          <ul bst-bookmark uib-dropdown-menu controller-name="controllerName" query="table.searchTerm" class="pull-right"></ul>
         </div>
       </form>
     </div>

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

@@ -14,8 +14,7 @@
                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
+               uib-typeahead="item.label for item in table.autocomplete($viewValue)"
                typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
           <span class="input-group-btn">
             <button class="btn btn-default"
@@ -48,11 +47,11 @@
   </div>
 </div>
 
-<div class="row header-bar" ng-show="table.rowSelect">
-  <div class="fr">
+<div class="row header-bar">
+  <div class="fr" ng-show="table.rowSelect">
     <span translate>{{ table.numSelected }} Selected</span>
   </div>
-  <div class="col-sm-5">
+  <div class="col-sm-10">
     <span data-block="filters"></span>
   </div>
 </div>

data/app/assets/javascripts/bastion/layouts/table-with-header.html

@@ -4,9 +4,12 @@
     <span data-block="item-actions"></span>
   </div>
 
-  <div data-extend-template="layouts/partials/messages-container.html"></div>
+  <div data-extend-template="layouts/partials/messages-container.html">
+    <span data-block="messages"></span>
+  </div>
 
   <div data-extend-template="layouts/partials/table.html">
+    <span data-block="search-filter"></span>
     <span data-block="list-actions"></span>
     <span data-block="no-rows-message"></span>
     <span data-block="no-search-results-message"></span>

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

@@ -5,20 +5,8 @@
   font-weight: normal;
 }
 
-.alert {
-  margin: 10px;
-
-  ul {
-    list-style: none;
-  }
-
-  p {
-    margin-bottom: 0;
-  }
-
-  div {
-    display: inline;
-  }
+.alert ul {
+  list-style: none;
 }
 
 // Patternfly Overrides
@@ -64,3 +52,12 @@ ul {
 .breadcrumbs .breadcrumb {
   margin-bottom: 0;
 }
+
+// Need to override these because .bastion .dropdown-menu (we wrap
+// everything in .bastion) has more specificity than these selectors
+// and thus overrides them making them not displayed when they should be.
+[uib-typeahead-popup].dropdown-menu,
+.uib-datepicker-popup.dropdown-menu
+{
+  display: block;
+}

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

@@ -1,4 +1,4 @@
 $listhover_color: rgb(0, 153, 211);
 $label-color: #000;
 $border_color: #d7d7d7;
-$grid-gutter-width: 15px;
+$grid-gutter-width: 30px;

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

@@ -1,5 +1,5 @@
 <% content_for(:content) do %>
-  <div class="article maincontent bastion" data-no-turbolink="true">
+  <div id="content" class="article maincontent bastion" data-no-turbolink="true">
     <section class="container-fluid">
         <div ui-view></div>
     </section>

data/bower.json

@@ -6,7 +6,7 @@
     "json3": "~3.2.4",
     "es5-shim": "~2.0.8",
     "angular": "=1.5.5",
-    "angular-bootstrap": "0.10.0",
+    "angular-bootstrap": "2.3.1",
     "angular-breadcrumb": "=0.4.1",
     "angular-sanitize": "=1.5.5",
     "angular-resource": "=1.5.5",
@@ -14,7 +14,7 @@
     "angular-gettext": "=1.0.0",
     "angular-ui-router": "=0.3.1",
     "angular-blocks": "~>0.1.8",
-    "angular-i18n": "1.3.13",
+    "angular-i18n": "1.5.5",
     "ngInfiniteScroll": "1.2.1",
     "ngUpload": "0.5.18",
     "angular-animate": "=1.5.5",

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "3.4.4"
+  VERSION = "4.0.0"
 end

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

@@ -6,7 +6,7 @@ describe('Directive: bstBookmark', function() {
         elementScope,
         BstBookmark,
         bookmarks,
-        $modal;
+        $uibModal;
 
     compileDirective = function () {
         compile(element)(scope);
@@ -24,7 +24,7 @@ describe('Directive: bstBookmark', function() {
             return this;
         };
 
-        $modal = {
+        $uibModal = {
             $get: function() {
                 return this;
             }
@@ -59,7 +59,7 @@ describe('Directive: bstBookmark', function() {
             }
         };
 
-        $provide.provider('$modal', $modal);
+        $provide.provider('$uibModal', $uibModal);
         $provide.provider('translate', translate);
         $provide.provider('BstBookmark', BstBookmark);
     }));

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

@@ -34,9 +34,9 @@ describe('Directive: bstDropdown', function() {
         elementScope = element.isolateScope();
     });
 
-    it("should display a .dropdown <ul>", function() {
+    it("should display a dropdown <ul>", function() {
         expect(element.is('ul')).toBe(true);
-        expect(element.hasClass('dropdown')).toBe(true);
+        expect(element[0].hasAttribute('uib-dropdown')).toBe(true);
     });
 
     it("should display a .dropdown-item <li> for each top level menu item", function() {