katello 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e193a2273fbdeccfaeb286b7a86738e7bbb1bb78120a663e4309aac912ef4501
-  data.tar.gz: afbec4d28494d215e8b7c318cd403a632d3c8c14ccff79f809cc01f4fc713f3d
+  metadata.gz: 60531c92a13f5d62aaea839bc1dc5512f0a75b0eea7f7a7820c0144747928501
+  data.tar.gz: ec6e2f242dabd880929727846034aae0356aa76ae61a467864f66703b5899093
 SHA512:
-  metadata.gz: da5af110e6327f56eff8c5f72eb1e80936142b534e68d9bdc9f081efa9838f35b0eb03d99e461e59f9c0f2be1a55f7955f2fee6d97b8874f35ce4ba60bb4c1df
-  data.tar.gz: 6c6db26dac3ffa0ace7837e9774d56d93cba08df34fee0616bde18816a6785e5c54d697768d2f5a39bbd40a67b990462bb9e2e7e2d44cfdd74043221ca820dd6
+  metadata.gz: 5a678ed0980575f97093e0908c58964ce62137ab502b0c5b2755f04d09466c8ed77e00f7ae120762a6006347d33d7ce7b94bf045c62799023d8efa0912426b44
+  data.tar.gz: 7a4e2f5eb5afac20586eb0c1581d560991cd012ded9887a249d873c579384b0d64f34db23d86a31db2d8f941b00a37f2bc579bad7ae6ad778f13e698b03137f5

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

@@ -35,7 +35,9 @@ module Katello
     end
 
     def all_for_content_view_filter(filter, _collection)
-      Erratum.joins(:repositories).merge(filter.applicable_repos)
+      available_ids = Erratum.joins(:repositories).merge(filter.applicable_repos)&.pluck(:errata_id) || []
+      added_ids = filter&.erratum_rules&.pluck(:errata_id) || []
+      Erratum.where(errata_id: available_ids + added_ids)
     end
 
     def custom_index_relation(collection)

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

@@ -36,7 +36,9 @@ module Katello
     end
 
     def all_for_content_view_filter(filter, _collection)
-      ModuleStream.joins(:repositories).merge(filter.applicable_repos)
+      available_ids = ModuleStream.joins(:repositories).merge(filter.applicable_repos)&.pluck(:id) || []
+      added_ids = filter&.module_stream_rules&.pluck(:module_stream_id) || []
+      ModuleStream.where(id: available_ids + added_ids)
     end
 
     def available_for_content_view_filter(filter, _collection)

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

@@ -67,7 +67,9 @@ module Katello
     end
 
     def all_for_content_view_filter(filter, _collection)
-      PackageGroup.joins(:repositories).merge(filter.applicable_repos)
+      available_ids = PackageGroup.joins(:repositories).merge(filter.applicable_repos)&.pluck(:pulp_id) || []
+      added_ids = filter&.package_group_rules&.pluck(:uuid) || []
+      PackageGroup.where(pulp_id: available_ids + added_ids)
     end
 
     def default_sort

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

@@ -36,7 +36,7 @@ module Actions
             else
               unit_ids = search_units(repo)
             end
-            ::Katello::Deb.import_all(unit_ids, repo)
+            ::Katello::Deb.import_all(unit_ids, repo, {filtered_indexing: true})
           elsif repo.yum?
             if input[:import_upload_task] && input[:import_upload_task][:content_unit_href]
               unit_ids = [input[:import_upload_task][:content_unit_href]]
@@ -48,9 +48,9 @@ module Actions
               unit_ids = search_units(repo)
             end
             if input[:content_type] == ::Katello::Srpm::CONTENT_TYPE
-              ::Katello::Srpm.import_all(unit_ids, repo)
+              ::Katello::Srpm.import_all(unit_ids, repo, {filtered_indexing: true})
             else
-              ::Katello::Rpm.import_all(unit_ids, repo)
+              ::Katello::Rpm.import_all(unit_ids, repo, {filtered_indexing: true})
             end
           end
         end

data/app/lib/actions/pulp3/repository/refresh_distribution.rb

@@ -3,7 +3,6 @@ module Actions
     module Repository
       class RefreshDistribution < Pulp3::AbstractAsyncTask
         include Helpers::Presenter
-        middleware.use Actions::Middleware::ExecuteIfContentsChanged
 
         def plan(repository, smart_proxy, options = {})
           smart_proxy = SmartProxy.unscoped.find_by(id: smart_proxy) #support bulk actions
@@ -16,11 +15,9 @@ module Actions
               :repository_id => repository.id,
               :smart_proxy_id => smart_proxy.id
             }
-            refresh_options[:contents_changed] if options.key?(:contents_changed)
             action = plan_self(refresh_options)
 
-            plan_action(SaveDistributionReferences, repository, smart_proxy,
-                        action.output, :contents_changed => options[:contents_changed])
+            plan_action(SaveDistributionReferences, repository, smart_proxy, action.output)
           end
         end
 

data/app/lib/actions/pulp3/repository/save_distribution_references.rb

@@ -2,8 +2,6 @@ module Actions
   module Pulp3
     module Repository
       class SaveDistributionReferences < Pulp3::Abstract
-        middleware.use Actions::Middleware::ExecuteIfContentsChanged
-
         def plan(repository, smart_proxy, tasks, options = {})
           plan_self(repository_id: repository.id, smart_proxy_id: smart_proxy.id, tasks: tasks, contents_changed: options[:contents_changed])
         end

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

@@ -81,7 +81,8 @@ module Katello
 
       def import_all(unit_ids, repository = nil, options = {})
         content_type = options[:content_type] || self.content_type
-        Katello::ContentUnitIndexer.new(content_type: Katello::RepositoryTypeManager.find_content_type(content_type), repository: repository, pulp_content_ids: unit_ids).import_all
+        filtered_indexing = options[:filtered_indexing] || false
+        Katello::ContentUnitIndexer.new(content_type: Katello::RepositoryTypeManager.find_content_type(content_type), repository: repository, pulp_content_ids: unit_ids).import_all(filtered_indexing)
       end
 
       def copy_repository_associations(source_repo, dest_repo)

data/app/services/katello/content_unit_indexer.rb

@@ -21,9 +21,9 @@ module Katello
       end
     end
 
-    def import_all
+    def import_all(filtered_indexing = false)
+      additive = filtered_indexing || (@repository&.mirroring_policy == 'additive')
       association_tracker = RepoAssociationTracker.new(@content_type, @service_class, @repository)
-
       units_from_pulp.each do |units|
         units.each do |unit|
           association_tracker.push(unit)
@@ -52,7 +52,7 @@ module Katello
       end
 
       if @model_class.many_repository_associations && @repository
-        sync_repository_associations(association_tracker)
+        sync_repository_associations(association_tracker, additive: additive)
       end
     end
 

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

@@ -119,7 +119,7 @@ module Katello
         date.to_i.to_s == date ? epoch_to_date(date) : date
       end
 
-      def epoch_to_date(epoch)
+      def self.epoch_to_date(epoch)
         Time.at(epoch.to_i).to_s
       end
     end

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

@@ -285,11 +285,17 @@ module Katello
           return update_distribution
         end
 
-        if dist_ref
+        if dist && dist_ref
+          # If the saved distribution reference is wrong, delete it and use the existing distribution
+          if dist.pulp_href != dist_ref.href
+            dist_ref.destroy
+            save_distribution_references([dist.pulp_href])
+          end
           return update_distribution
         end
 
         # Since we got this far, we need to create a new distribution
+        # Note: the distribution reference can't be saved yet because distribution creation is async
         begin
           create_distribution(relative_path)
         rescue api.client_module::ApiError => e
@@ -307,6 +313,9 @@ module Katello
 
       def create_distribution(path)
         distribution_data = api.distribution_class.new(secure_distribution_options(path))
+        unless ::Katello::RepositoryTypeManager.find(repo.content_type).pulp3_skip_publication
+          fail_missing_publication(distribution_data.publication)
+        end
         api.distributions_api.create(distribution_data)
       end
 
@@ -314,9 +323,16 @@ module Katello
         api.distributions_api.list(args).results
       end
 
+      def read_distribution(href = distribution_reference.href)
+        ignore_404_exception { api.distributions_api.read(href) }
+      end
+
       def update_distribution
         if distribution_reference
           options = secure_distribution_options(relative_path).except(:name)
+          unless ::Katello::RepositoryTypeManager.find(repo.content_type).pulp3_skip_publication
+            fail_missing_publication(options[:publication])
+          end
           distribution_reference.update(:content_guard_href => options[:content_guard])
           api.distributions_api.partial_update(distribution_reference.href, options)
         end
@@ -375,6 +391,12 @@ module Katello
         hrefs.each do |href|
           pulp3_distribution_data = api.get_distribution(href)
           path, content_guard_href = pulp3_distribution_data&.base_path, pulp3_distribution_data&.content_guard
+          if distribution_reference
+            found_distribution = read_distribution(distribution_reference.href)
+            unless found_distribution
+              distribution_reference.destroy
+            end
+          end
           unless distribution_reference
             # Ensure that duplicates won't be created in the case of a race condition
             DistributionReference.where(path: path, href: href, repository_id: repo.id, content_guard_href: content_guard_href).first_or_create!
@@ -529,6 +551,12 @@ module Katello
         return 0 if root.retain_package_versions_count.nil? || root.using_mirrored_content?
         root.retain_package_versions_count.to_i
       end
+
+      def fail_missing_publication(publication_href)
+        unless lookup_publication(publication_href)
+          fail _("The repository's publication is missing. Please run a 'complete sync' on %s." % repo.name)
+        end
+      end
     end
   end
 end

data/app/views/foreman/smart_proxies/show.html.erb

@@ -6,4 +6,6 @@
   <div ng-controller="PulpPrimaryController">
     <%= render :file => 'smart_proxies/show' %>
   </div>
+<% else -%>
+  <%= render :file => 'smart_proxies/show' %>
 <% end -%>

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

@@ -6,13 +6,6 @@ child :artifacts => :artifacts do
   attributes :id, :name
 end
 
-child :profiles => :profiles do
-  attributes :id, :name
-  child :rpms => :rpms do
-    attributes :id, :name
-  end
-end
-
 child :library_repositories => :repositories do
   attributes :id, :name
   glue :product do

data/db/migrate/20220303160220_remove_duplicate_errata.rb

@@ -1,4 +1,8 @@
 class RemoveDuplicateErrata < ActiveRecord::Migration[6.0]
+  # rubocop:disable Metrics/MethodLength
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/CyclomaticComplexity
+  # rubocop:disable Metrics/PerceivedComplexity
   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|
@@ -12,7 +16,7 @@ class RemoveDuplicateErrata < ActiveRecord::Migration[6.0]
     #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
+    # c) Delete all duplicate errata and child records
     ::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)
@@ -24,11 +28,48 @@ class RemoveDuplicateErrata < ActiveRecord::Migration[6.0]
           repo_erratum.update(erratum_id: errata_to_keep.id)
         end
       end
-      ::Katello::Erratum.delete(dup_errata&.pluck(:id))
+      ::Katello::ContentFacetErratum.where(erratum_id: dup_errata&.map(&:id)).each do |host_erratum|
+        if ::Katello::ContentFacetErratum.find_by(content_facet_id: host_erratum.content_facet_id, erratum_id: errata_to_keep.id)
+          host_erratum.delete
+        else
+          host_erratum.update(erratum_id: errata_to_keep.id)
+        end
+      end
+      dup_errata_ids = dup_errata&.pluck(:id)
+
+      erratum_packages = ::Katello::ErratumPackage.where(:erratum_id => dup_errata_ids)
+      erratum_packages.each do |dup_err_package|
+        erratum_package_to_keep = ::Katello::ErratumPackage.find_by(erratum_id: errata_to_keep.id, nvrea: dup_err_package.nvrea)
+        ::Katello::ModuleStreamErratumPackage.where(erratum_package_id: dup_err_package).each do |dup_mod_errata_package|
+          if ::Katello::ModuleStreamErratumPackage.find_by(module_stream_id: dup_mod_errata_package.module_stream_id, erratum_package_id: erratum_package_to_keep&.id)
+            dup_mod_errata_package.delete
+          else
+            begin
+              dup_mod_errata_package.update(erratum_package_id: erratum_package_to_keep&.id)
+            rescue
+              dup_mod_errata_package.delete
+            end
+          end
+        end
+      end
+
+      dup_errata_ids = dup_errata&.pluck(:id)
+      if dup_errata_ids&.present?
+        erratum_packages = ::Katello::ErratumPackage.where(:erratum_id => dup_errata_ids)
+        ::Katello::ModuleStreamErratumPackage.where(erratum_package_id: erratum_packages).delete_all
+        erratum_packages.delete_all
+        ::Katello::ErratumBugzilla.where(:erratum_id => dup_errata_ids).delete_all
+        ::Katello::ErratumCve.where(:erratum_id => dup_errata_ids).delete_all
+        ::Katello::Erratum.where(:id => dup_errata_ids).delete_all
+      end
     end
   end
 
+  # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/CyclomaticComplexity
+  # rubocop:enable Metrics/PerceivedComplexity
   def down
-    fail ActiveRecord::IrreversibleMigration
+    #Don't do anything on reverse
   end
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/mirroring-policy.service.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.repositories').service('MirroringPolicy',
     ['translate', function (translate) {
 
-        this.defaultMirroringPolicy = 'additive';
+        this.defaultMirroringPolicy = 'mirror_content_only';
 
         this.mirroringPolicies = function(repoType) {
             var policies = {

data/lib/katello/version.rb

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

data/webpack/components/RoutedTabs/index.js

@@ -1,18 +1,33 @@
 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, useLocation, withRouter, HashRouter } from 'react-router-dom';
+import { Switch, Route, Redirect, useHistory, 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 (
     <>
@@ -24,6 +39,7 @@ const RoutedTabs = ({
           <a
             key={key}
             href={`#/${key}`}
+            onMouseUp={e => onSelect(e, key)}
             style={{ textDecoration: 'none' }}
           >
             <Tab

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

@@ -115,7 +115,7 @@ const CreateContentViewForm = ({ setModalOpen }) => {
               aria-label="component_tile"
               icon={<ContentViewIcon composite={false} />}
               id="component"
-              title={__('Component content view')}
+              title={__('Content view')}
               onClick={() => { setComponent(true); setComposite(false); }}
               isSelected={component}
             >
@@ -133,7 +133,7 @@ const CreateContentViewForm = ({ setModalOpen }) => {
               onClick={() => { setComposite(true); setComponent(false); }}
               isSelected={composite}
             >
-              {__('Consisting of multiple component content views')}
+              {__('Consisting of multiple content views')}
             </Tile>
           </GridItem>
         </Grid>

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

@@ -68,7 +68,7 @@ test('Displays dependent fields correctly', () => {
   expect(getByText('Name')).toBeInTheDocument();
   expect(getByText('Label')).toBeInTheDocument();
   expect(getByText('Composite content view')).toBeInTheDocument();
-  expect(getByText('Component content view')).toBeInTheDocument();
+  expect(getByText('Content view')).toBeInTheDocument();
   expect(getByText('Solve dependencies')).toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
   expect(getByText('Import only')).toBeInTheDocument();

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

@@ -87,7 +87,7 @@ const ComponentContentViewAddModal = ({
 
   return (
     <Modal
-      title={componentId ? __('Update version') : __('Add component')}
+      title={componentId ? __('Update version') : __('Add content view')}
       variant={ModalVariant.small}
       isOpen={show}
       description={__(`Select available version of ${cvName} to use`)}

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

@@ -51,10 +51,10 @@ const ComponentContentViewBulkAddModal = ({ cvId, rowsToAdd, onClose }) => {
 
   return (
     <Modal
-      title={__('Add component content views')}
+      title={__('Add content views')}
       variant={ModalVariant.large}
       isOpen
-      description={__('Select available version of components to use')}
+      description={__('Select available version of content views to use')}
       onClose={onClose}
       appendTo={document.body}
     >

data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js

@@ -212,7 +212,7 @@ test('Can add published component views to content view with modal', async (done
   });
   fireEvent.click(getByText('Add'));
   await patientlyWaitFor(() => {
-    expect(getByText('Add component')).toBeInTheDocument();
+    expect(getByText('Add content view')).toBeInTheDocument();
   });
   fireEvent.click(getByLabelText('add_component'));
   await patientlyWaitFor(() => {
@@ -317,7 +317,7 @@ test('Can bulk add component views to content view with modal', async (done) =>
     .reply(200, {});
 
   const {
-    getByText, getByLabelText, queryByText,
+    getAllByText, getByLabelText, queryByText,
   } = renderWithRedux(
     <ContentViewComponents cvId={4} details={cvDetails} />,
     renderOptions,
@@ -333,14 +333,14 @@ test('Can bulk add component views to content view with modal', async (done) =>
   });
   fireEvent.click(getByLabelText('bulk_add_components'));
   await patientlyWaitFor(() => {
-    expect(getByText('Add component content views')).toBeInTheDocument();
+    expect(getAllByText('Add content views')[1]).toBeInTheDocument();
   });
   fireEvent.click(getByLabelText('version-select-cv-10'));
   fireEvent.click(getByLabelText('cv-10-3.0'));
 
   fireEvent.click(getByLabelText('add_components'));
   await patientlyWaitFor(() => {
-    expect(queryByText('Add component content views')).not.toBeInTheDocument();
+    expect(queryByText('Select available version of content views to use')).not.toBeInTheDocument();
     expect(getByLabelText('bulk_add_components')).toHaveAttribute('aria-disabled', 'false');
   });
 

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

@@ -70,7 +70,7 @@ const ContentViewInfo = ({ cvId, details }) => {
         <TextListItem component={TextListItemVariants.dd} className="foreman-spaced-list">
           <Flex>
             <FlexItem spacer={{ default: 'spacerXs' }}>
-              <ContentViewIcon composite={composite} description={composite ? __('Composite') : __('Component')} />
+              <ContentViewIcon composite={composite} description={composite ? __('Composite') : __('Content view')} />
             </FlexItem>
           </Flex>
         </TextListItem>

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

@@ -43,14 +43,14 @@ test('Can call API for CVs and show on screen on page load', async (done) => {
     .query(true)
     .reply(200, cvIndexData);
 
-  const { queryByText } = renderWithRedux(<ContentViewsPage />, renderOptions);
+  const { queryByText, queryAllByText } = renderWithRedux(<ContentViewsPage />, renderOptions);
 
   expect(queryByText(firstCV.name)).toBeNull();
 
   // Assert that the CV name is now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => {
     expect(queryByText(firstCV.name)).toBeInTheDocument();
-    expect(queryByText('Component content views')).toBeInTheDocument();
+    expect(queryAllByText('Content views')[0]).toBeInTheDocument();
     expect(queryByText('Composite content views')).toBeInTheDocument();
   });
 
@@ -354,7 +354,7 @@ test('Displays Create Content View and opens modal with Form', async () => {
   expect(queryByText('Name')).not.toBeInTheDocument();
   expect(queryByText('Label')).not.toBeInTheDocument();
   expect(queryByText('Composite content view')).not.toBeInTheDocument();
-  expect(queryByText('Component content view')).not.toBeInTheDocument();
+  expect(queryByText('Content view')).not.toBeInTheDocument();
   expect(queryByText('Solve dependencies')).not.toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
   expect(queryByText('Import only')).not.toBeInTheDocument();
@@ -365,7 +365,7 @@ test('Displays Create Content View and opens modal with Form', async () => {
   expect(getByText('Name')).toBeInTheDocument();
   expect(getByText('Label')).toBeInTheDocument();
   expect(getByText('Composite content view')).toBeInTheDocument();
-  expect(getByText('Component content view')).toBeInTheDocument();
+  expect(getByText('Content view')).toBeInTheDocument();
   expect(getByText('Solve dependencies')).toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
   expect(getByText('Import only')).toBeInTheDocument();

data/webpack/scenes/ContentViews/components/ContentViewsCounter.js

@@ -18,7 +18,7 @@ const ContentViewsCounter = () => {
         <b>
           <Flex>
             <FlexItem spacer={{ default: 'spacerXs' }}>
-              <ContentViewIcon composite={false} description={__('Component content views')} count={(component || component === 0) ? component : <InProgressIcon />} />
+              <ContentViewIcon composite={false} description={__('Content views')} count={(component || component === 0) ? component : <InProgressIcon />} />
             </FlexItem>
             <FlexItem>
               <Tooltip

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

@@ -14,14 +14,14 @@ const DetailsExpansion = ({
     if (cvComposite) {
       return (
         <>
-          {__('Related component cvs: ')}
+          {__('Related content views: ')}
           <RelatedContentViewComponentsModal key="cvId" {...{ cvName, cvId, relatedCVCount }} />
         </>
       );
     }
     return (
       <>
-        {__('Related composite cvs: ')}
+        {__('Related composite content views: ')}
         <RelatedCompositeContentViewsModal
           key={cvId}
           {...{

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

@@ -29,7 +29,7 @@ const RelatedContentViewsModal = ({ cvName, cvId, relatedCVCount }) => {
       <FlexItem>
         <RegistryIcon />
         <b>{` ${cvName}`}</b>
-        {__(' content view is used in listed component content views. For more information, ')}
+        {__(' content view is used in listed content views. For more information, ')}
         <Link to={urlBuilder(`content_views/${cvId}#/contentviews`, '')}>
           {__('view content view tabs.')}
         </Link>
@@ -49,7 +49,7 @@ const RelatedContentViewsModal = ({ cvName, cvId, relatedCVCount }) => {
       <Grid>
         <GridItem span={12}>
           <Modal
-            title={__('Related component content views')}
+            title={__('Related content views')}
             variant={ModalVariant.medium}
             isOpen={isOpen}
             description={description()}

data/webpack/scenes/ContentViews/expansions/__tests__/contentViewComponentsModal.test.js

@@ -30,7 +30,7 @@ test('Can call API and show Related Content Views Components Modal', async (done
 
   await patientlyWaitFor(() => expect(getByLabelText(`button_${cvId}`)).toBeInTheDocument());
   fireEvent.click(getByLabelText(`button_${cvId}`));
-  await patientlyWaitFor(() => expect(getByText('Related component content views')).toBeInTheDocument());
+  await patientlyWaitFor(() => expect(getByText('Related content views')).toBeInTheDocument());
 
   assertNockRequest(scope, done);
 });

data/webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import ModuleStreamDetailArtifacts from './ModuleStreamDetailArtifacts';
-import ModuleStreamDetailProfiles from './Profiles/ModuleStreamDetailProfiles';
 import ContentDetailInfo from '../../../components/Content/Details/ContentDetailInfo';
 import ContentDetailRepositories from '../../../components/Content/Details/ContentDetailRepositories';
 
@@ -17,7 +16,7 @@ export const displayMap = new Map([
 ]);
 
 export default (detailInfo) => {
-  const { repositories, profiles, artifacts } = detailInfo;
+  const { repositories, artifacts } = detailInfo;
 
   return [
     {
@@ -37,14 +36,6 @@ export default (detailInfo) => {
     },
     {
       key: 3,
-      tabHeader: __('Profiles'),
-      tabContent: (profiles && profiles.length ?
-        <ModuleStreamDetailProfiles profiles={profiles} /> :
-        __('No profiles to show')
-      ),
-    },
-    {
-      key: 4,
       tabHeader: __('Artifacts'),
       tabContent: (artifacts && artifacts.length ?
         <ModuleStreamDetailArtifacts artifacts={artifacts} /> :

data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetails.js

@@ -44,21 +44,20 @@ class ModuleStreamDetails extends Component {
     return (
       <div>
         {!loading && <BreadcrumbsBar
+          isLoadingResources={loading}
           onSwitcherItemClick={(e, url) => this.handleBreadcrumbSwitcherItem(e, url)}
-          data={{
-            isSwitchable: true,
-            breadcrumbItems: [
-              {
-                caption: __('Module Streams'),
-                onClick: () =>
-                  this.props.history.push('/module_streams'),
-              },
-              {
-                caption: `${name} ${stream}`,
-              },
-            ],
-            resource,
-          }}
+          isSwitchable
+          breadcrumbItems={[
+            {
+              caption: __('Module Streams'),
+              onClick: () =>
+                this.props.history.push('/module_streams'),
+            },
+            {
+              caption: `${name} ${stream}`,
+            },
+          ]}
+          resource={resource}
         />}
         <ContentDetails
           contentDetails={moduleStreamDetails}

data/webpack/scenes/ModuleStreams/Details/__tests__/__snapshots__/ModuleStreamDetails.test.js.snap

@@ -76,11 +76,6 @@ exports[`Module stream details page rendering renders with loading state 1`] = `
         },
         Object {
           "key": 3,
-          "tabContent": "No profiles to show",
-          "tabHeader": "Profiles",
-        },
-        Object {
-          "key": 4,
           "tabContent": "No artifacts to show",
           "tabHeader": "Artifacts",
         },
@@ -93,26 +88,26 @@ exports[`Module stream details page rendering renders with loading state 1`] = `
 exports[`Module stream details page rendering renders with module stream provided 1`] = `
 <div>
   <BreadcrumbsBar
-    data={
-      Object {
-        "breadcrumbItems": Array [
-          Object {
-            "caption": "Module Streams",
-            "onClick": [Function],
-          },
-          Object {
-            "caption": "avocado latest",
-          },
-        ],
-        "isSwitchable": true,
-        "resource": Object {
-          "nameField": "name",
-          "resourceUrl": "/katello/api/v2/module_streams",
-          "switcherItemUrl": "/module_streams/:id",
+    breadcrumbItems={
+      Array [
+        Object {
+          "caption": "Module Streams",
+          "onClick": [Function],
         },
-      }
+        Object {
+          "caption": "avocado latest",
+        },
+      ]
     }
+    isSwitchable={true}
     onSwitcherItemClick={[Function]}
+    resource={
+      Object {
+        "nameField": "name",
+        "resourceUrl": "/katello/api/v2/module_streams",
+        "switcherItemUrl": "/module_streams/:id",
+      }
+    }
   />
   <ContentDetails
     contentDetails={
@@ -397,84 +392,6 @@ exports[`Module stream details page rendering renders with module stream provide
         },
         Object {
           "key": 3,
-          "tabContent": <ModuleStreamDetailProfiles
-            profiles={
-              Array [
-                Object {
-                  "id": 37,
-                  "name": "default",
-                  "rpms": Array [
-                    Object {
-                      "id": 108,
-                      "name": "perl",
-                    },
-                    Object {
-                      "id": 110,
-                      "name": "foo",
-                    },
-                    Object {
-                      "id": 111,
-                      "name": "rpm_0",
-                    },
-                    Object {
-                      "id": 112,
-                      "name": "rpm_1",
-                    },
-                    Object {
-                      "id": 113,
-                      "name": "rpm_2",
-                    },
-                    Object {
-                      "id": 114,
-                      "name": "rpm_3",
-                    },
-                    Object {
-                      "id": 115,
-                      "name": "rpm_4",
-                    },
-                    Object {
-                      "id": 116,
-                      "name": "rpm_5",
-                    },
-                    Object {
-                      "id": 117,
-                      "name": "rpm_6",
-                    },
-                    Object {
-                      "id": 118,
-                      "name": "rpm_7",
-                    },
-                    Object {
-                      "id": 119,
-                      "name": "rpm_8",
-                    },
-                    Object {
-                      "id": 120,
-                      "name": "rpm_9",
-                    },
-                    Object {
-                      "id": 121,
-                      "name": "rpm_10",
-                    },
-                  ],
-                },
-                Object {
-                  "id": 38,
-                  "name": "minimal",
-                  "rpms": Array [
-                    Object {
-                      "id": 84,
-                      "name": "python2-avocado",
-                    },
-                  ],
-                },
-              ]
-            }
-          />,
-          "tabHeader": "Profiles",
-        },
-        Object {
-          "key": 4,
           "tabContent": <ModuleStreamDetailArtifacts
             artifacts={
               Array [

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

@@ -9,5 +9,6 @@ export const CDN_CONFIGURATION_TYPES = {
   airgapped: __('Air-gapped'),
 };
 
+export const DEFAULT_ORGANIZATION_LABEL = 'Default_Organization';
 export const DEFAULT_CONTENT_VIEW_LABEL = 'Default_Organization_View';
 export const DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL = 'Library';

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

@@ -18,7 +18,7 @@ import {
 import { translate as __ } from 'foremanReact/common/I18n';
 import { noop } from 'foremanReact/common/helpers';
 
-import { UPSTREAM_SERVER, DEFAULT_CONTENT_VIEW_LABEL, DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL } from './CdnConfigurationConstants';
+import { UPSTREAM_SERVER, DEFAULT_CONTENT_VIEW_LABEL, DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL, DEFAULT_ORGANIZATION_LABEL } from './CdnConfigurationConstants';
 import EditableTextInput from '../../../../components/EditableTextInput';
 
 import {
@@ -37,15 +37,17 @@ const UpstreamServerTypeForm = ({
   const [username, setUsername] = useState(cdnConfiguration.username);
   const [password, setPassword] = useState(null);
   const [organizationLabel, setOrganizationLabel] =
-    useState(cdnConfiguration.upstream_organization_label);
+    useState(cdnConfiguration.upstream_organization_label || DEFAULT_ORGANIZATION_LABEL);
   const [sslCaCredentialId, setSslCaCredentialId] = useState(cdnConfiguration.ssl_ca_credential_id);
   const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
 
   const [contentViewLabel, setContentViewLabel] =
-    useState(cdnConfiguration.upstream_content_view_label);
+    useState(cdnConfiguration.upstream_content_view_label ||
+      DEFAULT_CONTENT_VIEW_LABEL);
 
   const [lifecycleEnvironmentLabel, setLifecycleEnvironmentLabel] =
-    useState(cdnConfiguration.upstream_lifecycle_environment_label);
+    useState(cdnConfiguration.upstream_lifecycle_environment_label ||
+      DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL);
 
   const [updateEnabled, setUpdateEnabled] = useState(false);
 
@@ -85,7 +87,7 @@ const UpstreamServerTypeForm = ({
       url,
       username,
       password,
-      upstream_organization_label: organizationLabel,
+      upstream_organization_label: organizationLabel || DEFAULT_ORGANIZATION_LABEL,
       ssl_ca_credential_id: sslCaCredentialId,
       upstream_content_view_label: contentViewLabel || DEFAULT_CONTENT_VIEW_LABEL,
       upstream_lifecycle_environment_label: lifecycleEnvironmentLabel ||
@@ -184,7 +186,7 @@ const UpstreamServerTypeForm = ({
           <TextInput
             aria-label="cdn-lifecycle-environment-label"
             type="text"
-            value={lifecycleEnvironmentLabel || DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL}
+            value={lifecycleEnvironmentLabel || ''}
             isDisabled={updatingCdnConfiguration}
             onChange={setLifecycleEnvironmentLabel}
           />
@@ -195,7 +197,7 @@ const UpstreamServerTypeForm = ({
           <TextInput
             aria-label="cdn-content-view-label"
             type="text"
-            value={contentViewLabel || DEFAULT_CONTENT_VIEW_LABEL}
+            value={contentViewLabel || ''}
             isDisabled={updatingCdnConfiguration}
             onChange={setContentViewLabel}
           />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails