katello 4.6.2 → 4.6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d7693d6a56ee10971e122cad1954c027e6be19a6a5b97f0e6916d5c15429daa
-  data.tar.gz: 7bec1301d49c9f4fbb4ed36a4e18ef2ee2320007048ceb59ac6290bc19a7e705
+  metadata.gz: 2dd589cc9f10f642c5e8eac5dec7145c6e36eb35ba7ff39da34e295998277e0f
+  data.tar.gz: 8e6e3b9674bc9c153cb54ff2408a6c504d61c9bb95e4dd45b30ecbaabc3c1cd3
 SHA512:
-  metadata.gz: d76732ac02b89f7c71917dd97b86e4069f7d1d044005d2c97c43b097cad07b69f26fb1579c931eb9a23d35b8a47d0c85c76542bdedfc5c4392931f58dbeebe64
-  data.tar.gz: d30c17abe79a6c500e396098665c85a6cd7ccc5f1116771bab56a6426bc0d29bd8607d377f381db46962eb1138249076c5a888648d4064610a62e0a7bcc9f550
+  metadata.gz: 166848d61324a18d58a58708146b5525888788707ffac5c1d0899cb9f1663a42f075628d691289c54771db0dd769bfbbdd159df68c9249c4dc87fd11f265fef8
+  data.tar.gz: 9a693e7711623e663ceadaea211a5aa2d2b4a0c658d36fd36f1705f0d5a799a763574c75415af9373caec26f41b34de227e2e70e7a3e4915279d7603fe8c39f2

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/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.6.2".freeze
+  VERSION = "4.6.2.1".freeze
 end

data/webpack/components/Table/TableHooks.js

@@ -145,6 +145,7 @@ export const useBulkSelect = ({
   initialArry = [],
   initialSearchQuery = '',
   idColumn = 'id',
+  filtersQuery = '',
   isSelectable,
 }) => {
   const { selectionSet: inclusionSet, ...selectOptions } =
@@ -208,7 +209,7 @@ export const useBulkSelect = ({
 
   const fetchBulkParams = (idColumnName = idColumn) => {
     const searchQueryWithExclusionSet = () => {
-      const query = [searchQuery,
+      const query = [searchQuery, filtersQuery,
         !isEmpty(exclusionSet) && `${idColumnName} !^ (${[...exclusionSet].join(',')})`];
       return query.filter(item => item).join(' and ');
     };

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

@@ -120,6 +120,17 @@ export const ErrataTab = () => {
     initialSortColumnName: 'Errata',
   });
 
+  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;
@@ -155,6 +166,7 @@ export const ErrataTab = () => {
     results,
     metadata,
     idColumn: 'errata_id',
+    filtersQuery: filtersQuery(),
     isSelectable: result => result.installable,
     initialSearchQuery: searchParam || '',
   });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.6.2.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4629,6 +4629,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/components/SortableColumnHeaders.js
 - webpack/components/Table/components/TranslatedPlural.js
 - webpack/components/Table/helpers.js