katello 4.9.0 → 4.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41a12235a03808c77522d0fbc1c0fe8394ee1bfd6735b4a9671909ccc341bd3d
-  data.tar.gz: 4b6514b149494a537a41b1b944c1133328591aa9c950bf9ff343679a76532100
+  metadata.gz: 2725e254c69e3a52955ec2e85605097ad13751770b46de79a14bb6153451e5b7
+  data.tar.gz: a59ffe3ac6b743b36ac2207a44c333dc504975b54d23efb2d9d04aa13741c575
 SHA512:
-  metadata.gz: c7f886b06454dafcf674d3ba7694d8bf7ef79799d3e1ebc21523edb59b1139d4ca3e8ad0733ea2cd2880dcb4eebe1b52c2e675da46935192906c95ce8281f4dc
-  data.tar.gz: e00320f2a9a0273fd850feda7946c9fa6f2e068358fc7177e406334fa0400cd240fa36c8ed216c46e118ce64302081c9331f8101c63cee78774482836144023e
+  metadata.gz: 78951d090b4e05283c65ebb11d2c18475ffc2afa26cb2c1f981a425f18cd85bf9a82c84c06e33dc8c05348a1b9f8af845adb482fd0075116f75da85c847e5d31
+  data.tar.gz: 5c2acdd95ed253669357a68142f42c8b09ba5b34603bfa9acf1e029cdc32c9696d1edb40a8e616e032747c6771110ca54bd048b4108a342d755b1d000270766c

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

@@ -87,7 +87,7 @@ module Katello
       end
     end
 
-    api :POST, '/capsules/:id/reclaim_space', N_('Reclaim space from all On Demand repositories on a smart proxy')
+    api :POST, '/capsules/:id/content/reclaim_space', N_('Reclaim space from all On Demand repositories on a smart proxy')
     param :id, :number, :required => true, :desc => N_('Id of the smart proxy')
     def reclaim_space
       find_capsule(true)

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

@@ -258,7 +258,8 @@ module Katello
         fail HttpErrors::BadRequest, _("Both major and minor parameters have to be used to override a CV version")
       end
 
-      if (::Foreman::Cast.to_bool(params[:publish_only_if_needed]) && !@content_view.needs_publish?)
+      cv_needs_publish = @content_view.needs_publish?
+      if (::Foreman::Cast.to_bool(params[:publish_only_if_needed]) && !cv_needs_publish.nil? && !cv_needs_publish)
         fail HttpErrors::BadRequest, _("Content view does not need a publish since there are no audited changes since the last publish." \
                                      " Pass check_needs_publish parameter as false if you don't want to check if content view needs a publish.")
       end

data/app/lib/actions/katello/content_view_version/auto_create_redhat_repositories.rb

@@ -15,7 +15,8 @@ module Actions
             helper.creatable.each do |root|
               plan_action(::Actions::Katello::RepositorySet::EnableRepository,
                             root[:product], root[:content], root[:substitutions],
-                            override_url: root[:override_url])
+                            override_url: root[:override_url],
+                            override_arch: root[:override_arch])
             end
             helper.updatable.each do |root|
               plan_action(::Actions::Katello::Repository::Update, root[:repository], root[:options])

data/app/lib/actions/katello/orphan_cleanup/remove_orphaned_content_units.rb

@@ -0,0 +1,22 @@
+module Actions
+  module Katello
+    module OrphanCleanup
+      class RemoveOrphanedContentUnits < Actions::Base
+        def run
+          models = []
+
+          ::Katello::RepositoryTypeManager.enabled_repository_types.each_value do |repo_type|
+            models << repo_type.content_types_to_index
+          end
+          models.flatten.each do |content_type|
+            content_type.model_class.orphaned.destroy_all
+          end
+        end
+
+        def rescue_strategy
+          Dynflow::Action::Rescue::Skip
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb

@@ -7,27 +7,16 @@ module Actions
         end
         def plan(proxy)
           sequence do
+            if proxy.pulp_primary?
+              ::Katello::RootRepository.orphaned.destroy_all
+              plan_action(RemoveOrphanedContentUnits)
+            end
             if proxy.pulp3_enabled?
               plan_action(
                 Actions::Pulp3::Orchestration::OrphanCleanup::RemoveOrphans,
                 proxy)
             end
-            plan_self
-          end
-        end
-
-        def run
-          models = []
-          ::Katello::RepositoryTypeManager.enabled_repository_types.each_value do |repo_type|
-            indexable_types = repo_type.content_types_to_index
-            models += indexable_types&.map(&:model_class)
-            models.select! { |model| model.many_repository_associations }
-          end
-          models.each do |model|
-            model.joins("left join katello_#{model.repository_association} on #{model.table_name}.id = katello_#{model.repository_association}.#{model.unit_id_field}").where("katello_#{model.repository_association}.#{model.unit_id_field} IS NULL").destroy_all
           end
-
-          ::Katello::RootRepository.orphaned.destroy_all
         end
       end
     end

data/app/lib/actions/katello/repository_set/enable_repository.rb

@@ -6,7 +6,8 @@ module Actions
           _("Enable")
         end
 
-        def plan(product, content, substitutions, override_url: nil)
+        def plan(product, content, substitutions, override_url: nil,
+                 override_arch: nil)
           mapper = ::Katello::Candlepin::RepositoryMapper.new(product,
                                                                content,
                                                                substitutions)
@@ -15,6 +16,7 @@ module Actions
             fail ::Katello::Errors::ConflictException, _("The repository is already enabled")
           end
           repository = mapper.build_repository
+          repository.root.arch = override_arch if override_arch.present?
           if override_url
             repository.root.url = override_url
             repository.root.download_policy = ::Katello::RootRepository::DOWNLOAD_IMMEDIATE if URI(override_url).scheme == 'file'

data/app/models/katello/concerns/pulp_database_unit.rb

@@ -169,9 +169,9 @@ module Katello
 
       def orphaned
         if many_repository_associations
-          where.not(:id => repository_association_class.where(:repository_id => ::Katello::Repository.all).select(unit_id_field))
+          where.not(:id => repository_association_class.select(unit_id_field))
         else
-          where.not(:repository_id => ::Katello::Repository.all)
+          where.not(:repository_id => ::Katello::Repository.select(:id))
         end
       end
 

data/app/models/katello/content_view.rb

@@ -799,6 +799,7 @@ module Katello
       # True:
       #     a) When content/repo/filter change audit records exist
       #     b) CV hasn't ever been published
+      #     c) CV dependency_solving != latest_version.applied_filters.dependency_solving
       # nil:
       #     a) When CV version creation audit is missing(Indicating audit cleanup)
       #     b) Version doesn't have audited_filters set indicating
@@ -815,6 +816,8 @@ module Katello
       # return true if the audit records clearly show we have unpublished changes
       return true if (audited_cv_repositories_since_last_publish.present? || audited_cv_repository_changed.present? ||
         audited_cv_filters_changed.present? || audited_cv_filter_rules_changed.present?)
+      # return true if the dependency solving changed for CV between last publish and now
+      return true if dependency_solving_changed?
       # if we didn't return `true` already, either the audit records show that we don't need to publish, or we may
       # have insufficient data to make the determination (either audits were cleaned, or never got created at all).
       # first, check for the `create` audit record; its absence indicates that audits were cleaned some time after
@@ -831,6 +834,10 @@ module Katello
       latest_version_object.applied_filters.nil? ? nil : false
     end
 
+    def dependency_solving_changed?
+      latest_version_object.applied_filters && solve_dependencies != latest_version_object.applied_filters['dependency_solving']
+    end
+
     def filtered?
       filters.present?
     end

data/app/models/katello/repository.rb

@@ -935,7 +935,6 @@ module Katello
         repository_type.content_types_to_index.each do |type|
           Katello::Logging.time("CONTENT_INDEX", data: {type: type.model_class}) do
             Katello::ContentUnitIndexer.new(content_type: type, repository: self, optimized: !full_index).import_all
-            type.model_class.orphaned.destroy_all
           end
         end
         repository_type.index_additional_data_proc&.call(self)

data/app/models/katello/root_repository.rb

@@ -130,7 +130,7 @@ module Katello
       where(:http_proxy_policy => RootRepository::USE_SELECTED_HTTP_PROXY).
       where(:http_proxy_id => http_proxy_id)
     }
-    scope :orphaned, -> { where.not(id: Katello::Repository.pluck(:root_id).uniq) }
+    scope :orphaned, -> { where.not(id: Katello::Repository.select(:root_id)) }
     scope :redhat, -> { joins(:provider).merge(Katello::Provider.redhat) }
     scope :custom, -> { where.not(:id => self.redhat) }
     delegate :redhat?, :provider, :organization, to: :product

data/app/services/katello/pulp3/content_view_version/importable_repositories.rb

@@ -29,10 +29,12 @@ module Katello
 
             root = product.root_repositories.find do |r|
               if repo.content&.id && repo.redhat
-                r.content.cp_content_id == repo.content.id &&
+                repo_exists = r.content.cp_content_id == repo.content.id &&
                   r.arch == repo.arch &&
                   r.major == repo.major &&
                   r.minor == repo.minor
+
+                repo_exists || r.label == repo.label
               else
                 r.label == repo.label
               end
@@ -46,11 +48,13 @@ module Katello
                 basearch: repo.arch,
                 releasever: repo.minor
               }
-              creatable << { product: product,
-                             content: product_content,
-                             substitutions: substitutions,
-                             override_url: fetch_feed_url(repo)
-                           }
+              creatable << {
+                product: product,
+                content: product_content,
+                substitutions: substitutions,
+                override_url: fetch_feed_url(repo),
+                override_arch: repo.arch
+              }
             else
               creatable << { repository: product.add_repo(create_repo_params(repo, product)) }
             end

data/app/services/katello/pulp3/repository/docker.rb

@@ -70,7 +70,7 @@ module Katello
         rescue api.client_module::ApiError => e
           if e.message.include? 'Could not find the following content units'
             raise ::Katello::Errors::Pulp3Error, "Content units that do not exist in Pulp were requested to be copied."\
-              " Please run a complete sync on the following repository: #{repository_reference.root_repository.name}. Original error: #{e.message}"
+              " Please run `foreman-rake katello:delete_orphaned_content` to fix the following repository: #{repository_reference.root_repository.name}. Original error: #{e.message}"
           else
             raise e
           end

data/app/services/katello/pulp3/repository.rb

@@ -497,7 +497,8 @@ module Katello
       rescue api.client_module::ApiError => e
         if e.message.include? 'Could not find the following content units'
           raise ::Katello::Errors::Pulp3Error, "Content units that do not exist in Pulp were requested to be copied."\
-            " Please run a complete sync on the following repository: #{repository_reference.root_repository.name}. Original error: #{e.message}"
+             " Please run `foreman-rake katello:delete_orphaned_content` to fix the following repository:"\
+            " #{repository_reference.root_repository.name}. Original error: #{e.message}"
         else
           raise e
         end
@@ -509,7 +510,7 @@ module Katello
       rescue api.client_module::ApiError => e
         if e.message.include? 'Could not find the following content units'
           raise ::Katello::Errors::Pulp3Error, "Content units that do not exist in Pulp were requested to be copied."\
-            " Please run a complete sync on the following repository:"\
+            " Please run `foreman-rake katello:delete_orphaned_content` to fix the following repository:"\
             " #{::Katello::Pulp3::RepositoryReference.find_by(repository_href: repository_href).root_repository.name}. Original error: #{e.message}"
         else
           raise e

data/lib/katello/tasks/upgrades/4.9/update_custom_products_enablement.rake

@@ -3,8 +3,10 @@ namespace :katello do
     namespace '4.9' do
       desc "Update custom products enablement"
       task :update_custom_products_enablement => ['environment'] do
-        migrator = Katello::Util::DefaultEnablementMigrator.new
-        migrator.execute!
+        if ::Katello::ProductContent.custom.where(enabled: true).exists?
+          migrator = Katello::Util::DefaultEnablementMigrator.new
+          migrator.execute!
+        end
       end
     end
   end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.9.0".freeze
+  VERSION = "4.9.1".freeze
 end

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

@@ -106,7 +106,7 @@ const HostContentViewDetails = ({
               <h3>{__('Content view')}</h3>
             </Flex>
             <Flex direction={{ default: 'row', sm: 'row' }} flexWrap={{ default: 'wrap' }}>
-              <a style={{ fontSize: '14px' }} href={`/content_views/${contentView.id}`}>{`${contentView.name}`}</a>
+              <a style={{ fontSize: '14px' }} href={`/content_views/${contentView.id}`}>{contentView.name}</a>
               <Tooltip
                 position="top"
                 enableFlip
@@ -119,7 +119,7 @@ const HostContentViewDetails = ({
                   }}
                 />}
               >
-                <Label isTruncated color="purple" href={`/lifecycle_environments/${lifecycleEnvironment.id}`}>{`${lifecycleEnvironment.name}`}</Label>
+                <Label isTruncated color="purple" href={`/lifecycle_environments/${lifecycleEnvironment.id}`}>{lifecycleEnvironment.name}</Label>
               </Tooltip>
             </Flex>
           </Flex>

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

@@ -580,7 +580,7 @@ export const PackagesTab = () => {
               }
 
               return (
-                <Tr key={`${id}`} ouiaId={`action-row-${id}`}>
+                <Tr key={id} ouiaId={`action-row-${id}`}>
                   {showActions ? (
                     <Td
                       select={{

data/webpack/scenes/Content/Details/ContentRepositories.js

@@ -59,7 +59,7 @@ const ContentRepositories = ({ contentType, id, tabKey }) => {
       </Thead>
       <Tbody>
         {results?.map((details, idx) => (
-          <Tr key={`${details.id}`} ouiaId={`content-repositories-row-${idx}`}>
+          <Tr key={details.id} ouiaId={`content-repositories-row-${idx}`}>
             {columnHeaders.map((col, index) =>
               <Td key={index}>{col.getProperty(details, typeSingularLabel)}</Td>)
             }

data/webpack/scenes/Content/Table/ContentTable.js

@@ -65,7 +65,7 @@ const ContentTable = ({
       </Thead>
       <Tbody>
         {results?.map(details => (
-          <Tr key={`${details.id}`} ouiaId={`${details.id}-tr`}>
+          <Tr key={details.id} ouiaId={`${details.id}-tr`}>
             {columnHeaders.map((col, index) =>
               <Td key={index}>{col.getProperty(details)}</Td>)
             }

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentEnvironments.js

@@ -10,7 +10,7 @@ const ComponentEnvironments = ({ environments }) => environments.map((env, index
     href={`/lifecycle_environments/${env.id}`}
     isTruncated
   >
-    {`${env.name}`}
+    {env.name}
   </Label>
 ));
 

data/webpack/scenes/ContentViews/Details/ContentViewDetails.js

@@ -37,7 +37,7 @@ import { hasPermission } from '../helpers';
 import CopyContentViewModal from '../Copy/CopyContentViewModal';
 import ContentViewDeleteWizard from '../Delete/ContentViewDeleteWizard';
 import EmptyStateMessage from '../../../components/Table/EmptyStateMessage';
-import { cvVersionTaskPollingKey } from '../ContentViewsConstants';
+import { CONTENT_VIEW_NEEDS_PUBLISH_RESET, cvVersionTaskPollingKey } from '../ContentViewsConstants';
 import { clearPollTaskData, stopPollingTask } from '../../Tasks/TaskActions';
 
 export default () => {
@@ -73,6 +73,7 @@ export default () => {
 
   useEffect(() => {
     dispatch(getContentViewDetails(cvId));
+    dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH_RESET });
   }, [cvId, dispatch]);
 
 

data/webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js

@@ -49,9 +49,9 @@ const ContentViewHistories = ({ cvId }) => {
     const taskType = task ? task.label : taskTypes[action];
 
     if (taskType === taskTypes.removal) {
-      return <>{__('Deleted from ')} <Label isTruncated key="1" color="blue" href={`/lifecycle_environments/${environment?.id}`}>{`${environment?.name ?? __('all environments')}`}</Label></>;
+      return <>{__('Deleted from ')} <Label isTruncated key="1" color="blue" href={`/lifecycle_environments/${environment?.id}`}>{environment?.name ?? __('all environments')}</Label></>;
     } else if (action === 'promotion' || taskType === taskTypes.promotion) {
-      return <>{__('Promoted to ')}<Label isTruncated key="2" color="blue" href={`/lifecycle_environments/${environment?.id}`}>{`${environment?.name}`}</Label></>;
+      return <>{__('Promoted to ')}<Label isTruncated key="2" color="blue" href={`/lifecycle_environments/${environment?.id}`}>{environment?.name}</Label></>;
     } else if (taskType === taskTypes.publish) {
       return __('Published new version');
     } else if (taskType === taskTypes.export) {

data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js

@@ -66,7 +66,7 @@ const AffectedActivationKeys = ({
       </Thead>
       <Tbody>
         {results?.map(({ name, id, environment }) => (
-          <Tr ouiaId={`${id}`} key={`${id}`}>
+          <Tr ouiaId={id} key={id}>
             <Td>
               <a rel="noreferrer" target="_blank" href={urlBuilder(`activation_keys/${id}`, '')}>{name}</a>
             </Td>

data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedHosts.js

@@ -65,7 +65,7 @@ const AffectedHosts = ({
           id,
           content_facet_attributes: { lifecycle_environment: environment },
         }) => (
-          <Tr ouiaId={`${id}`} key={`${id}`}>
+          <Tr ouiaId={id} key={id}>
             <Td>
               <a rel="noreferrer" target="_blank" href={urlBuilder(`new/hosts/${id}`, '')}>{name}</a>
             </Td>

data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js

@@ -13,6 +13,7 @@ import contentViewTaskResponseData from './contentViewTaskResponse.fixtures.json
 import cvDetailData from '../../../../ContentViews/__tests__/mockDetails.fixtures.json';
 import environmentPathsData from '../../../Publish/__tests__/environmentPaths.fixtures.json';
 import cvIndexData from '../../../__tests__/contentViewList.fixtures.json';
+import contentViewFilterData from '../../Filters/__tests__/contentViewFilters.fixtures.json';
 
 const cvPromotePath = api.getApiUrl('/content_view_versions/10/promote');
 const cvIndexPath = api.getApiUrl('/content_views');
@@ -34,6 +35,7 @@ const renderOptions = {
 const cvVersions = api.getApiUrl('/content_view_versions');
 const autocompleteUrl = '/content_view_versions/auto_complete_search';
 const taskPollingUrl = '/foreman_tasks/api/tasks/6b900ff8-62bb-42ac-8c45-da86b7258520';
+const cvFiltersPath = api.getApiUrl('/content_view_filters?content_view_id=5');
 
 let firstVersion;
 let envScope;
@@ -330,6 +332,10 @@ test('Shows call-to-action when there are no versions', async (done) => {
     .query(true)
     .reply(200, environmentPathsData);
 
+  const filterScope = nockInstance
+    .get(cvFiltersPath)
+    .reply(200, contentViewFilterData);
+
   const { getByText, queryByText } = renderWithRedux(
     withCVRoute(<ContentViewVersions cvId={5} details={cvDetailData} />),
     renderOptions,
@@ -347,6 +353,7 @@ test('Shows call-to-action when there are no versions', async (done) => {
   assertNockRequest(scopeWizard);
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
+  assertNockRequest(filterScope);
   act(done);
 });
 

data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetails.fixtures.json

@@ -7,6 +7,7 @@
   "latest_version": "5.0",
   "auto_publish": false,
   "solve_dependencies": false,
+  "needs_publish": false,
   "generated_for": "none",
   "repository_ids": [
     58,

data/webpack/scenes/ContentViews/Publish/CVPublishReview.js

@@ -15,16 +15,20 @@ import InactiveText from '../components/InactiveText';
 import ComponentEnvironments from '../Details/ComponentContentViews/ComponentEnvironments';
 import { selectEnvironmentPaths, selectEnvironmentPathsStatus } from '../components/EnvironmentPaths/EnvironmentPathSelectors';
 import WizardHeader from '../components/WizardHeader';
+import { selectCVFilters, selectCVFiltersStatus } from '../Details/ContentViewDetailSelectors';
 
 const CVPublishReview = ({
   details: {
-    id, name, composite, filtered, next_version: nextVersion,
+    id, name, composite, next_version: nextVersion,
   },
   userCheckedItems,
 }) => {
   const environmentPathResponse = useSelector(selectEnvironmentPaths);
   const environmentPathStatus = useSelector(selectEnvironmentPathsStatus);
+  const cvFiltersResponse = useSelector(state => selectCVFilters(state, id));
+  const cvFiltersStatus = useSelector(state => selectCVFiltersStatus(state, id));
   const environmentPathLoading = environmentPathStatus === STATUS.PENDING;
+  const cvFiltersLoading = cvFiltersStatus === STATUS.PENDING;
 
   const promotedToEnvironments = useMemo(() => {
     if (!environmentPathLoading) {
@@ -35,6 +39,14 @@ const CVPublishReview = ({
     return [];
   }, [environmentPathResponse, environmentPathLoading, userCheckedItems]);
 
+  const filtered = useMemo(() => {
+    if (!cvFiltersLoading) {
+      const { results } = cvFiltersResponse || {};
+      return results.length > 0;
+    }
+    return [];
+  }, [cvFiltersResponse, cvFiltersLoading]);
+
   return (
     <>
       <WizardHeader
@@ -94,7 +106,6 @@ CVPublishReview.propTypes = {
     ]).isRequired,
     name: PropTypes.string.isRequired,
     composite: PropTypes.bool.isRequired,
-    filtered: PropTypes.bool.isRequired,
     next_version: PropTypes.oneOfType([
       PropTypes.number,
       PropTypes.string,

data/webpack/scenes/ContentViews/Publish/PublishContentViewWizard.js

@@ -14,6 +14,7 @@ import {
 } from '../components/EnvironmentPaths/EnvironmentPathSelectors';
 import { stopPollingTask } from '../../Tasks/TaskActions';
 import { cvVersionTaskPollingKey } from '../ContentViewsConstants';
+import { getContentViewFilters } from '../Details/ContentViewDetailActions';
 
 const PublishContentViewWizard = ({
   details, show, onClose,
@@ -30,6 +31,7 @@ const PublishContentViewWizard = ({
   const environmentPathStatus = useSelector(selectEnvironmentPathsStatus);
   const environmentPathLoading = environmentPathStatus === STATUS.PENDING;
 
+
   const steps = [
     {
       id: 1,
@@ -71,8 +73,9 @@ const PublishContentViewWizard = ({
   useEffect(
     () => {
       dispatch(getEnvironmentPaths());
+      dispatch(getContentViewFilters(cvId, {}));
     },
-    [dispatch],
+    [dispatch, cvId],
   );
 
   const envPathFlat = useMemo(() => {

data/webpack/scenes/ContentViews/Publish/__tests__/publishContentView.test.js

@@ -7,18 +7,21 @@ import PublishContentViewWizard from '../PublishContentViewWizard';
 import cvDetailData from '../../Details/__tests__/contentViewDetails.fixtures.json';
 import publishResponseData from './publishResponse.fixture.json';
 import environmentPathsData from './environmentPaths.fixtures.json';
+import contentViewFilterData from './../../Details/Filters/__tests__/contentViewFilters.fixtures.json';
 
 const cvPublishPath = api.getApiUrl('/content_views/1/publish');
 
 const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths');
+const cvFiltersPath = api.getApiUrl('/content_view_filters?content_view_id=1');
 
 test('Can call API and show Wizard', async (done) => {
   const scope = nockInstance
     .get(environmentPathsPath)
     .query(true)
     .reply(200, environmentPathsData);
-  const useSelectorMock = jest.spyOn(reactRedux, 'useSelector');
-  useSelectorMock.mockReturnValue(environmentPathsData);
+  const filterScope = nockInstance
+    .get(cvFiltersPath)
+    .reply(200, contentViewFilterData);
 
   const { getByText } = renderWithRedux(<PublishContentViewWizard
     details={cvDetailData}
@@ -26,9 +29,13 @@ test('Can call API and show Wizard', async (done) => {
     onClose={() => { }}
   />);
 
-  await patientlyWaitFor(() => expect(getByText('Publish new version - 6.0')).toBeInTheDocument());
-  useSelectorMock.mockClear();
-  assertNockRequest(scope, done);
+  await patientlyWaitFor(() => {
+    expect(getByText('Publish new version - 6.0')).toBeInTheDocument();
+    expect(getByText('Newly published version will be the same as the previous version.')).toBeTruthy();
+  });
+
+  assertNockRequest(scope);
+  assertNockRequest(filterScope, done);
 });
 
 test('Can show Wizard and show environment paths', async (done) => {
@@ -36,6 +43,9 @@ test('Can show Wizard and show environment paths', async (done) => {
     .get(environmentPathsPath)
     .query(true)
     .reply(200, environmentPathsData);
+  const filterScope = nockInstance
+    .get(cvFiltersPath)
+    .reply(200, contentViewFilterData);
   const useSelectorMock = jest.spyOn(reactRedux, 'useSelector');
   useSelectorMock.mockReturnValue(environmentPathsData);
 
@@ -55,7 +65,8 @@ test('Can show Wizard and show environment paths', async (done) => {
     expect(getByText('dev1')).toBeTruthy();
   });
   useSelectorMock.mockClear();
-  assertNockRequest(scope, done);
+  assertNockRequest(scope);
+  assertNockRequest(filterScope, done);
 });
 
 test('Can show and hide force promotion alert', async (done) => {
@@ -63,6 +74,9 @@ test('Can show and hide force promotion alert', async (done) => {
     .get(environmentPathsPath)
     .query(true)
     .reply(200, environmentPathsData);
+  const filterScope = nockInstance
+    .get(cvFiltersPath)
+    .reply(200, contentViewFilterData);
   const useSelectorMock = jest.spyOn(reactRedux, 'useSelector');
   useSelectorMock.mockReturnValue(environmentPathsData);
 
@@ -109,15 +123,18 @@ test('Can show and hide force promotion alert', async (done) => {
   expect(queryByText('Force promotion')).not.toBeInTheDocument();
 
   useSelectorMock.mockClear();
-  assertNockRequest(scope, done);
+  assertNockRequest(scope);
+  assertNockRequest(filterScope, done);
 });
 
-
 test('Can show Wizard form and move to review', async (done) => {
   const scope = nockInstance
     .get(environmentPathsPath)
     .query(true)
     .reply(200, environmentPathsData);
+  const filterScope = nockInstance
+    .get(cvFiltersPath)
+    .reply(200, contentViewFilterData);
 
   const { getByText } = renderWithRedux(<PublishContentViewWizard
     details={cvDetailData}
@@ -134,9 +151,12 @@ test('Can show Wizard form and move to review', async (done) => {
     expect(getByText('Newly published')).toBeInTheDocument();
     expect(getByText('Version 6.0')).toBeInTheDocument();
     expect(getByText('Library')).toBeTruthy();
+    expect(getByText('Filters')).toBeTruthy();
+    expect(getByText('Filters will be applied to this content view version.')).toBeTruthy();
   });
   useSelectorMock.mockClear();
-  assertNockRequest(scope, done);
+  assertNockRequest(scope);
+  assertNockRequest(filterScope, done);
 });
 
 test('Can move to Finish step and publish CV', async (done) => {
@@ -144,7 +164,9 @@ test('Can move to Finish step and publish CV', async (done) => {
     .get(environmentPathsPath)
     .query(true)
     .reply(200, environmentPathsData);
-
+  const filterScope = nockInstance
+    .get(cvFiltersPath)
+    .reply(200, contentViewFilterData);
   const cvPublishParams = {
     id: 1, versionCount: 5, description: '', environment_ids: [], is_force_promote: false,
   };
@@ -166,6 +188,7 @@ test('Can move to Finish step and publish CV', async (done) => {
   fireEvent.click(getByText('Finish'));
 
   assertNockRequest(scope);
+  assertNockRequest(filterScope);
   assertNockRequest(publishScope, done);
   act(done); // stop listening for nocks
 });

data/webpack/scenes/ContentViews/expansions/RelatedContentViewComponentsModal.js

@@ -83,7 +83,7 @@ const RelatedContentViewsModal = ({ cvName, cvId, relatedCVCount }) => {
               </Thead>
               <Tbody>
                 {results?.map(details => (
-                  <Tr key={`${details.content_view.id}`} ouiaId={`${details.content_view.id}`}>
+                  <Tr key={details.content_view.id} ouiaId={details.content_view.id}>
                     <Td>
                       <Link to={urlBuilder(`content_views/${details.content_view.id}`, '')}>{details.content_view.name}</Link>
                     </Td>

data/webpack/scenes/Hosts/ChangeContentSource/components/ContentSourceForm.js

@@ -54,7 +54,7 @@ const ContentSourceSelect = ({
       {contentSources.map(cs => (
         <SelectOption
           key={cs.id}
-          value={`${cs.id}`}
+          value={cs.id}
         >
           {cs.name}
         </SelectOption>
@@ -218,7 +218,12 @@ const ContentSourceForm = ({
         className="set-select-width"
         placeholderText={cvPlaceholderText}
       >
-        {!environmentIsDisabled && contentViews?.map(cv => <ContentViewSelectOption key={`${cv.id}`} value={`${cv.name}`} cv={cv} env={environments[0]} />)}
+        {!environmentIsDisabled && contentViews?.map(cv => (<ContentViewSelectOption
+          key={cv.id}
+          value={cv.name}
+          cv={cv}
+          env={environments[0]}
+        />))}
       </ContentViewSelect>
       <ActionGroup style={{ display: 'block' }}>
         <Button

data/webpack/scenes/Subscriptions/Manifest/DeleteManifestModalText.js

@@ -1,29 +1,46 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 
-const question = __('Are you sure you want to delete the manifest?');
-const note = __(`Note: Deleting a subscription manifest is STRONGLY discouraged.
-                 Deleting a manifest will:`);
-const l1 = __('Delete all subscriptions that are attached to running hosts.');
-const l2 = __('Delete all subscriptions attached to activation keys.');
-const l3 = __('Disable Red Hat Insights.');
-const l4 = __(`Require you to upload the subscription-manifest and re-attach
-               subscriptions to hosts and activation keys.`);
-const debug = __(`This action should only be taken in extreme circumstances or
-                  for debugging purposes.`);
-
-const DeleteManifestModalText = () => (
+const DeleteManifestModalText = ({ simpleContentAccess }) => (
   <React.Fragment>
-    <p>{question}</p>
-    <p>{note}</p>
-    <ul className="list-aligned">
-      <li>{l1}</li>
-      <li>{l2}</li>
-      <li>{l3}</li>
-      <li>{l4}</li>
-    </ul>
-    <p>{debug}</p>
+    <p>{__('Are you sure you want to delete the manifest?')}</p>
+    {simpleContentAccess && (
+      <>
+        <p>{__('Note: Deleting a subscription manifest is STRONGLY discouraged.')}</p>
+        <p>{__('This action should only be taken for debugging purposes.')}</p>
+      </>
+    )}
+    {!simpleContentAccess && (
+      <>
+        <p>
+          {__(`Note: Deleting a subscription manifest is STRONGLY discouraged.
+        Deleting a manifest will:`)}
+        </p>
+        <ul className="list-aligned">
+          <li>{__('Delete all subscriptions that are attached to running hosts.')}</li>
+          <li>{__('Delete all subscriptions attached to activation keys.')}</li>
+          <li>{__('Disable Red Hat Insights.')}</li>
+          <li>
+            {__(`Require you to upload the subscription-manifest and re-attach
+              subscriptions to hosts and activation keys.`)}
+          </li>
+        </ul>
+        <p>
+          {__(`This action should only be taken in extreme circumstances or
+              for debugging purposes.`)}
+        </p>
+      </>
+    )}
   </React.Fragment>
 );
 
+DeleteManifestModalText.propTypes = {
+  simpleContentAccess: PropTypes.bool,
+};
+
+DeleteManifestModalText.defaultProps = {
+  simpleContentAccess: false,
+};
+
 export default DeleteManifestModalText;

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -84,6 +84,7 @@ class ManageManifestModal extends Component {
       disabledReason,
       canImportManifest,
       canDeleteManifest,
+      simpleContentAccess,
       isManifestImported,
       canEditOrganizations,
       taskInProgress,
@@ -196,7 +197,7 @@ class ManageManifestModal extends Component {
                             }
                           </div>
                           <ForemanModal title={__('Confirm delete manifest')} id={DELETE_MANIFEST_MODAL_ID}>
-                            <DeleteManifestModalText />
+                            <DeleteManifestModalText simpleContentAccess={simpleContentAccess} />
                             <ForemanModal.Footer>
                               <Button ouiaId="cancel-button" bsStyle="default" onClick={this.hideDeleteManifestModal}>
                                 {__('Cancel')}
@@ -282,6 +283,7 @@ ManageManifestModal.propTypes = {
   }).isRequired,
   canImportManifest: PropTypes.bool,
   canDeleteManifest: PropTypes.bool,
+  simpleContentAccess: PropTypes.bool,
   isManifestImported: PropTypes.bool,
   deleteManifestModalExists: PropTypes.bool,
   canEditOrganizations: PropTypes.bool,
@@ -309,6 +311,7 @@ ManageManifestModal.defaultProps = {
   disabledReason: '',
   canImportManifest: false,
   canDeleteManifest: false,
+  simpleContentAccess: true,
   isManifestImported: false,
   deleteManifestModalExists: false,
   canEditOrganizations: false,

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -264,6 +264,7 @@ class SubscriptionsPage extends Component {
               canImportManifest={canImportManifest}
               canDeleteManifest={canDeleteManifest}
               canEditOrganizations={canEditOrganizations}
+              simpleContentAccess={simpleContentAccess}
               taskInProgress={!!task}
               disableManifestActions={disableManifestActions}
               disabledReason={this.getDisabledReason()}

data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsPage.test.js.snap

@@ -64,6 +64,7 @@ exports[`subscriptions page should render 1`] = `
         disableManifestActions={true}
         disabledReason="This is disabled because no connection could be made to the upstream Manifest."
         refresh={[Function]}
+        simpleContentAccess={false}
         taskInProgress={false}
         upload={[Function]}
       />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.9.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -406,16 +406,16 @@ dependencies:
   name: pulp_ostree_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -948,6 +948,7 @@ files:
 - app/lib/actions/katello/organization/simple_content_access/disable.rb
 - app/lib/actions/katello/organization/simple_content_access/enable.rb
 - app/lib/actions/katello/organization/simple_content_access/toggle.rb
+- app/lib/actions/katello/orphan_cleanup/remove_orphaned_content_units.rb
 - app/lib/actions/katello/orphan_cleanup/remove_orphans.rb
 - app/lib/actions/katello/product/content_create.rb
 - app/lib/actions/katello/product/content_destroy.rb