katello 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60531c92a13f5d62aaea839bc1dc5512f0a75b0eea7f7a7820c0144747928501
-  data.tar.gz: ec6e2f242dabd880929727846034aae0356aa76ae61a467864f66703b5899093
+  metadata.gz: 5ba77185c8a7b69f5804f90eca22f14863b4eaf37311fbbfcdd30e95bff824cf
+  data.tar.gz: 024c9250e18577f8897698c4af3d21e432c3986a6b84599876412a715fe2bbc5
 SHA512:
-  metadata.gz: 5a678ed0980575f97093e0908c58964ce62137ab502b0c5b2755f04d09466c8ed77e00f7ae120762a6006347d33d7ce7b94bf045c62799023d8efa0912426b44
-  data.tar.gz: 7a4e2f5eb5afac20586eb0c1581d560991cd012ded9887a249d873c579384b0d64f34db23d86a31db2d8f941b00a37f2bc579bad7ae6ad778f13e698b03137f5
+  metadata.gz: 00ba2a8b933f5069920529d0780c48c290a157ff62123a0f530332497c5c34e5901d20eb7b4b832a2f7fb1ba3ed6a7dd591b3131e1f20e5b1f75335d67d487a0
+  data.tar.gz: 31d37614299b5877a287ef408d3f3a37b46f8b2c9111860ce438c60e69b7fbab11c3e7531e433d0d54eea7f18e73f25a4d117b3364315dd3103102df082f788d

data/app/services/katello/content_unit_indexer.rb

@@ -22,7 +22,6 @@ module Katello
     end
 
     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|
@@ -52,7 +51,7 @@ module Katello
       end
 
       if @model_class.many_repository_associations && @repository
-        sync_repository_associations(association_tracker, additive: additive)
+        sync_repository_associations(association_tracker, additive: filtered_indexing)
       end
     end
 

data/db/migrate/20211220185935_clean_duplicate_content_units.rb

@@ -20,7 +20,7 @@ class CleanDuplicateContentUnits < ActiveRecord::Migration[6.0]
     to_delete = []
     to_update = []
     duplicate_models.each do |duplicate|
-      query = {new_id_field => new_id}
+      query = { new_id_field => new_id }
       unique_fields.each do |field|
         query[field] = duplicate.send(field)
       end
@@ -52,28 +52,25 @@ class CleanDuplicateContentUnits < ActiveRecord::Migration[6.0]
   def up
     handle_null_pulp_ids
     add_foreign_keys
+    delete_deprecated_models
 
     handle_duplicate(Katello::ModuleStream,
                      'module_stream_id',
                      [:pulp_id],
-                     associated_models: {Katello::RepositoryModuleStream => :repository_id},
+                     associated_models: { Katello::RepositoryModuleStream => :repository_id },
                      child_models: [Katello::ContentViewModuleStreamFilterRule,
                                     Katello::ContentFacetApplicableModuleStream,
                                     Katello::ModuleProfile,
                                     Katello::ModuleStreamArtifact,
                                     Katello::ModuleStreamErratumPackage,
                                     Katello::ModuleStreamRpm])
-    add_index :katello_module_streams, :pulp_id, :unique => true
 
-    handle_duplicate(Katello::ModuleProfile, 'module_profile_id', [:module_stream_id, :name],
-                     child_models: [Katello::ModuleProfileRpm])
+    add_index :katello_module_streams, :pulp_id, :unique => true
     add_index :katello_module_profiles, [:module_stream_id, :name], :unique => true
-
-    handle_duplicate(Katello::ModuleProfileRpm, 'module_profile_rpm_id', [:module_profile_id, :name])
     add_index :katello_module_profile_rpms, [:module_profile_id, :name], :unique => true
 
     handle_duplicate(Katello::AnsibleTag, 'ansible_tag_id', [:name],
-                     associated_models: {Katello::AnsibleCollectionTag => :ansible_collection_id})
+                     associated_models: { Katello::AnsibleCollectionTag => :ansible_collection_id })
     add_index :katello_ansible_tags, [:name], :unique => true
 
     handle_duplicate(Katello::AnsibleCollectionTag, 'ansible_collection_tag_id', [:ansible_collection_id, :ansible_tag_id])
@@ -83,7 +80,7 @@ class CleanDuplicateContentUnits < ActiveRecord::Migration[6.0]
     handle_duplicate(Katello::GenericContentUnit,
                      'generic_content_unit_id',
                      [:pulp_id],
-                     associated_models: {Katello::RepositoryGenericContentUnit => :repository_id})
+                     associated_models: { Katello::RepositoryGenericContentUnit => :repository_id })
     add_index :katello_generic_content_units, :pulp_id, :unique => true
 
     handle_duplicate(Katello::DockerManifestList, 'docker_manifest_list_id', [:pulp_id],
@@ -112,6 +109,11 @@ class CleanDuplicateContentUnits < ActiveRecord::Migration[6.0]
     change_column :katello_docker_manifests, :pulp_id, :string, :null => false
   end
 
+  def delete_deprecated_models
+    Katello::ModuleProfileRpm.delete_all
+    Katello::ModuleProfile.delete_all
+  end
+
   def add_foreign_keys
     Katello::DockerManifestListManifest.where.not(docker_manifest_list_id: Katello::DockerManifestList.pluck(:id)).delete_all
     add_foreign_key :katello_docker_manifest_list_manifests, :katello_docker_manifest_lists, column: :docker_manifest_list_id

data/lib/katello/version.rb

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

data/webpack/components/Table/TableHooks.js

@@ -139,6 +139,7 @@ export const useBulkSelect = ({
   initialArry = [],
   initialSearchQuery = '',
   idColumn = 'id',
+  filtersQuery = '',
   isSelectable,
 }) => {
   const { selectionSet: inclusionSet, ...selectOptions } =
@@ -200,16 +201,16 @@ export const useBulkSelect = ({
     }
   };
 
-  const fetchBulkParams = () => {
+  const fetchBulkParams = (idColumnName = idColumn) => {
     const searchQueryWithExclusionSet = () => {
-      const query = [searchQuery,
-        !isEmpty(exclusionSet) && `${idColumn} !^ (${[...exclusionSet].join(',')})`];
+      const query = [searchQuery, filtersQuery,
+        !isEmpty(exclusionSet) && `${idColumnName} !^ (${[...exclusionSet].join(',')})`];
       return query.filter(item => item).join(' and ');
     };
 
     const searchQueryWithInclusionSet = () => {
       if (isEmpty(inclusionSet)) throw new Error('Cannot build a search query with no items selected');
-      return `${idColumn} ^ (${[...inclusionSet].join(',')})`;
+      return `${idColumnName} ^ (${[...inclusionSet].join(',')})`;
     };
 
     return selectAllMode ? searchQueryWithExclusionSet() : searchQueryWithInclusionSet();

data/webpack/components/Table/__test__/useBulkSelect.test.js

@@ -0,0 +1,99 @@
+import { act, renderHook } from '@testing-library/react-hooks';
+import { useBulkSelect } from '../TableHooks';
+
+const isSelectable = () => true;
+const idColumn = 'errata_id';
+const metadata = {
+  error: null, selectable: 2, subtotal: 2, total: 2,
+};
+const results = [
+  {
+    errata_id: 'RHSA-2022:2031',
+    id: 311,
+    severity: 'Low',
+    type: 'security',
+  },
+  {
+    errata_id: 'RHSA-2022:2110',
+    id: 17,
+    severity: 'Low',
+    type: 'security',
+  },
+];
+
+it('returns a scoped search string based on inclusionSet', () => {
+  const { result } = renderHook(() => useBulkSelect({
+    results,
+    metadata,
+    idColumn,
+    isSelectable,
+  }));
+
+  act(() => {
+    result.current.selectOne(true, 'RHSA-2022:2031');
+  });
+
+  expect(result.current.fetchBulkParams()).toBe('errata_id ^ (RHSA-2022:2031)');
+});
+
+it('returns a scoped search string based on exclusionSet', () => {
+  const { result } = renderHook(() => useBulkSelect({
+    results,
+    metadata,
+    idColumn,
+    isSelectable,
+  }));
+
+  act(() => {
+    result.current.selectAll(true);
+  });
+
+  act(() => {
+    result.current.selectOne(false, 'RHSA-2022:2031');
+  });
+
+  expect(result.current.fetchBulkParams()).toBe('errata_id !^ (RHSA-2022:2031)');
+});
+
+it('adds search query to scoped search string based on exclusionSet', () => {
+  const { result } = renderHook(() => useBulkSelect({
+    results,
+    metadata,
+    idColumn,
+    isSelectable,
+  }));
+
+  act(() => {
+    result.current.updateSearchQuery('type=security');
+  });
+
+  act(() => {
+    result.current.selectAll(true);
+  });
+
+  act(() => {
+    result.current.selectOne(false, 'RHSA-2022:2031');
+  });
+
+  expect(result.current.fetchBulkParams()).toBe('type=security and errata_id !^ (RHSA-2022:2031)');
+});
+
+it('adds filter dropdown query to scoped search string', () => {
+  const { result } = renderHook(() => useBulkSelect({
+    results,
+    metadata,
+    idColumn,
+    isSelectable,
+    filtersQuery: 'severity=Low',
+  }));
+
+  act(() => {
+    result.current.selectAll(true);
+  });
+
+  act(() => {
+    result.current.selectOne(false, 'RHSA-2022:2031');
+  });
+
+  expect(result.current.fetchBulkParams()).toBe('severity=Low and errata_id !^ (RHSA-2022:2031)');
+});

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

@@ -79,6 +79,17 @@ export const ErrataTab = () => {
     __('Published date'),
   ];
 
+  const filtersQuery = () => {
+    const query = [];
+    if (errataTypeSelected !== ERRATA_TYPE) {
+      query.push(`type=${TYPES_TO_PARAM[errataTypeSelected]}`);
+    }
+    if (errataSeveritySelected !== ERRATA_SEVERITY) {
+      query.push(`severity=${SEVERITIES_TO_PARAM[errataSeveritySelected]}`);
+    }
+    return query.join(' and ');
+  };
+
   const fetchItems = useCallback(
     (params) => {
       if (!hostId) return hostIdNotReady;
@@ -112,6 +123,7 @@ export const ErrataTab = () => {
     results,
     metadata,
     idColumn: 'errata_id',
+    filtersQuery: filtersQuery(),
     isSelectable: result => result.installable,
     initialSearchQuery: searchParam || '',
   });
@@ -248,7 +260,7 @@ export const ErrataTab = () => {
   );
 
   const hostIsNonLibrary = (
-    contentFacet?.contentViewDefault === false && contentFacet.lifecycleEnvironmentLibrary === false
+    contentFacet?.contentViewDefault === false || contentFacet.lifecycleEnvironmentLibrary === false
   );
   const toggleGroup = (
     <Split hasGutter>

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

@@ -75,7 +75,7 @@ const RepositorySetsTab = () => {
     contentViewName,
     lifecycleEnvironmentName,
   } = contentFacet;
-  const nonLibraryHost = contentViewDefault === false &&
+  const nonLibraryHost = contentViewDefault === false ||
     lifecycleEnvironmentLibrary === false;
   const simpleContentAccess = (Number(subscriptionStatus) === 5);
   const dispatch = useDispatch();

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

@@ -558,7 +558,7 @@ test('Toggle Group shows if it\'s not the default content view or library enviro
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
 
-test('Toggle Group does not show if it\'s the default content view ', async (done) => {
+test('Toggle Group shows if it\'s the default content view but non-library environment', async (done) => {
   const options = renderOptions({
     ...contentFacetAttributes,
     content_view_default: true,
@@ -579,14 +579,41 @@ test('Toggle Group does not show if it\'s the default content view ', async (don
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
-  expect(queryByLabelText('Installable Errata')).not.toBeInTheDocument();
+  expect(queryByLabelText('Installable Errata')).toBeInTheDocument();
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});
+
+test('Toggle Group shows if it\'s the library environment but non-default content view', async (done) => {
+  const options = renderOptions({
+    ...contentFacetAttributes,
+    lifecycle_environment_library: true,
+  });
+  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const mockErrata = makeMockErrata({});
+  // return errata data results when we look for errata
+  const scope = nockInstance
+    .get(hostErrata)
+    .query(defaultQuery)
+    .reply(200, mockErrata);
+
+  const {
+    queryByLabelText,
+    getAllByText,
+  } = renderWithRedux(<ErrataTab />, options);
+
+  // Assert that the errata are now showing on the screen, but wait for them to appear.
+  await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
+  expect(queryByLabelText('Installable Errata')).toBeInTheDocument();
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
 
-test('Toggle Group does not show if it\'s the  library environment', async (done) => {
+test('Toggle Group does not show if it\'s the default content view and library environment', async (done) => {
   const options = renderOptions({
     ...contentFacetAttributes,
+    content_view_default: true,
     lifecycle_environment_library: true,
   });
   // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello

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

@@ -36,7 +36,7 @@ const autocompleteUrl = '/repository_sets/auto_complete_search';
 const repositorySetBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_product_contents');
 const contentOverride = foremanApi.getApiUrl('/hosts/1/subscriptions/content_override');
 
-const defaultQuery = {
+const limitToEnvQuery = {
   content_access_mode_env: true,
   content_access_mode_all: true,
   host_id: 1,
@@ -44,8 +44,8 @@ const defaultQuery = {
   page: 1,
   search: '',
 };
-const libraryQuery = {
-  ...defaultQuery,
+const showAllQuery = {
+  ...limitToEnvQuery,
   content_access_mode_env: false,
 };
 
@@ -73,7 +73,7 @@ test('Can call API for repository sets and show basic table', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
 
   const { getByText } = renderWithRedux(<RepositorySetsTab />, renderOptions());
@@ -97,7 +97,7 @@ test('Can handle no repository sets being present', async (done) => {
 
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, noResults);
 
   const { queryByText } = renderWithRedux(<RepositorySetsTab />, renderOptions());
@@ -113,7 +113,7 @@ test('Toggle Group shows if it\'s not the default content view or library enviro
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -128,7 +128,7 @@ test('Toggle Group shows if it\'s not the default content view or library enviro
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
 
-test('Toggle Group does not show if it\'s the default content view ', async (done) => {
+test('Toggle Group shows if it\'s the default content view but non-library environment', async (done) => {
   const options = renderOptions({
     ...contentFacetAttributes,
     content_view_default: true,
@@ -137,7 +137,7 @@ test('Toggle Group does not show if it\'s the default content view ', async (don
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(libraryQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -147,12 +147,12 @@ test('Toggle Group does not show if it\'s the default content view ', async (don
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getByText(firstRepoSet.contentUrl)).toBeInTheDocument());
-  expect(queryByLabelText('Limit to environment')).not.toBeInTheDocument();
+  expect(queryByLabelText('Limit to environment')).toBeInTheDocument();
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
 
-test('Toggle Group does not show if it\'s the library environment', async (done) => {
+test('Toggle Group shows if it\'s the library environment but a non-default content view', async (done) => {
   const options = renderOptions({
     ...contentFacetAttributes,
     lifecycle_environment_library: true,
@@ -161,7 +161,32 @@ test('Toggle Group does not show if it\'s the library environment', async (done)
   // return errata data results when we look for errata
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(libraryQuery)
+    .query(limitToEnvQuery)
+    .reply(200, mockRepoSetData);
+
+  const {
+    queryByLabelText,
+    getByText,
+  } = renderWithRedux(<RepositorySetsTab />, options);
+
+  // Assert that the errata are now showing on the screen, but wait for them to appear.
+  await patientlyWaitFor(() => expect(getByText(firstRepoSet.contentUrl)).toBeInTheDocument());
+  expect(queryByLabelText('Limit to environment')).toBeInTheDocument();
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});
+
+test('Toggle Group does not show if it\'s the library environment and default content view', async (done) => {
+  const options = renderOptions({
+    ...contentFacetAttributes,
+    lifecycle_environment_library: true,
+    content_view_default: true,
+  });
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  // return errata data results when we look for errata
+  const scope = nockInstance
+    .get(hostRepositorySets)
+    .query(showAllQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -182,7 +207,7 @@ test('Can toggle with the Toggle Group ', async (done) => {
   // return errata data results when we look for errata
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -202,7 +227,7 @@ test('Can override to disabled', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
   const contentOverrideScope = nockInstance
     .put(contentOverride)
@@ -238,7 +263,7 @@ test('Can override to enabled', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
   const contentOverrideScope = nockInstance
     .put(contentOverride)
@@ -274,7 +299,7 @@ test('Can reset to default', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
   const contentOverrideScope = nockInstance
     .put(contentOverride)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-27 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +97,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -4690,6 +4696,7 @@ files:
 - webpack/components/Table/PageControls.js
 - webpack/components/Table/TableHooks.js
 - webpack/components/Table/TableWrapper.js
+- webpack/components/Table/__test__/useBulkSelect.test.js
 - webpack/components/Table/helpers.js
 - webpack/components/TooltipButton/TooltipButton.js
 - webpack/components/TooltipButton/TooltipButton.scss
@@ -5388,7 +5395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman