katello 3.2.1.1 → 3.3.0.rc1

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

@@ -15,9 +15,8 @@
  *   within the table.
  */
 angular.module('Bastion.host-collections').controller('HostCollectionsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'HostCollection', 'CurrentOrganization', 'urlencodeFilter',
-    function ($scope, $location, translate, Nutupane, HostCollection, CurrentOrganization, urlencodeFilter) {
-
+    ['$scope', '$location', 'translate', 'Nutupane', 'HostCollection', 'CurrentOrganization',
+    function ($scope, $location, translate, Nutupane, HostCollection, CurrentOrganization) {
         var params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
@@ -27,19 +26,12 @@ angular.module('Bastion.host-collections').controller('HostCollectionsController
         };
 
         var nutupane = new Nutupane(HostCollection, params);
+        nutupane.masterOnly = true;
+
         $scope.table = nutupane.table;
         $scope.removeRow = nutupane.removeRow;
         $scope.controllerName = 'katello_host_collections';
 
-        $scope.table.closeItem = function () {
-            $scope.transitionTo('host-collections.index');
-        };
-
-        $scope.getHostCollectionSearchUrl = function (hostCollectionName) {
-            var search = 'host_collection="%s"'.replace('%s', hostCollectionName);
-            return '?select_all=true&search=' + urlencodeFilter(search);
-        };
-
         $scope.$on("updateContentHostCollection", function (event, hostCollectionRow) {
             $scope.table.replaceRow(hostCollectionRow);
         });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/host-collections.module.js

@@ -13,88 +13,3 @@ angular.module('Bastion.host-collections', [
     'Bastion.common',
     'Bastion.utils'
 ]);
-
-angular.module('Bastion.host-collections').config(['$stateProvider', function ($stateProvider) {
-    $stateProvider.state('host-collections', {
-        abstract: true,
-        controller: 'HostCollectionsController',
-        templateUrl: 'host-collections/views/host-collections.html'
-    })
-    .state('host-collections.index', {
-        url: '/host_collections',
-        permission: 'view_host_collections',
-        views: {
-            'table': {
-                templateUrl: 'host-collections/views/host-collections-table-full.html'
-            }
-        }
-    })
-    .state('host-collections.new', {
-        abstract: true,
-        collapsed: true,
-        views: {
-            'table': {
-                templateUrl: 'host-collections/views/host-collections-table-collapsed.html'
-            },
-            'action-panel': {
-                controller: 'NewHostCollectionController',
-                templateUrl: 'host-collections/new/views/host-collection-new.html'
-            }
-        }
-    })
-    .state('host-collections.new.form', {
-        url: '/host_collections/new',
-        permission: 'create_host_collections',
-        collapsed: true,
-        controller: 'HostCollectionFormController',
-        templateUrl: 'host-collections/new/views/host-collection-new-form.html'
-    });
-
-    $stateProvider.state("host-collections.details", {
-        abstract: true,
-        url: '/host_collections/:hostCollectionId',
-        permission: 'view_host_collections',
-        collapsed: true,
-        views: {
-            'table': {
-                templateUrl: 'host-collections/views/host-collections-table-collapsed.html'
-            },
-            'action-panel': {
-                controller: 'HostCollectionDetailsController',
-                templateUrl: 'host-collections/details/views/host-collection-details.html'
-            }
-        }
-    })
-    .state('host-collections.details.info', {
-        url: '/info',
-        permission: 'view_host_collections',
-        collapsed: true,
-        templateUrl: 'host-collections/details/views/host-collection-info.html'
-    })
-    .state('host-collections.details.hosts', {
-        abstract: true,
-        collapsed: true,
-        templateUrl: 'host-collections/details/views/host-collection-hosts.html'
-    })
-    .state('host-collections.details.hosts.list', {
-        url: '/hosts',
-        permission: 'view_host_collections',
-        collapsed: true,
-        controller: 'HostCollectionHostsController',
-        templateUrl: 'host-collections/details/views/host-collection-hosts-list.html'
-    })
-    .state('host-collections.details.hosts.add', {
-        url: '/add-hosts',
-        permission: 'edit_host_collections',
-        collapsed: true,
-        controller: 'HostCollectionAddHostsController',
-        templateUrl: 'host-collections/details/views/host-collection-add-hosts.html'
-    })
-    .state('host-collections.details.actions', {
-        url: '/actions',
-        permission: 'edit_host_collections',
-        collapsed: true,
-        templateUrl: 'host-collections/details/views/host-collection-actions.html'
-    });
-
-}]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/host-collections.routes.js

@@ -0,0 +1,80 @@
+angular.module('Bastion.host-collections').config(['$stateProvider', function ($stateProvider) {
+    $stateProvider.state('host-collections', {
+        url: '/host_collections',
+        permission: 'view_host_collections',
+        template: '<div ui-view></div>',
+        views: {
+            '@': {
+                controller: 'HostCollectionsController',
+                templateUrl: 'host-collections/views/host-collections.html'
+            }
+        },
+        ncyBreadcrumb: {
+            label: "{{ 'Host Collections' | translate }}"
+        }
+    })
+    .state('host-collections.new', {
+        url: '/new',
+        permission: 'create_host_collections',
+        views: {
+            '@': {
+                controller: 'NewHostCollectionController',
+                templateUrl: 'host-collections/new/views/new-host-collection.html'
+            }
+        },
+        ncyBreadcrumb: {
+            label: "{{ 'New Host Collection' | translate }}"
+        }
+    });
+
+    $stateProvider.state("host-collection", {
+        abstract: true,
+        url: '/host_collections/:hostCollectionId',
+        permission: 'view_host_collections',
+        controller: 'HostCollectionDetailsController',
+        templateUrl: 'host-collections/details/views/host-collection-details.html'
+    })
+    .state('host-collection.info', {
+        url: '',
+        permission: 'view_host_collections',
+        templateUrl: 'host-collections/details/views/host-collection-info.html',
+        ncyBreadcrumb: {
+            label: "{{ hostCollection.name }}",
+            parent: 'host-collections'
+        }
+    })
+    .state('host-collection.hosts', {
+        abstract: true,
+        templateUrl: 'host-collections/details/views/host-collection-hosts.html'
+    })
+    .state('host-collection.hosts.list', {
+        url: '/hosts',
+        permission: 'view_host_collections',
+        controller: 'HostCollectionHostsController',
+        templateUrl: 'host-collections/details/views/host-collection-hosts-list.html',
+        ncyBreadcrumb: {
+            label: "{{ 'List Hosts' | translate }}",
+            parent: 'host-collection.info'
+        }
+    })
+    .state('host-collection.hosts.add', {
+        url: '/add-hosts',
+        permission: 'edit_host_collections',
+        controller: 'HostCollectionAddHostsController',
+        templateUrl: 'host-collections/details/views/host-collection-add-hosts.html',
+        ncyBreadcrumb: {
+            label: "{{ 'List Hosts' | translate }}",
+            parent: 'host-collection.info'
+        }
+    })
+    .state('host-collection.copy', {
+        url: '/copy',
+        permission: 'create_host_collections',
+        controller: 'HostCollectionCopyController',
+        templateUrl: 'host-collections/details/views/host-collection-copy.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Create Copy' | translate }}",
+            parent: 'host-collection.info'
+        }
+    });
+}]);

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

@@ -16,7 +16,7 @@ angular.module('Bastion.host-collections').controller('HostCollectionFormControl
 
         function success(response) {
             $scope.table.addRow(response);
-            $scope.transitionTo('host-collections.details.info', {hostCollectionId: $scope.hostCollection.id});
+            $scope.transitionTo('host-collection.info', {hostCollectionId: $scope.hostCollection.id});
         }
 
         function error(response) {

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

@@ -4,16 +4,36 @@
  *
  * @requires $scope
  * @requires HostCollection
+ * @requires CurrentOrganization
  *
  * @description
  *   Controls the creation of an empty HostCollection object for use by sub-controllers.
  */
 angular.module('Bastion.host-collections').controller('NewHostCollectionController',
-    ['$scope', 'HostCollection',
-    function ($scope, HostCollection) {
+    ['$scope', 'HostCollection', 'CurrentOrganization',
+    function ($scope, HostCollection, CurrentOrganization) {
 
         $scope.hostCollection = new HostCollection();
         $scope.panel = {loading: false};
 
+        function success() {
+            $scope.transitionTo('host-collection.info', {hostCollectionId: $scope.hostCollection.id});
+        }
+
+        function error(response) {
+            $scope.working = false;
+            angular.forEach(response.data.errors, function (errors, field) {
+                $scope.hostCollectionForm[field].$setValidity('', false);
+                $scope.hostCollectionForm[field].$error.messages = errors;
+            });
+        }
+
+        $scope.hostCollection = $scope.hostCollection || new HostCollection();
+        $scope.hostCollection['unlimited_hosts'] = true;
+
+        $scope.save = function (hostCollection) {
+            hostCollection['organization_id'] = CurrentOrganization;
+            hostCollection.$save(success, error);
+        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/new/views/new-host-collection.html

@@ -0,0 +1,53 @@
+<span page-title>{{ 'New Host Collection' | translate }}</span>
+
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header">
+    <h2 translate>New Host Collection</h2>
+  </header>
+
+  <div data-block="content">
+    <form name="hostCollectionForm" class="col-sm-5" novalidate role="form">
+      <div bst-form-group label="{{ 'Name' | translate }}">
+        <input id="name"
+               name="name"
+               ng-model="hostCollection.name"
+               type="text"
+               tabindex="1"
+               autofocus
+               required/>
+      </div>
+
+      <div bst-form-group label="{{ 'Content Host Limit' | translate }}" field="max_hosts">
+        <span translate>Unlimited Hosts:</span>
+        <input type="checkbox"
+               name="limit"
+               ng-model="hostCollection.unlimited_hosts"/>
+
+        <div bst-form-group label="{{ 'Limit' | translate }}" ng-hide="hostCollection.unlimited_hosts">
+          <input id="max_hosts"
+                 name="max_hosts"
+                 class="form-control"
+                 ng-model="hostCollection.max_hosts"
+                 ng-required="!hostCollection.unlimited_hosts"
+                 type="number"
+                 min="1"
+                 tabindex="2"/>
+        </div>
+      </div>
+
+      <div bst-form-group label="{{ 'Description' | translate }}">
+      <textarea id="description"
+                name="description"
+                ng-model="hostCollection.description"
+                tabindex="3">
+      </textarea>
+      </div>
+
+      <div bst-form-buttons
+           on-cancel="transitionTo('host-collections')"
+           on-save="save(hostCollection)"
+           working="working">
+      </div>
+    </form>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/views/host-collections.html

@@ -1,16 +1,15 @@
 <span page-title>{{ 'Host Collections' | translate }}</span>
 
-<div data-extend-template="layouts/nutupane.html">
+<div data-extend-template="layouts/table-with-header.html">
 
   <div data-block="header">
-    {{ 'Host Collections' | translate }}
+    <h2 translate>Host Collections</h2>
   </div>
 
-  <div data-block="actions">
-    <button class="btn btn-primary"
-            ui-sref="host-collections.new.form"
+  <div data-block="list-actions">
+    <button class="btn btn-default"
+            ui-sref="host-collections.new"
             ng-hide="denied('create_host_collections')">
-      <i class="fa fa-plus"></i>
       {{ "New Host Collection" | translate }}
     </button>
   </div>
@@ -19,8 +18,38 @@
     You currently don't have any Host Collections, you can add Host Collections using the button on the right.
   </span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Host Collections.
   </span>
 
+  <div data-block="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="hosts"><span translate>Content Hosts</span></th>
+        <th bst-table-column="limit"><span translate>Limit</span></th>
+      </tr>
+      </thead>
+
+      <tbody>
+      <tr bst-table-row ng-repeat="hostCollection in table.rows">
+        <td bst-table-cell>
+          <a ui-sref="host-collection.info({hostCollectionId: hostCollection.id})">
+            {{ hostCollection.name }}
+          </a>
+          <i class="fa fa-chevron-right selected-icon" ng-show="hostCollection.selected"></i>
+        </td>
+        <td bst-table-cell>
+          <a ui-sref="host-collection.hosts.list({hostCollectionId: hostCollection.id})">
+            {{ hostCollection.total_hosts }}
+          </a>
+        </td>
+        <td bst-table-cell>{{ hostCollection.max_hosts | unlimitedFilter:hostCollection.unlimited_hosts }}</td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-package.factory.js

@@ -16,7 +16,8 @@ angular.module('Bastion.hosts').factory('HostPackage',
             install: {method: 'PUT', params: {action: 'install'}},
             update: {method: 'PUT', params: {action: 'upgrade'}},
             updateAll: {method: 'PUT', params: {action: 'upgrade_all'}},
-            autocomplete: {method: 'GET', isArray: true, params: {action: 'auto_complete_search'}}
+            autocomplete: {method: 'GET', isArray: true, params: {action: 'auto_complete_search'}},
+            applicable: {method: 'GET', params: {action: 'applicable'}}
         });
 
     }]

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces.factory.js

@@ -0,0 +1,18 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.hosts.factory:HostTraces
+ *
+ * @requires BastionResource
+ *
+ * @description
+ *   Provides a BastionResource for the packages of a single content host
+ */
+angular.module('Bastion.hosts').factory('HostTraces',
+    ['BastionResource', function (BastionResource) {
+
+        return BastionResource('/api/v2/hosts/:id/traces/:action', {id: '@id'}, {
+            get: {method: 'GET', isArray: false}
+        });
+
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/katello-features.run.js

@@ -23,11 +23,11 @@
             'products.discovery',
             'products.discovery.scan',
             'products.discovery.create',
-            'gpg-keys.index',
+            'gpg-keys',
             'gpg-keys.new',
-            'gpg-keys.details.info',
-            'gpg-keys.details.products',
-            'gpg-keys.details.repositories'
+            'gpg-key.info',
+            'gpg-key.products',
+            'gpg-key.repositories'
         ];
 
         FeatureFlag.addStates('remote_actions', remoteActions);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/fenced-pages.service.js

@@ -15,6 +15,7 @@ angular.module('Bastion.organizations').service('FencedPages',
             'subscriptions',
             'gpg-keys',
             'sync-plans',
+            'sync-plan',
             'content-views',
             'errata',
             'content-hosts',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/views/organization-selector.html

@@ -1,6 +1,6 @@
 <div class="well col-sm-6 col-sm-offset-3">
 
-  <form name="organizationSelectorForm" class="form-horizontal" novalidate role="form">
+  <form name="organizationSelectorForm" novalidate role="form">
 
     <h1 class="center-header" translate>Select an Organization</h1>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/ostree-branches-details-repositories.controller.js

@@ -31,12 +31,12 @@ angular.module('Bastion.ostree-branches').controller('OstreeBranchesDetailsRepos
 
         environment = Environment.queryUnpaged(function (response) {
             $scope.environments = response.results;
-            $scope.environmentFilter = _.findWhere($scope.environments, {library: true}).id;
+            $scope.environmentFilter = _.find($scope.environments, {library: true}).id;
         });
 
         contentView = ContentView.queryUnpaged(function (response) {
             $scope.contentViews = response.results;
-            $scope.contentViewFilter = _.findWhere($scope.contentViews, {'default': true});
+            $scope.contentViewFilter = _.find($scope.contentViews, {'default': true});
         });
 
         $scope.detailsTable.working = true;
@@ -50,7 +50,7 @@ angular.module('Bastion.ostree-branches').controller('OstreeBranchesDetailsRepos
             params['content_view_version_id'] = $scope.contentViewFilter;
 
             if ($scope.contentViewFilter) {
-                params['content_view_version_id'] = _.pluck($scope.contentViewFilter.versions, 'id');
+                params['content_view_version_id'] = _.map($scope.contentViewFilter.versions, 'id');
             }
 
             repositoriesNutupane.setParams(params);