katello 4.4.2.2 → 4.5.0.rc1

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

@@ -1,4 +1,5 @@
 import React, { useState, useCallback } from 'react';
+import { FormattedMessage } from 'react-intl';
 import {
   Skeleton, Button, Split, SplitItem, ActionList, ActionListItem, Dropdown,
   DropdownItem, KebabToggle,
@@ -9,13 +10,14 @@ import { useSelector, useDispatch } from 'react-redux';
 import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
 import EnableTracerEmptyState from './EnableTracerEmptyState';
 import TableWrapper from '../../../../Table/TableWrapper';
-import { useBulkSelect, useUrlParams } from '../../../../Table/TableHooks';
+import { useBulkSelect, useTableSort, useUrlParams } from '../../../../Table/TableHooks';
 import { getHostTraces } from './HostTracesActions';
 import { resolveTraces } from '../RemoteExecutionActions';
 import { selectHostTracesStatus } from './HostTracesSelectors';
 import { resolveTraceUrl } from '../customizedRexUrlHelpers';
 import './TracesTab.scss';
 import hostIdNotReady from '../../HostDetailsActions';
+import SortableColumnHeaders from '../../../../Table/components/SortableColumnHeaders';
 
 const TracesTab = () => {
   const hostDetails = useSelector(state => selectAPIResponse(state, 'HOST_DETAILS'));
@@ -26,20 +28,41 @@ const TracesTab = () => {
     content_facet_attributes: contentFacetAttributes,
   } = hostDetails;
   const showEnableTracer = (contentFacetAttributes?.katello_tracer_installed === false);
-  const emptyContentTitle = __('This host currently does not have traces.');
-  const emptyContentBody = __('Add traces by applying updates on this host.');
+  const emptyContentTitle = __('No applications to restart');
+  const emptyContentBody = (<FormattedMessage
+    id="traces-happy-empty"
+    values={{
+      pkgLink: <a href="#/Content/packages?status=Upgradable">{__('installing or updating packages')}</a>,
+    }}
+    defaultMessage={__('Traces may be listed here after {pkgLink}.')}
+  />);
   const emptySearchTitle = __('No matching traces found');
   const emptySearchBody = __('Try changing your search settings.');
-  const fetchItems = useCallback(
-    params =>
-      (hostId ? getHostTraces(hostId, params) : hostIdNotReady),
-    [hostId],
-  );
+  const errorSearchTitle = __('Problem searching traces');
+  const columnHeaders = [
+    __('Application'),
+    __('Type'),
+    __('Helper'),
+  ];
+  const COLUMNS_TO_SORT_PARAMS = {
+    [columnHeaders[0]]: 'application',
+    [columnHeaders[1]]: 'app_type',
+    [columnHeaders[2]]: 'helper',
+  };
+  const {
+    pfSortParams, apiSortParams,
+    activeSortColumn, activeSortDirection,
+  } = useTableSort({
+    allColumns: columnHeaders,
+    columnsToSortParams: COLUMNS_TO_SORT_PARAMS,
+    initialSortColumnName: 'Application',
+  });
   const { searchParam } = useUrlParams();
   const [isBulkActionOpen, setIsBulkActionOpen] = useState(false);
   const toggleBulkAction = () => setIsBulkActionOpen(prev => !prev);
   const response = useSelector(state => selectAPIResponse(state, 'HOST_TRACES'));
   const { results, ...meta } = response;
+  const { error: errorSearchBody } = meta;
   const tracesSearchQuery = id => `id = ${id}`;
   const {
     selectOne, isSelected, searchQuery, selectedCount, isSelectable,
@@ -51,6 +74,11 @@ const TracesTab = () => {
     initialSearchQuery: searchParam || '',
   });
 
+  const fetchItems = useCallback(
+    params =>
+      (hostId ? getHostTraces(hostId, { ...apiSortParams, ...params }) : hostIdNotReady),
+    [hostId, apiSortParams],
+  );
 
   const onBulkRestartApp = () => {
     dispatch(resolveTraces({
@@ -120,6 +148,8 @@ const TracesTab = () => {
           emptyContentBody,
           emptySearchTitle,
           emptySearchBody,
+          errorSearchTitle,
+          errorSearchBody,
           status,
           searchQuery,
           updateSearchQuery,
@@ -129,20 +159,26 @@ const TracesTab = () => {
           actionButtons,
         }
         }
+        happyEmptyContent
+        ouiaId="host-traces-table"
         metadata={meta}
+        bookmarkController="katello_host_tracers"
         autocompleteEndpoint={`/hosts/${hostId}/traces/auto_complete_search`}
         foremanApiAutoComplete
         rowsCount={results?.length}
         variant={TableVariant.compact}
         displaySelectAllCheckbox
+        additionalListeners={[activeSortColumn, activeSortDirection]}
         {...selectAll}
       >
         <Thead>
           <Tr>
             <Th key="select_checkbox" />
-            <Th>{__('Application')}</Th>
-            <Th>{__('Type')}</Th>
-            <Th>{__('Helper')}</Th>
+            <SortableColumnHeaders
+              columnHeaders={columnHeaders}
+              pfSortParams={pfSortParams}
+              columnsToSortParams={COLUMNS_TO_SORT_PARAMS}
+            />
             <Th key="action_menu" />
           </Tr>
         </Thead>

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

@@ -8,6 +8,7 @@ import { REX_FEATURES } from '../RemoteExecutionConstants';
 import { ErrataTab } from '../ErrataTab/ErrataTab.js';
 import mockErrataData from './errata.fixtures.json';
 import mockResolveErrataTask from './resolveErrata.fixtures.json';
+import mockBookmarkData from './bookmarks.fixtures.json';
 
 const contentFacetAttributes = {
   id: 11,
@@ -17,6 +18,8 @@ const contentFacetAttributes = {
 };
 const hostName = 'foo.example.com';
 
+const errataBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_errata');
+
 const renderOptions = (facetAttributes = contentFacetAttributes) => ({
   apiNamespace: HOST_ERRATA_KEY,
   initialState: {
@@ -65,13 +68,18 @@ const makeMockErrata = ({ pageSize = 20, total = 100, page = 1 }) => {
 
 const hostErrata = foremanApi.getApiUrl('/hosts/1/errata');
 const autocompleteUrl = '/hosts/1/errata/auto_complete_search';
-const defaultQueryWithoutSearch = {
+const baseQuery = {
   include_applicable: false,
   per_page: 20,
   page: 1,
 };
-const defaultQuery = { ...defaultQueryWithoutSearch, search: '' };
-const page2Query = { ...defaultQueryWithoutSearch, page: 2 };
+const baseQueryWithSort = {
+  ...baseQuery,
+  sort_by: 'errata_id',
+  sort_order: 'asc',
+};
+const defaultQuery = { ...baseQueryWithSort, search: '' };
+const page2Query = { ...baseQueryWithSort, page: 2 };
 const jobInvocations = foremanApi.getApiUrl('/job_invocations');
 const applyByKatelloAgentUrl = foremanApi.getApiUrl('/hosts/1/errata/apply');
 
@@ -79,10 +87,12 @@ let firstErrata;
 let thirdErrata;
 let searchDelayScope;
 let autoSearchScope;
+let bookmarkScope;
 
 beforeEach(() => {
   const { results } = mockErrataData;
   [firstErrata, , thirdErrata] = results;
+  bookmarkScope = nockInstance.get(errataBookmarks).reply(200, mockBookmarkData);
   searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
   autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
@@ -90,6 +100,7 @@ beforeEach(() => {
 afterEach(() => {
   assertNockRequest(searchDelayScope);
   assertNockRequest(autoSearchScope);
+  assertNockRequest(bookmarkScope);
 });
 
 test('Can call API for errata and show on screen on page load', async (done) => {
@@ -129,7 +140,7 @@ test('Can handle no errata being present', async (done) => {
   const { queryByText } = renderWithRedux(<ErrataTab />, renderOptions());
 
   // Assert that there are not any errata showing on the screen.
-  await patientlyWaitFor(() => expect(queryByText('This host does not have any installable errata.')).toBeInTheDocument());
+  await patientlyWaitFor(() => expect(queryByText('This host has errata that are applicable, but not installable.')).toBeInTheDocument());
   // Assert request was made and completed, see helper function
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
@@ -171,8 +182,8 @@ test('Can display expanded errata details', async (done) => {
   expect(queryByText(firstErrata.cves[0].cve_id)).not.toBeInTheDocument();
 
   firstExpansion.click();
-  // the errata details should now be hidden
-  expect(getByText(firstErrata.summary)).not.toBeVisible();
+  // the errata details should now be gone
+  expect(queryByText(firstErrata.summary)).not.toBeInTheDocument();
   // Assert request was made and completed, see helper function
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
@@ -393,7 +404,7 @@ test('Can de-select items in select all mode across pages', async (done) => {
 
   const scope2 = nockInstance
     .get(hostErrata)
-    .query({ ...defaultQueryWithoutSearch, page: 1 })
+    .query({ ...baseQueryWithSort, page: 1 })
     .reply(200, makeMockErrata({ page: 2 }));
 
   const scope3 = nockInstance
@@ -558,7 +569,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 shows if it\'s the default content view but non-library environment', async (done) => {
+test('Toggle Group does not show if it\'s the default content view ', async (done) => {
   const options = renderOptions({
     ...contentFacetAttributes,
     content_view_default: true,
@@ -579,41 +590,14 @@ test('Toggle Group shows if it\'s the default content view but non-library envir
 
   // 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 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();
+  expect(queryByLabelText('Installable Errata')).not.toBeInTheDocument();
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
 
-test('Toggle Group does not show if it\'s the default content view and library environment', async (done) => {
+test('Toggle Group does not show if it\'s the  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
@@ -743,6 +727,7 @@ test('Can filter by errata type', async (done) => {
 
   const {
     queryByText,
+    queryByLabelText,
     getByRole,
     getAllByText,
     getByText,
@@ -753,7 +738,8 @@ test('Can filter by errata type', async (done) => {
   // the Bugfix text in the table is just a text node, while the dropdown is a button
   expect(getByText('Bugfix', { ignore: ['button', 'title'] })).toBeInTheDocument();
   expect(getByText('Enhancement', { ignore: ['button', 'title'] })).toBeInTheDocument();
-  const typeDropdown = queryByText('Type', { ignore: 'th' });
+  const typeContainer = queryByLabelText('select Type container', { ignore: 'th' });
+  const typeDropdown = within(typeContainer).queryByText('Type');
   expect(typeDropdown).toBeInTheDocument();
   fireEvent.click(typeDropdown);
   const security = getByRole('option', { name: 'select Security' });
@@ -786,6 +772,7 @@ test('Can filter by severity', async (done) => {
   const {
     queryByText,
     getByRole,
+    queryByLabelText,
     getAllByText,
     getByText,
   } = renderWithRedux(<ErrataTab />, renderOptions());
@@ -796,7 +783,8 @@ test('Can filter by severity', async (done) => {
   expect(getByText('Moderate', { ignore: ['button', 'title'] })).toBeInTheDocument();
   expect(getByText('Important', { ignore: ['.pf-c-select__toggle-text', 'title'] })).toBeInTheDocument();
   expect(getByText('Critical', { ignore: ['button', 'title'] })).toBeInTheDocument();
-  const severityDropdown = queryByText('Severity', { ignore: 'th' });
+  const severityContainer = queryByLabelText('select Severity container', { ignore: 'th' });
+  const severityDropdown = within(severityContainer).queryByText('Severity');
   expect(severityDropdown).toBeInTheDocument();
   fireEvent.click(severityDropdown);
   const important = getByRole('option', { name: 'select Important' });
@@ -963,7 +951,7 @@ test('Apply button chooses remote execution', async (done) => {
 
   const scope1 = nockInstance
     .get(hostErrata)
-    .query(defaultQueryWithoutSearch)
+    .query(baseQuery)
     .reply(200, mockErrata);
 
   const resolveErrataScope = nockInstance
@@ -1001,7 +989,7 @@ test('Can bulk apply via remote execution', async (done) => {
 
   const scope1 = nockInstance
     .get(hostErrata)
-    .query(defaultQueryWithoutSearch)
+    .query(baseQuery)
     .reply(200, mockErrata);
 
   // eslint-disable-next-line camelcase
@@ -1050,7 +1038,7 @@ test('Can select all, exclude and bulk apply via remote execution', async (done)
 
   const scope1 = nockInstance
     .get(hostErrata)
-    .query(defaultQueryWithoutSearch)
+    .query(baseQuery)
     .reply(200, mockErrata);
 
   const jobInvocationBody = ({ job_invocation: { inputs } }) =>

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

@@ -6,6 +6,8 @@ import { HOST_PACKAGES_KEY, PACKAGES_SEARCH_QUERY } from '../PackagesTab/HostPac
 import { PackagesTab } from '../PackagesTab/PackagesTab.js';
 import mockPackagesData from './packages.fixtures.json';
 import { REX_FEATURES } from '../RemoteExecutionConstants';
+import * as hooks from '../../../../Table/TableHooks';
+import mockBookmarkData from './bookmarks.fixtures.json';
 
 const contentFacetAttributes = {
   id: 11,
@@ -15,6 +17,8 @@ const contentFacetAttributes = {
 };
 
 const hostname = 'test-host.example.com';
+const packageBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_host_installed_packages');
+
 const renderOptions = (facetAttributes = contentFacetAttributes) => ({
   apiNamespace: HOST_PACKAGES_KEY,
   initialState: {
@@ -34,21 +38,29 @@ const renderOptions = (facetAttributes = contentFacetAttributes) => ({
 const hostPackages = foremanApi.getApiUrl('/hosts/1/packages');
 const jobInvocations = foremanApi.getApiUrl('/job_invocations');
 const autocompleteUrl = '/hosts/1/packages/auto_complete_search';
-const defaultQueryWithoutSearch = {
+const baseQuery = {
   include_latest_upgradable: true,
   per_page: 20,
   page: 1,
 };
+
+const defaultQueryWithoutSearch = {
+  ...baseQuery,
+  sort_by: 'nvra',
+  sort_order: 'asc',
+};
 const defaultQuery = { ...defaultQueryWithoutSearch, search: '' };
 
 let firstPackage;
 let secondPackage;
 let searchDelayScope;
 let autoSearchScope;
+let bookmarkScope;
 
 beforeEach(() => {
   const { results } = mockPackagesData;
   [firstPackage, secondPackage] = results;
+  bookmarkScope = nockInstance.get(packageBookmarks).reply(200, mockBookmarkData);
   searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
   autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
@@ -56,6 +68,7 @@ beforeEach(() => {
 afterEach(() => {
   assertNockRequest(searchDelayScope);
   assertNockRequest(autoSearchScope);
+  assertNockRequest(bookmarkScope);
 });
 
 test('Can call API for packages and show on screen on page load', async (done) => {
@@ -390,3 +403,25 @@ test('Remove is disabled when in select all mode', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
 });
+
+test('Sets initial search query from url params', async (done) => {
+  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostPackages)
+    .query({ ...defaultQuery, search: `name=${firstPackage.name}` })
+    .reply(200, { ...mockPackagesData, results: [firstPackage] });
+
+  jest.spyOn(hooks, 'useUrlParams').mockImplementation(() => ({
+    searchParam: `name=${firstPackage.name}`,
+  }));
+
+  const { getAllByText, queryByText } = renderWithRedux(<PackagesTab />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getAllByText(firstPackage.name)[0]).toBeInTheDocument());
+  expect(queryByText(secondPackage.name)).not.toBeInTheDocument();
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});
+

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import { renderWithRedux, patientlyWaitFor, within, fireEvent } from 'react-testing-lib-wrapper';
 import { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
 import katelloApi, { foremanApi } from '../../../../../services/api';
 import { REPOSITORY_SETS_KEY } from '../RepositorySetsTab/RepositorySetsConstants';
@@ -36,20 +36,23 @@ 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 limitToEnvQuery = {
+const defaultQuery = {
   content_access_mode_env: true,
   content_access_mode_all: true,
   host_id: 1,
   per_page: 20,
   page: 1,
   search: '',
+  sort_by: 'name',
+  sort_order: 'asc',
 };
-const showAllQuery = {
-  ...limitToEnvQuery,
+const libraryQuery = {
+  ...defaultQuery,
   content_access_mode_env: false,
 };
 
 let firstRepoSet;
+let secondRepoSet;
 let searchDelayScope;
 let autoSearchScope;
 let bookmarkScope;
@@ -57,7 +60,7 @@ let bookmarkScope;
 beforeEach(() => {
   // jest.resetModules();
   const { results } = mockRepoSetData;
-  [firstRepoSet] = results;
+  [firstRepoSet, secondRepoSet] = results;
   bookmarkScope = nockInstance.get(repositorySetBookmarks).reply(200, mockBookmarkData);
   searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
   autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
@@ -73,7 +76,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(limitToEnvQuery)
+    .query(defaultQuery)
     .reply(200, mockRepoSetData);
 
   const { getByText } = renderWithRedux(<RepositorySetsTab />, renderOptions());
@@ -97,7 +100,7 @@ test('Can handle no repository sets being present', async (done) => {
 
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(limitToEnvQuery)
+    .query(defaultQuery)
     .reply(200, noResults);
 
   const { queryByText } = renderWithRedux(<RepositorySetsTab />, renderOptions());
@@ -113,7 +116,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(limitToEnvQuery)
+    .query(defaultQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -128,7 +131,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 shows if it\'s the default content view but non-library environment', async (done) => {
+test('Toggle Group does not show if it\'s the default content view ', async (done) => {
   const options = renderOptions({
     ...contentFacetAttributes,
     content_view_default: true,
@@ -137,7 +140,7 @@ test('Toggle Group shows if it\'s the default content view but non-library envir
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(limitToEnvQuery)
+    .query(libraryQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -147,46 +150,21 @@ test('Toggle Group shows if it\'s the default content view but non-library envir
 
   // 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 shows if it\'s the library environment but a non-default content view', async (done) => {
-  const options = renderOptions({
-    ...contentFacetAttributes,
-    lifecycle_environment_library: true,
-  });
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  // return errata data results when we look for errata
-  const scope = nockInstance
-    .get(hostRepositorySets)
-    .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();
+  expect(queryByLabelText('Limit to environment')).not.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) => {
+test('Toggle Group does not show if it\'s the library environment', 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)
+    .query(libraryQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -207,7 +185,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(limitToEnvQuery)
+    .query(defaultQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -227,11 +205,13 @@ test('Can override to disabled', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(limitToEnvQuery)
+    .query(defaultQuery)
     .reply(200, mockRepoSetData);
+  const overrides = JSON.parse(JSON.stringify(mockContentOverride));
+  overrides.results[0].enabled_content_override = false;
   const contentOverrideScope = nockInstance
     .put(contentOverride)
-    .reply(200, mockContentOverride);
+    .reply(200, overrides);
 
   const { getByText, getAllByText, getAllByLabelText } =
     renderWithRedux(<RepositorySetsTab />, renderOptions());
@@ -263,11 +243,14 @@ test('Can override to enabled', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(limitToEnvQuery)
+    .query(defaultQuery)
     .reply(200, mockRepoSetData);
+  const overrides = JSON.parse(JSON.stringify(mockContentOverride));
+  overrides.results[1].enabled_content_override = true;
+
   const contentOverrideScope = nockInstance
     .put(contentOverride)
-    .reply(200, mockContentOverride);
+    .reply(200, overrides);
 
   const {
     getByText, queryByText, getAllByText, getAllByLabelText,
@@ -299,12 +282,14 @@ test('Can reset to default', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(limitToEnvQuery)
+    .query(defaultQuery)
     .reply(200, mockRepoSetData);
+  const overrides = JSON.parse(JSON.stringify(mockContentOverride));
+  overrides.results[1].enabled_content_override = null;
+
   const contentOverrideScope = nockInstance
     .put(contentOverride)
-    .reply(200, mockContentOverride);
-
+    .reply(200, overrides);
   const {
     getByText, queryByText, getAllByText, getAllByLabelText,
   } = renderWithRedux(<RepositorySetsTab />, renderOptions());
@@ -313,6 +298,7 @@ test('Can reset to default', async (done) => {
   await patientlyWaitFor(() => expect(getByText(firstRepoSet.contentUrl)).toBeInTheDocument());
   expect(getAllByText('Enabled')).toHaveLength(2);
   expect(getAllByText('Disabled')).toHaveLength(1);
+
   // The second item is overridden to disabled but would normally be enabled; we're going to reset
   const actionMenu = getAllByLabelText('Actions')[1].closest('button');
   fireEvent.click(actionMenu);
@@ -330,3 +316,65 @@ test('Can reset to default', async (done) => {
   assertNockRequest(scope);
   assertNockRequest(contentOverrideScope, done); // Pass jest callback to confirm test is done
 });
+
+test('Can override in bulk', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostRepositorySets)
+    .query(defaultQuery)
+    .reply(200, mockRepoSetData);
+  const contentOverrideScope = nockInstance
+    .put(contentOverride)
+    .reply(200, mockContentOverride);
+
+  const {
+    getByText, getByLabelText, queryByText,
+  } = renderWithRedux(<RepositorySetsTab />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getByText(firstRepoSet.contentUrl)).toBeInTheDocument());
+  getByLabelText('Select row 0').click();
+  getByLabelText('Select row 1').click();
+  const actionMenu = getByLabelText('bulk_actions');
+  actionMenu.click();
+  const resetToDefault = queryByText('Reset to default');
+  expect(resetToDefault).toBeInTheDocument();
+  resetToDefault.click();
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(contentOverrideScope, done); // Pass jest callback to confirm test is done});
+});
+
+test('Can filter by status', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostRepositorySets)
+    .query(defaultQuery)
+    .reply(200, mockRepoSetData);
+
+  const scope2 = nockInstance
+    .get(hostRepositorySets)
+    .query({ ...defaultQuery, status: 'overridden' })
+    .reply(200, { ...mockRepoSetData, results: [secondRepoSet] });
+
+  const {
+    getByText, queryByLabelText, getByRole,
+  } = renderWithRedux(<RepositorySetsTab />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getByText(firstRepoSet.contentUrl)).toBeInTheDocument());
+
+  const statusContainer = queryByLabelText('select Status container', { ignore: 'th' });
+  const statusDropdown = within(statusContainer).queryByText('Status');
+  expect(statusDropdown).toBeInTheDocument();
+  fireEvent.click(statusDropdown);
+  const overridden = getByRole('option', { name: 'select Overridden' });
+  fireEvent.click(overridden);
+  await patientlyWaitFor(() => {
+    expect(getByText('Overridden')).toBeInTheDocument();
+  });
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+  assertNockRequest(scope2, done); // Pass jest callback to confirm test is done
+});