bastion 6.1.15 → 6.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13ffc69e73030b57a5fff08b7e9c528c0b7cb4fd
-  data.tar.gz: 1efff373737cada489cbe63ece5ac05387d6c7ce
+  metadata.gz: 2607fab0f842cf9e2c34c584ff3a9859f1360d94
+  data.tar.gz: 15118cb3a4bfecc7545f62efc2a7522f63735f37
 SHA512:
-  metadata.gz: 9e1a8af65eea0bb9eacf9294a74f7d3aead0538ce200354f8d9fd6942c2fca6a664f83c39c94f9b99b344e4591adc5e71432ffaa41901221f25a5af15766f07d
-  data.tar.gz: c0ed8bb2304d11043be9fc722d5ad46b005904f3ddb15a57f340c75412908824e2adc404cba6e90f2715522c69b53a5a52a752df584a2c8fcb472f9dd271aff9
+  metadata.gz: c9f0d1cdf94458f08fb1c34246986c45ab812ae87435a9ae1605eb76a77f923e7872f4dcccc68d4e43304f58827d28297bf8d6921228a6de16d2cb8c8f2dbece
+  data.tar.gz: d96035fb9a5eba057d27bef4f5b6f1b93f7727ea75d798b41142450ca68f5bca334649d461c1c33445c98f83aed354af9cf1715a156da28e6424da322ac00a58

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

@@ -244,6 +244,8 @@ angular.module('Bastion.components')
                 model: '=bstEditSelect',
                 displayValueDefault: '=displayValueDefault',
                 formatter: '@formatter',
+                iconClass: '=iconClass',
+                iconShow: '=iconShow',
                 readonly: '=',
                 selector: '=',
                 handleOptions: '&options',
@@ -268,6 +270,8 @@ angular.module('Bastion.components')
             templateUrl: 'components/views/bst-edit-multiselect.html',
             scope: {
                 model: '=bstEditMultiselect',
+                iconClass: '=iconClass',
+                iconShow: '=iconShow',
                 formatter: '@formatter',
                 formatterOptions: '@formatterOptions',
                 handleOptions: '&options',
@@ -287,12 +291,17 @@ angular.module('Bastion.components')
 
         getIds = function (models) {
             models = models || [];
-            return _.map(models, "id");
+            return _.chain(models).map("id").without(undefined).value();
         };
 
         checkPrevious = function () {
+            var appliedIds = getIds($scope.model);
+
+            if (_.isEmpty(appliedIds)) {
+                return;
+            }
+
             _.each($scope.options, function (tag) {
-                var appliedIds = getIds($scope.model);
                 if (_.includes(appliedIds, tag.id, 0)) {
                     tag.selected = true;
                 } else {

data/app/assets/javascripts/bastion/components/notification.service.js

@@ -16,8 +16,15 @@ angular.module('Bastion.components').service("Notification", ['$interpolate', 'f
         return result;
     }
 
-    this.setSuccessMessage = function (message, context) {
-        foreman.toastNotifications.notify({message: interpolateIfNeeded(message, context), type: 'success'});
+    this.setSuccessMessage = function (message, options) {
+        var baseOptions, fullOptions;
+        /* eslint-disable no-unused-expressions */
+        (angular.isUndefined(options)) && (options = {});
+        /* eslint-enable no-unused-expressions */
+        baseOptions = { message: interpolateIfNeeded(message, options.context), type: 'success' };
+        delete options.context;
+        fullOptions = _.extend(baseOptions, options);
+        foreman.toastNotifications.notify(fullOptions);
     };
 
     this.setWarningMessage = function (message, context) {

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

@@ -81,8 +81,7 @@ angular.module('Bastion.components').factory('Nutupane',
             };
 
             self.loadParamsFromExistingTable = function (existingTable) {
-                _.extend(existingTable.params, params);
-                self.params = existingTable.params;
+                _.extend(params, existingTable.params);
                 if (!self.table.searchTerm) {
                     self.table.searchTerm = existingTable.searchTerm;
                 }

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

@@ -4,7 +4,10 @@
       <i class="fa fa-edit inline-icon"></i>
       <i class="fa fa-remove inline-icon" ng-click="delete($event)" ng-show="deletable"></i>
     </span>
-    <span class="editable-value">{{ displayValue }}</span>
+    <span>
+      <i class="{{ iconClass }}" ng-show="iconShow && displayValue"></i>
+      <span class="editable-value">{{ displayValue }}</span>
+    </span>
   </div>
 
   <span ng-switch on="buttonConfig">

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

@@ -37,7 +37,3 @@
   height: auto;
   max-width: 100%;
 }
-
-.editable-value {
-  white-space: pre-line;
-}

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "6.1.15"
+  VERSION = "6.1.16"
 end

data/test/components/notification.service.test.js

@@ -38,10 +38,17 @@ describe('Factory: Nofification', function() {
 
     it("allows message context to be specified for interpolation", function () {
         var message = "Everything ran correctly {{ ending }}!",
-            $scope = {ending: 'yay'},
+            options = {link: "", context: {ending: 'yay'}},
             expectedMessage = 'Everything ran correctly yay!';
 
-        Notification.setSuccessMessage(message, $scope);
-        expect(foreman.toastNotifications.notify).toHaveBeenCalledWith({message: expectedMessage, type: 'success'});
+        Notification.setSuccessMessage(message, options);
+        expect(foreman.toastNotifications.notify).toHaveBeenCalledWith({message: expectedMessage, type: 'success', link: options.link});
+    });
+
+    it("provides link to success task", function () {
+        var message = "Everything ran correctly!";
+        options = {link: "www.redhat.com"};
+        Notification.setSuccessMessage(message, options);
+        expect(foreman.toastNotifications.notify).toHaveBeenCalledWith({message: message, type: 'success', link: options.link});
     });
 });

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

@@ -114,6 +114,13 @@ describe('Factory: Nutupane', function() {
                 expect($location.search).toHaveBeenCalledWith('per_page', 20);
             });
 
+            it("from existing table", function () {
+                table = {params: {per_page: 30}};
+                expect(nutupane.table.params.per_page).toBe(20);
+                nutupane.loadParamsFromExistingTable(table);
+                expect(nutupane.table.params.per_page).toBe(30);
+            });
+
             it("but does not include page information if not paged", function () {
                 nutupane.table.params.paged = false;
                 nutupane.load();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 6.1.15
+  version: 6.1.16
 platform: ruby
 authors:
 - Eric D Helms
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates