katello 4.4.1 → 4.5.0

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

@@ -0,0 +1,104 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import {
+  EmptyState,
+  EmptyStateIcon,
+  EmptyStateBody,
+  Title,
+  EmptyStateVariant,
+  Button,
+  Flex,
+  FlexItem,
+  Spinner,
+} from '@patternfly/react-core';
+import { WrenchIcon } from '@patternfly/react-icons';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import EnableTracerModal from './EnableTracerModal';
+import { useRexJobPolling } from '../RemoteExecutionHooks';
+import { installTracerPackage } from './HostTracesActions';
+import { getHostDetails } from '../../HostDetailsActions';
+
+const EnableTracerButton = ({ setEnableTracerModalOpen, pollingStarted }) => (
+  <Button
+    onClick={() => setEnableTracerModalOpen(true)}
+    isDisabled={pollingStarted}
+  >
+    {__('Enable Traces')}
+  </Button>
+);
+
+const ViewTaskButton = ({ jobId }) => (
+  <Button
+    component="a"
+    href={urlBuilder('job_invocations', '', jobId)}
+    variant="secondary"
+    isDisabled={!jobId}
+  >
+    {__('View the job')}
+  </Button>
+);
+
+ViewTaskButton.propTypes = {
+  jobId: PropTypes.number,
+};
+ViewTaskButton.defaultProps = {
+  jobId: null,
+};
+
+EnableTracerButton.propTypes = {
+  setEnableTracerModalOpen: PropTypes.func.isRequired,
+  pollingStarted: PropTypes.bool.isRequired,
+};
+
+const TracesEnabler = ({ hostname }) => {
+  const title = __('Traces are not enabled');
+  const enablingTitle = __('Traces are being enabled');
+  const body = __('Traces help administrators identify applications that need to be restarted after a system is patched.');
+  const [enableTracerModalOpen, setEnableTracerModalOpen] = useState(false);
+  const initialAction = installTracerPackage({ hostname });
+  const successAction = getHostDetails({ hostname });
+  const {
+    pollingStarted,
+    rexJobId,
+    triggerJobStart,
+  } = useRexJobPolling(initialAction, successAction);
+
+  return (
+    <EmptyState variant={EmptyStateVariant.small}>
+      {pollingStarted ?
+        <Spinner /> :
+        <EmptyStateIcon icon={WrenchIcon} />
+      }
+      <Title headingLevel="h2" size="lg">
+        {pollingStarted ? enablingTitle : title}
+      </Title>
+      <EmptyStateBody>
+        <Flex direction={{ default: 'column' }}>
+          <FlexItem>{body}</FlexItem>
+          <FlexItem>
+            {pollingStarted ?
+              <ViewTaskButton jobId={rexJobId} /> :
+              <EnableTracerButton {...{
+                setEnableTracerModalOpen,
+                pollingStarted,
+              }}
+              />
+            }
+          </FlexItem>
+        </Flex>
+      </EmptyStateBody>
+      <EnableTracerModal
+        isOpen={enableTracerModalOpen}
+        setIsOpen={setEnableTracerModalOpen}
+        triggerJobStart={triggerJobStart}
+      />
+    </EmptyState>
+  );
+};
+
+TracesEnabler.propTypes = {
+  hostname: PropTypes.string.isRequired,
+};
+
+export default TracesEnabler;

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

@@ -1,45 +1,77 @@
 import React, { useState, useCallback } from 'react';
+import { FormattedMessage } from 'react-intl';
 import {
-  Skeleton, Button, Split, SplitItem, ActionList, ActionListItem, Dropdown,
-  DropdownItem, KebabToggle,
+  Skeleton, Split, SplitItem, ActionList, ActionListItem, Dropdown,
+  DropdownItem, DropdownToggle, DropdownToggleAction,
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { TableVariant, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
-import { useSelector, useDispatch } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
-import EnableTracerEmptyState from './EnableTracerEmptyState';
+import TracesEnabler from './TracesEnabler';
 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';
+import { useRexJobPolling } from '../RemoteExecutionHooks';
+import { hasRequiredPermissions as can,
+  missingRequiredPermissions as cannot,
+  userPermissionsFromHostDetails } from '../../hostDetailsHelpers';
+
+const invokeRexJobs = ['create_job_invocations'];
+const createBookmarks = ['create_bookmarks'];
 
 const TracesTab = () => {
   const hostDetails = useSelector(state => selectAPIResponse(state, 'HOST_DETAILS'));
-  const dispatch = useDispatch();
   const {
     id: hostId,
     name: hostname,
     content_facet_attributes: contentFacetAttributes,
   } = hostDetails;
+  const showActions = can(invokeRexJobs, userPermissionsFromHostDetails({ 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 = showActions ? __('No applications to restart') : __('Traces not available');
+  const tracesNotAvailBody = showEnableTracer ? __('Traces may be enabled by a user with the appropriate permissions.') :
+    __('Traces will be shown here to a user with the appropriate permissions.');
+  const emptyContentBody = showActions ? (<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}.')}
+  />) : tracesNotAvailBody;
   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,25 +83,46 @@ const TracesTab = () => {
     initialSearchQuery: searchParam || '',
   });
 
+  const BulkRestartTracesAction = () => resolveTraces({
+    hostname, search: fetchBulkParams(),
+  });
+  const {
+    triggerJobStart: triggerBulkRestart, lastCompletedJob: lastCompletedBulkRestart,
+    isPolling: isBulkRestartInProgress,
+  } = useRexJobPolling(BulkRestartTracesAction);
+
+  const restartTraceAction = id => resolveTraces({
+    hostname,
+    search: tracesSearchQuery(id),
+  });
+
+  const {
+    triggerJobStart: triggerAppRestart, lastCompletedJob: lastCompletedAppRestart,
+    isPolling: isAppRestartInProgress,
+  } = useRexJobPolling(restartTraceAction);
+
+  const actionInProgress = (isBulkRestartInProgress || isAppRestartInProgress);
+
+  const fetchItems = useCallback(
+    params =>
+      (hostId ? getHostTraces(hostId, { ...apiSortParams, ...params }) : hostIdNotReady),
+    [hostId, apiSortParams],
+  );
 
   const onBulkRestartApp = () => {
-    dispatch(resolveTraces({
-      hostname, search: fetchBulkParams(),
-    }));
+    triggerBulkRestart();
     selectNone();
-    const params = { page: meta.page, per_page: meta.per_page, search: meta.search };
-    dispatch(getHostTraces(hostId, params));
   };
 
-  const onRestartApp = id => dispatch(resolveTraces({
-    hostname,
-    search: tracesSearchQuery(id),
-  }));
+  const onRestartApp = id => triggerAppRestart(id);
 
   const bulkCustomizedRexUrl = () => resolveTraceUrl({
     hostname, search: (selectedCount > 0) ? fetchBulkParams() : '',
   });
 
+  const readOnlyBookmarks =
+  cannot(createBookmarks, userPermissionsFromHostDetails({ hostDetails }));
+
   const dropdownItems = [
     <DropdownItem isDisabled={selectedCount === 0} aria-label="bulk_rex" key="bulk_rex" component="button" onClick={onBulkRestartApp}>
       {__('Restart via remote execution')}
@@ -79,24 +132,28 @@ const TracesTab = () => {
     </DropdownItem>,
   ];
 
-  const actionButtons = (
+  const actionButtons = showActions ? (
     <Split hasGutter>
       <SplitItem>
         <ActionList isIconList>
-          <ActionListItem>
-            <Button
-              variant="secondary"
-              isDisabled={selectedCount === 0}
-              onClick={onBulkRestartApp}
-            >
-              {__('Restart app')}
-            </Button>
-          </ActionListItem>
           <ActionListItem>
             <Dropdown
-              toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
+              aria-label="bulk_actions_dropdown"
+              toggle={
+                <DropdownToggle
+                  aria-label="bulk_actions"
+                  splitButtonItems={[
+                    <DropdownToggleAction key="action" onClick={onBulkRestartApp}>
+                      {__('Restart app')}
+                    </DropdownToggleAction>,
+                  ]}
+                  isDisabled={selectedCount === 0}
+                  splitButtonVariant="action"
+                  toggleVariant="primary"
+                  onToggle={toggleBulkAction}
+                />
+              }
               isOpen={isBulkActionOpen}
-              isPlain
               dropdownItems={dropdownItems}
             />
           </ActionListItem>
@@ -104,9 +161,9 @@ const TracesTab = () => {
       </SplitItem>
     </Split>
 
-  );
+  ) : null;
   const status = useSelector(state => selectHostTracesStatus(state));
-  if (showEnableTracer) return <EnableTracerEmptyState />;
+  if (showEnableTracer && showActions) return <TracesEnabler hostname={hostname} />;
 
   if (!hostId) return <Skeleton />;
 
@@ -120,6 +177,8 @@ const TracesTab = () => {
           emptyContentBody,
           emptySearchTitle,
           emptySearchBody,
+          errorSearchTitle,
+          errorSearchBody,
           status,
           searchQuery,
           updateSearchQuery,
@@ -129,20 +188,28 @@ const TracesTab = () => {
           actionButtons,
         }
         }
+        happyEmptyContent={showActions}
+        ouiaId="host-traces-table"
         metadata={meta}
+        bookmarkController="katello_host_tracers"
+        readOnlyBookmarks={readOnlyBookmarks}
         autocompleteEndpoint={`/hosts/${hostId}/traces/auto_complete_search`}
         foremanApiAutoComplete
         rowsCount={results?.length}
         variant={TableVariant.compact}
-        displaySelectAllCheckbox
+        additionalListeners={[activeSortColumn, activeSortDirection,
+          lastCompletedAppRestart, lastCompletedBulkRestart]}
+        displaySelectAllCheckbox={showActions}
         {...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>
@@ -155,8 +222,11 @@ const TracesTab = () => {
               app_type: appType,
             } = result;
             const resolveDisabled = !isSelectable(id);
+            let disabledReason;
+            if (resolveDisabled) disabledReason = __('Traces that require logout cannot be restarted remotely');
+            if (actionInProgress) disabledReason = __('A remote execution job is in progress');
             let rowDropdownItems = [
-              { title: 'Restart via remote execution', onClick: () => onRestartApp(id) },
+              { title: 'Restart via remote execution', onClick: () => onRestartApp(id), isDisabled: actionInProgress },
               {
                 component: 'a', href: resolveTraceUrl({ hostname, search: tracesSearchQuery(id) }), title: 'Restart via customized remote execution',
               },
@@ -168,25 +238,32 @@ const TracesTab = () => {
             }
             return (
               <Tr key={id} >
-                <Td select={{
-                  disable: resolveDisabled,
-                  props: {
-                    'aria-label': `check-${application}`,
-                  },
-                  isSelected: isSelected(id),
-                  onSelect: (event, selected) => selectOne(selected, id),
-                  rowIndex,
-                  variant: 'checkbox',
-                }}
-                />
+                {showActions ? (
+                  <Td
+                    select={{
+                      disable: actionInProgress || resolveDisabled,
+                      props: {
+                        'aria-label': `check-${application}`,
+                      },
+                      isSelected: isSelected(id),
+                      onSelect: (event, selected) => selectOne(selected, id),
+                      rowIndex,
+                      variant: 'checkbox',
+                    }}
+                    title={disabledReason}
+                  />
+                ) : <Td>&nbsp;</Td>
+                }
                 <Td>{application}</Td>
                 <Td>{appType}</Td>
                 <Td>{helper}</Td>
-                <Td
-                  actions={{
-                    items: rowDropdownItems,
-                  }}
-                />
+                {showActions && (
+                  <Td
+                    actions={{
+                      items: rowDropdownItems,
+                    }}
+                  />
+                )}
               </Tr>
             );
           })

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

@@ -8,6 +8,15 @@ 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';
+
+jest.mock('../../hostDetailsHelpers', () => ({
+  ...jest.requireActual('../../hostDetailsHelpers'),
+  userPermissionsFromHostDetails: () => ({
+    create_job_invocations: true,
+    edit_hosts: true,
+  }),
+}));
 
 const contentFacetAttributes = {
   id: 11,
@@ -17,6 +26,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 +76,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 +95,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 +108,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 +148,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 +190,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 +412,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
@@ -716,6 +735,7 @@ test('Can filter by errata type', async (done) => {
 
   const {
     queryByText,
+    queryByLabelText,
     getByRole,
     getAllByText,
     getByText,
@@ -726,7 +746,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' });
@@ -759,6 +780,7 @@ test('Can filter by severity', async (done) => {
   const {
     queryByText,
     getByRole,
+    queryByLabelText,
     getAllByText,
     getByText,
   } = renderWithRedux(<ErrataTab />, renderOptions());
@@ -769,7 +791,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' });
@@ -860,7 +883,7 @@ test('Can bulk apply via katello agent', async (done) => {
   getByLabelText('Select row 0').click();
   getByLabelText('Select row 1').click();
 
-  const actionMenu = getByLabelText('bulk_actions');
+  const actionMenu = getByLabelText('expand_errata_toggle');
   actionMenu.click();
   const viaAction = queryByText('Apply via Katello agent');
   expect(viaAction).toBeInTheDocument();
@@ -908,7 +931,7 @@ test('Can select all, exclude and bulk apply via katello agent', async (done) =>
 
   getByLabelText('Select row 0').click(); // deselect
 
-  const actionMenu = getByLabelText('bulk_actions');
+  const actionMenu = getByLabelText('expand_errata_toggle');
   actionMenu.click();
   const viaAction = queryByText('Apply via Katello agent');
   expect(viaAction).toBeInTheDocument();
@@ -934,11 +957,6 @@ test('Apply button chooses remote execution', async (done) => {
     .query(defaultQuery)
     .reply(200, mockErrata);
 
-  const scope1 = nockInstance
-    .get(hostErrata)
-    .query(defaultQueryWithoutSearch)
-    .reply(200, mockErrata);
-
   const resolveErrataScope = nockInstance
     .post(jobInvocations)
     .reply(201, mockResolveErrataTask);
@@ -959,7 +977,6 @@ test('Apply button chooses remote execution', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(resolveErrataScope);
-  assertNockRequest(scope1);
   assertNockRequest(scope, done);
 });
 
@@ -972,11 +989,6 @@ test('Can bulk apply via remote execution', async (done) => {
     .query(defaultQuery)
     .reply(200, mockErrata);
 
-  const scope1 = nockInstance
-    .get(hostErrata)
-    .query(defaultQueryWithoutSearch)
-    .reply(200, mockErrata);
-
   // eslint-disable-next-line camelcase
   const jobInvocationBody = ({ job_invocation: { inputs, feature, search_query } }) =>
     inputs[ERRATA_SEARCH_QUERY] === `errata_id ^ (${results[0].errata_id},${results[1].errata_id})` &&
@@ -998,7 +1010,7 @@ test('Can bulk apply via remote execution', async (done) => {
   getByLabelText('Select row 0').click();
   getByLabelText('Select row 1').click();
 
-  const actionMenu = getByLabelText('bulk_actions');
+  const actionMenu = getByLabelText('expand_errata_toggle');
   actionMenu.click();
   const viaRexAction = queryByText('Apply via remote execution');
   expect(viaRexAction).toBeInTheDocument();
@@ -1006,7 +1018,6 @@ test('Can bulk apply via remote execution', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(resolveErrataScope);
-  assertNockRequest(scope1);
   assertNockRequest(scope, done);
 });
 
@@ -1021,11 +1032,6 @@ test('Can select all, exclude and bulk apply via remote execution', async (done)
     .query(defaultQuery)
     .reply(200, mockErrata);
 
-  const scope1 = nockInstance
-    .get(hostErrata)
-    .query(defaultQueryWithoutSearch)
-    .reply(200, mockErrata);
-
   const jobInvocationBody = ({ job_invocation: { inputs } }) =>
     inputs[ERRATA_SEARCH_QUERY] === `errata_id !^ (${results[0].errata_id})`;
 
@@ -1044,7 +1050,7 @@ test('Can select all, exclude and bulk apply via remote execution', async (done)
 
   getByLabelText('Select row 0').click(); // de select
 
-  const actionMenu = getByLabelText('bulk_actions');
+  const actionMenu = getByLabelText('expand_errata_toggle');
   actionMenu.click();
   const viaRexAction = queryByText('Apply via remote execution');
   expect(viaRexAction).toBeInTheDocument();
@@ -1052,7 +1058,6 @@ test('Can select all, exclude and bulk apply via remote execution', async (done)
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(resolveErrataScope);
-  assertNockRequest(scope1);
   assertNockRequest(scope, done);
 });
 
@@ -1076,7 +1081,7 @@ test('Can apply errata in bulk via customized remote execution', async (done) =>
   getByLabelText('Select row 1').click();
   const errata = `${results[0].errata_id},${results[1].errata_id}`;
   const feature = REX_FEATURES.KATELLO_HOST_ERRATA_INSTALL_BY_SEARCH;
-  const actionMenu = getByLabelText('bulk_actions');
+  const actionMenu = getByLabelText('expand_errata_toggle');
   actionMenu.click();
   const viaRexAction = queryByText('Apply via customized remote execution');
   expect(viaRexAction).toBeInTheDocument();

data/webpack/components/extensions/HostDetails/Tabs/{ModuleStreamsTab/__tests__/modules.fixtures.json → __tests__/moduleStreams.fixtures.json}

@@ -12,7 +12,8 @@
         "upgradable":false,
         "name":"horse",
         "stream":"1.4",
-        "module_spec":"horse:1.4"
+        "module_spec":"horse:1.4",
+        "id":"1"
      },
      {
         "status":"unknown",
@@ -20,7 +21,8 @@
         "upgradable":false,
         "name":"monkey",
         "stream":"1.8",
-        "module_spec":"monkey:1.8"
+        "module_spec":"monkey:1.8",
+        "id":"1"
      },
      {
         "status":"enabled",
@@ -28,7 +30,8 @@
         "upgradable":false,
         "name":"walrus",
         "stream":"2.4",
-        "module_spec":"walrus:2.4"
+        "module_spec":"walrus:2.4",
+        "id":"3"
      }
   ]
 }