katello 3.9.0 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '091b4e68cbaf3d4f59e7e68eadb6c7614dec995d'
-  data.tar.gz: d5f981cb609b26e25e4e3115578f499965ee506a
+  metadata.gz: 69e80194e98966a9f7d9942fdd36fb5996718cca
+  data.tar.gz: 6daa564d8872d33964d3cda0c1f6f9268b603aa8
 SHA512:
-  metadata.gz: 0efb1494294fad86bd7b712f297daf11a1ca22dda766436fa5c59fc1c4e71db9657ce20752f60874f9126d37bd2ba04f7c2be50be7ce2921afd55e09d01338a6
-  data.tar.gz: e0b07d723a3a90e0dff8e89e5ca56030d660b3428570acb9995ec4a00b80af84a53eeac9d1c1b39d0239b513517eaa2b3b16ffeb3ab0dda79f60acb46b99e08c
+  metadata.gz: 7e6df8ffbe7dd816c21f438efe12b4a6973b2d2be4e37da959799ea7285ad7b38f49dff638432f2075c82b02185c3f69e473b66ac3d1a2f250fc57e3f3f923cf
+  data.tar.gz: 1f2b5d16fac33a4b81da05bd320bfcd68eed769d28b79c41adf273ffebe5533f68ff560b8112743873fd5234dd7c86bba6d6e9ff883c70d73c5f5a03ef5429b2

data/app/lib/actions/katello/repository/clone_to_version.rb

@@ -23,21 +23,31 @@ module Actions
               plan_action(Repository::CloneYumMetadata, repositories[0], new_repository,
                                                             :force_yum_metadata_regeneration => true)
             else
-              repositories.each do |repository|
-                if new_repository.yum?
-                  plan_action(Repository::CloneYumContent, repository, new_repository, filters, :purge_empty_units => !incremental,
-                              :generate_metadata => !incremental, :index_content => !incremental, :simple_clone => incremental, :rpm_filenames => rpm_filenames)
-                elsif new_repository.deb?
-                  plan_action(Repository::CloneDebContent, repository, new_repository, filters, !incremental,
-                              :generate_metadata => !incremental, :index_content => !incremental, :simple_clone => incremental)
-                elsif new_repository.docker?
-                  plan_action(Repository::CloneDockerContent, repository, new_repository, filters)
-                elsif new_repository.ostree?
-                  plan_action(Repository::CloneOstreeContent, repository, new_repository)
-                elsif new_repository.file?
-                  plan_action(Repository::CloneFileContent, repository, new_repository)
-                end
-              end
+              clone_repository_content(repositories, new_repository, filters, incremental, rpm_filenames)
+            end
+
+            plan_action(Katello::Repository::MetadataGenerate, new_repository) if repositories.length > 1
+          end
+        end
+
+        def clone_repository_content(repositories, new_repository, filters, incremental, rpm_filenames)
+          repositories.each do |repository|
+            if new_repository.yum?
+              # If there is more than one repository passed here, that means that there are duplicate repos in a composite content view.
+              # We skip generating metadata in this case and generate it later to prevent conflicting data, such as filters.
+              skip_metadata = incremental || repositories.length > 1
+              plan_action(Repository::CloneYumContent, repository, new_repository, filters, :purge_empty_units => !incremental,
+                          :generate_metadata => !skip_metadata, :index_content => !incremental,
+                          :simple_clone => incremental, :rpm_filenames => rpm_filenames)
+            elsif new_repository.deb?
+              plan_action(Repository::CloneDebContent, repository, new_repository, filters, !incremental,
+                          :generate_metadata => !incremental, :index_content => !incremental, :simple_clone => incremental)
+            elsif new_repository.docker?
+              plan_action(Repository::CloneDockerContent, repository, new_repository, filters)
+            elsif new_repository.ostree?
+              plan_action(Repository::CloneOstreeContent, repository, new_repository)
+            elsif new_repository.file?
+              plan_action(Repository::CloneFileContent, repository, new_repository)
             end
           end
         end

data/app/models/katello/repository.rb

@@ -661,7 +661,7 @@ module Katello
     end
 
     def self.safe_render_container_name(repository, pattern = nil)
-      if pattern || (repository.environment && !repository.environment.registry_name_pattern.empty?)
+      if (pattern && !pattern.blank?) || (repository.environment && !repository.environment.registry_name_pattern.empty?)
         pattern ||= repository.environment.registry_name_pattern
         allowed_methods = {}
         allowed_vars = {}

data/app/models/katello/sync_plan.rb

@@ -46,6 +46,7 @@ module Katello
     end
 
     def save_with_logic!
+      self.cron_expression = '' if (self.cron_expression && !(self.interval.eql? CUSTOM_CRON))
       associate_recurring_logic
       self.save!
       start_recurring_logic
@@ -117,8 +118,8 @@ module Katello
     end
 
     def next_sync_date
-      return nil unless (self.enabled || !self.foreman_tasks_recurring_logic.tasks.nil?)
-      self.foreman_tasks_recurring_logic.tasks.order(:start_at).last.try(:start_at)
+      return nil unless self.enabled
+      self.foreman_tasks_recurring_logic&.tasks&.order(:start_at)&.last&.start_at
     end
 
     def next_sync

data/app/views/katello/api/v2/host_collections/create.json.rabl

@@ -1,3 +1,3 @@
 object @host_collection
 
-extends "katello/api/v2/host_collections/base"
+extends "katello/api/v2/host_collections/show"

data/app/views/katello/api/v2/subscriptions/base.json.rabl

@@ -17,6 +17,7 @@ attributes :unmapped_guest
 attributes :virt_only
 attributes :virt_who
 attributes :upstream? => :upstream
+attributes :upstream_pool_id
 
 node :hypervisor, :if => lambda { |sub| sub && sub.respond_to?(:hypervisor) && sub.hypervisor } do |subscription|
   {

data/db/migrate/20180814202747_add_recurring_logic_to_sync_plan.rb

@@ -3,11 +3,5 @@ class AddRecurringLogicToSyncPlan < ActiveRecord::Migration[5.1]
     add_column :katello_sync_plans, :foreman_tasks_recurring_logic_id, :integer
     add_column :katello_sync_plans, :cron_expression, :string
     add_foreign_key :katello_sync_plans, :foreman_tasks_recurring_logics, :name => "katello_sync_plan_foreman_tasks_recurring_logic_fk", :column => "foreman_tasks_recurring_logic_id"
-    Katello::SyncPlan.find_each do |sync_plan|
-      User.as_anonymous_admin do
-        sync_plan.associate_recurring_logic
-        sync_plan.save!
-      end
-    end
   end
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-publish.html

@@ -14,7 +14,9 @@
 <div class="row">
   <div class="col-sm-5">
     <div bst-alert="info" ng-show="contentView.duplicate_repositories_to_publish.length > 0">
-      You have selected more than one component Content View Version with the same repository resulting in slower publishing:
+      <p translate>
+        You have selected more than one component Content View Version with the same repository resulting in slower publishing:
+      </p>
       <ul>
         <li ng-repeat="repository in contentView.duplicate_repositories_to_publish">
           {{ repository.name }}
@@ -23,6 +25,10 @@
           </ul>
         </li>
       </ul>
+      <p translate>
+        For the duplicate repositories, the packages in each Content View Version will combine regardless of the filters that 
+        were applied to the individual Content View Version.
+      </p>
     </div>
 
     <form name="versionForm" role="form" novalidate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/new-sync-plan-modal.controller.js

@@ -11,36 +11,40 @@
  *   A controller for creating a new sync plan in a modal.
  */
 angular.module('Bastion.products').controller('NewSyncPlanModalController',
-    ['$scope', '$uibModalInstance', 'SyncPlan', 'SyncPlanHelper',
-        function ($scope, $uibModalInstance, SyncPlan, SyncPlanHelper) {
+    ['$scope', '$uibModalInstance', 'SyncPlan', 'SyncPlanHelper', 'Notification', 'translate',
+        function ($scope, $uibModalInstance, SyncPlan, SyncPlanHelper, Notification, translate) {
             function success(syncPlan) {
+                Notification.setSuccessMessage(translate("Sync Plan saved"));
+                $scope.isWorking = false;
                 $uibModalInstance.close(syncPlan);
             }
 
             function error(response) {
                 var form = SyncPlanHelper.getForm();
-
+                $scope.isWorking = false;
                 angular.forEach(response.data.errors, function (errors, field) {
                     if (form[field]) {
                         form[field].$setValidity('server', false);
                         form[field].$error.messages = errors;
                     } else {
-                        Notification.setErrorMessage("Error saving the Sync Plan: " + " " + errors);
+                        Notification.setErrorMessage(translate("Error saving the Sync Plan: " + " " + errors));
                     }
                 });
             }
 
             $scope.ok = function (syncPlan) {
+                $scope.isWorking = true;
                 SyncPlanHelper.createSyncPlan(syncPlan, success, error);
             };
 
             $scope.cancel = function () {
+                $scope.isWorking = true;
                 $uibModalInstance.dismiss('cancel');
             };
 
             $scope.isFormDisabled = function () {
                 var form = SyncPlanHelper.getForm();
-                return form && !form.$valid;
+                return form && $scope.isWorking;
             };
 
             $scope.intervals = SyncPlanHelper.getIntervals();

data/lib/katello/tasks/upgrades/3.9/migrate_sync_plans.rake

@@ -7,6 +7,8 @@ namespace :katello do
         puts "Starting recurring logic for migrated sync plans and deleting Pulp schedules"
 
         Katello::SyncPlan.find_each do |sync_plan|
+          sync_plan.associate_recurring_logic
+          sync_plan.save!
           if sync_plan.foreman_tasks_recurring_logic.state.nil?
             sync_plan.start_recurring_logic
             sync_plan.foreman_tasks_recurring_logic.enabled = false unless sync_plan.enabled

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.9.0".freeze
+  VERSION = "3.9.1".freeze
 end

data/webpack/scenes/Subscriptions/SubscriptionHelpers.js

@@ -1,6 +1,7 @@
 // eslint-disable-next-line import/prefer-default-export
 export const filterRHSubscriptions = subscriptions =>
-  subscriptions.filter(sub => sub.available >= 0);
+  subscriptions.filter(sub =>
+    sub.available >= 0 && sub.upstream_pool_id);
 
 export const manifestExists = organization =>
   organization.owner_details && organization.owner_details.upstreamConsumer;

data/webpack/scenes/Subscriptions/__tests__/SubscriptionValidations.test.js

@@ -51,21 +51,25 @@ describe('recordsValid', () => {
     expect(recordsValid([])).toBe(true);
   });
 
+  /* eslint-disable object-curly-newline */
   it('accepts valid array', () => {
     const rows = [
-      { quantity: 10, available: 10, availableQuantity: 100 },
+      { quantity: 10, available: 10, availableQuantity: 100, upstream_pool_id: ' ' },
       { quantity: 10, available: 10, availableQuantity: -1 },
       { quantity: -1, available: -1 },
-      { quantity: 10, available: 10 },
+      { quantity: 10, available: 10, upstream_pool_id: ' ' },
     ];
     expect(recordsValid(rows)).toBe(true);
   });
+  /* eslint-enable object-curly-newline */
 
   it('detects invalid record', () => {
+    /* eslint-disable object-curly-newline */
     const rows = [
-      { quantity: 10, available: 10, availableQuantity: 100 },
-      { quantity: 10, available: 10, availableQuantity: 5 },
+      { quantity: 10, available: 10, availableQuantity: 100, upstream_pool_id: ' ' },
+      { quantity: 10, available: 10, availableQuantity: 5, upstream_pool_id: ' ' },
     ];
+    /* eslint-enable object-curly-newline */
     expect(recordsValid(rows)).toBe(false);
   });
 });

data/webpack/scenes/Subscriptions/__tests__/subscriptions.fixtures.js

@@ -132,6 +132,7 @@ export const requestSuccessResponseWithRHSubscriptions = Immutable({
       virt_only: false,
       virt_who: false,
       upstream: true,
+      upstream_pool_id: '8a85f98160f068060160f06e922a0201',
     },
   ],
 });

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/EntitlementsInlineEditFormatter.js

@@ -10,9 +10,9 @@ export const entitlementsInlineEditFormatter =
       inlineEditController.isEditing(additionalData),
     renderValue: (value, additionalData) => {
       const { rowData } = additionalData;
-      if (rowData.available < 0) {
+      if (rowData.available < 0 || !rowData.upstream_pool_id) {
         return (
-          <td>{__('Unlimited')}</td>
+          <td>{rowData.available < 0 ? __('Unlimited') : rowData.available}</td>
         );
       }
       return (

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js

@@ -151,7 +151,8 @@ class SubscriptionsTable extends Component {
     };
 
     const inlineEditController = {
-      isEditing: ({ rowData }) => (this.state.editing && rowData.available >= 0),
+      isEditing: ({ rowData }) =>
+        (this.state.editing && rowData.available >= 0 && rowData.upstream_pool_id),
       hasChanged: ({ rowData }) => {
         const editedValue = this.state.updatedQuantity[rowData.id];
         return this.hasQuantityChanged(rowData, editedValue);

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/EntitlementsInlineEditFormatter.test.js

@@ -92,7 +92,9 @@ describe('EntitlementsInlineEditFormatter', () => {
     it('renders the value', async () => {
       const controller = mockController({ editing: false });
       const value = 200;
-      const formatter = editFormatter(controller)(value, data({}));
+      const formatter = editFormatter(controller)(value, data({
+        upstream_pool_id: ' ',
+      }));
 
       expect(toJson(shallow(formatter))).toMatchSnapshot();
     });
@@ -102,6 +104,7 @@ describe('EntitlementsInlineEditFormatter', () => {
       const value = 200;
       const formatter = editFormatter(controller)(value, data({
         available: -1,
+        upstream_pool_id: ' ',
       }));
 
       expect(toJson(shallow(formatter))).toMatchSnapshot();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.9.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails