katello 4.7.3 → 4.8.0.rc1

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

@@ -15,6 +15,7 @@ import {
   useDispatch,
   useSelector,
 } from 'react-redux';
+import { isEqual } from 'lodash';
 
 import {
   ActionList,
@@ -169,12 +170,12 @@ const RepositorySetsTab = () => {
     organization_id: orgId,
   } = hostDetails;
 
-  const organizationDetails = useSelector(state => selectOrganization(state, orgId));
-  const orgStatus = useSelector(state => selectOrganizationStatus(state, orgId));
-
   const {
     simple_content_access: simpleContentAccess,
-  } = organizationDetails;
+  } = useSelector(state => selectOrganization(state, orgId));
+  const orgStatus = useSelector(state => selectOrganizationStatus(state, orgId));
+  const orgNotLoaded = orgStatus !== STATUS.RESOLVED;
+
   const canDoContentOverrides = can(
     editHosts,
     userPermissionsFromHostDetails({ hostDetails }),
@@ -185,9 +186,11 @@ const RepositorySetsTab = () => {
   const {
     contentViewDefault,
     lifecycleEnvironmentLibrary,
-    contentViewName,
-    lifecycleEnvironmentName,
+    contentView,
+    lifecycleEnvironment,
   } = contentFacet;
+  const { name: contentViewName } = contentView ?? {};
+  const { name: lifecycleEnvironmentName } = lifecycleEnvironment ?? {};
   const nonLibraryHost = contentViewDefault === false ||
     lifecycleEnvironmentLibrary === false;
   const [isBulkActionOpen, setIsBulkActionOpen] = useState(false);
@@ -196,22 +199,24 @@ const RepositorySetsTab = () => {
   const { searchParam, show, status: initialStatus } = useUrlParams();
 
   const toggleGroupStates = ['noLimit', 'limitToEnvironment'];
-  const [noLimit, limitToEnvironment] = toggleGroupStates;
-  const defaultToggleGroupState = nonLibraryHost ? limitToEnvironment : noLimit;
+  const [SHOW_ALL, LIMIT_TO_ENVIRONMENT] = toggleGroupStates;
+  const defaultToggleGroupState = nonLibraryHost ? LIMIT_TO_ENVIRONMENT : SHOW_ALL;
+  const unfilteredToggleGroupState = SHOW_ALL;
   const [toggleGroupState, setToggleGroupState] =
     useState(show ?? defaultToggleGroupState);
   const [statusSelected, setStatusSelected]
     = useState(PARAM_TO_FRIENDLY_NAME[initialStatus] ?? STATUS_LABEL);
-  const activeFilters = [statusSelected, toggleGroupState];
-  const defaultFilters = [STATUS_LABEL, defaultToggleGroupState];
+  const activeFilters = [statusSelected];
+  const defaultFilters = [STATUS_LABEL];
 
   const [alertShowing, setAlertShowing] = useState(false);
+
   const emptyContentTitle = __('No repository sets to show.');
-  const emptyContentBody = __('Repository sets will appear here after enabling Red Hat repositories or creating custom products.');
+  const emptyContentBody = toggleGroupState === SHOW_ALL ?
+    __('Repository sets will appear here after enabling Red Hat repositories or creating custom products.') :
+    __('Repository sets will appear here when the host\'s content view and environment has available content.');
   const emptySearchTitle = __('No matching repository sets found');
   const emptySearchBody = __('Try changing your search query.');
-  const showPrimaryAction = true;
-  const showSecondaryAction = true;
   const primaryActionTitle = __('Enable Red Hat repositories');
   const secondaryActionTitle = __('Create a custom product');
   const primaryActionLink = '/redhat_repositories';
@@ -246,26 +251,27 @@ const RepositorySetsTab = () => {
         modifiedParams.status = STATUS_TO_PARAM[statusSelected];
       }
       return getHostRepositorySets({
-        content_access_mode_env: toggleGroupState === limitToEnvironment,
+        content_access_mode_env: toggleGroupState === LIMIT_TO_ENVIRONMENT,
         content_access_mode_all: simpleContentAccess,
         host_id: hostId,
         ...apiSortParams,
         ...modifiedParams,
       });
     },
-    [hostId, toggleGroupState, limitToEnvironment,
+    [hostId, toggleGroupState, LIMIT_TO_ENVIRONMENT,
       simpleContentAccess, apiSortParams, statusSelected, STATUS_LABEL],
   );
 
   useEffect(() => {
-    if (orgId && orgStatus !== STATUS.RESOLVED) {
+    if (orgId && orgNotLoaded) {
       dispatch(getOrganization({ orgId }));
     }
-  }, [orgId, orgStatus, dispatch]);
+  }, [orgId, orgNotLoaded, dispatch]);
 
+  const status = useSelector(state => selectRepositorySetsStatus(state));
   const response = useSelector(state => selectAPIResponse(state, REPOSITORY_SETS_KEY));
   const { results, error: errorSearchBody, ...metadata } = response;
-  const status = useSelector(state => selectRepositorySetsStatus(state));
+
   const repoSetSearchQuery = label => `cp_content_id = ${label}`;
   const {
     selectOne, isSelected, searchQuery, selectedCount, isSelectable,
@@ -278,9 +284,17 @@ const RepositorySetsTab = () => {
 
   const hostDetailsStatus = useSelector(state => selectHostDetailsStatus(state));
 
+  // Ignore the toggle group when deciding if there is emptyContent. This will
+  // ensure the correct EmptyStateMessage
+  const isFiltering = activeFilters?.length &&
+    !isEqual(new Set(activeFilters), new Set(defaultFilters));
+  const emptyContent = (results && results.length === 0) && !searchQuery && !isFiltering;
+  const showPrimaryAction = (toggleGroupState === SHOW_ALL) && emptyContent;
+  const showSecondaryAction = showPrimaryAction;
+
   const resetFilters = () => {
     setStatusSelected(STATUS_LABEL);
-    setToggleGroupState(defaultToggleGroupState);
+    if (emptyContent) setToggleGroupState(SHOW_ALL);
   };
   useEffect(() => {
     // wait until host details are loaded to set alertShowing
@@ -289,7 +303,7 @@ const RepositorySetsTab = () => {
     }
   }, [hostDetailsStatus, nonLibraryHost]);
 
-  if (!hostId) return <Skeleton />;
+  if (!hostId || orgNotLoaded) return <Skeleton />;
   const updateResults = newResponse => dispatch({
     type: `${REPOSITORY_SETS_KEY}_SUCCESS`,
     key: REPOSITORY_SETS_KEY,
@@ -396,15 +410,15 @@ const RepositorySetsTab = () => {
               text={__('Show all')}
               buttonId="no-limit-toggle"
               aria-label="No limit"
-              isSelected={toggleGroupState === noLimit}
-              onChange={() => setToggleGroupState(noLimit)}
+              isSelected={toggleGroupState === SHOW_ALL}
+              onChange={() => setToggleGroupState(SHOW_ALL)}
             />
             <ToggleGroupItem
               text={__('Limit to environment')}
               buttonId="limit-to-env-toggle"
               aria-label="Limit to environment"
-              isSelected={toggleGroupState === limitToEnvironment}
-              onChange={() => setToggleGroupState(limitToEnvironment)}
+              isSelected={toggleGroupState === LIMIT_TO_ENVIRONMENT}
+              onChange={() => setToggleGroupState(LIMIT_TO_ENVIRONMENT)}
             />
           </ToggleGroup>
         </SplitItem>
@@ -443,11 +457,11 @@ const RepositorySetsTab = () => {
 
   const hostEnvText = 'the "{contentViewName}" content view and "{lifecycleEnvironmentName}" environment';
 
-  const scaAlert = (toggleGroupState === limitToEnvironment ?
+  const scaAlert = (toggleGroupState === LIMIT_TO_ENVIRONMENT ?
     `Showing only repositories in ${hostEnvText}.` :
     'Showing all available repositories.');
 
-  const nonScaAlert = (toggleGroupState === limitToEnvironment ?
+  const nonScaAlert = (toggleGroupState === LIMIT_TO_ENVIRONMENT ?
     `Showing repositories in ${hostEnvText} that are available through subscriptions.` :
     'Showing all repositories available through subscriptions.');
 
@@ -518,13 +532,19 @@ const RepositorySetsTab = () => {
             resetFilters,
           }
           }
+          alwaysHideToolbar={showPrimaryAction}
+          activeToggleState={toggleGroupState}
+          unfilteredToggleState={unfilteredToggleGroupState}
+          showSecondaryActionButton={toggleGroupState === LIMIT_TO_ENVIRONMENT}
+          secondaryActionTextOverride={__('Show all repository sets')}
+          emptyContentOverride={emptyContent}
           ouiaId="host-repository-sets-table"
           errorSearchTitle={errorSearchTitle}
           errorSearchBody={errorSearchBody}
           additionalListeners={[hostId, toggleGroupState, statusSelected,
             activeSortColumn, activeSortDirection]}
           fetchItems={fetchItems}
-          autocompleteEndpoint="/repository_sets/auto_complete_search"
+          autocompleteEndpoint="/katello/api/v2/repository_sets"
           bookmarkController="katello_product_contents" // Katello::ProductContent.table_name
           readOnlyBookmarks={readOnlyBookmarks}
           rowsCount={results?.length}

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

@@ -210,8 +210,7 @@ const TracesTab = () => {
         metadata={meta}
         bookmarkController="katello_host_tracers"
         readOnlyBookmarks={readOnlyBookmarks}
-        autocompleteEndpoint={`/hosts/${hostId}/traces/auto_complete_search`}
-        foremanApiAutoComplete
+        autocompleteEndpoint={`/api/v2/hosts/${hostId}/traces`}
         rowsCount={results?.length}
         variant={TableVariant.compact}
         additionalListeners={[activeSortColumn, activeSortDirection,

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

@@ -1,14 +1,13 @@
 import React from 'react';
 import { isEqual } from 'lodash';
 import { renderWithRedux, patientlyWaitFor, within, fireEvent } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete } from '../../../../../test-utils/nockWrapper';
 import { foremanApi } from '../../../../../services/api';
 import { HOST_ERRATA_KEY, ERRATA_SEARCH_QUERY } from '../ErrataTab/HostErrataConstants';
 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'),
@@ -39,8 +38,6 @@ const cfNoErrata = cfWithErrataTotal(0);
 
 const hostName = 'foo.example.com';
 
-const errataBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_errata');
-
 const renderOptions = (facetAttributes = contentFacetAttributes) => ({
   apiNamespace: HOST_ERRATA_KEY,
   initialState: {
@@ -108,22 +105,10 @@ const applyByKatelloAgentUrl = foremanApi.getApiUrl('/hosts/1/errata/apply');
 
 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');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(bookmarkScope);
 });
 
 test('Can call API for errata and show on screen on page load', async (done) => {
@@ -163,7 +148,7 @@ test('Can handle no errata being present', async (done) => {
   const { queryByText } = renderWithRedux(<ErrataTab />, renderOptions(cfNoErrata));
 
   // Assert that there are not any errata showing on the screen.
-  await patientlyWaitFor(() => expect(queryByText('This host has errata that are applicable, but not installable.')).toBeInTheDocument());
+  await patientlyWaitFor(() => expect(queryByText('This host has errata that are applicable, but not installable. Adjust your filters and try again.')).toBeInTheDocument());
   // Assert request was made and completed, see helper function
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
@@ -805,8 +790,6 @@ test('Can filter by errata type', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(scope2, done); // Pass jest callback to confirm test is done
 });
 
@@ -853,8 +836,6 @@ test('Can filter by severity', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(scope2, done); // Pass jest callback to confirm test is done
 });
 

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

@@ -1,10 +1,9 @@
 import React from 'react';
 import { act } from 'react-test-renderer';
 import { renderWithRedux, patientlyWaitFor, within, fireEvent } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete } from '../../../../../test-utils/nockWrapper';
 import { ModuleStreamsTab } from '../ModuleStreamsTab/ModuleStreamsTab.js';
 import mockModuleStreams from './moduleStreams.fixtures.json';
-import mockBookmarkData from './bookmarks.fixtures.json';
 import { MODULE_STREAMS_KEY } from '../../../../../scenes/ModuleStreams/ModuleStreamsConstants';
 import { foremanApi } from '../../../../../services/api';
 
@@ -15,8 +14,6 @@ jest.mock('../../hostDetailsHelpers', () => ({
   }),
 }));
 
-const moduleBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_host_available_module_streams');
-
 const contentFacetAttributes = {
   id: 11,
   uuid: 'e5761ea3-4117-4ecf-83d0-b694f99b389e',
@@ -44,34 +41,10 @@ const hostModuleStreams = foremanApi.getApiUrl('/hosts/1/module_streams');
 const autocompleteUrl = '/hosts/1/module_streams/auto_complete_search';
 
 let firstModuleStreams;
-let searchDelayScope;
-let autoSearchScope;
-let bookmarkScope;
-
-beforeEach(() => {
-  const { results } = mockModuleStreams;
-  [firstModuleStreams] = results;
-  bookmarkScope = nockInstance.get(moduleBookmarks).reply(200, mockBookmarkData);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(bookmarkScope);
-});
 
 beforeEach(() => {
   const { results } = mockModuleStreams;
   [firstModuleStreams] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
 });
 
 test('Can call API for Module streams and show on screen on page load', async (done) => {

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent, within } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete } from '../../../../../test-utils/nockWrapper';
 import katelloApi, { foremanApi } from '../../../../../services/api';
 import mockPackagesData from './yumInstallablePackages.fixtures.json';
 import PackageInstallModal from '../PackagesTab/PackageInstallModal';
@@ -54,19 +54,10 @@ const defaultQuery = {
 
 let firstPackages;
 let secondPackages;
-let searchDelayScope;
-let autoSearchScope;
 
 beforeEach(() => {
   const { results } = mockPackagesData;
   [firstPackages, secondPackages] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', true);
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
 });
 
 test('Can call API for installable packages and show on screen on page load', async (done) => {

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

@@ -1,13 +1,12 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete } from '../../../../../test-utils/nockWrapper';
 import { foremanApi } from '../../../../../services/api';
 import { HOST_PACKAGES_KEY, PACKAGES_SEARCH_QUERY, SELECTED_UPDATE_VERSIONS } from '../PackagesTab/HostPackagesConstants';
 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';
 
 jest.mock('../../hostDetailsHelpers', () => ({
   ...jest.requireActual('../../hostDetailsHelpers'),
@@ -25,8 +24,6 @@ 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: {
@@ -61,22 +58,10 @@ 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');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(bookmarkScope);
 });
 
 test('Can call API for packages and show on screen on page load', async (done) => {
@@ -159,8 +144,6 @@ test('Can filter by package status', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(scope2, done); // Pass jest callback to confirm test is done
 });
 

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

@@ -1,11 +1,10 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, within, fireEvent } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../../test-utils/nockWrapper';
 import katelloApi, { foremanApi } from '../../../../../services/api';
 import { REPOSITORY_SETS_KEY } from '../RepositorySetsTab/RepositorySetsConstants';
 import RepositorySetsTab from '../RepositorySetsTab/RepositorySetsTab';
 import mockRepoSetData from './repositorySets.fixtures.json';
-import mockBookmarkData from './bookmarks.fixtures.json';
 import mockContentOverride from './contentOverrides.fixtures.json';
 
 jest.mock('../../hostDetailsHelpers', () => ({
@@ -50,7 +49,6 @@ const renderOptions = (facetAttributes = contentFacetAttributes) => ({
 
 const hostRepositorySets = katelloApi.getApiUrl('/repository_sets');
 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 = {
@@ -70,23 +68,11 @@ const showAllQuery = {
 
 let firstRepoSet;
 let secondRepoSet;
-let searchDelayScope;
-let autoSearchScope;
-let bookmarkScope;
 
 beforeEach(() => {
   // jest.resetModules();
   const { results } = mockRepoSetData;
   [firstRepoSet, secondRepoSet] = results;
-  bookmarkScope = nockInstance.get(repositorySetBookmarks).reply(200, mockBookmarkData);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(bookmarkScope);
 });
 
 test('Can call API for repository sets and show basic table', async (done) => {
@@ -415,8 +401,6 @@ test('Can filter by status', async (done) => {
   });
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(scope2, done); // Pass jest callback to confirm test is done
 });
 

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderWithRedux, waitFor, patientlyWaitFor, fireEvent, act } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete } from '../../../../../test-utils/nockWrapper';
 import { foremanApi } from '../../../../../services/api';
 import { REX_FEATURES } from '../RemoteExecutionConstants';
 import { HOST_TRACES_KEY, TRACES_SEARCH_QUERY } from '../TracesTab/HostTracesConstants';
@@ -9,10 +9,8 @@ import mockTraceData from './traces.fixtures.json';
 import mockResolveTraceTask from './resolveTraces.fixtures.json';
 import emptyTraceResults from './tracerEmptyTraceResults.fixtures.json';
 import mockJobInvocationStatus from './tracerEnableJobInvocation.fixtures.json';
-import mockBookmarkData from './bookmarks.fixtures.json';
 
 const hostName = 'client.example.com';
-const tracesBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_host_tracers');
 
 jest.mock('../../hostDetailsHelpers', () => ({
   ...jest.requireActual('../../hostDetailsHelpers'),
@@ -57,23 +55,11 @@ const autocompleteUrl = '/hosts/1/traces/auto_complete_search';
 const jobInvocations = foremanApi.getApiUrl('/job_invocations');
 
 let firstTrace;
-let searchDelayScope;
-let autoSearchScope;
-let bookmarkScope;
 
 describe('With tracer installed', () => {
   beforeEach(() => {
     const { results } = mockTraceData;
     [firstTrace] = results;
-    bookmarkScope = nockInstance.get(tracesBookmarks).reply(200, mockBookmarkData);
-    searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-    autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-  });
-
-  afterEach(() => {
-    assertNockRequest(searchDelayScope);
-    assertNockRequest(autoSearchScope);
-    assertNockRequest(bookmarkScope);
   });
 
   test('Can call API for traces and show on screen on page load', async (done) => {

data/webpack/global_test_setup.js

@@ -16,7 +16,7 @@ global.console.error = (error, stack) => {
   //    'The prop `ouiaId` is marked as required in `Modal`, but its value is `undefined`',
   //    'created by WizardHeader', 'created by Navigation',
   //    'created by ActionsColumn', 'created by InactiveText', 'created by Select',
-  //    'created by Context.Consumer'];
+  //    'created by Context.Consumer', 'created by DualListSelector'];
 
   /* eslint-disable-next-line no-console */
   if (stack) console.log(stack); // Prints out original stack trace

data/webpack/scenes/AlternateContentSources/Create/ACSCreateWizard.js

@@ -51,6 +51,11 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     [dispatch],
   );
 
+  const subPathValidated = areSubPathsValid(subpaths) ? 'default' : 'error';
+  const urlValidated = (url === '' || isValidUrl(url, acsType)) ? 'default' : 'error';
+
+  const urlAndPathsValid = () => url !== '' && urlValidated !== 'error' && subPathValidated !== 'error';
+
   const credentialsFilled = () => {
     if (authentication === 'manual') {
       return username !== '';
@@ -58,9 +63,6 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     return true;
   };
 
-  const subPathValidated = areSubPathsValid(subpaths) ? 'default' : 'error';
-  const urlValidated = (url === '' || isValidUrl(url)) ? 'default' : 'error';
-
   const sourceTypeStep = {
     id: 1,
     name: __('Select source type'),
@@ -88,7 +90,7 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     id: 4,
     name: __('Select products'),
     component: <ACSProducts />,
-    canJumpTo: smartProxies.length,
+    canJumpTo: smartProxies.length && name !== '',
     enableNext: productIds.length,
   };
 
@@ -96,16 +98,16 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     id: 5,
     name: __('URL and paths'),
     component: <AcsUrlPaths />,
-    canJumpTo: (acsType === 'custom' || acsType === 'rhui') && (smartProxies.length),
-    enableNext: url !== '' && urlValidated !== 'error' && subPathValidated !== 'error',
+    canJumpTo: (acsType === 'custom' || acsType === 'rhui') && (smartProxies.length) && name !== '',
+    enableNext: urlAndPathsValid(),
   };
 
   const credentialsStep = {
     id: 6,
     name: __('Credentials'),
     component: <ACSCredentials />,
-    canJumpTo: url !== '' && urlValidated !== 'error' && subPathValidated !== 'error',
-    enableNext: (url !== '' || productIds.length) && smartProxies.length && name !== '' && acsType && contentType && credentialsFilled(),
+    canJumpTo: urlAndPathsValid() && (smartProxies.length) && name !== '',
+    enableNext: (urlAndPathsValid() || productIds.length) && smartProxies.length && name !== '' && acsType && contentType && credentialsFilled(),
   };
 
   const reviewStep = {
@@ -113,8 +115,8 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     name: __('Review details'),
     component: <ACSReview />,
     nextButtonText: __('Add'),
-    canJumpTo: (url !== '' || productIds.length) && smartProxies.length && name !== '' && acsType && contentType && credentialsFilled(),
-    enableNext: (url !== '' || productIds.length) && smartProxies.length && name !== '' && acsType && contentType,
+    canJumpTo: (urlAndPathsValid() || productIds.length) && smartProxies.length && name !== '' && acsType && contentType && credentialsFilled(),
+    enableNext: (urlAndPathsValid() || productIds.length) && smartProxies.length && name !== '' && acsType && contentType,
   };
 
   const finishStep = {

data/webpack/scenes/AlternateContentSources/Create/Steps/ACSCredentials.js

@@ -47,6 +47,7 @@ const ACSCredentials = () => {
         <Radio
           label={__('Manual authentication')}
           id="manual_auth"
+          ouiaId="manual_auth"
           name="manual_auth"
           aria-label="manual_auth"
           isChecked={authentication === 'manual'}
@@ -71,6 +72,7 @@ const ACSCredentials = () => {
                 isRequired
                 type="text"
                 id="acs_username_field"
+                ouiaId="acs_username_field"
                 name="acs_username_field"
                 aria-label="acs_username_field"
                 value={username}
@@ -87,6 +89,7 @@ const ACSCredentials = () => {
                 isRequired
                 type="password"
                 id="acs_password_field"
+                ouiaId="acs_password_field"
                 name="acs_password_field"
                 aria-label="acs_password_field"
                 value={password}
@@ -98,6 +101,7 @@ const ACSCredentials = () => {
         <Radio
           label={__('Content credentials')}
           id="content_credentials"
+          ouiaId="content_credentials"
           aria-label="content_credentials"
           name="content_cred_auth"
           isChecked={authentication === 'content_credentials'}
@@ -163,6 +167,7 @@ const ACSCredentials = () => {
           label={__('None')}
           id="none"
           name="none"
+          ouiaId="none"
           aria-label="none"
           isChecked={authentication === ''}
           onChange={() => {
@@ -178,6 +183,7 @@ const ACSCredentials = () => {
         <FormGroup label={__('Verify SSL')} fieldId="verify_ssl">
           <Switch
             id="verify-ssl-switch"
+            ouiaId="verify-ssl-switch"
             aria-label="verify-ssl-switch"
             isChecked={verifySSL}
             onChange={checked => setVerifySSL(checked)}

data/webpack/scenes/AlternateContentSources/Create/Steps/ACSSmartProxies.js

@@ -55,6 +55,7 @@ const ACSSmartProxies = () => {
       >
         <Switch
           id="use-http-proxies-switch"
+          ouiaId="use-http-proxies-switch"
           aria-label="use-http-proxies-switch"
           isChecked={useHttpProxies}
           onChange={checked => setUseHttpProxies(checked)}