katello 4.8.0.rc1 → 4.8.0

data/webpack/components/Content/{ContentPage.js → GenericContentPage.js}

@@ -4,8 +4,9 @@ import { Grid, Col, Row, Form, FormGroup } from 'react-bootstrap';
 import SearchBar from 'foremanReact/components/SearchBar';
 import { getControllerSearchProps } from 'foremanReact/constants';
 import ContentTable from './ContentTable';
+import { useClearSearch } from '../extensions/SearchBar/SearchBarHooks';
 
-const ContentPage = ({
+const GenericContentPage = ({
   header, onSearch, bookmarkController,
   autocompleteEndpoint, autocompleteQueryParams,
   updateSearchQuery, initialInputValue,
@@ -15,6 +16,7 @@ const ContentPage = ({
     ...getControllerSearchProps(autocompleteEndpoint, `searchBar-content-page-${header}`, true, autocompleteQueryParams),
     controller: bookmarkController,
   };
+  const searchBarKey = useClearSearch({ updateSearchQuery });
   return (
     <Grid bsClass="container-fluid">
       <Row>
@@ -27,6 +29,7 @@ const ContentPage = ({
           <Form className="toolbar-pf-actions">
             <FormGroup className="toolbar-pf toolbar-pf-filter">
               <SearchBar
+                key={searchBarKey}
                 data={searchDataProp}
                 onSearch={onSearch}
                 onSearchChange={updateSearchQuery}
@@ -49,7 +52,7 @@ const ContentPage = ({
   );
 };
 
-ContentPage.propTypes = {
+GenericContentPage.propTypes = {
   header: PropTypes.string.isRequired,
   content: PropTypes.shape({}).isRequired,
   tableSchema: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
@@ -62,10 +65,10 @@ ContentPage.propTypes = {
   bookmarkController: PropTypes.string,
 };
 
-ContentPage.defaultProps = {
+GenericContentPage.defaultProps = {
   autocompleteEndpoint: undefined,
   autocompleteQueryParams: undefined,
   bookmarkController: undefined,
 };
 
-export default ContentPage;
+export default GenericContentPage;

data/webpack/components/Content/__tests__/ContentTable.test.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import ContentTable from '../ContentTable';
 import { LoadingState } from '../../../components/LoadingState';
 import { Table } from '../../../components/pf3Table';
+import ContentTable from '../ContentTable';
 
 describe('Content Table', () => {
   it('should render and contain appropriate components', async () => {

data/webpack/components/Content/__tests__/GenericContentPage.test.js

@@ -0,0 +1,35 @@
+import React from 'react';
+import { act } from 'react-test-renderer';
+import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
+import { CONTENT_KEY } from '../../../scenes/Content/ContentConstants';
+import GenericContentPage from '../GenericContentPage';
+
+const renderOptions = () => ({
+  apiNamespace: CONTENT_KEY,
+});
+
+test('Can render the basic component with no data', async (done) => {
+  const contentHeader = 'Content Header';
+  const content = { results: [] };
+  const onSearch = jest.fn();
+  const updateSearchQuery = jest.fn();
+  const searchQuery = '';
+  const onPaginationChange = jest.fn();
+  const TableSchema = [];
+  const bookmarkController = 'module_streams';
+
+  const { getByText } = renderWithRedux(<GenericContentPage
+    header={contentHeader}
+    content={content}
+    tableSchema={TableSchema}
+    onSearch={onSearch}
+    updateSearchQuery={updateSearchQuery}
+    initialInputValue={searchQuery}
+    onPaginationChange={onPaginationChange}
+    bookmarkController={bookmarkController}
+  />, renderOptions());
+
+  await patientlyWaitFor(() =>
+    expect(getByText(contentHeader)).toBeInTheDocument());
+  act(done);
+});

data/webpack/components/Search/SearchText.js

@@ -0,0 +1,70 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { SearchAutocomplete } from 'foremanReact/components/SearchBar/SearchAutocomplete';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import { STATUS } from 'foremanReact/constants';
+import { noop } from 'foremanReact/common/helpers';
+
+const SearchText = ({
+  data: {
+    autocomplete: { url, apiParams } = { url: '' },
+    disabled,
+  },
+  initialQuery,
+  onSearchChange,
+  name,
+}) => {
+  const [search, setSearch] = useState(initialQuery || '');
+  const getAPIparams = input => ({ ...apiParams(input) });
+  const { response, status, setAPIOptions } = useAPI('get', url, {
+    params: getAPIparams(search),
+  });
+  const onChange = (newValue) => {
+    onSearchChange(newValue);
+    setSearch(newValue);
+    setAPIOptions({ params: { ...getAPIparams(newValue) } });
+  };
+  const error =
+    status === STATUS.ERROR || response?.[0]?.error
+      ? response?.[0]?.error || response.message
+      : null;
+
+  let results = [];
+  if (Array.isArray(response) && !error) {
+    results = response.map(item => ({ label: item, category: '' }));
+  }
+
+  return (
+    <div className="foreman-search-text">
+      <SearchAutocomplete
+        results={results}
+        onSearchChange={onChange}
+        value={search}
+        disabled={disabled}
+        error={error}
+        name={name}
+      />
+    </div>
+  );
+};
+
+SearchText.propTypes = {
+  data: PropTypes.shape({
+    autocomplete: PropTypes.shape({
+      url: PropTypes.string.isRequired,
+      apiParams: PropTypes.func,
+    }).isRequired,
+    disabled: PropTypes.bool,
+  }).isRequired,
+  initialQuery: PropTypes.string,
+  onSearchChange: PropTypes.func,
+  name: PropTypes.string,
+};
+
+SearchText.defaultProps = {
+  initialQuery: '',
+  onSearchChange: noop,
+  name: null,
+};
+
+export default SearchText;

data/webpack/components/Table/EmptyStateMessage.js

@@ -14,7 +14,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { CubeIcon, ExclamationCircleIcon, SearchIcon, CheckCircleIcon, PlusCircleIcon } from '@patternfly/react-icons';
 import { global_danger_color_200 as dangerColor, global_success_color_100 as successColor } from '@patternfly/react-tokens';
 import { useDispatch, useSelector } from 'react-redux';
-import { selectHostDetailsClearSearch } from '../extensions/HostDetails/HostDetailsSelectors';
+import { selectSearchBarClearSearch } from '../extensions/SearchBar/SearchBarSelectors';
 
 const KatelloEmptyStateIcon = ({
   error, search, customIcon, happyIcon,
@@ -51,7 +51,7 @@ const EmptyStateMessage = ({
   const defaultSecondaryActionText = searchIsActive ? __('Clear search') : __('Clear filters');
   const secondaryActionText = secondaryActionTextOverride || defaultSecondaryActionText;
   const dispatch = useDispatch();
-  const clearSearch = useSelector(selectHostDetailsClearSearch);
+  const clearSearch = useSelector(selectSearchBarClearSearch);
   const showSecondaryActionAnchor = showSecondaryAction && secondaryActionLink;
   const handleClick = () => {
     if (searchIsActive) {

data/webpack/components/Table/TableWrapper.js

@@ -14,6 +14,7 @@ import MainTable from './MainTable';
 import { getPageStats } from './helpers';
 import SelectAllCheckbox from '../SelectAllCheckbox';
 import { orgId } from '../../services/api';
+import { useClearSearch } from '../extensions/SearchBar/SearchBarHooks';
 
 /* Patternfly 4 table wrapper */
 const TableWrapper = ({
@@ -132,6 +133,8 @@ const TableWrapper = ({
     spawnFetch();
   }, [searchQuery, spawnFetch, additionalListeners]);
 
+  const searchBarKey = useClearSearch({ updateSearchQuery });
+
   // If the new page wouldn't exist because of a perPage change,
   // we should set the current page to the last page.
   const validatePagination = (data) => {
@@ -194,6 +197,7 @@ const TableWrapper = ({
               data={searchDataProp}
               initialQuery={searchQuery}
               onSearch={search => updateSearchQuery(search)}
+              key={searchBarKey}
             />
           </FlexItem>
         }

data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/ChangeHostCVModal.js

@@ -1,11 +1,7 @@
 import React, { useState, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
 import { useDispatch, useSelector } from 'react-redux';
-import { Modal, Button, SelectOption, Alert, Flex } from '@patternfly/react-core';
-import {
-  global_palette_black_600 as pfDescriptionColor,
-} from '@patternfly/react-tokens';
+import { Modal, Button, Alert } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
@@ -15,42 +11,15 @@ import { ENVIRONMENT_PATHS_KEY } from '../../../../../scenes/ContentViews/compon
 import api from '../../../../../services/api';
 import getContentViews from '../../../../../scenes/ContentViews/ContentViewsActions';
 import { selectContentViews, selectContentViewStatus } from '../../../../../scenes/ContentViews/ContentViewSelectors';
-import { uniq } from '../../../../../utils/helpers';
-import ContentViewIcon from '../../../../../scenes/ContentViews/components/ContentViewIcon';
 import updateHostContentViewAndEnvironment from './HostContentViewActions';
 import HOST_CV_AND_ENV_KEY from './HostContentViewConstants';
 import { getHostDetails } from '../../HostDetailsActions';
 import ContentViewSelect from '../../../../../scenes/ContentViews/components/ContentViewSelect/ContentViewSelect';
+import ContentViewSelectOption
+  from '../../../../../scenes/ContentViews/components/ContentViewSelect/ContentViewSelectOption';
 
 const ENV_PATH_OPTIONS = { key: ENVIRONMENT_PATHS_KEY };
 
-const ContentViewDescription = ({ cv, versionNumber }) => {
-  const descriptionStyle = {
-    fontSize: '12px',
-    fontWeight: 400,
-    color: pfDescriptionColor.value,
-  };
-  if (cv.default) return <span style={descriptionStyle}>{__('Library')}</span>;
-  return (
-    <span style={descriptionStyle}>
-      <FormattedMessage
-        id={`content-view-${cv.id}-version-${cv.latest_version}`}
-        defaultMessage="Version {versionNumber}"
-        values={{ versionNumber }}
-      />
-    </span>
-  );
-};
-
-ContentViewDescription.propTypes = {
-  cv: PropTypes.shape({
-    default: PropTypes.bool.isRequired,
-    id: PropTypes.number.isRequired,
-    latest_version: PropTypes.string.isRequired,
-  }).isRequired,
-  versionNumber: PropTypes.string.isRequired,
-};
-
 const ChangeHostCVModal = ({
   isOpen,
   closeModal,
@@ -66,6 +35,7 @@ const ChangeHostCVModal = ({
   const [cvSelectOpen, setCVSelectOpen] = useState(false);
   const dispatch = useDispatch();
   const contentViewsInEnvResponse = useSelector(state => selectContentViews(state, `FOR_ENV_${hostEnvId}`));
+  const { results } = contentViewsInEnvResponse;
   const contentViewsInEnvStatus = useSelector(state => selectContentViewStatus(state, `FOR_ENV_${hostEnvId}`));
   const hostUpdateStatus = useSelector(state => selectAPIStatus(state, HOST_CV_AND_ENV_KEY));
   useAPI( // No TableWrapper here, so we can useAPI from Foreman
@@ -73,6 +43,7 @@ const ChangeHostCVModal = ({
     api.getApiUrl(`/organizations/${orgId}/environments/paths?permission_type=promotable`),
     ENV_PATH_OPTIONS,
   );
+  const selectedCVForHostId = results?.find(cv => cv.name === selectedCVForHost)?.id;
 
   const handleModalClose = () => {
     setCVSelectOpen(false);
@@ -102,13 +73,6 @@ const ChangeHostCVModal = ({
   const { results: contentViewsInEnv = [] } = contentViewsInEnvResponse;
   const canSave = !!(selectedCVForHost && selectedEnvForHost.length);
 
-  const relevantVersionObjFromCv = (cv, env) => { // returns the entire version object
-    const versions = cv.versions.filter(version => new Set(version.environment_ids).has(env.id));
-    return uniq(versions)?.[0];
-  };
-  const relevantVersionFromCv = (cv, env) =>
-    relevantVersionObjFromCv(cv, env)?.version; // returns the version text e.g. "1.0"
-
   const refreshHostDetails = () => {
     handleModalClose();
     return dispatch(getHostDetails({ hostname: hostName }));
@@ -119,7 +83,7 @@ const ChangeHostCVModal = ({
       id: hostId,
       host: {
         content_facet_attributes: {
-          content_view_id: selectedCVForHost,
+          content_view_id: selectedCVForHostId,
           lifecycle_environment_id: selectedEnvId,
         },
       },
@@ -183,7 +147,7 @@ const ChangeHostCVModal = ({
         headerText={__('Select environment')}
         isDisabled={hostUpdateStatus === STATUS.PENDING}
       />
-      {selectedEnvForHost.length > 0 &&
+      {selectedEnvForHost.length > 0 && contentViewsInEnvStatus !== STATUS.PENDING &&
         <ContentViewSelect
           selections={selectedCVForHost}
           onClear={() => setSelectedCVForHost(null)}
@@ -193,35 +157,9 @@ const ChangeHostCVModal = ({
           onToggle={isExpanded => setCVSelectOpen(isExpanded)}
           placeholderText={cvPlaceholderText()}
         >
-          {contentViewsInEnv?.map(cv => (
-            <SelectOption
-              key={cv.id}
-              value={cv.id}
-            >
-              <Flex
-                direction={{ default: 'row', sm: 'row' }}
-                flexWrap={{ default: 'nowrap' }}
-                alignItems={{ default: 'alignItemsCenter', sm: 'alignItemsCenter' }}
-              >
-                <ContentViewIcon
-                  composite={cv.composite}
-                  size="sm"
-                />
-                <Flex
-                  direction={{ default: 'column', sm: 'column' }}
-                  flexWrap={{ default: 'nowrap' }}
-                  alignItems={{ default: 'alignItemsFlexStart', sm: 'alignItemsFlexStart' }}
-                >
-                  {cv.name}
-                  <ContentViewDescription
-                    cv={cv}
-                    versionNumber={relevantVersionFromCv(cv, selectedEnv)}
-                  />
-                </Flex>
-              </Flex>
-            </SelectOption>
-          ))
-          }
+          {(contentViewsInEnv.length !== 0) &&
+              contentViewsInEnv?.map(cv =>
+                <ContentViewSelectOption key={cv.id} cv={cv} env={selectedEnvForHost[0]} />)}
         </ContentViewSelect>
       }
     </Modal>

data/webpack/components/extensions/HostDetails/HostDetailsConstants.js

@@ -1,3 +1,2 @@
-export const SET_CLEAR_SEARCH = 'SET_CLEAR_SEARCH';
 const HOST_DETAILS = 'HOST_DETAILS';
 export default HOST_DETAILS;

data/webpack/components/extensions/HostDetails/HostDetailsSelectors.js

@@ -14,9 +14,3 @@ export const selectHostDetailsStatus = state =>
 
 export const selectHostDetailsError = state =>
   selectAPIError(state, HOST_DETAILS_KEY);
-
-export const selectHostDetailsState = state =>
-  state.katello.hostDetails;
-
-export const selectHostDetailsClearSearch = state =>
-  selectHostDetailsState(state).clearSearch;

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

@@ -93,6 +93,82 @@ test('Can handle no Module streams being present', async (done) => {
   act(done);
 });
 
+test('When there are no search results, can display an empty state with a clear search link that works', async (done) => {
+  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const noResults = {
+    total: 0,
+    subtotal: 0,
+    page: 1,
+    search: 'bad search',
+    per_page: 20,
+    results: [],
+  };
+
+  const initialScope = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .times(1)
+    .reply(200, mockModuleStreams);
+
+  const badSearchScope = nockInstance
+    .get(hostModuleStreams)
+    .query({
+      sort_by: 'name',
+      sort_order: 'asc',
+      per_page: '20',
+      page: '1',
+      search: 'bad search',
+    })
+    .reply(200, noResults);
+
+  const badAutoCompleteScope =
+    mockForemanAutocomplete(
+      nockInstance,
+      autocompleteUrl,
+      true,
+      [],
+      2, // times
+    );
+
+  const scopeWithoutSearch = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .reply(200, mockModuleStreams);
+
+  const { queryByText, getByRole } = renderWithRedux(<ModuleStreamsTab />, renderOptions());
+
+
+  await patientlyWaitFor(() => expect(queryByText(firstModuleStreams.name)).toBeInTheDocument());
+
+  const searchInput = getByRole('textbox', { name: 'Search input' });
+  // Foreman SearchAutocomplete doesn't run onSearchChange unless the element is focused!
+  searchInput.focus();
+
+  fireEvent.change(searchInput, { target: { value: 'bad search' } });
+  expect(searchInput.value).toBe('bad search');
+  const searchButton = getByRole('button', { name: 'Search' });
+  expect(searchButton).not.toHaveAttribute('aria-disabled', true);
+  fireEvent.click(searchButton);
+
+  await patientlyWaitFor(() => expect(queryByText('Your search returned no matching Module streams.')).toBeInTheDocument());
+  // Now click the clear search link and assert that the search is cleared and the results are back
+  const clearSearchLink = getByRole('button', { name: 'Clear search' });
+  fireEvent.click(clearSearchLink);
+
+  await patientlyWaitFor(() => {
+    expect(queryByText(firstModuleStreams.name)).toBeInTheDocument();
+    expect(getByRole('textbox', { name: 'Search input' }).value).toBe('');
+    expect(queryByText('Clear search')).not.toBeInTheDocument();
+  });
+
+  assertNockRequest(initialScope);
+  assertNockRequest(badAutoCompleteScope);
+  assertNockRequest(badSearchScope);
+  assertNockRequest(scopeWithoutSearch);
+  assertNockRequest(autocompleteScope, done);
+});
+
 test('Can filter results based on status', async (done) => {
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance

data/webpack/components/extensions/SearchBar/SearchBarConstants.js

@@ -0,0 +1,3 @@
+export const SET_CLEAR_SEARCH = 'SET_CLEAR_SEARCH';
+
+export default SET_CLEAR_SEARCH;

data/webpack/components/extensions/SearchBar/SearchBarHooks.js

@@ -0,0 +1,50 @@
+import { useEffect, useCallback, useRef } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { selectSearchBarClearSearch } from './SearchBarSelectors';
+
+export const useClearSearch = ({
+  updateSearchQuery,
+}) => {
+  const dispatch = useDispatch();
+  // We keep the clearSearch function in Redux to avoid prop drilling and make EmptyStateMessage
+  // more reusable both with and without TableWrapper.
+  const existingClearSearch = useSelector(selectSearchBarClearSearch);
+  // In Katello we don't have access to Foreman <SearchBar /> component's internal state,
+  // so we don't have an easy way to clear the search input. We can use a counter to
+  // pass as a key prop to the <SearchBar /> component, which will force it to reset
+  // its internal state when clearSearch is called.
+  const counter = useRef(0);
+
+  const clearSearch = useCallback(() => {
+    counter.current += 1; // reset the text input
+    if (typeof updateSearchQuery !== 'function') {
+      // eslint-disable-next-line no-console
+      console.error('You must pass the updateSearchQuery function to useClearSearch');
+      return;
+    }
+    updateSearchQuery(''); // make a new API call with blank search query
+  }, [updateSearchQuery]);
+
+  useEffect(() => {
+    if (typeof existingClearSearch !== 'function') {
+      dispatch({
+        type: 'SET_CLEAR_SEARCH',
+        payload: clearSearch,
+      });
+    }
+  }, [dispatch, existingClearSearch, clearSearch]);
+
+  // eslint-disable-next-line arrow-body-style
+  useEffect(() => {
+    return function cleanupClearSearch() {
+      dispatch({
+        type: 'SET_CLEAR_SEARCH',
+        payload: {},
+      });
+    };
+  }, [dispatch]);
+
+  return `search-bar-${counter.current}`;
+};
+
+export default useClearSearch;

data/webpack/components/extensions/SearchBar/SearchBarReducer.js

@@ -0,0 +1,14 @@
+import Immutable from 'seamless-immutable';
+
+import { SET_CLEAR_SEARCH } from './SearchBarConstants';
+
+const initialState = Immutable({ clearSearch: undefined });
+
+export default (state = initialState, action) => {
+  switch (action.type) {
+  case SET_CLEAR_SEARCH:
+    return state.set('clearSearch', action.payload);
+  default:
+    return state;
+  }
+};

data/webpack/components/extensions/SearchBar/SearchBarSelectors.js

@@ -0,0 +1,5 @@
+export const selectSearchBarState = state =>
+  state.katello.searchBar;
+
+export const selectSearchBarClearSearch = state =>
+  selectSearchBarState(state)?.clearSearch;

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -11,7 +11,9 @@ const repoTypeSearchQueryMap = {
 
 const recommendedRepositoriesRHEL = [
   'rhel-9-for-x86_64-baseos-rpms',
+  'rhel-9-for-x86_64-baseos-kickstart',
   'rhel-9-for-x86_64-appstream-rpms',
+  'rhel-9-for-x86_64-appstream-kickstart',
   'rhel-8-for-x86_64-baseos-rpms',
   'rhel-8-for-x86_64-baseos-kickstart',
   'rhel-8-for-x86_64-appstream-rpms',
@@ -33,10 +35,10 @@ const recommendedRepositoriesSatTools = [
 ];
 
 const recommendedRepositoriesMisc = [
-  'satellite-capsule-6.12-for-rhel-8-x86_64-rpms',
+  'satellite-capsule-6.13-for-rhel-8-x86_64-rpms',
   'ansible-2-for-rhel-8-x86_64-rpms',
-  'satellite-maintenance-6.12-for-rhel-8-x86_64-rpms',
-  'satellite-utils-6.12-for-rhel-8-x86_64-rpms',
+  'satellite-maintenance-6.13-for-rhel-8-x86_64-rpms',
+  'satellite-utils-6.13-for-rhel-8-x86_64-rpms',
 ];
 
 const recommendedRepositorySetLables = recommendedRepositoriesRHEL

data/webpack/redux/reducers/index.js

@@ -4,7 +4,6 @@ import redHatRepositories from './RedHatRepositories';
 import { subscriptions } from '../../scenes/Subscriptions';
 import { upstreamSubscriptions } from '../../scenes/Subscriptions/UpstreamSubscriptions';
 import { manifestHistory } from '../../scenes/Subscriptions/Manifest';
-import settings from '../../scenes/Settings';
 import { subscriptionDetails } from '../../scenes/Subscriptions/Details';
 import { setOrganization } from '../../components/SelectOrg/SetOrganization';
 import { moduleStreams } from '../../scenes/ModuleStreams';
@@ -13,6 +12,7 @@ import { moduleStreamDetails } from '../../scenes/ModuleStreams/Details';
 import { reducers as systemStatuses } from '../../components/extensions/about';
 import { contentViewDetails } from '../../scenes/ContentViews/Details';
 import hostDetails from '../../components/extensions/HostDetails/HostDetailsReducer';
+import searchBar from '../../components/extensions/SearchBar/SearchBarReducer';
 
 export default combineReducers({
   organization,
@@ -20,13 +20,13 @@ export default combineReducers({
   subscriptions,
   upstreamSubscriptions,
   manifestHistory,
-  settings,
   subscriptionDetails,
   setOrganization,
   moduleStreams,
   moduleStreamDetails,
   contentViewDetails,
   hostDetails,
+  searchBar,
   ...organizationProductsReducers,
   ...systemStatuses,
 });

data/webpack/scenes/AlternateContentSources/Create/__tests__/acsCreate.test.js

@@ -3,7 +3,7 @@ import * as reactRedux from 'react-redux';
 import { Route } from 'react-router-dom';
 import { act, fireEvent, patientlyWaitFor, renderWithRedux } from 'react-testing-lib-wrapper';
 import api, { foremanApi } from '../../../../services/api';
-import { assertNockRequest, mockAutocomplete, mockSetting, nockInstance } from '../../../../test-utils/nockWrapper';
+import { assertNockRequest, mockAutocomplete, nockInstance } from '../../../../test-utils/nockWrapper';
 import ACSTable from '../../MainTable/ACSTable';
 import contentCredentialResult from './contentCredentials.fixtures';
 import smartProxyResult from './smartProxy.fixtures';
@@ -70,18 +70,6 @@ const renderOptions = {
   },
 };
 
-let searchDelayScope;
-let autoSearchScope;
-beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-});
-
 test('Can show add ACS button if can_create is true', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance

data/webpack/scenes/AlternateContentSources/Details/ACSExpandableDetails.js

@@ -19,6 +19,7 @@ import {
   TextListItem,
   TextListItemVariants,
   TextListVariants,
+  Text,
   Flex,
   FlexItem,
 } from '@patternfly/react-core';
@@ -104,7 +105,7 @@ const ACSExpandableDetails = ({ expandedId }) => {
                 }}
                 contentId="showDetails"
               >
-                {__('Details')}
+                <Text ouiaId="expandable-details-text">{__('Details')}</Text>
               </ExpandableSectionToggle>
             </SplitItem>
             {canEdit &&
@@ -184,7 +185,7 @@ const ACSExpandableDetails = ({ expandedId }) => {
                 }}
                 contentId="showSmartProxies"
               >
-                {__('Smart proxies')}
+                <Text ouiaId="expandable-smart-proxies-text">{__('Smart proxies')}</Text>
               </ExpandableSectionToggle>
             </SplitItem>
             {canEdit &&
@@ -255,7 +256,7 @@ const ACSExpandableDetails = ({ expandedId }) => {
                   isExpanded={showProducts}
                   contentId="showProducts"
                 >
-                  {__('Products')}
+                  <Text ouiaId="expandable-products-text">{__('Products')}</Text>
                 </ExpandableSectionToggle>
               </SplitItem>
               {canEdit &&
@@ -306,7 +307,7 @@ const ACSExpandableDetails = ({ expandedId }) => {
                   isExpanded={showUrlPaths}
                   contentId="showUrlPaths"
                 >
-                  {__('URL and subpaths')}
+                  <Text ouiaId="expandable-url-paths-text">{__('URL and subpaths')}</Text>
                 </ExpandableSectionToggle>
               </SplitItem>
               {canEdit &&
@@ -367,7 +368,7 @@ const ACSExpandableDetails = ({ expandedId }) => {
                   isExpanded={showCredentials}
                   contentId="showCredentials"
                 >
-                  {__('Credentials')}
+                  <Text ouiaId="expandable-credentials-text">{__('Credentials')}</Text>
                 </ExpandableSectionToggle>
               </SplitItem>
               {canEdit &&