katello 3.2.1.1 → 3.3.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html

@@ -223,7 +223,7 @@
               on-save="saveSubscriptionFacet(host)"
               on-cancel="cancelReleaseVersionUpdate()">
         </span>
-        <div alert type="'info'" ng-show="showVersionAlert">
+        <div bst-alert="info" ng-show="showVersionAlert">
           <p translate>
             No alternate release version choices are available. The available releases are based upon what is available in "{{ host.content_facet_attributes.content_view.name }}", the selected <a href="/content_views">content view</a> this content host is attached to for the given <a href="/lifecycle_environments">lifecycle environment</a>, "{{ host.content_facet_attributes.lifecycle_environment.name }}".
           </p>
@@ -244,7 +244,7 @@
       </div>
 
       <div class="detail" bst-feature-flag="lifecycle_environments">
-        <div alert type="'info'" ng-show="editContentView">
+        <div bst-alert="info" ng-show="editContentView">
           <p translate ng-show="contentViews.length === 0">
             The host requires being attached to a content view and the environment you have chosen has no content views promoted to it.
             See the <a href="/content_views">content views page</a> to manage and promote a content view.
@@ -294,7 +294,7 @@
           <ul ng-show="host.subscription_facet_attributes.activation_keys.length > 0">
             <li ng-repeat="activation_key in host.subscription_facet_attributes.activation_keys">
               <span>
-                <a ui-sref="activation-keys.details.info({activationKeyId: activation_key.id})">
+                <a ui-sref="activation-key.info({activationKeyId: activation_key.id})">
                   {{ activation_key.name }}
                 </a>
               </span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-products.html

@@ -3,7 +3,7 @@
 </div>
 
 <div ng-if="host.hasSubscription()">
-  <div alert type="'info'">
+  <div bst-alert="info">
     {{ "Below are the repository content sets currently available for this content host through its subscriptions. For Red Hat subscriptions, additional content can be made available through the" | translate}}
     <a ng-href="/katello/providers/redhat_provider" translate>Red Hat Repositories page</a>.
     {{ "Changing default settings requires subscription-manager version 1.10 or newer to be installed on this host." | translate }}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions-list.html

@@ -27,7 +27,7 @@
        You currently don't have any Subscriptions associated with this Content Host, you can add Subscriptions after selecting the 'Add' tab.
   </span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Subscriptions.
   </span>
 
@@ -60,7 +60,7 @@
         <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
           <td bst-table-cell>{{ subscription.quantity_consumed }}</td>
           <td bst-table-cell>
-            <a ui-sref="subscriptions.details.info({subscriptionId: subscription.id})">
+            <a ui-sref="subscription.info({subscriptionId: subscription.id})">
               {{ subscription | subscriptionConsumedFilter }}
             </a>
           </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/host-collections-table.html

@@ -75,7 +75,7 @@
           <tbody>
             <tr bst-table-row ng-repeat="hostCollection in hostCollectionsTable.rows | filter:hostCollectionFilter" row-select="hostCollection">
               <td bst-table-cell>
-                <a ui-sref="host-collections.details.info({hostCollectionId: hostCollection.id})">
+                <a ui-sref="host-collection.info({hostCollectionId: hostCollection.id})">
                   {{ hostCollection.name }}
                 </a>
               </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts-table-full.html

@@ -8,7 +8,7 @@
         {{ "Subscription Status" | translate }}
       </th>
       <th bst-table-column="status">
-        <span translate>Installable Errata</span>
+        <span translate>Installable Updates</span>
       </th>
       <th bst-table-column="os" sortable><span translate>OS</span></th>
       <th bst-table-column="lifecycle_environment" sortable><span sortable translate>Environment</span></th>
@@ -36,6 +36,20 @@
         <a ui-sref="content-hosts.details.errata.index({hostId: host.id})">
           <span class="aligned-errata-count" errata-counts="host.content_facet_attributes.errata_counts"></span>
         </a>
+
+        <a ui-sref="content-hosts.details.packages.applicable({hostId: host.id})">
+          <span class="aligned-errata-count">
+            <span class="errata-count">
+              <span>
+                {{ host.content_facet_attributes.upgradable_package_count || 0 }}
+              </span>
+              <i class="fa fa-cube inline-icon"
+                 ng-class="{black: host.content_facet_attributes.upgradable_package_count === 0,
+                            green: host.content_facet_attributes.upgradable_package_count > 0}"
+                 title="{{ 'Package Updates' | translate }}"></i>
+            </span>
+          </span>
+        </a>
       </td>
       <td bst-table-cell>{{ host.operatingsystem_name }}</td>
       <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment.name }}</td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html

@@ -8,17 +8,16 @@
 
   <div data-block="actions">
     <button class="btn btn-default"
+            ng-disabled="table.numSelected === 0"
             ng-show="permitted('edit_hosts') || permitted('destroy_hosts')"
             ui-sref="content-hosts.bulk-actions.host-collections">
-      <i class="fa fa-group leading-icon"></i>
-      {{ "Bulk Actions" | translate }}
+      <span translate>Bulk Actions</span>
     </button>
 
     <button class="btn btn-primary"
             ng-show="permitted('create_hosts')"
             ui-sref="content-hosts.register">
-      <i class="fa fa-signin leading-icon"></i>
-      {{ "Register Content Host" | translate }}
+      <span translate>Register Content Host</span>
     </button>
   </div>
 
@@ -26,7 +25,7 @@
     You currently don't have any Content Hosts, you can register one by clicking the button on the right and following the instructions.
   </span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Content Hosts.
   </span>
   

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-view.factory.js

@@ -21,9 +21,9 @@ angular.module('Bastion.content-views').factory('ContentView',
                 publish: {method: 'POST', params: {action: 'publish'}},
                 removeAssociations: {method: 'PUT', params: {action: 'remove'}},
                 versions: {method: 'GET', isArray: false, params: {action: 'content_view_versions'}},
-                components: {method: 'GET', transformResponse: function (data) {
+                contentViewComponents: {method: 'GET', transformResponse: function (data) {
                     var contentView = angular.fromJson(data);
-                    return {results: contentView.components};
+                    return {results: contentView.content_view_components};
                 }},
                 availablePuppetModules: {method: 'GET', params: {action: 'available_puppet_modules'},
                     transformResponse: function (data) {
@@ -31,7 +31,7 @@ angular.module('Bastion.content-views').factory('ContentView',
 
                         angular.forEach(_.groupBy(response.results, 'author'), function (puppetModules) {
                             var latest = angular.copy(puppetModules[0]);
-                            latest.version = translate('Use Latest (currently %s)').replace('%s', latest.version);
+                            latest.version = translate('Always Use Latest (currently %s)').replace('%s', latest.version);
                             latest.useLatest = true;
                             response.results.push(latest);
                         });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.controller.js

@@ -30,6 +30,5 @@ angular.module('Bastion.content-views').controller('ContentViewsController',
         $scope.table.closeItem = function () {
             $scope.transitionTo('content-views.index');
         };
-
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.routes.js

@@ -273,24 +273,29 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
         controller: 'ContentViewHistoryController',
         templateUrl: 'content-views/details/histories/views/content-view-history.html'
     })
-    .state('content-views.details.composite-content-views', {
+    .state('content-views.details.components', {
+        abstract: true,
+        template: '<div ui-view></div>',
+        collapsed: true
+    })
+    .state('content-views.details.components.composite-content-views', {
         abstract: true,
         collapsed: true,
-        templateUrl: 'content-views/details/views/content-view-composite.html'
+        templateUrl: 'content-views/details/components/views/content-view-composite.html'
     })
-    .state('content-views.details.composite-content-views.list', {
+    .state('content-views.details.components.composite-content-views.list', {
         collapsed: true,
         url: '/content-views',
         permission: 'view_content_views',
         controller: 'ContentViewCompositeContentViewsListController',
-        templateUrl: 'content-views/details/views/content-view-composite-content-views-list.html'
+        templateUrl: 'content-views/details/components/views/content-view-composite-content-views-list.html'
     })
-    .state('content-views.details.composite-content-views.available', {
+    .state('content-views.details.components.composite-content-views.available', {
         collapsed: true,
         url: '/content-views/available',
         permission: 'edit_content_views',
         controller: 'ContentViewCompositeAvailableContentViewsController',
-        templateUrl: 'content-views/details/views/content-view-composite-available-content-views.html'
+        templateUrl: 'content-views/details/components/views/content-view-composite-available-content-views.html'
     })
     .state('content-views.details.puppet-modules', {
         abstract: true,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-deletion.controller.js

@@ -38,7 +38,7 @@ angular.module('Bastion.content-views').controller('ContentViewDeletionControlle
         };
 
         $scope.environmentNames = function (version) {
-            return _.pluck($scope.readableEnvironments(version), 'name');
+            return _.map($scope.readableEnvironments(version), 'name');
         };
 
         $scope.readableEnvironments = function (version) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-activation-keys.controller.js

@@ -56,7 +56,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionAc
 
         $scope.processSelection = function () {
             $scope.deleteOptions.activationKeys.environment = $scope.selectedEnvironment;
-            $scope.deleteOptions.activationKeys.contentView = _.findWhere($scope.contentViewsForEnvironment,
+            $scope.deleteOptions.activationKeys.contentView = _.find($scope.contentViewsForEnvironment,
                 {id: $scope.selectedContentViewId});
             $scope.selectedEnvironment = undefined;
             $scope.selectedContentViewId = undefined;
@@ -65,7 +65,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionAc
 
         $scope.activationKeyLink = function () {
             var search = $scope.searchString($scope.contentView, $scope.deleteOptions.environments);
-            return $scope.$state.href('activation-keys.index') + '?search=' + search;
+            return $scope.$state.href('activation-keys') + '?search=' + search;
         };
 
         $scope.toggleKeys = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-content-hosts.controller.js

@@ -56,7 +56,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
 
         $scope.processSelection = function () {
             $scope.deleteOptions.contentHosts.environment = $scope.selectedEnvironment;
-            $scope.deleteOptions.contentHosts.contentView = _.findWhere($scope.contentViewsForEnvironment,
+            $scope.deleteOptions.contentHosts.contentView = _.find($scope.contentViewsForEnvironment,
                 {id: $scope.selectedContentViewId});
             $scope.selectedEnvironment = undefined;
             $scope.selectedContentViewId = undefined;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-environments.controller.js

@@ -32,7 +32,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionEn
                 } else {
                     //set existing selections
                     angular.forEach($scope.environmentsTable.rows, function (row) {
-                        row.selected = angular.isDefined(_.findWhere($scope.deleteOptions.environments, {unselectable: false, id: row.id}));
+                        row.selected = angular.isDefined(_.find($scope.deleteOptions.environments, {unselectable: false, id: row.id}));
 
                     });
                 }
@@ -58,13 +58,13 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionEn
             if ($scope.environmentsTable.rows.length === 0) {
                 anySelectable = true;
             } else {
-                anySelectable = angular.isDefined(_.findWhere($scope.environmentsTable.rows, {unselectable: false}));
+                anySelectable = angular.isDefined(_.find($scope.environmentsTable.rows, {unselectable: false}));
             }
             return anySelectable;
         };
 
         $scope.allSelectable = function () {
-            return angular.isUndefined(_.findWhere($scope.environmentsTable.rows, {unselectable: true}));
+            return angular.isUndefined(_.find($scope.environmentsTable.rows, {unselectable: true}));
         };
 
         $scope.processSelection = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion.controller.js

@@ -106,7 +106,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
         };
 
         $scope.selectedEnvironmentIds = function () {
-            return _.pluck($scope.deleteOptions.environments, 'id');
+            return _.map($scope.deleteOptions.environments, 'id');
         };
 
         $scope.selectedEnvironmentNames = function () {
@@ -142,7 +142,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
                 if (angular.isUndefined(childScope.selectedEnvironment)) {
                     childScope.contentViewsForEnvironment = [];
                 } else {
-                    removingEnvironment = angular.isDefined(_.findWhere(childScope.deleteOptions.environments, {id: childScope.selectedEnvironment.id}));
+                    removingEnvironment = angular.isDefined(_.find(childScope.deleteOptions.environments, {id: childScope.selectedEnvironment.id}));
                     $scope.fetchingViews = true;
                     ContentView.queryUnpaged({ 'environment_id': childScope.selectedEnvironment.id },
                         function (response) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-activation-keys.html

@@ -18,7 +18,7 @@
       <span translate>
         If you would prefer to move portions of these Activation Keys to different content views or Lifecycle Environments click
       </span>
-      <a ui-sref="activation-keys.index({})" translate >here</a>
+      <a ui-sref="activation-keys" translate >here</a>
       <span translate>to manage them individually.</span>
     </p>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-component.factory.js

@@ -0,0 +1,32 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.content-views.factory:ContentViewComponent
+ *
+ * @requires BastionResource
+ * @requires CurrentOrganization
+ *
+ * @description
+ *   Provides a BastionResource for interacting with content view components.
+ */
+angular.module('Bastion.content-views').factory('ContentViewComponent',
+    ['BastionResource', 'CurrentOrganization',
+    function (BastionResource, CurrentOrganization) {
+
+        return BastionResource('/katello/api/v2/content_views/:compositeContentViewId/content_view_components/:id/:action',
+            {id: '@id', compositeContentViewId: '@compositeContentViewId', 'organization_id': CurrentOrganization},
+            {
+                update: {method: 'PUT'},
+                removeComponents: {
+                    method: 'PUT',
+                    isArray: false,
+                    url: '/katello/api/v2/content_views/:compositeContentViewId/content_view_components/remove'
+                },
+                addComponents: {
+                    method: 'PUT',
+                    isArray: false,
+                    url: '/katello/api/v2/content_views/:compositeContentViewId/content_view_components/add'
+                }
+            }
+        );
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/{content-view-composite-available-content-views.controller.js → components/content-view-composite-available-content-views.controller.js}

@@ -6,13 +6,14 @@
  * @requires Nutupane
  * @requires CurrentOrganization
  * @requires ContentView
+ * @requires ContentViewComponent
  *
  * @description
  *  Provides a nutupane for eligible content views to be included in the composite.
  */
 angular.module('Bastion.content-views').controller('ContentViewCompositeAvailableContentViewsController',
-    ['$scope', 'Nutupane', 'CurrentOrganization', 'ContentView',
-        function ($scope, Nutupane, CurrentOrganization, ContentView) {
+    ['$scope', 'Nutupane', 'CurrentOrganization', 'ContentView', 'ContentViewComponent',
+        function ($scope, Nutupane, CurrentOrganization, ContentView, ContentViewComponent) {
             var nutupane, params;
 
             params = {
@@ -28,9 +29,10 @@ angular.module('Bastion.content-views').controller('ContentViewCompositeAvailabl
 
             $scope.contentView.$promise.then(function (contentView) {
                 var filterIds = [];
-
-                if (contentView.components) {
-                    filterIds = _.pluck(contentView.components, 'content_view_id');
+                if (contentView["content_view_components"]) {
+                    filterIds = _.map(contentView["content_view_components"], function (component) {
+                        return component['content_view'].id;
+                    });
                 }
                 filterIds.push(contentView.id);
 
@@ -40,31 +42,28 @@ angular.module('Bastion.content-views').controller('ContentViewCompositeAvailabl
                 nutupane.load(true);
             });
 
-
             $scope.addContentViews = function () {
                 var selectedRows = nutupane.getAllSelectedResults().included.resources,
-                    existingComponentsIds = $scope.contentView['component_ids'],
-                    versionIds = [];
-
-                angular.forEach(selectedRows, function (contentView) {
-                    if (!contentView.versionId) {
-                        contentView.versionId = contentView.versions[contentView.versions.length - 1].id;
+                    components = [];
+                components = _.map(selectedRows, function (view) {
+                    var component = {};
+                    if ((!view.versionId) || view.versionId === "latest") {
+                        component.latest = true;
+                        component["content_view_id"] = view.id;
+                    } else {
+                        component["content_view_version_id"] = view.versionId;
                     }
-                    versionIds.push(contentView.versionId);
+                    return component;
                 });
 
-                $scope.contentView['component_ids'] = existingComponentsIds.concat(versionIds);
-
-                $scope.save($scope.contentView).then(function () {
-                    var newContentIds = _.pluck(selectedRows, 'id');
+                ContentViewComponent.addComponents({compositeContentViewId: $scope.contentView.id,
+                                                    components: components}, function () {
+                    var newContentIds = _.map(selectedRows, 'id');
+                    $scope.saveSuccess();
                     params['without[]'] = params["without[]"].concat(newContentIds);
                     nutupane.setParams(params);
                     nutupane.refresh();
-                }, function () {
-                    $scope.contentView['component_ids'] = existingComponentsIds;
-                });
-
-
+                }, $scope.saveError);
             };
         }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-composite-content-views-list.controller.js

@@ -0,0 +1,66 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-views.controller:ContentViewCompositeContentViewsListController
+ *
+ * @requires $scope
+ * @requires translate
+ * @requires Nutupane
+ * @requires CurrentOrganization
+ * @requires ContentView
+ * @requires ContentViewComponent
+ *
+ * @description
+ *  Provides a nutupane for existing content views that are included in the composite.
+ */
+angular.module('Bastion.content-views').controller('ContentViewCompositeContentViewsListController',
+    ['$scope', 'translate', 'Nutupane', 'CurrentOrganization', 'ContentView', 'ContentViewComponent',
+    function ($scope, translate, Nutupane, CurrentOrganization, ContentView, ContentViewComponent) {
+        var nutupane = new Nutupane(ContentView, {
+            'organization_id': CurrentOrganization,
+            'id': $scope.$stateParams.contentViewId,
+            'full_result': true
+        }, 'contentViewComponents');
+
+        $scope.detailsTable = nutupane.table;
+
+        $scope.saveContentViewComponent = function (contentViewComponent) {
+            var component = {
+                id: contentViewComponent.id,
+                latest: contentViewComponent.versionId === "latest",
+                compositeContentViewId: $scope.contentView.id
+            };
+
+            if (contentViewComponent.versionId !== "latest") {
+                component["content_view_version_id"] = contentViewComponent.versionId;
+            }
+            ContentViewComponent.update(component, function () {
+                nutupane.refresh();
+                $scope.saveSuccess();
+            }, $scope.saveError);
+        };
+
+        $scope.removeContentViewComponents = function () {
+            var selected = nutupane.getAllSelectedResults().included.ids,
+                params = {compositeContentViewId: $scope.contentView.id,
+                          'component_ids': selected};
+            ContentViewComponent.removeComponents(params, function () {
+                nutupane.refresh();
+                $scope.contentView.$get($scope.saveSuccess, $scope.saveError);
+            }, $scope.saveError);
+        };
+
+        $scope.getVersionString = function (contentViewComponent) {
+            if (contentViewComponent.latest) {
+                return translate('Latest (Currently %s)').replace('%s', contentViewComponent['content_view_version'].version.toString());
+            }
+            return contentViewComponent['content_view_version'].version.toString();
+        };
+
+        $scope.getVersionId = function (contentViewComponent) {
+            if (contentViewComponent.latest) {
+                return "latest";
+            }
+            return contentViewComponent.content_view_version.id;
+        };
+    }]
+);