katello 4.9.0.rc2 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d870b3e8317aae2cc5675bdebddc2541257c470714209df06d79135ebc751643
-  data.tar.gz: e19a405204719de4c723e6b7a0c4612e40983698df33562f74e28e0eb2fb83f6
+  metadata.gz: 41a12235a03808c77522d0fbc1c0fe8394ee1bfd6735b4a9671909ccc341bd3d
+  data.tar.gz: 4b6514b149494a537a41b1b944c1133328591aa9c950bf9ff343679a76532100
 SHA512:
-  metadata.gz: ee637b366b689e48fdbde217e2255b683c35095ffcbc3ad1234b9446ba7757be992a5b33a61650dc1fc5ac25ff4474185e2e58772991475c0f6a78627bbd70c4
-  data.tar.gz: 6eac40d9467c4365c19c82ecdce5d53f42418f511c7e35e12f987c5e58b432c3919f0ff0a2c1d581084e14e8f1ca29147f298a505331ec1d6907a6f132b4e209
+  metadata.gz: c7f886b06454dafcf674d3ba7694d8bf7ef79799d3e1ebc21523edb59b1139d4ca3e8ad0733ea2cd2880dcb4eebe1b52c2e675da46935192906c95ce8281f4dc
+  data.tar.gz: e00320f2a9a0273fd850feda7946c9fa6f2e068358fc7177e406334fa0400cd240fa36c8ed216c46e118ce64302081c9331f8101c63cee78774482836144023e

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

@@ -78,11 +78,8 @@ module Katello
 
     api :PUT, "/content_view_versions/:id/republish_repositories", N_("Forces a republish of the version's repositories' metadata")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
-    param :force, :bool, :desc => N_("Force metadata regeneration to proceed.  Dangerous when repositories use the 'Complete Mirroring' mirroring policy"), :required => true
+    param :force, :bool, :desc => N_("Force metadata regeneration to proceed. (Deprecated)"), deprecated: true
     def republish_repositories
-      unless ::Foreman::Cast.to_bool(params[:force])
-        fail HttpErrors::BadRequest, _("Metadata republishing must be forced because it is a dangerous operation.")
-      end
       task = async_task(::Actions::Katello::ContentViewVersion::RepublishRepositories, @content_view_version)
       respond_for_async :resource => task
     end

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

@@ -180,11 +180,14 @@ module Katello
     protected
 
     def action_permission
-      if %w(download_debug_certificate redhat_provider repo_discover cdn_configuration
-            cancel_repo_discover).include?(params[:action])
-        :edit
-      elsif params[:action] == "releases"
+      if params[:action] == "releases"
+        :view
+      elsif params[:action] == "download_debug_certificate" &&
+          Organization.find(params[:id]).authorized?(:export_content)
         :view
+      elsif %w(download_debug_certificate redhat_provider repo_discover cdn_configuration
+               cancel_repo_discover).include?(params[:action])
+        :edit
       else
         super
       end

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

@@ -323,12 +323,12 @@ module Katello
       render :json => repo_types.values
     end
 
-    api :PUT, "/repositories/:id/republish", N_("Forces a republish of the specified repository, regenerating metadata and symlinks on the filesystem.")
+    api :PUT, "/repositories/:id/republish", N_("Forces a republish of the specified repository, regenerating metadata and symlinks on the filesystem. Not allowed for repositories with the 'Complete Mirroring' mirroring policy.")
     param :id, :number, :desc => N_("Repository identifier"), :required => true
-    param :force, :bool, :desc => N_("Force metadata regeneration to proceed.  Dangerous when repositories use the 'Complete Mirroring' mirroring policy."), :required => true
+    param :force, :bool, :desc => N_("Force metadata regeneration to proceed. (Deprecated)"), deprecated: true
     def republish
-      unless ::Foreman::Cast.to_bool(params[:force])
-        fail HttpErrors::BadRequest, _('Metadata republishing must be forced because it is a dangerous operation.')
+      if @repository.mirroring_policy == Katello::RootRepository::MIRRORING_POLICY_COMPLETE
+        fail HttpErrors::BadRequest, _("Metadata republishing is not allowed on repositories with the 'Complete Mirroring' mirroring policy.")
       end
       task = async_task(::Actions::Katello::Repository::MetadataGenerate, @repository)
       respond_for_async :resource => task

data/app/lib/actions/katello/content_view/promote_to_environment.rb

@@ -55,7 +55,7 @@ module Actions
 
         def trigger_capsule_sync(_execution_plan)
           environment = ::Katello::KTEnvironment.find(input[:environment_id])
-          if !input[:incremental_update] && sync_proxies?(environment)
+          if !input[:incremental_update] && sync_proxies?(environment) && Setting[:foreman_proxy_content_auto_sync]
             ForemanTasks.async_task(ContentView::CapsuleSync,
                                     ::Katello::ContentView.find(input[:content_view_id]),
                                     environment)

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

@@ -5,7 +5,7 @@ module Actions
         def plan(content_view_version)
           action_subject(content_view_version.content_view)
           plan_self(:version_id => content_view_version.id)
-          plan_action(::Actions::Katello::Repository::BulkMetadataGenerate, content_view_version.repositories)
+          plan_action(::Actions::Katello::Repository::BulkMetadataGenerate, content_view_version.repositories.joins(:root).where.not(root: { mirroring_policy: ::Katello::RootRepository::MIRRORING_POLICY_COMPLETE }))
         end
 
         def run

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

@@ -23,7 +23,7 @@ module Actions
                         rpm_filenames: rpm_filenames,
                         copy_contents: copy_contents,
                         solve_dependencies: content_view.solve_dependencies,
-                        metadata_generate: !incremental)
+                        generate_metadata: true)
           end
         end
 

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

@@ -10,7 +10,7 @@ module Actions
             plan_action(::Actions::Katello::Repository::MultiCloneContents, extended_repo_map,
                         copy_contents: true,
                         solve_dependencies: true,
-                        metadata_generate: !incremental)
+                        generate_metadata: true)
           end
         end
 

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

@@ -11,10 +11,14 @@ module Katello
           super
         end
 
-        def fetch_paths(content_path)
+        def fetch_repo_set(content_path)
           url = "/katello/api/v2/repository_sets?organization_id=#{organization['id']}&search=#{CGI.escape("path = #{content_path}")}"
           response = get(url)
-          repo_set = JSON.parse(response)['results'].first
+          JSON.parse(response)['results'].first
+        end
+
+        def fetch_paths(content_path)
+          repo_set = fetch_repo_set(content_path)
 
           fail _("Upstream organization %s does not provide this content path") % @organization_label if repo_set.nil?
 
@@ -33,8 +37,8 @@ module Katello
           results = json_body['results']
 
           results.map do |repo|
-            Katello::Content.substitute_content_path(arch: repo[:arch],
-                                                     releasever: repo[:minor],
+            Katello::Content.substitute_content_path(arch: repo['arch'],
+                                                     releasever: repo['minor'],
                                                      content_path: content_path)
           end
         end

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

@@ -39,6 +39,7 @@ module Katello
 
       def self.api(smart_proxy, repository_type_label)
         repo_type = RepositoryTypeManager.enabled_repository_types[repository_type_label]
+        fail _("%s content type is not enabled." % repository_type_label) unless repo_type
         repo_type.pulp3_api(smart_proxy)
       end
 

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

@@ -79,18 +79,19 @@ module Katello
         known_acss = smart_proxy.smart_proxy_alternate_content_sources
         known_acs_hrefs = known_acss.pluck(:alternate_content_source_href) if known_acss.present?
 
-        file_acs_api = ::Katello::Pulp3::Repository.api(smart_proxy, 'file').alternate_content_source_api
-        yum_acs_api = ::Katello::Pulp3::Repository.api(smart_proxy, 'yum').alternate_content_source_api
-
-        orphan_file_acs_hrefs = file_acs_api.list.results.map(&:pulp_href) - known_acs_hrefs
-        orphan_yum_acs_hrefs = yum_acs_api.list.results.map(&:pulp_href) - known_acs_hrefs
-
-        orphan_file_acs_hrefs.each do |orphan_file_acs_href|
-          tasks << file_acs_api.delete(orphan_file_acs_href)
+        if RepositoryTypeManager.enabled_repository_types['file']
+          file_acs_api = ::Katello::Pulp3::Repository.api(smart_proxy, 'file').alternate_content_source_api
+          orphan_file_acs_hrefs = file_acs_api.list.results.map(&:pulp_href) - known_acs_hrefs
+          orphan_file_acs_hrefs.each do |orphan_file_acs_href|
+            tasks << file_acs_api.delete(orphan_file_acs_href)
+          end
         end
-
-        orphan_yum_acs_hrefs.each do |orphan_yum_acs_href|
-          tasks << yum_acs_api.delete(orphan_yum_acs_href)
+        if RepositoryTypeManager.enabled_repository_types['yum']
+          yum_acs_api = ::Katello::Pulp3::Repository.api(smart_proxy, 'yum').alternate_content_source_api
+          orphan_yum_acs_hrefs = yum_acs_api.list.results.map(&:pulp_href) - known_acs_hrefs
+          orphan_yum_acs_hrefs.each do |orphan_yum_acs_href|
+            tasks << yum_acs_api.delete(orphan_yum_acs_href)
+          end
         end
       end
 

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

@@ -1,6 +1,4 @@
 attributes :id, :uuid
-attributes :content_view_id, :content_view_name
-attributes :lifecycle_environment_id, :lifecycle_environment_name
 attributes :content_source_id, :content_source_name
 attributes :kickstart_repository_id, :kickstart_repository_name
 attributes :errata_counts
@@ -10,6 +8,15 @@ attributes :applicable_rpm_count => :applicable_package_count
 attributes :upgradable_rpm_count => :upgradable_package_count
 attributes :applicable_module_stream_count, :upgradable_module_stream_count
 
+child :content_view_environments => :content_view_environments do
+  node :content_view do |cve|
+    { id: cve.content_view.id, name: cve.content_view.name, composite: cve.content_view.composite }
+  end
+  node :lifecycle_environment do |cve|
+    { id: cve.lifecycle_environment.id, name: cve.lifecycle_environment.name }
+  end
+end
+
 node :content_view do |content_facet|
   content_view = content_facet.single_content_view
   if content_view.present?
@@ -31,14 +38,6 @@ node :lifecycle_environment do |content_facet|
   end
 end
 
-child :content_views => :content_views do
-  attributes :id, :name, :composite
-end
-
-child :lifecycle_environments => :lifecycle_environments do
-  attributes :id, :name
-end
-
 child :content_source => :content_source do
   attributes :id, :name, :url
 end

data/app/views/katello/hosts/_errata_counts.html.erb

@@ -1,4 +1,8 @@
+<% if Setting["host_details_ui"] %>
+<a href="/new/hosts/<%= host.name %>#/Content/errata">
+<% else %>
 <a href="/content_hosts/<%= host.id %>/errata">
+<% end %>
   <span class="aligned-errata-count">
     <span class="errata-count <%= counts[:security].to_i.positive? ? 'red' : 'black' %>">
       <span>
@@ -20,8 +24,13 @@
     </span>
   </span>
 </a>
+
 <% if !host.operatingsystem_name&.match(/Debian|Ubuntu/) %>
+<% if Setting["host_details_ui"] %>
+<a href="/new/hosts/<%= host.name %>#/Content/packages">
+<% else %>
 <a href="/content_hosts/<%= host.id %>/packages/applicable">
+<% end %>
   <span class="aligned-errata-count">
     <span class="errata-count <%= host.content_facet_attributes&.upgradable_rpm_count&.positive? ? 'green' : 'black' %>"
       <span>
@@ -33,7 +42,11 @@
 </a>
 <% end %>
 <% if host.operatingsystem_name&.match(/Debian|Ubuntu/) %>
+<% if Setting["host_details_ui"] %>
+<a href="/new/hosts/<%= host.name %>#/Content/packages">
+<% else %>
 <a href="/content_hosts/<%= host.id %>/debs/applicable">
+<% end %>
   <span class="aligned-errata-count">
     <span class="errata-count <%= host.content_facet_attributes&.upgradable_deb_count&.positive? ? 'green' : 'black' %>"
       <span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repository.factory.js

@@ -18,7 +18,7 @@ angular.module('Bastion.repositories').factory('Repository',
                 update: { method: 'PUT' },
                 sync: { method: 'POST', params: { action: 'sync' } },
                 verifyChecksum: { method: 'POST', params: { action: 'verify_checksum' }},
-                republishMetadata: { method: 'PUT', params: { action: 'republish', force: true }},
+                republishMetadata: { method: 'PUT', params: { action: 'republish'}},
                 reclaimSpace: { method: 'POST', params: { action: 'reclaim_space' }},
                 removePackages: { method: 'PUT', params: { action: 'remove_packages'}},
                 removeContent: { method: 'PUT', params: { action: 'remove_content'}},

data/lib/katello/plugin.rb

@@ -748,7 +748,7 @@ Foreman::Plugin.register :katello do
     :attach_subscriptions, :view_host_collections,
     :view_organizations, :view_lifecycle_environments, :view_products,
     :view_locations, :view_domains, :view_architectures,
-    :view_operatingsystems, :view_smart_proxies
+    :view_operatingsystems, :view_smart_proxies, :view_params
   ]
 
   role 'Content Importer', [

data/lib/katello/version.rb

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

data/webpack/components/RoutedTabs/index.js

@@ -23,6 +23,7 @@ const RoutedTabs = ({
       >
         {tabs.map(({ key, title }) => (
           <Tab
+            ouiaId={`routed-tabs-tab-${key}`}
             href={`#/${key}`}
             key={key}
             eventKey={key}

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

@@ -24,6 +24,7 @@ const ContentTab = ({ location: { pathname } }) => {
       >
         {filteredTabs.map(({ key, title }) => (
           <Tab
+            ouiaId={`host-content-tabs-tab-${key}`}
             key={key}
             eventKey={key}
             title={<TabTitleText>{title}</TabTitleText>}

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/ActivationKeys.test.js.snap

@@ -2,7 +2,7 @@
 
 exports[`ActivationKeys renders 1`] = `
 <FormGroup
-  fieldId="reg_katello_ak"
+  fieldId="activation_keys_field"
   helperText="From host group: "
   helperTextInvalid={
     <a
@@ -36,7 +36,7 @@ exports[`ActivationKeys renders 1`] = `
     favoritesLabel="Favorites"
     hasInlineFilter={false}
     hasPlaceholderStyle={false}
-    id="reg_katello_ak"
+    id="activation_keys_field"
     inlineFilterPlaceholderText={null}
     inputAutoComplete="off"
     inputIdPrefix=""
@@ -58,7 +58,7 @@ exports[`ActivationKeys renders 1`] = `
     onSelect={[Function]}
     onToggle={[Function]}
     onTypeaheadInputChanged={null}
-    ouiaId="reg-katello-ak"
+    ouiaId="activation-keys-field"
     ouiaSafe={true}
     placeholderText="No Activation keys to select"
     position="left"

data/webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js

@@ -45,7 +45,7 @@ const ActivationKeys = ({
   return (
     <FormGroup
       label={__('Activation Keys')}
-      fieldId="reg_katello_ak"
+      fieldId="activation_keys_field"
       helperText={hostGroupActivationKeys && sprintf('From host group: %s', hostGroupActivationKeys)}
       helperTextInvalid={activationKeys?.length === 0 ? <a href="/activation_keys/new">{__('Create new activation key')}</a> : __('No Activation Keys selected')}
       validated={validateAKField(hostGroupId, pluginValues?.activationKeys, hostGroupActivationKeys)}
@@ -53,14 +53,14 @@ const ActivationKeys = ({
       isRequired
     >
       <Select
-        ouiaId="reg-katello-ak"
+        ouiaId="activation-keys-field"
         selections={selectedKeys}
         variant={SelectVariant.typeaheadMulti}
         onToggle={() => setIsOpen(!isOpen)}
         onSelect={onSelect}
         onClear={() => updatePluginValues([])}
         isOpen={isOpen}
-        id="reg_katello_ak"
+        id="activation_keys_field"
         className="without_select2"
         isDisabled={isLoading || activationKeys?.length === 0}
         placeholderText={activationKeys?.length === 0 ? __('No Activation keys to select') : ''}

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -24,7 +24,6 @@ const recommendedRepositoriesRHEL = [
   'rhel-7-server-optional-rpms',
   'rhel-7-server-extras-rpms',
   'rhel-7-server-kickstart',
-  'rhel-6-server-els-rpms',
 ];
 
 const recommendedRepositoriesSatTools = [
@@ -35,10 +34,9 @@ const recommendedRepositoriesSatTools = [
 ];
 
 const recommendedRepositoriesMisc = [
-  'satellite-capsule-6.13-for-rhel-8-x86_64-rpms',
-  'ansible-2-for-rhel-8-x86_64-rpms',
-  'satellite-maintenance-6.13-for-rhel-8-x86_64-rpms',
-  'satellite-utils-6.13-for-rhel-8-x86_64-rpms',
+  'satellite-capsule-6.14-for-rhel-8-x86_64-rpms',
+  'satellite-maintenance-6.14-for-rhel-8-x86_64-rpms',
+  'satellite-utils-6.14-for-rhel-8-x86_64-rpms',
 ];
 
 const recommendedRepositorySetLables = recommendedRepositoriesRHEL

data/webpack/scenes/ContentViews/Create/CreateContentViewForm.js

@@ -7,7 +7,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Form, FormGroup, TextInput, TextArea, Checkbox, ActionGroup, Button, Tile, Grid, GridItem } from '@patternfly/react-core';
 import { createContentView } from '../ContentViewsActions';
 import { selectCreateContentViews, selectCreateContentViewStatus, selectCreateContentViewError } from './ContentViewCreateSelectors';
-import { LabelDependencies, LabelAutoPublish, LabelImportOnly } from './ContentViewFormComponents';
+import { LabelDependencies, LabelAutoPublish } from './ContentViewFormComponents';
 import ContentViewIcon from '../components/ContentViewIcon';
 import './CreateContentViewForm.scss';
 
@@ -19,7 +19,6 @@ const CreateContentViewForm = ({ setModalOpen }) => {
   const [composite, setComposite] = useState(false);
   const [component, setComponent] = useState(true);
   const [autoPublish, setAutoPublish] = useState(false);
-  const [importOnly, setImportOnly] = useState(false);
   const [dependencies, setDependencies] = useState(false);
   const [redirect, setRedirect] = useState(false);
   const [saving, setSaving] = useState(false);
@@ -59,7 +58,6 @@ const CreateContentViewForm = ({ setModalOpen }) => {
       composite,
       solve_dependencies: dependencies,
       auto_publish: (autoPublish && composite),
-      import_only: importOnly,
     }));
   };
 
@@ -168,17 +166,6 @@ const CreateContentViewForm = ({ setModalOpen }) => {
             onChange={checked => setDependencies(checked)}
           />
         </FormGroup>}
-      {!composite &&
-        <FormGroup isInline fieldId="importOnly">
-          <Checkbox
-            id="importOnly"
-            ouiaId="importOnly"
-            name="importOnly"
-            label={LabelImportOnly()}
-            isChecked={importOnly}
-            onChange={checked => setImportOnly(checked)}
-          />
-        </FormGroup>}
       {composite &&
         <FormGroup isInline fieldId="autoPublish">
           <Checkbox

data/webpack/scenes/ContentViews/Create/__tests__/createContentView.test.js

@@ -24,7 +24,6 @@ const createDetails = {
   composite: false,
   solve_dependencies: false,
   auto_publish: false,
-  import_only: false,
 };
 
 const createdCVDetails = { ...cvCreateData };
@@ -78,7 +77,6 @@ test('Displays dependent fields correctly', () => {
   expect(getByText('Content view')).toBeInTheDocument();
   expect(getByText('Solve dependencies')).toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
-  expect(getByText('Import only')).toBeInTheDocument();
 
   // label auto_set
   fireEvent.change(getByLabelText('input_name'), { target: { value: '123 2123' } });
@@ -88,13 +86,11 @@ test('Displays dependent fields correctly', () => {
   fireEvent.click(getByLabelText('composite_tile'));
   expect(queryByText('Solve dependencies')).not.toBeInTheDocument();
   expect(getByText('Auto publish')).toBeInTheDocument();
-  expect(queryByText('Import only')).not.toBeInTheDocument();
 
   // display Solve Dependencies when Component CV
   fireEvent.click(getByLabelText('component_tile'));
   expect(getByText('Solve dependencies')).toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
-  expect(getByText('Import only')).toBeInTheDocument();
 });
 
 test('Validates label field', () => {

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

@@ -592,7 +592,7 @@ export const republishCVVRepoMetadata = (params, handleSuccess) => put({
   type: API_OPERATIONS.PUT,
   key: cvVersionRepublishRepoMetadataKey(params.cvId, params.id),
   url: api.getApiUrl(`/content_view_versions/${params.id}/republish_repositories`),
-  params: { ...params, force: true },
+  params,
   handleSuccess: (response) => {
     if (handleSuccess) return handleSuccess();
     return renderTaskStartedToast(response.data);

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

@@ -105,39 +105,47 @@ export default () => {
     generated_for: generatedFor, import_only: importOnly,
   } = details;
   const generatedContentView = generatedFor !== 'none';
+  const detailsTab = {
+    key: 'details',
+    title: __('Details'),
+    content: <ContentViewInfo {...{ cvId, details }} />,
+  };
+  const versionsTab = {
+    key: 'versions',
+    title: __('Versions'),
+    content: <ContentViewVersionsRoutes {...{ cvId, details }} />,
+  };
+  const contentViewsTab = {
+    key: 'contentviews',
+    title: __('Content views'),
+    content: <ContentViewComponents {...{ cvId, details }} />,
+  };
+  const repositoriesTab = {
+    key: 'repositories',
+    title: __('Repositories'),
+    content: <ContentViewRepositories {...{ cvId, details }} />,
+  };
+  const filtersTab = {
+    key: 'filters',
+    title: __('Filters'),
+    content: <ContentViewFilterRoutes {...{ cvId, details }} />,
+  };
+  const historyTab = {
+    key: 'history',
+    title: __('History'),
+    content: <ContentViewHistories cvId={cvId} />,
+  };
+
+  /* eslint-disable no-nested-ternary */
   const tabs = [
-    {
-      key: 'details',
-      title: __('Details'),
-      content: <ContentViewInfo {...{ cvId, details }} />,
-    },
-    {
-      key: 'versions',
-      title: __('Versions'),
-      content: <ContentViewVersionsRoutes {...{ cvId, details }} />,
-    },
-    ...composite ? [{
-      key: 'contentviews',
-      title: __('Content views'),
-      content: <ContentViewComponents {...{ cvId, details }} />,
-    }] : [{
-      key: 'repositories',
-      title: __('Repositories'),
-      content: <ContentViewRepositories {...{ cvId, details }} />,
-    },
-    !(importOnly || generatedContentView) &&
-    {
-      key: 'filters',
-      title: __('Filters'),
-      content: <ContentViewFilterRoutes {...{ cvId, details }} />,
-    }],
-    {
-      key: 'history',
-      title: __('History'),
-      content: <ContentViewHistories cvId={cvId} />,
-    },
+    detailsTab,
+    versionsTab,
+    ...(composite ? [contentViewsTab] :
+      ((importOnly || generatedContentView) ?
+        [repositoriesTab] : [repositoriesTab, filtersTab])),
+    historyTab,
   ];
-
+  /* eslint-enable no-nested-ternary */
 
   return (
     <>

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

@@ -111,32 +111,38 @@ const ContentViewInfo = ({ cvId, details }) => {
             boolean
             {...{ currentAttribute, setCurrentAttribute }}
           />)}
-        <TextListItem component={TextListItemVariants.dt}>
-          {LabelImportOnly()}
-        </TextListItem>
-        <TextListItem component={TextListItemVariants.dd} className="foreman-spaced-list">
-          <Switch
-            id="import_only_switch"
-            ouiaId="import_only_switch"
-            aria-label="import_only_switch"
-            isChecked={importOnly}
-            className="foreman-spaced-list"
-            disabled
-          />
-        </TextListItem>
-        <TextListItem component={TextListItemVariants.dt}>
-          {LabelGenerated()}
-        </TextListItem>
-        <TextListItem component={TextListItemVariants.dd} className="foreman-spaced-list">
-          <Switch
-            id="generated_by_export_switch"
-            ouiaId="generated_by_export_switch"
-            aria-label="generated_by_export_switch"
-            isChecked={generatedContentView}
-            className="foreman-spaced-list"
-            disabled
-          />
-        </TextListItem>
+        {importOnly &&
+          <>
+            <TextListItem component={TextListItemVariants.dt}>
+              {LabelImportOnly()}
+            </TextListItem>
+            <TextListItem component={TextListItemVariants.dd} className="foreman-spaced-list">
+              <Switch
+                id="import_only_switch"
+                ouiaId="import_only_switch"
+                aria-label="import_only_switch"
+                isChecked={importOnly}
+                className="foreman-spaced-list"
+                disabled
+              />
+            </TextListItem>
+          </>}
+        {generatedContentView &&
+          <>
+            <TextListItem component={TextListItemVariants.dt}>
+              {LabelGenerated()}
+            </TextListItem>
+            <TextListItem component={TextListItemVariants.dd} className="foreman-spaced-list">
+              <Switch
+                id="generated_by_export_switch"
+                ouiaId="generated_by_export_switch"
+                aria-label="generated_by_export_switch"
+                isChecked={generatedContentView}
+                className="foreman-spaced-list"
+                disabled
+              />
+            </TextListItem>
+          </>}
       </TextList>
     </TextContent>
   );

data/webpack/scenes/ContentViews/Details/Filters/CVContainerImageFilterContent.js

@@ -135,7 +135,11 @@ const CVContainerImageFilterContent = ({
       ouiaId="cv-container-image-filter-tabs"
       onSelect={(_event, eventKey) => setActiveTabKey(eventKey)}
     >
-      <Tab eventKey={0} title={<TabTitleText>{__('Tags')}</TabTitleText>}>
+      <Tab
+        ouiaId="cv-container-image-filter-tags-tab"
+        eventKey={0}
+        title={<TabTitleText>{__('Tags')}</TabTitleText>}
+      >
         <div className="margin-24-0">
           <TableWrapper
             {...{
@@ -200,7 +204,11 @@ const CVContainerImageFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
+        <Tab
+          ouiaId="cv-container-image-affected-repos-tab"
+          eventKey={1}
+          title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}
+        >
           <div className="margin-24-0">
             <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="docker" setShowAffectedRepos={setShowAffectedRepos} details={details} />
           </div>

data/webpack/scenes/ContentViews/Details/Filters/CVDebFilterContent.js

@@ -150,7 +150,11 @@ const CVDebFilterContent = ({
       activeKey={activeTabKey}
       onSelect={(_event, eventKey) => setActiveTabKey(eventKey)}
     >
-      <Tab eventKey={0} title={<TabTitleText>{tabTitle}</TabTitleText>}>
+      <Tab
+        ouiaId="cv-deb-filter-content-table-tab"
+        eventKey={0}
+        title={<TabTitleText>{tabTitle}</TabTitleText>}
+      >
         <div className="tab-body-with-spacing">
           <TableWrapper
             {...{
@@ -225,7 +229,11 @@ const CVDebFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-        <Tab eventKey={1} title={<TabTitleText>{__('Affected Repositories')}</TabTitleText>}>
+        <Tab
+          ouiaId="cv-deb-filter-content-affected-repos-tab"
+          eventKey={1}
+          title={<TabTitleText>{__('Affected Repositories')}</TabTitleText>}
+        >
           <div className="tab-body-with-spacing">
             <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="deb" setShowAffectedRepos={setShowAffectedRepos} details={details} />
           </div>

data/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js

@@ -119,7 +119,11 @@ const CVErrataDateFilterContent = ({
       activeKey={activeTabKey}
       onSelect={(_event, eventKey) => setActiveTabKey(eventKey)}
     >
-      <Tab eventKey={0} title={<TabTitleText>{tabTitle}</TabTitleText>}>
+      <Tab
+        ouiaId="errata-date-filter-form-tab"
+        eventKey={0}
+        title={<TabTitleText>{tabTitle}</TabTitleText>}
+      >
         <div className="margin-24">
           <Form onSubmit={(e) => {
             e.preventDefault();
@@ -309,7 +313,11 @@ const CVErrataDateFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
+        <Tab
+          ouiaId="affected-repositories-tab"
+          eventKey={1}
+          title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}
+        >
           <div className="margin-24-0">
             <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
           </div>

data/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js

@@ -251,7 +251,11 @@ const CVErrataIDFilterContent = ({
       activeKey={activeTabKey}
       onSelect={(_event, eventKey) => setActiveTabKey(eventKey)}
     >
-      <Tab eventKey={0} title={<TabTitleText>{__('Errata')}</TabTitleText>}>
+      <Tab
+        ouiaId="errata-filter-table-tab"
+        eventKey={0}
+        title={<TabTitleText>{__('Errata')}</TabTitleText>}
+      >
         <div className="margin-24-0">
           <TableWrapper
             {...{
@@ -452,7 +456,11 @@ const CVErrataIDFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
+        <Tab
+          ouiaId="affected-repos-tab"
+          eventKey={1}
+          title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}
+        >
           <div className="margin-24-0">
             <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
           </div>

data/webpack/scenes/ContentViews/Details/Filters/CVModuleStreamFilterContent.js

@@ -207,7 +207,11 @@ const CVModuleStreamFilterContent = ({
       activeKey={activeTabKey}
       onSelect={(_event, eventKey) => setActiveTabKey(eventKey)}
     >
-      <Tab eventKey={0} title={<TabTitleText>{__('Module Streams')}</TabTitleText>}>
+      <Tab
+        ouiaId="module-stream-filter-content-table-tab"
+        eventKey={0}
+        title={<TabTitleText>{__('Module Streams')}</TabTitleText>}
+      >
         <div className="margin-24-0">
           <TableWrapper
             {...{
@@ -285,7 +289,11 @@ const CVModuleStreamFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
+        <Tab
+          ouiaId="affected-repos-tab"
+          eventKey={1}
+          title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}
+        >
           <div className="margin-24-0">
             <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
           </div>

data/webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js

@@ -197,7 +197,11 @@ const CVPackageGroupFilterContent = ({
       activeKey={activeTabKey}
       onSelect={(_event, eventKey) => setActiveTabKey(eventKey)}
     >
-      <Tab eventKey={0} title={<TabTitleText>{__('Package groups')}</TabTitleText>}>
+      <Tab
+        ouiaId="cv-package-group-filter-content-table-tab"
+        eventKey={0}
+        title={<TabTitleText>{__('Package groups')}</TabTitleText>}
+      >
         <div className="margin-24-0">
           <TableWrapper
             {...{
@@ -275,7 +279,11 @@ const CVPackageGroupFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
+        <Tab
+          ouiaId="affected-repos-tab"
+          eventKey={1}
+          title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}
+        >
           <div className="margin-24-0">
             <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
           </div>

data/webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js

@@ -167,7 +167,11 @@ const CVRpmFilterContent = ({
       activeKey={activeTabKey}
       onSelect={(_event, eventKey) => setActiveTabKey(eventKey)}
     >
-      <Tab eventKey={0} title={<TabTitleText>{tabTitle}</TabTitleText>}>
+      <Tab
+        ouiaId="cv-rpm-filter-content-table-tab"
+        eventKey={0}
+        title={<TabTitleText>{tabTitle}</TabTitleText>}
+      >
         <div className="margin-24-0">
           <TableWrapper
             {...{
@@ -239,7 +243,11 @@ const CVRpmFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
+        <Tab
+          ouiaId="cv-rpm-filter-content-affected-repos-tab"
+          eventKey={1}
+          title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}
+        >
           <div className="margin-24-0">
             <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
           </div>

data/webpack/scenes/ContentViews/Details/Repositories/ContentCounts.js

@@ -12,9 +12,9 @@ const repoLabels = {
   erratum: ['errata', 'erratum', 'errata'], // need to handle link, its $URL/errata?repositoryId=107
   deb: ['deb packages', 'deb package', 'debs'],
   ansible_collection: ['Ansible collections', 'Ansible collection', 'ansible_collections'],
-  docker_manifest: ['container manifests', 'container manifest', 'content/docker_manifests'],
-  docker_manifest_list: ['container manifest lists', 'container manifest list', 'content/docker_manifest_lists'],
-  docker_tag: ['container tags', 'container tag', 'content/docker_tags'],
+  docker_manifest: ['container manifests', 'container manifest', 'docker_manifests'],
+  docker_manifest_list: ['container manifest lists', 'container manifest list', 'docker_manifest_lists'],
+  docker_tag: ['container tags', 'container tag', 'docker_tags'],
   file: ['files', 'file', 'content/files'],
   package_group: ['package groups', 'package group', 'package_groups'],
   srpm: ['source RPMs', 'source RPM', 'source_rpms'], // no link?

data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompare.js

@@ -106,6 +106,7 @@ const CVVersionCompare = ({
                 const { name } = config;
                 return (
                   <Tab
+                    ouiaId={`cv-version-compare-tab-${name}`}
                     key={name}
                     eventKey={name}
                     title={

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

@@ -76,6 +76,7 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
           >
             {filteredTableConfigs.map(({ route, name, getCountKey }) => (
               <Tab
+                ouiaId={`cv-version-details-tabs-tab-${route}`}
                 key={route}
                 eventKey={route}
                 title={

data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js

@@ -28,7 +28,7 @@ test('Can call API and show details on page load', async (done) => {
     .query(true)
     .reply(200, cvDetailData);
 
-  const { getByLabelText } = renderWithRedux(
+  const { getByLabelText, queryByLabelText } = renderWithRedux(
     withCVRoute(<ContentViewDetails />),
     renderOptions,
   );
@@ -40,6 +40,8 @@ test('Can call API and show details on page load', async (done) => {
     expect(getByLabelText('a_cv_index')).toBeInTheDocument();
     expect(getByLabelText(`b_${name}`)).toBeInTheDocument();
     expect(getByLabelText('c_details')).toBeInTheDocument();
+    expect(queryByLabelText('Import only')).not.toBeInTheDocument();
+    expect(queryByLabelText('Generated')).not.toBeInTheDocument();
   });
 
   assertNockRequest(scope, done);
@@ -98,7 +100,7 @@ test('Can edit boolean details such as solve dependencies', async (done) => {
     .query(true)
     .reply(200, updatedCVDetails);
 
-  const { getByLabelText } = renderWithRedux(
+  const { getByLabelText, queryByLabelText } = renderWithRedux(
     withCVRoute(<ContentViewDetails />),
     renderOptions,
   );
@@ -110,8 +112,7 @@ test('Can edit boolean details such as solve dependencies', async (done) => {
   await patientlyWaitFor(() => expect(getByLabelText(checkboxLabel).checked).toBeTruthy());
 
   const disabledImportLabel = /import_only_switch/;
-  expect(getByLabelText(disabledImportLabel)).toBeInTheDocument();
-  expect(getByLabelText(disabledImportLabel)).toHaveAttribute('disabled');
+  expect(queryByLabelText(disabledImportLabel)).not.toBeInTheDocument();
 
   assertNockRequest(getscope);
   assertNockRequest(updatescope);
@@ -137,3 +138,26 @@ test('Can link to view tasks', async () => {
 
   assertNockRequest(scope);
 });
+
+test('Can show import_only and generated when true', async (done) => {
+  const updatedCVDetails = { ...cvDetailData };
+  updatedCVDetails.generated_for = 'Library';
+  updatedCVDetails.import_only = true;
+
+  const scope = nockInstance
+    .get(cvDetailsPath)
+    .query(true)
+    .reply(200, updatedCVDetails);
+
+  const { getByLabelText } = renderWithRedux(
+    withCVRoute(<ContentViewDetails />),
+    renderOptions,
+  );
+
+  await patientlyWaitFor(() => {
+    expect(getByLabelText('import_only_switch')).toBeInTheDocument();
+    expect(getByLabelText('generated_by_export_switch')).toBeInTheDocument();
+  });
+
+  assertNockRequest(scope, done);
+});

data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js

@@ -351,7 +351,6 @@ test('Displays Create Content View and opens modal with Form', async () => {
   expect(queryByText('Content view')).not.toBeInTheDocument();
   expect(queryByText('Solve dependencies')).not.toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
-  expect(queryByText('Import only')).not.toBeInTheDocument();
 
   getByLabelText('create_content_view').click();
 
@@ -362,7 +361,6 @@ test('Displays Create Content View and opens modal with Form', async () => {
   expect(getByText('Content view')).toBeInTheDocument();
   expect(getByText('Solve dependencies')).toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
-  expect(getByText('Import only')).toBeInTheDocument();
 });
 
 /* eslint-enable no-useless-escape */

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

@@ -130,7 +130,11 @@ class ManageManifestModal extends Component {
       <ForemanModal id={MANAGE_MANIFEST_MODAL_ID} title={__('Manage Manifest')}>
         <Tabs id="manifest-history-tabs" ouiaId="manifest-history-tabs">
           {showManifestTab &&
-            <Tab eventKey={1} title={__('Manifest')}>
+            <Tab
+              ouiaId="subscription-manifest-tab"
+              eventKey={1}
+              title={__('Manifest')}
+            >
                 {showSubscriptionManifest &&
                   <React.Fragment>
                     <Grid>
@@ -210,7 +214,11 @@ class ManageManifestModal extends Component {
               <Slot id="katello-manage-manifest-form" multi />
             </Tab>
           }
-          <Tab eventKey={2} title={__('Manifest History')}>
+          <Tab
+            ouiaId="manifest-history-tab"
+            eventKey={2}
+            title={__('Manifest History')}
+          >
             <LoadingState loading={manifestHistory.loading} loadingText={__('Loading')}>
               <Table
                 ouiaId="manifest-history-table"
@@ -221,7 +229,11 @@ class ManageManifestModal extends Component {
             </LoadingState>
           </Tab>
           {showCdnConfigurationTab &&
-            <Tab eventKey={3} title={__('CDN Configuration')}>
+            <Tab
+              ouiaId="cdn-configuration-tab"
+              eventKey={3}
+              title={__('CDN Configuration')}
+            >
               <Grid>
                 <h3>{__('CDN Configuration for Red Hat Content')}</h3>
                 <hr />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.9.0.rc2
+  version: 4.9.0
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -5514,11 +5514,11 @@ 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.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman