katello 4.4.0.rc2 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 294ac07f46dd213e4ebbdd13f97d387b39ef2e5859ed6224e354672f4b26f244
-  data.tar.gz: b08b1182252900cc7390ae257b1a9243fcdb26f00d64b1f668cc17faff4f08e8
+  metadata.gz: e193a2273fbdeccfaeb286b7a86738e7bbb1bb78120a663e4309aac912ef4501
+  data.tar.gz: afbec4d28494d215e8b7c318cd403a632d3c8c14ccff79f809cc01f4fc713f3d
 SHA512:
-  metadata.gz: 85c64b73f97252bd9f99c28071bddd97aebc83a525a5ec8559f4538180c733eca336e433e4d2f06204e6d57c5333246fc512e155c2396622daa369fd0dc0bbb4
-  data.tar.gz: e5d7904f19cb93eac89ff6e27b6c585e53f9419e925c4c5bedce2b30ac7a1d8df6c3e518574ad86c6607edbacc99a21360df54cef3b3ddfb94c4c38570f945a7
+  metadata.gz: da5af110e6327f56eff8c5f72eb1e80936142b534e68d9bdc9f081efa9838f35b0eb03d99e461e59f9c0f2be1a55f7955f2fee6d97b8874f35ce4ba60bb4c1df
+  data.tar.gz: 6c6db26dac3ffa0ace7837e9774d56d93cba08df34fee0616bde18816a6785e5c54d697768d2f5a39bbd40a67b990462bb9e2e7e2d44cfdd74043221ca820dd6

data/app/controllers/katello/api/v2/content_views_controller.rb

@@ -53,6 +53,7 @@ module Katello
     param :composite, :bool, :desc => N_("Filter only composite content views")
     param :without, Array, :desc => N_("Do not include this array of content views")
     param :name, String, :desc => N_("Name of the content view"), :required => false
+    param :label, String, :desc => N_("Label of the content view"), :required => false
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(ContentView)
     def index
@@ -69,6 +70,7 @@ module Katello
       content_views = ::Foreman::Cast.to_bool(params[:noncomposite]) ? content_views.non_composite : content_views.composite if params[:noncomposite]
       content_views = ::Foreman::Cast.to_bool(params[:composite]) ? content_views.composite : content_views.non_composite if params[:composite]
       content_views = content_views.where(:name => params[:name]) if params[:name]
+      content_views = content_views.where(:label => params[:label]) if params[:label]
       content_views = content_views.where("#{ContentView.table_name}.id NOT IN (?)", params[:without]) if params[:without]
       content_views
     end

data/app/controllers/katello/api/v2/environments_controller.rb

@@ -48,6 +48,7 @@ module Katello
     param :organization_id, :number, :desc => N_("organization identifier")
     param :library, [true, false], :desc => N_("set true if you want to see only library environments")
     param :name, String, :desc => N_("filter only environments containing this name")
+    param :label, String, :desc => N_("filter only environments containing this label"), :required => false
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(KTEnvironment)
     def index
@@ -58,6 +59,7 @@ module Katello
       query = KTEnvironment.readable
       query = query.where(organization: @organization) if @organization
       query = query.where(:name => params[:name]) if params[:name]
+      query = query.where(:label => params[:label]) if params[:label]
       query = query.where(:library => params[:library]) if params[:library]
       query
     end

data/app/lib/actions/katello/cdn_configuration/update.rb

@@ -4,10 +4,10 @@ module Actions
       class Update < Actions::EntryAction
         def plan(cdn_configuration, options)
           cdn_configuration.update!(options)
-          return if cdn_configuration.airgapped?
 
           if cdn_configuration.upstream_server?
             resource = ::Katello::Resources::CDN::CdnResource.create(cdn_configuration: cdn_configuration)
+            resource.validate!
             keypair = resource.debug_certificate
             cdn_configuration.ssl_cert = OpenSSL::X509::Certificate.new(keypair)
             cdn_configuration.ssl_key = OpenSSL::PKey::RSA.new(keypair)
@@ -20,7 +20,7 @@ module Actions
           roots.each do |root|
             full_path = if cdn_configuration.redhat_cdn?
                           root.product.repo_url(root.library_instance.generate_content_path)
-                        else
+                        elsif cdn_configuration.upstream_server?
                           resource.repository_url(content_label: root.content.label)
                         end
             plan_action(::Actions::Katello::Repository::Update, root, url: full_path)

data/app/lib/katello/resources/cdn/katello_cdn.rb

@@ -4,8 +4,8 @@ module Katello
       class KatelloCdn < CdnResource
         def initialize(url, options)
           @organization_label = options.delete(:organization_label)
-          @content_view_label = options.delete(:content_view_label)
-          @lifecycle_environment_label = options.delete(:lifecycle_environment_label)
+          @content_view_label = options.delete(:content_view_label) || ::Katello::OrganizationCreator::DEFAULT_CONTENT_VIEW_LABEL
+          @lifecycle_environment_label = options.delete(:lifecycle_environment_label) || ::Katello::OrganizationCreator::DEFAULT_LIFECYCLE_ENV_LABEL
           fail ArgumentError, "No upstream organization was specified" if @organization_label.nil?
 
           super
@@ -18,16 +18,33 @@ module Katello
 
           fail _("Upstream organization %s does not provide this content path") % @organization_label if repo_set.nil?
 
-          # now get available repositories when we know the upstream repo set ID
-          url = "/katello/api/v2/repository_sets/#{repo_set['id']}/available_repositories?organization_id=#{organization['id']}"
+          params = {
+            full_result: true,
+            organization_id: organization['id'],
+            content_view_id: content_view_id,
+            environment_id: lifecycle_environment_id,
+            search: CGI.escape("content_label = #{repo_set['label']}")
+          }
+          query_params = params.map { |key, value| "#{key}=#{value}" }
+
+          url = "/katello/api/v2/repositories?#{query_params.join("&")}"
           response = get(url)
           json_body = JSON.parse(response)
           results = json_body['results']
 
-          results.map do |r|
+          results.map do |repo|
+            arch = repo['arch']
+            arch = nil if arch == "noarch"
+            substitutions = {
+              :releasever => repo['minor'],
+              :basearch => arch
+            }.compact
+            path = substitutions.inject(content_path) do |path_url, (key, value)|
+              path_url.gsub("$#{key}", value)
+            end
             {
-              path: r['path'],
-              substitutions: r['substitutions']
+              path: path,
+              substitutions: substitutions
             }
           end
         end
@@ -36,12 +53,16 @@ module Katello
           true
         end
 
+        def validate!
+          organization && content_view_id && lifecycle_environment_id
+        end
+
         def debug_certificate
           get("/katello/api/v2/organizations/#{organization['id']}/download_debug_certificate")
         end
 
         def content_view_id
-          rs = get("/katello/api/v2/organizations/#{organization['id']}/content_views?name=#{CGI.escape(@content_view_label)}")
+          rs = get("/katello/api/v2/organizations/#{organization['id']}/content_views?search=#{CGI.escape("label=#{@content_view_label}")}")
           content_view = JSON.parse(rs)['results']&.first
           if content_view.blank?
             fail _("Upstream organization %{org_label} does not have a content view with the label %{cv_label}") % { org_label: @organization_label,
@@ -51,7 +72,7 @@ module Katello
         end
 
         def lifecycle_environment_id
-          rs = get("/katello/api/v2/organizations/#{organization['id']}/environments")
+          rs = get("/katello/api/v2/organizations/#{organization['id']}/environments?full_result=true")
           env = JSON.parse(rs)['results'].find { |lce| lce['label'] == @lifecycle_environment_label }
 
           if env.blank?
@@ -61,7 +82,7 @@ module Katello
           env["id"]
         end
 
-        def repository_url(content_label:)
+        def repository_url(content_label:, arch:, major:, minor:)
           params = {
             search: CGI.escape("content_label = #{content_label}")
           }
@@ -72,17 +93,19 @@ module Katello
           query_params = params.map { |key, value| "#{key}=#{value}" }
           url = "/katello/api/v2/organizations/#{organization['id']}/repositories?#{query_params.join('&')}"
           response = get(url)
-          repository = JSON.parse(response)['results'].first
-
+          repository = JSON.parse(response)['results']&.find { |r| r['arch'] == arch && r['major'] == major && r['minor'] == minor }
           if repository.nil?
             msg_params = { content_label: content_label,
+                           arch: arch,
+                           major: major,
+                           minor: minor,
                            org_label: @organization_label,
                            cv_label: @content_view_label || Katello::OrganizationCreator::DEFAULT_CONTENT_VIEW_LABEL,
                            env_label: @lifecycle_environment_label || Katello::OrganizationCreator::DEFAULT_LIFECYCLE_ENV_LABEL
             }
 
-            fail _("Repository with content label %{content_label} was not found in upstream organization %{org_label},"\
-                   " content view %{cv_label} and lifecycle environment %{env_label} ") % msg_params
+            fail _("Repository with content label: '%{content_label}'#{arch ? ', arch: \'%{arch}\'' : ''}#{minor ? ', version: \'%{minor}\'' : ''} was not found in upstream organization '%{org_label}',"\
+                   " content view '%{cv_label}' and lifecycle environment '%{env_label}'") % msg_params
           end
           repository['full_path']
         end

data/app/models/katello/candlepin/repository_mapper.rb

@@ -34,7 +34,7 @@ module Katello
           :content_type => katello_content_type,
           :unprotected => unprotected?,
           :download_policy => download_policy,
-          :mirroring_policy => Katello::RootRepository::MIRRORING_POLICY_COMPLETE
+          :mirroring_policy => mirroring_policy
         )
 
         Repository.new(:root => root,
@@ -76,7 +76,7 @@ module Katello
       def feed_url
         return if product.organization.cdn_configuration.airgapped?
         @feed_url ||= if product.cdn_resource&.respond_to?(:repository_url)
-                        product.cdn_resource.repository_url(content_label: content.label)
+                        product.cdn_resource.repository_url(content_label: content.label, arch: arch, major: version[:major], minor: version[:minor])
                       else
                         product.repo_url(path)
                       end
@@ -137,6 +137,14 @@ module Katello
           ""
         end
       end
+
+      def mirroring_policy
+        if katello_content_type == Repository::YUM_TYPE
+          Katello::RootRepository::MIRRORING_POLICY_COMPLETE
+        else
+          Katello::RootRepository::MIRRORING_POLICY_CONTENT
+        end
+      end
     end
   end
 end

data/app/models/katello/cdn_configuration.rb

@@ -53,6 +53,8 @@ module Katello
       self.ssl_ca_credential_id = nil
       self.upstream_content_view_label = nil
       self.upstream_lifecycle_environment_label = nil
+      self.ssl_cert = nil
+      self.ssl_key = nil
     end
 
     def non_redhat_configuration

data/app/models/katello/kt_environment.rb

@@ -75,6 +75,7 @@ module Katello
     ERROR_CLASS_NAME = "Environment".freeze
 
     scoped_search :on => :name, :complete_value => true
+    scoped_search :on => :label, :complete_value => true
     scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
 

data/app/services/katello/organization_creator.rb

@@ -133,11 +133,15 @@ module Katello
     end
 
     def create_cdn_configuration
-      @cdn_configuration = Katello::CdnConfiguration.where(
-        organization: @organization,
-        url: ::Katello::Resources::CDN::CdnResource.redhat_cdn_url,
-        type: ::Katello::CdnConfiguration::CDN_TYPE
-      ).first_or_create!
+      @cdn_configuration = Katello::CdnConfiguration.where(organization: @organization)
+
+      if @cdn_configuration.blank?
+        Katello::CdnConfiguration.where(
+          organization: @organization,
+          url: ::Katello::Resources::CDN::CdnResource.redhat_cdn_url,
+          type: ::Katello::CdnConfiguration::CDN_TYPE
+        ).first_or_create!
+      end
     end
   end
 end

data/app/services/katello/registration_manager.rb

@@ -297,6 +297,7 @@ module Katello
           host.content_facet.applicable_errata = []
           host.content_facet.uuid = nil
           host.content_facet.save!
+          host.content_facet.calculate_and_import_applicability
         end
 
         host.get_status(::Katello::ErrataStatus).destroy

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -48,8 +48,8 @@ glue(@resource.root) do
     attributes :id => @resource.root&.ssl_client_key&.id, :name => @resource.root&.ssl_client_key&.name
   end
 
-  child :gpg_key do
-    attributes :id, :name
+  node :gpg_key do
+    attributes :id => @resource.root&.gpg_key&.id, :name => @resource.root&.gpg_key&.name
   end
 end
 

data/db/migrate/20220124191056_add_type_to_cdn_configuration.rb

@@ -1,16 +1,10 @@
 class AddTypeToCdnConfiguration < ActiveRecord::Migration[6.0]
   def change
+    add_index :katello_cdn_configurations, :organization_id, unique: true
     add_column :katello_cdn_configurations, :type, :string, default: ::Katello::CdnConfiguration::CDN_TYPE
 
     ::Katello::CdnConfiguration.reset_column_information
     ::Katello::CdnConfiguration.all.each do |config|
-      unless Setting[:subscription_connection_enabled]
-        # if subscription connection is not enabled
-        # the user most likely wants the type to be airgapped
-        config.update!(type: ::Katello::CdnConfiguration::AIRGAPPED_TYPE)
-        next
-      end
-
       unless config.username.blank? ||
              config.password.blank? ||
              config.upstream_organization_label.blank? ||

data/db/migrate/20220303160220_remove_duplicate_errata.rb

@@ -0,0 +1,34 @@
+class RemoveDuplicateErrata < ActiveRecord::Migration[6.0]
+  def up
+    #Update all unique errata records to have pulp_id = errata_id
+    ::Katello::Erratum.group(:errata_id).having("count(errata_id) = 1").pluck(:errata_id).each do |original_errata_id|
+      erratum = ::Katello::Erratum.find_by(errata_id: original_errata_id)
+      if (erratum.pulp_id != erratum.errata_id)
+        erratum.pulp_id = erratum.errata_id
+        erratum.save!
+      end
+    end
+
+    #For duplicate errata,
+    # a) update all RepositoryErrata to point to unique errata,
+    # b) if repo-errata association for that combination exists, delete duplicate errata association
+    # c) Delete all duplicate errata
+    ::Katello::Erratum.group(:errata_id).having("count(errata_id) > 1").pluck(:errata_id).each do |original_errata_id|
+      errata_to_keep = ::Katello::Erratum.find_by(pulp_id: original_errata_id)
+      errata_all = ::Katello::Erratum.where(errata_id: original_errata_id)
+      dup_errata = errata_all - [errata_to_keep]
+      ::Katello::RepositoryErratum.where(erratum_id: dup_errata&.map(&:id)).each do |repo_erratum|
+        if ::Katello::RepositoryErratum.find_by(repository_id: repo_erratum.repository_id, erratum_id: errata_to_keep.id)
+          repo_erratum.delete
+        else
+          repo_erratum.update(erratum_id: errata_to_keep.id)
+        end
+      end
+      ::Katello::Erratum.delete(dup_errata&.pluck(:id))
+    end
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-products.html

@@ -39,7 +39,7 @@
 
   <span data-block="no-rows-message">
     <span ng-if="isState('sync-plan.products.list')" translate>
-      No products are have been added to this Sync Plan.
+      No products have been added to this Sync Plan.
     </span>
     <span ng-if="isState('sync-plan.products.add')" translate>
       No products are available to add to this Sync Plan.

data/lib/katello/tasks/pulp2to3_migrate_deb_attributes.rake

@@ -0,0 +1,20 @@
+namespace :katello do
+  desc "Migrate deb content attributes to Pulp3"
+  task :migrate_deb_content_attributes_to_pulp3 => ["environment", "check_ping"] do
+    User.current = User.anonymous_api_admin
+    repos = Katello::Repository.deb_type.where(library_instance_id: nil)
+
+    repos.find_each.with_index do |repo, index|
+      puts "Processing Repository #{index + 1}/#{repos.count}: #{repo.name} (#{repo.id})"
+      begin
+        ForemanTasks.sync_task(::Actions::Katello::Repository::Update, repo.root,
+                               download_policy: 'immediate',
+                               deb_architectures: repo.root.deb_architectures&.gsub(',', ' '),
+                               deb_releases: repo.root.deb_releases&.gsub(',', ' ') || 'stable',
+                               deb_components: repo.root.deb_components&.gsub(',', ' '))
+      rescue => e
+        puts "Failed to update repository #{repo.name} (#{repo.id}): #{e.message}"
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.4.0.rc2".freeze
+  VERSION = "4.4.0".freeze
 end

data/webpack/components/RoutedTabs/index.js

@@ -1,33 +1,18 @@
 import React from 'react';
 import { shape, string, number, element, arrayOf } from 'prop-types';
 import { Tab, Tabs, TabTitleText } from '@patternfly/react-core';
-import { Switch, Route, Redirect, useHistory, useLocation, withRouter, HashRouter } from 'react-router-dom';
+import { Switch, Route, Redirect, useLocation, withRouter, HashRouter } from 'react-router-dom';
 import { head, last } from 'lodash';
 
 const RoutedTabs = ({
   tabs, defaultTabIndex,
 }) => {
-  const { push } = useHistory();
   const {
     hash, key: locationKey,
   } = useLocation();
 
   // The below transforms #/history/6 to history
   const currentTabFromUrl = head(last(hash.split('#/')).split('/'));
-  // Allows navigation back to mainTab
-  const onSubTab = currentTabFromUrl !== last(last(hash.split('#/')).split('/'));
-
-  const onSelect = (e, key) => {
-    e.preventDefault();
-    // See the below links for understanding of this mouseEvent
-    // https://www.w3schools.com/jsref/event_which.asp
-    // https://www.w3schools.com/jsref/event_button.asp
-    const middleMouseButtonNotUsed = !(e.button === 1 || e.buttons === 4 || e.which === 2);
-    const notCurrentTab = currentTabFromUrl !== key;
-    if (middleMouseButtonNotUsed && (notCurrentTab || !!onSubTab)) {
-      push(`#/${key}`);
-    }
-  };
 
   return (
     <>
@@ -39,7 +24,6 @@ const RoutedTabs = ({
           <a
             key={key}
             href={`#/${key}`}
-            onMouseUp={e => onSelect(e, key)}
             style={{ textDecoration: 'none' }}
           >
             <Tab

data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard.js

@@ -15,6 +15,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { propsToCamelCase } from 'foremanReact/common/helpers';
 import PropTypes from 'prop-types';
 import ContentViewIcon from '../../../../scenes/ContentViews/components/ContentViewIcon';
+import { hostIsRegistered } from '../hostDetailsHelpers';
 
 const HostContentViewDetails = ({
   contentView, lifecycleEnvironment, contentViewVersionId,
@@ -61,7 +62,7 @@ const HostContentViewDetails = ({
 };
 
 const ContentViewDetailsCard = ({ hostDetails }) => {
-  if (hostDetails.content_facet_attributes) {
+  if (hostIsRegistered({ hostDetails }) && hostDetails.content_facet_attributes) {
     return <HostContentViewDetails {...propsToCamelCase(hostDetails.content_facet_attributes)} />;
   }
   return null;

data/webpack/components/extensions/HostDetails/Cards/ErrataOverviewCard.js

@@ -13,6 +13,7 @@ import { propsToCamelCase } from 'foremanReact/common/helpers';
 import PropTypes from 'prop-types';
 import { ChartPie } from '@patternfly/react-charts';
 import { ErrataMapper } from '../../../../components/Errata';
+import { hostIsRegistered } from '../hostDetailsHelpers';
 
 function HostInstallableErrata({
   id, errataCounts,
@@ -74,7 +75,7 @@ function HostInstallableErrata({
 }
 
 const ErrataOverviewCard = ({ hostDetails }) => {
-  if (hostDetails.content_facet_attributes) {
+  if (hostIsRegistered({ hostDetails }) && hostDetails.content_facet_attributes) {
     const { id: hostId } = hostDetails;
     return (<HostInstallableErrata
       {...propsToCamelCase(hostDetails.content_facet_attributes)}

data/webpack/components/extensions/HostDetails/Cards/__tests__/contentViewDetailsCard.test.js

@@ -2,48 +2,47 @@ import React from 'react';
 import { render } from 'react-testing-lib-wrapper';
 import ContentViewDetailsCard from '../ContentViewDetailsCard';
 
-test('shows host details when content facet is set', () => {
-  const hostDetails = {
-    content_facet_attributes: {
-      content_view: {
-        name: 'CV',
-        id: 100,
-        composite: false,
-      },
-      lifecycle_environment: {
-        name: 'ENV',
-        id: 300,
-      },
-      content_view_version_id: 1000,
-      content_view_version: '1.0',
-      content_view_version_latest: true,
+const baseHostDetails = {
+  content_facet_attributes: {
+    content_view: {
+      name: 'CV',
+      id: 100,
+      composite: false,
     },
-  };
-  const { getByText } = render(<ContentViewDetailsCard hostDetails={hostDetails} />);
+    lifecycle_environment: {
+      name: 'ENV',
+      id: 300,
+    },
+    content_view_version_id: 1000,
+    content_view_version: '1.0',
+    content_view_version_latest: true,
+  },
+  subscription_facet_attributes: {
+    uuid: '123',
+  },
+};
+
+test('shows content view details when host is registered', () => {
+  const { getByText } = render(<ContentViewDetailsCard hostDetails={baseHostDetails} />);
   expect(getByText('Version 1.0 (latest)')).toBeInTheDocument();
 });
 
 
-test('doesnot show host details when content facet is not set', () => {
-  const { queryByText } = render(<ContentViewDetailsCard />);
+test('does not show content view details when host is not registered', () => {
+  const hostDetails = {
+    ...baseHostDetails,
+    subscription_facet_attributes: undefined,
+  };
+  const { queryByText } = render(<ContentViewDetailsCard hostDetails={hostDetails} />);
   expect(queryByText('Version 1.0')).toBeNull();
 });
 
 
-test('shows host details not latest', () => {
+test('shows when the CV in use is not the latest version', () => {
   const hostDetails = {
+    ...baseHostDetails,
     content_facet_attributes: {
-      content_view: {
-        name: 'CV',
-        id: 100,
-        composite: false,
-      },
-      lifecycle_environment: {
-        name: 'ENV',
-        id: 300,
-      },
-      content_view_version_id: 1000,
-      content_view_version: '1.0',
+      ...baseHostDetails.content_facet_attributes,
       content_view_version_latest: false,
     },
   };

data/webpack/components/extensions/HostDetails/Cards/__tests__/errataOverviewCard.test.js

@@ -3,6 +3,13 @@ import { render } from 'react-testing-lib-wrapper';
 import ErrataOverviewCard from '../ErrataOverviewCard';
 import nock from '../../../../../test-utils/nockWrapper';
 
+const baseHostDetails = {
+  id: 2,
+  subscription_facet_attributes: {
+    uuid: '123',
+  },
+};
+
 describe('Without errata', () => {
   afterEach(() => {
     nock.cleanAll();
@@ -10,7 +17,7 @@ describe('Without errata', () => {
 
   test('does not show piechart when there are 0 errata', () => {
     const hostDetails = {
-      id: 2,
+      ...baseHostDetails,
       content_facet_attributes: {
         errata_counts: {
           bugfix: 0,
@@ -26,6 +33,26 @@ describe('Without errata', () => {
     expect(queryByLabelText('errataChart')).not.toBeInTheDocument();
     expect(getByText('0 errata')).toBeInTheDocument();
   });
+
+  test('does not show errata card when host not registered', () => {
+    const hostDetails = {
+      ...baseHostDetails,
+      content_facet_attributes: {
+        errata_counts: {
+          bugfix: 0,
+          enhancement: 0,
+          security: 0,
+          total: 0,
+        },
+      },
+      subscription_facet_attributes: undefined,
+    };
+    /* eslint-disable max-len */
+    const { queryByLabelText, queryByText } = render(<ErrataOverviewCard hostDetails={hostDetails} />);
+    /* eslint-enable max-len */
+    expect(queryByLabelText('errataChart')).not.toBeInTheDocument();
+    expect(queryByText('0 errata')).not.toBeInTheDocument();
+  });
 });
 
 describe('With errata', () => {
@@ -33,9 +60,9 @@ describe('With errata', () => {
     nock.cleanAll();
   });
 
-  test('show piechart when there are errata', () => {
+  test('shows piechart when there are errata', () => {
     const hostDetails = {
-      id: 2,
+      ...baseHostDetails,
       content_facet_attributes: {
         errata_counts: {
           bugfix: 10,

data/webpack/components/extensions/HostDetails/Tabs/ContentTab/SecondaryTabsRoutes.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Route, Switch, Redirect } from 'react-router-dom';
-import { PackagesTab } from '../PackagesTab';
+import { PackagesTab } from '../PackagesTab/PackagesTab.js';
 import { ErrataTab } from '../ErrataTab/ErrataTab.js';
 import { ModuleStreamsTab } from '../ModuleStreamsTab/ModuleStreamsTab';
 import { route } from './helpers';

data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/ErrataTab.js

@@ -33,7 +33,7 @@ import { installErrata } from '../RemoteExecutionActions';
 import { errataInstallUrl } from '../customizedRexUrlHelpers';
 import './ErrataTab.scss';
 import hostIdNotReady from '../../HostDetailsActions';
-import defaultRemoteActionMethod, { KATELLO_AGENT } from '../../hostDetailsHelpers';
+import { defaultRemoteActionMethod, KATELLO_AGENT } from '../../hostDetailsHelpers';
 
 export const ErrataTab = () => {
   const hostDetails = useSelector(state => selectAPIResponse(state, 'HOST_DETAILS'));

data/webpack/components/extensions/HostDetails/{HostPackages → Tabs/PackagesTab}/HostPackagesActions.js

@@ -1,7 +1,7 @@
 import { API_OPERATIONS, get, put } from 'foremanReact/redux/API';
-import { renderTaskStartedToast } from '../../../../scenes/Tasks/helpers';
-import { foremanApi } from '../../../../services/api';
-import { getResponseErrorMsgs } from '../../../../utils/helpers';
+import { renderTaskStartedToast } from '../../../../../scenes/Tasks/helpers';
+import { foremanApi } from '../../../../../services/api';
+import { getResponseErrorMsgs } from '../../../../../utils/helpers';
 import {
   HOST_PACKAGES_INSTALL_KEY,
   HOST_PACKAGES_KEY,

data/webpack/components/extensions/HostDetails/Tabs/{PackageInstallModal.js → PackagesTab/PackageInstallModal.js}

@@ -9,16 +9,16 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
 import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
 import PropTypes from 'prop-types';
-import TableWrapper from '../../../Table/TableWrapper';
-import { useBulkSelect } from '../../../Table/TableHooks';
-import { HOST_YUM_INSTALLABLE_PACKAGES_KEY } from '../YumInstallablePackages/YumInstallablePackagesConstants';
-import { selectHostYumInstallablePackagesStatus } from '../YumInstallablePackages/YumInstallablePackagesSelectors';
-import { getHostYumInstallablePackages } from '../YumInstallablePackages/YumInstallablePackagesActions';
+import TableWrapper from '../../../../Table/TableWrapper';
+import { useBulkSelect } from '../../../../Table/TableHooks';
+import { HOST_YUM_INSTALLABLE_PACKAGES_KEY } from './YumInstallablePackagesConstants';
+import { selectHostYumInstallablePackagesStatus } from './YumInstallablePackagesSelectors';
+import { getHostYumInstallablePackages } from './YumInstallablePackagesActions';
 import './PackageInstallModal.scss';
-import { installPackageBySearch } from './RemoteExecutionActions';
-import { katelloPackageInstallBySearchUrl, katelloPackageInstallUrl } from './customizedRexUrlHelpers';
-import hostIdNotReady from '../HostDetailsActions';
-import { installPackageViaKatelloAgent } from '../HostPackages/HostPackagesActions';
+import { installPackageBySearch } from '../RemoteExecutionActions';
+import { katelloPackageInstallBySearchUrl, katelloPackageInstallUrl } from '../customizedRexUrlHelpers';
+import hostIdNotReady from '../../HostDetailsActions';
+import { installPackageViaKatelloAgent } from './HostPackagesActions';
 
 const InstallDropdown = ({
   isDisabled, installViaRex, installViaKatelloAgent,

data/webpack/components/extensions/HostDetails/Tabs/{PackagesTab.js → PackagesTab/PackagesTab.js}

@@ -18,26 +18,26 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
 
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
-import { useBulkSelect } from '../../../../components/Table/TableHooks';
-import SelectableDropdown from '../../../SelectableDropdown';
-import TableWrapper from '../../../../components/Table/TableWrapper';
-import { PackagesStatus, PackagesLatestVersion } from '../../../../components/Packages';
+import SelectableDropdown from '../../../../SelectableDropdown';
+import TableWrapper from '../../../../../components/Table/TableWrapper';
+import { useBulkSelect } from '../../../../../components/Table/TableHooks';
+import { PackagesStatus, PackagesLatestVersion } from '../../../../../components/Packages';
 import {
   getInstalledPackagesWithLatest,
   removePackageViaKatelloAgent,
   upgradeAllViaKatelloAgent,
   upgradePackageViaKatelloAgent,
-} from '../HostPackages/HostPackagesActions';
-import { selectHostPackagesStatus } from '../HostPackages/HostPackagesSelectors';
+} from './HostPackagesActions';
+import { selectHostPackagesStatus } from './HostPackagesSelectors';
 import {
   HOST_PACKAGES_KEY, PACKAGES_VERSION_STATUSES, VERSION_STATUSES_TO_PARAM,
-} from '../HostPackages/HostPackagesConstants';
-import { removePackage, updatePackage, removePackages, updatePackages } from './RemoteExecutionActions';
-import { katelloPackageUpdateUrl, packagesUpdateUrl } from './customizedRexUrlHelpers';
+} from './HostPackagesConstants';
+import { removePackage, updatePackage, removePackages, updatePackages } from '../RemoteExecutionActions';
+import { katelloPackageUpdateUrl, packagesUpdateUrl } from '../customizedRexUrlHelpers';
 import './PackagesTab.scss';
-import hostIdNotReady from '../HostDetailsActions';
+import hostIdNotReady from '../../HostDetailsActions';
 import PackageInstallModal from './PackageInstallModal';
-import defaultRemoteActionMethod, { KATELLO_AGENT } from '../hostDetailsHelpers';
+import { defaultRemoteActionMethod, KATELLO_AGENT } from '../../hostDetailsHelpers';
 
 export const PackagesTab = () => {
   const hostDetails = useSelector(state => selectAPIResponse(state, 'HOST_DETAILS'));

data/webpack/components/extensions/HostDetails/{YumInstallablePackages → Tabs/PackagesTab}/YumInstallablePackagesActions.js

@@ -1,5 +1,5 @@
 import { API_OPERATIONS, get } from 'foremanReact/redux/API';
-import katelloApi from '../../../../services/api';
+import katelloApi from '../../../../../services/api';
 import { HOST_YUM_INSTALLABLE_PACKAGES_KEY } from './YumInstallablePackagesConstants';
 
 export const getHostYumInstallablePackages = (hostId, params) => get({

data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionActions.js

@@ -5,8 +5,8 @@ import { getResponseErrorMsgs } from '../../../../utils/helpers';
 import { renderTaskStartedToast } from '../../../../scenes/Tasks/helpers';
 import { ERRATA_SEARCH_QUERY } from './ErrataTab/HostErrataConstants';
 import { TRACES_SEARCH_QUERY } from './TracesTab/HostTracesConstants';
-import { PACKAGE_SEARCH_QUERY } from '../YumInstallablePackages/YumInstallablePackagesConstants';
-import { PACKAGES_SEARCH_QUERY } from '../HostPackages/HostPackagesConstants';
+import { PACKAGE_SEARCH_QUERY } from './PackagesTab/YumInstallablePackagesConstants';
+import { PACKAGES_SEARCH_QUERY } from './PackagesTab/HostPackagesConstants';
 
 const errorToast = (error) => {
   const message = getResponseErrorMsgs(error.response);

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packageInstallModal.test.js

@@ -3,8 +3,8 @@ import { renderWithRedux, patientlyWaitFor, fireEvent, within } from 'react-test
 import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
 import katelloApi, { foremanApi } from '../../../../../services/api';
 import mockPackagesData from './yumInstallablePackages.fixtures.json';
-import PackageInstallModal from '../PackageInstallModal';
-import { HOST_YUM_INSTALLABLE_PACKAGES_KEY, PACKAGE_SEARCH_QUERY } from '../../YumInstallablePackages/YumInstallablePackagesConstants';
+import PackageInstallModal from '../PackagesTab/PackageInstallModal';
+import { HOST_YUM_INSTALLABLE_PACKAGES_KEY, PACKAGE_SEARCH_QUERY } from '../PackagesTab/YumInstallablePackagesConstants';
 import { REX_FEATURES } from '../RemoteExecutionConstants';
 
 const contentFacetAttributes = {

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packagesTab.test.js

@@ -2,8 +2,8 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
 import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
 import { foremanApi } from '../../../../../services/api';
-import { HOST_PACKAGES_KEY, PACKAGES_SEARCH_QUERY } from '../../HostPackages/HostPackagesConstants';
-import { PackagesTab } from '../PackagesTab';
+import { HOST_PACKAGES_KEY, PACKAGES_SEARCH_QUERY } from '../PackagesTab/HostPackagesConstants';
+import { PackagesTab } from '../PackagesTab/PackagesTab.js';
 import mockPackagesData from './packages.fixtures.json';
 import { REX_FEATURES } from '../RemoteExecutionConstants';
 

data/webpack/components/extensions/HostDetails/Tabs/customizedRexUrlHelpers.js

@@ -1,8 +1,8 @@
 import { REX_FEATURES } from './RemoteExecutionConstants';
 import { TRACES_SEARCH_QUERY } from './TracesTab/HostTracesConstants';
 import { ERRATA_SEARCH_QUERY } from './ErrataTab/HostErrataConstants';
-import { PACKAGE_SEARCH_QUERY } from '../YumInstallablePackages/YumInstallablePackagesConstants';
-import { PACKAGES_SEARCH_QUERY } from '../HostPackages/HostPackagesConstants';
+import { PACKAGE_SEARCH_QUERY } from './PackagesTab/YumInstallablePackagesConstants';
+import { PACKAGES_SEARCH_QUERY } from './PackagesTab/HostPackagesConstants';
 
 export const createJob = ({
   hostname, feature, inputs,

data/webpack/components/extensions/HostDetails/hostDetailsHelpers.js

@@ -3,7 +3,7 @@ import { propsToCamelCase } from 'foremanReact/common/helpers';
 export const REMOTE_EXECUTION = 'remoteExecution';
 export const KATELLO_AGENT = 'katelloAgent';
 
-const defaultRemoteActionMethod = ({ hostDetails }) => {
+export const defaultRemoteActionMethod = ({ hostDetails }) => {
   const {
     content_facet_attributes: contentFacetAttributes,
   } = hostDetails;
@@ -16,4 +16,13 @@ const defaultRemoteActionMethod = ({ hostDetails }) => {
   return KATELLO_AGENT;
 };
 
+export const hostIsNotRegistered = ({ hostDetails }) => {
+  const {
+    subscription_facet_attributes: subscriptionFacetAttributes,
+  } = hostDetails;
+  return !subscriptionFacetAttributes?.uuid;
+};
+
+export const hostIsRegistered = ({ hostDetails }) => !hostIsNotRegistered({ hostDetails });
+
 export default defaultRemoteActionMethod;

data/webpack/global_index.js

@@ -14,17 +14,18 @@ import RepositorySetsTab from './components/extensions/HostDetails/Tabs/Reposito
 import TracesTab from './components/extensions/HostDetails/Tabs/TracesTab/TracesTab.js';
 import extendReducer from './components/extensions/reducers';
 import rootReducer from './redux/reducers';
+import { hostIsNotRegistered } from './components/extensions/HostDetails/hostDetailsHelpers';
 
 registerReducer('katelloExtends', extendReducer);
 registerReducer('katello', rootReducer);
 
 addGlobalFill('aboutFooterSlot', '[katello]AboutSystemStatuses', <SystemStatuses key="katello-system-statuses" />, 100);
 addGlobalFill('registrationAdvanced', '[katello]RegistrationCommands', <RegistrationCommands key="katello-reg" />, 100);
-addGlobalFill('host-details-page-tabs', 'Content', <ContentTab key="content" />, 900, { title: __('Content') });
+addGlobalFill('host-details-page-tabs', 'Content', <ContentTab key="content" />, 900, { title: __('Content'), hideTab: hostIsNotRegistered });
 /* eslint-disable max-len */
 // addGlobalFill('host-details-page-tabs', 'Subscription', <SubscriptionTab key="subscription" />, 100, { title: __('Subscription') });
-addGlobalFill('host-details-page-tabs', 'Traces', <TracesTab key="traces" />, 800, { title: __('Traces') });
-addGlobalFill('host-details-page-tabs', 'Repository sets', <RepositorySetsTab key="repository-sets" />, 700, { title: __('Repository sets') });
+addGlobalFill('host-details-page-tabs', 'Traces', <TracesTab key="traces" />, 800, { title: __('Traces'), hideTab: hostIsNotRegistered });
+addGlobalFill('host-details-page-tabs', 'Repository sets', <RepositorySetsTab key="repository-sets" />, 700, { title: __('Repository sets'), hideTab: hostIsNotRegistered });
 
 addGlobalFill(
   'details-cards',

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsHeader.js

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 import {
+  Button,
   Grid,
   GridItem,
   TextContent,
@@ -12,7 +13,7 @@ import {
   FlexItem,
   Dropdown,
   DropdownItem,
-  DropdownToggle,
+  KebabToggle,
   DropdownPosition,
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -43,14 +44,6 @@ const ContentViewVersionDetailsHeader = ({
   const [currentStep, setCurrentStep] = useState(1);
   const [deleteVersion, setDeleteVersion] = useState(false);
   const dropDownItems = [
-    <DropdownItem
-      key="promote"
-      onClick={() => {
-        setPromoting(true);
-      }}
-    >
-      {__('Promote')}
-    </DropdownItem>,
     <DropdownItem
       key="remove"
       onClick={() => {
@@ -73,23 +66,26 @@ const ContentViewVersionDetailsHeader = ({
 
   return (
     <Grid className="margin-0-24">
-      <GridItem span={10}>
+      <GridItem sm={6} >
         <TextContent>
           <Text component={TextVariants.h2}>{__('Version ')}{version}</Text>
         </TextContent>
       </GridItem>
-      <GridItem span={2} style={{ display: 'flex' }}>
+      <GridItem sm={6} style={{ display: 'flex' }}>
+        <Button
+          style={{ marginLeft: 'auto' }}
+          onClick={() => setPromoting(true)}
+          variant="primary"
+          aria-label="publish_content_view"
+        >
+          {__('Promote')}
+        </Button>
         <Dropdown
-          aria-label="version-action-dropdown"
+          isPlain
+          style={{ width: 'inherit' }}
           position={DropdownPosition.right}
-          style={{ marginLeft: 'auto' }}
           toggle={
-            <DropdownToggle
-              onToggle={setDropdownOpen}
-              id="toggle-id"
-            >
-              {__('Actions')}
-            </DropdownToggle>
+            <KebabToggle onToggle={setDropdownOpen} id="toggle-dropdown" />
           }
           isOpen={dropdownOpen}
           dropdownItems={dropDownItems}

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/UpstreamServerTypeForm.js

@@ -87,8 +87,9 @@ const UpstreamServerTypeForm = ({
       password,
       upstream_organization_label: organizationLabel,
       ssl_ca_credential_id: sslCaCredentialId,
-      upstream_content_view_label: contentViewLabel,
-      upstream_lifecycle_environment_label: lifecycleEnvironmentLabel,
+      upstream_content_view_label: contentViewLabel || DEFAULT_CONTENT_VIEW_LABEL,
+      upstream_lifecycle_environment_label: lifecycleEnvironmentLabel ||
+      DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL,
       type: UPSTREAM_SERVER,
     }, onUpdate, onError));
   };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.4.0.rc2
+  version: 4.4.0
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2181,6 +2181,7 @@ files:
 - db/migrate/20220204171908_rename_docker_tags_whitelist_and_add_exclude_tags.rb
 - db/migrate/20220207140355_change_deb_attributes_size_limit.rb
 - db/migrate/20220209205137_expand_sync_timeout_settings.rb
+- db/migrate/20220303160220_remove_duplicate_errata.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4502,6 +4503,7 @@ files:
 - lib/katello/tasks/import_subscriptions.rake
 - lib/katello/tasks/jenkins.rake
 - lib/katello/tasks/job_templates.rake
+- lib/katello/tasks/pulp2to3_migrate_deb_attributes.rake
 - lib/katello/tasks/receptor/extract_orgs.rake
 - lib/katello/tasks/regenerate_ueber_certs.rake
 - lib/katello/tasks/reimport.rake
@@ -4716,9 +4718,6 @@ files:
 - webpack/components/extensions/HostDetails/HostDetailsActions.js
 - webpack/components/extensions/HostDetails/HostDetailsConstants.js
 - webpack/components/extensions/HostDetails/HostDetailsSelectors.js
-- webpack/components/extensions/HostDetails/HostPackages/HostPackagesActions.js
-- webpack/components/extensions/HostDetails/HostPackages/HostPackagesConstants.js
-- webpack/components/extensions/HostDetails/HostPackages/HostPackagesSelectors.js
 - webpack/components/extensions/HostDetails/Tabs/ContentTab/EmptyPage.js
 - webpack/components/extensions/HostDetails/Tabs/ContentTab/SecondaryTabsRoutes.js
 - webpack/components/extensions/HostDetails/Tabs/ContentTab/constants.js
@@ -4737,10 +4736,16 @@ files:
 - webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsTab.js
 - webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/__tests__/moduleStreamsTab.test.js
 - webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/__tests__/modules.fixtures.json
-- webpack/components/extensions/HostDetails/Tabs/PackageInstallModal.js
-- webpack/components/extensions/HostDetails/Tabs/PackageInstallModal.scss
-- webpack/components/extensions/HostDetails/Tabs/PackagesTab.js
-- webpack/components/extensions/HostDetails/Tabs/PackagesTab.scss
+- webpack/components/extensions/HostDetails/Tabs/PackagesTab/HostPackagesActions.js
+- webpack/components/extensions/HostDetails/Tabs/PackagesTab/HostPackagesConstants.js
+- webpack/components/extensions/HostDetails/Tabs/PackagesTab/HostPackagesSelectors.js
+- webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackageInstallModal.js
+- webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackageInstallModal.scss
+- webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackagesTab.js
+- webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackagesTab.scss
+- webpack/components/extensions/HostDetails/Tabs/PackagesTab/YumInstallablePackagesActions.js
+- webpack/components/extensions/HostDetails/Tabs/PackagesTab/YumInstallablePackagesConstants.js
+- webpack/components/extensions/HostDetails/Tabs/PackagesTab/YumInstallablePackagesSelectors.js
 - webpack/components/extensions/HostDetails/Tabs/RemoteExecutionActions.js
 - webpack/components/extensions/HostDetails/Tabs/RemoteExecutionConstants.js
 - webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsActions.js
@@ -4772,9 +4777,6 @@ files:
 - webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js
 - webpack/components/extensions/HostDetails/Tabs/__tests__/yumInstallablePackages.fixtures.json
 - webpack/components/extensions/HostDetails/Tabs/customizedRexUrlHelpers.js
-- webpack/components/extensions/HostDetails/YumInstallablePackages/YumInstallablePackagesActions.js
-- webpack/components/extensions/HostDetails/YumInstallablePackages/YumInstallablePackagesConstants.js
-- webpack/components/extensions/HostDetails/YumInstallablePackages/YumInstallablePackagesSelectors.js
 - webpack/components/extensions/HostDetails/hostDetailsHelpers.js
 - webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageConstants.js
 - webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageHelpers.js
@@ -5382,9 +5384,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.22
 signing_key: