katello 3.2.1.1 → 3.3.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/gpg-keys.controller.js

@@ -29,24 +29,5 @@ angular.module('Bastion.gpg-keys').controller('GPGKeysController',
         $scope.panel = {loading: false};
         $scope.removeRow = nutupane.removeRow;
         $scope.controllerName = 'katello_gpg_keys';
-
-        if ($scope.$state.current.collapsed) {
-            $scope.panel.loading = true;
-        }
-
-        $scope.table.openGPGKey = function (gpgKey) {
-            $scope.panel.loading = true;
-            $scope.transitionTo('gpg-keys.details.info', {gpgKeyId: gpgKey.id});
-        };
-
-        $scope.transitionToNewGPGKey = function () {
-            $scope.panel.loading = true;
-            $scope.transitionTo('gpg-keys.new');
-        };
-
-        $scope.table.closeItem = function () {
-            $scope.transitionTo('gpg-keys.index');
-        };
-
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/gpg-keys.module.js

@@ -14,79 +14,3 @@ angular.module('Bastion.gpg-keys', [
     'Bastion.components',
     'ngUpload'
 ]);
-
-/**
- * @ngdoc object
- * @name Bastion.gpg-keys.config
- *
- * @requires $stateProvider
- *
- * @description
- *   Used for systems level configuration such as setting up the ui state machine.
- */
-angular.module('Bastion.gpg-keys').config(['$stateProvider', function ($stateProvider) {
-    $stateProvider.state('gpg-keys', {
-        abstract: true,
-        controller: 'GPGKeysController',
-        templateUrl: 'gpg-keys/views/gpg-keys.html'
-    })
-    .state('gpg-keys.index', {
-        url: '/gpg_keys',
-        permission: 'view_gpg_keys',
-        views: {
-            'table': {
-                templateUrl: 'gpg-keys/views/gpg-keys-table-full.html'
-            }
-        }
-    })
-    .state('gpg-keys.new', {
-        url: '/gpg_keys/new',
-        permission: 'create_gpg_keys',
-        collapsed: true,
-        views: {
-            'table': {
-                templateUrl: 'gpg-keys/views/gpg-keys-table-collapsed.html'
-            },
-            'action-panel': {
-                controller: 'NewGPGKeyController',
-                templateUrl: 'gpg-keys/new/views/gpg-key-new.html'
-            }
-        }
-    })
-    .state("gpg-keys.details", {
-        abstract: true,
-        url: '/gpg_keys/:gpgKeyId',
-        permission: 'view_gpg_keys',
-        collapsed: true,
-        views: {
-            'table': {
-                templateUrl: 'gpg-keys/views/gpg-keys-table-collapsed.html'
-            },
-            'action-panel': {
-                controller: 'GPGKeyDetailsController',
-                templateUrl: 'gpg-keys/details/views/gpg-key-details.html'
-            }
-        }
-    })
-    .state('gpg-keys.details.info', {
-        url: '/info',
-        permission: 'view_gpg_keys',
-        collapsed: true,
-        controller: 'GPGKeyDetailsInfoController',
-        templateUrl: 'gpg-keys/details/views/gpg-key-info.html'
-    })
-    .state('gpg-keys.details.products', {
-        url: '/products',
-        permission: 'view_gpg_keys',
-        collapsed: true,
-        controller: 'GPGKeyDetailsController',
-        templateUrl: 'gpg-keys/details/views/gpg-key-products.html'
-    })
-    .state('gpg-keys.details.repositories', {
-        url: '/repositories',
-        permission: 'view_gpg_keys',
-        collapsed: true,
-        controller: 'GPGKeyDetailsController',
-        templateUrl: 'gpg-keys/details/views/gpg-key-repositories.html'
-    });
-}]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/gpg-keys.routes.js

@@ -0,0 +1,76 @@
+/**
+ * @ngdoc object
+ * @name Bastion.gpg-keys.config
+ *
+ * @requires $stateProvider
+ *
+ * @description
+ *   Used for systems level configuration such as setting up the ui state machine.
+ */
+angular.module('Bastion.gpg-keys').config(['$stateProvider', function ($stateProvider) {
+    $stateProvider.state('gpg-keys', {
+        url: '/gpg_keys',
+        permission: 'view_gpg_keys',
+        template: '<div ui-view></div>',
+        views: {
+            '@': {
+                controller: 'GPGKeysController',
+                templateUrl: 'gpg-keys/views/gpg-keys.html'
+            }
+        },
+        ncyBreadcrumb: {
+            label: "{{ 'GPG Keys' | translate}}"
+        }
+    })
+    .state('gpg-keys.new', {
+        url: '/new',
+        permission: 'create_gpg_keys',
+        views: {
+            '@': {
+                controller: 'NewGPGKeyController',
+                templateUrl: 'gpg-keys/new/views/new-gpg-key.html'
+            }
+        },
+        ncyBreadcrumb: {
+            label: "{{'New GPG Key' | translate }}",
+            parent: 'gpg-keys'
+        }
+    })
+    .state("gpg-key", {
+        abstract: true,
+        url: '/gpg_keys/:gpgKeyId',
+        permission: 'view_gpg_keys',
+        controller: 'GPGKeyDetailsController',
+        templateUrl: 'gpg-keys/details/views/gpg-key-details.html'
+    })
+    .state('gpg-key.info', {
+        url: '',
+        permission: 'view_gpg_keys',
+        controller: 'GPGKeyDetailsInfoController',
+        templateUrl: 'gpg-keys/details/views/gpg-key-info.html',
+        ncyBreadcrumb: {
+            label: "{{ gpgKey.name }}",
+            parent: 'gpg-keys'
+        }
+    })
+    .state('gpg-key.products', {
+        url: '/products',
+        permission: 'view_gpg_keys',
+        controller: 'GPGKeyProductsController',
+        templateUrl: 'gpg-keys/details/views/gpg-key-products.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Products' | translate }}",
+            parent: 'gpg-key.info'
+        }
+    })
+    .state('gpg-key.repositories', {
+        url: '/repositories',
+        permission: 'view_gpg_keys',
+        controller: 'GPGKeyRepositoriesController',
+        templateUrl: 'gpg-keys/details/views/gpg-key-repositories.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Repositories' | translate }}",
+            parent: 'gpg-key.info'
+        }
+    });
+}]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/new/new-gpg-key.controller.js

@@ -3,6 +3,7 @@
  * @name  Bastion.gpg-keys.controller:NewGPGKeyController
  *
  * @requires $scope
+ * @requires $state
  * @requires translate
  * @requires GPGKey
  * @requires CurrentOrganization
@@ -12,32 +13,30 @@
  *   Controls the creation of an empty GPGKey object for use by sub-controllers.
  */
 angular.module('Bastion.gpg-keys').controller('NewGPGKeyController',
-    ['$scope', 'translate', 'GPGKey', 'CurrentOrganization', 'GlobalNotification',
-    function ($scope, translate, GPGKey, CurrentOrganization, GlobalNotification) {
+    ['$scope', '$state', 'translate', 'GPGKey', 'CurrentOrganization', 'GlobalNotification',
+    function ($scope, $state, translate, GPGKey, CurrentOrganization, GlobalNotification) {
+        $scope.successMessages = [];
         $scope.errorMessages = [];
 
         $scope.panel = {loading: false};
         $scope.gpgKey = new GPGKey();
         $scope.CurrentOrganization = CurrentOrganization;
         $scope.progress = {uploading: false};
-        $scope.contentFormType = 'paste';
         $scope.uploadURL = '/katello/api/v2/gpg_keys?organization_id=' + CurrentOrganization;
 
-        $scope.uploadContent = function (content) {
-            if (content) {
-                if (angular.isUndefined(content.errors)) {
-                    $scope.table.addRow(content);
+        $scope.uploadContent = function (response) {
+            if (response) {
+                if (angular.isUndefined(response.errors)) {
                     $scope.uploadStatus = 'success';
-                    $scope.transitionTo('gpg-keys.index');
-                    GlobalNotification.setSuccessMessage(translate('GPG key %s has been created.').replace('%s', content.name));
+                    $scope.transitionTo('gpg-key.info', {gpgKeyId: response.id});
+                    GlobalNotification.setSuccessMessage(translate('GPG key %s has been created.').replace('%s', response.name));
                 } else {
-                    $scope.errorMessages = [translate("An error occurred while creating the GPG key: ") + content.displayMessage];
+                    $scope.errorMessages = [translate("An error occurred while creating the GPG key: ") + response.displayMessage];
                     $scope.uploadStatus = 'error';
                 }
 
                 $scope.progress.uploading = false;
             }
         };
-
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/new/views/new-gpg-key.html

@@ -0,0 +1,44 @@
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header">
+    <h2 translate>New GPG Key</h2>
+  </header>
+
+  <div data-block="content">
+    <form name="gpgKeyForm" class="col-sm-5" novalidate role="form"
+          action="{{ uploadURL }}"
+          ng-upload="uploadContent(content)"
+          upload-options-enable-rails-csrf>
+
+      <div bst-form-group label="{{ 'Name' | translate }}">
+        <input id="name"
+               name="name"
+               ng-model="gpgKey.name"
+               type="text"
+               tabindex="1"
+               autofocus
+               required/>
+      </div>
+
+      <div bst-form-group label="{{ 'GPG Key Contents' | translate }}">
+        <textarea name="content"
+                  ng-model="gpgKey.pastedGPG"
+                  tabindex="1"
+                  class="form-control"
+                  rows="15"
+                  placeholder="{{ 'Paste contents of GPG Key' | translate }}">
+        </textarea>
+      </div>
+
+      <div class="form-group">
+        <input type="file" name="file_path"/>
+        <p class="help-block" translate>Upload GPG Key file</p>
+      </div>
+
+      <div bst-form-buttons upload-submit
+           on-cancel="transitionTo('gpg-keys')"
+           ng-disabled="gpgKey.name == undefined"
+           working="progress.uploading">
+      </div>
+    </form>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/views/gpg-keys.html

@@ -1,15 +1,13 @@
 <span page-title>{{ 'GPG Keys' | translate }}</span>
 
-<div data-extend-template="layouts/nutupane.html">
-
+<div data-extend-template="layouts/table-with-header.html">
   <div data-block="header">
-    {{ 'GPG Keys' | translate }}
+    <h2 translate>GPG Keys</h2>
   </div>
 
-  <div data-block="actions">
-    <button class="btn btn-primary" ui-sref="gpg-keys.new" ng-hide="denied('create_gpg_keys')">
-      <i class="fa fa-plus"></i>
-      {{ "New GPG Key" | translate }}
+  <div data-block="list-actions">
+    <button class="btn btn-default" ui-sref="gpg-keys.new" ng-hide="denied('create_gpg_keys')">
+      <span translate>New GPG Key</span>
     </button>
   </div>
 
@@ -17,7 +15,35 @@
     You currently don't have any GPG keys, you can add GPG keys using the button on the right.
   </span>
 
-   <span data-block="no-search-results-message">
-     Your search returned zero GPG keys.
-   </span>
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero GPG keys.
+  </span>
+
+  <div data-block="table">
+    <table bst-table="table"
+           class="table table-striped"
+           ng-class="{'table-mask': table.working}"
+           ng-show="table.rows.length > 0">
+      <thead>
+      <tr bst-table-head>
+        <th bst-table-column="name" sortable><span translate>Name</span></th>
+        <th bst-table-column="organization"><span translate>Organization</span></th>
+        <th bst-table-column="products" class="number-cell"><span translate>Product Count</span></th>
+        <th bst-table-column class="number-cell"><span translate>Repository Count</span></th>
+      </tr>
+      </thead>
+
+      <tbody>
+      <tr bst-table-row ng-repeat="gpgKey in table.rows">
+        <td bst-table-cell>
+          <a ui-sref="gpg-key.info({gpgKeyId: gpgKey.id})">{{ gpgKey.name }}</a>
+        </td>
+        <td bst-table-cell>{{ gpgKey.organization.name }}</td>
+        <td bst-table-cell class="number-cell">{{ gpgKey.products.length || 0 }}</td>
+        <td bst-table-cell class="number-cell">{{ gpgKey.repositories.length || 0 }}</td>
+      </tr>
+      </tbody>
+    </table>
+
+  </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-add-hosts.controller.js

@@ -37,17 +37,17 @@ angular.module('Bastion.host-collections').controller('HostCollectionAddHostsCon
             return term + " and " + addition;
         };
 
-        $scope.detailsTable = contentNutupane.table;
+        $scope.table = contentNutupane.table;
         $scope.isAdding = false;
-        $scope.detailsTable.closeItem = function () {};
+        $scope.table.closeItem = function () {};
 
         $scope.disableAddButton = function () {
-            return $scope.detailsTable.numSelected === 0 || $scope.isAdding;
+            return $scope.table.numSelected === 0 || $scope.isAdding;
         };
 
         $scope.addSelected = function () {
             var selected;
-            selected = _.pluck($scope.detailsTable.getSelected(), 'id');
+            selected = _.map($scope.table.getSelected(), 'id');
 
             $scope.isAdding = true;
             HostCollection.addHosts({id: $scope.hostCollection.id, 'host_ids': selected}, function (data) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-copy.controller.js

@@ -0,0 +1,30 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc controller
+     * @name  Bastion.host-collections.controller:HostCollectionCopyController
+     *
+     * @description
+     *   For copying a host collection.
+     */
+    function HostCollectionCopyController($scope, HostCollection) {
+        $scope.successMessages = [];
+        $scope.errorMessages = [];
+
+        $scope.copy = function (newName) {
+            HostCollection.copy({id: $scope.$stateParams.hostCollectionId, 'host_collection': {name: newName}}, function (response) {
+                $scope.transitionTo('host-collection.info', {hostCollectionId: response.id});
+            }, function (response) {
+                $scope.errorMessages.push(response.data.displayMessage);
+            });
+        };
+    }
+
+    angular
+        .module('Bastion.host-collections')
+        .controller('HostCollectionCopyController', HostCollectionCopyController);
+
+    HostCollectionCopyController.$inject = ['$scope', 'HostCollection'];
+
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-details.controller.js

@@ -8,16 +8,17 @@
  * @requires translate
  * @requires HostCollection
  * @requires ApiErrorHandler
+ * @requires urlencodeFilter
  *
  * @description
  *   Provides the functionality for the host collection details action pane.
  */
 angular.module('Bastion.host-collections').controller('HostCollectionDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'HostCollection', 'ApiErrorHandler',
-    function ($scope, $state, $q, translate, HostCollection, ApiErrorHandler) {
+    ['$scope', '$state', '$q', 'translate', 'HostCollection', 'ApiErrorHandler', 'urlencodeFilter',
+    function ($scope, $state, $q, translate, HostCollection, ApiErrorHandler, urlencodeFilter) {
         $scope.successMessages = [];
         $scope.errorMessages = [];
-        $scope.copyErrorMessages = [];
+
         $scope.panel = {
             error: false,
             loading: true
@@ -41,6 +42,11 @@ angular.module('Bastion.host-collections').controller('HostCollectionDetailsCont
             });
         };
 
+        $scope.getHostCollectionSearchUrl = function (hostCollectionName) {
+            var search = 'host_collection="%s"'.replace('%s', hostCollectionName);
+            return '?select_all=true&search=' + urlencodeFilter(search);
+        };
+
         $scope.save = function (hostCollection) {
             var deferred = $q.defer();
 
@@ -55,22 +61,9 @@ angular.module('Bastion.host-collections').controller('HostCollectionDetailsCont
             return deferred.promise;
         };
 
-        $scope.copy = function (newName) {
-            HostCollection.copy({id: $scope.hostCollection.id, 'host_collection': {name: newName}}, function (response) {
-                $scope.showCopy = false;
-                $scope.table.addRow(response);
-                $scope.transitionTo('host-collections.details.info', {hostCollectionId: response.id});
-            }, function (response) {
-                $scope.copyErrorMessages.push(response.data.displayMessage);
-            });
-        };
-
         $scope.removeHostCollection = function (hostCollection) {
-            var id = hostCollection.id;
-
             hostCollection.$delete(function () {
-                $scope.removeRow(id);
-                $scope.transitionTo('host-collections.index');
+                $scope.transitionTo('host-collections');
                 $scope.successMessages.push(translate('Host Collection removed.'));
             }, function (response) {
                 $scope.errorMessages.push(translate("An error occurred removing the Host Collection: ") + response.data.displayMessage);