katello 4.5.0 → 4.6.0.rc1

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

@@ -1,12 +1,6 @@
 import React, { useContext } from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import {
-  TextContent,
-  TextList,
-  TextListVariants,
-  TextListItem,
-  TextListItemVariants,
-} from '@patternfly/react-core';
+import { TextContent, TextList, TextListItem, TextListItemVariants, TextListVariants } from '@patternfly/react-core';
 import ACSCreateContext from '../ACSCreateContext';
 import WizardHeader from '../../../ContentViews/components/WizardHeader';
 
@@ -15,7 +9,7 @@ const ACSReview = () => {
     name, description, acsType, contentType,
     smartProxies, url, subpaths, verifySSL,
     authentication, sslCertName, sslKeyName, username,
-    password, caCertName,
+    password, caCertName, productNames,
   } = useContext(ACSCreateContext);
 
   return (
@@ -23,7 +17,7 @@ const ACSReview = () => {
       <WizardHeader
         title={__('Review Details')}
         description={__('Review the information below and click Add to add your source. ' +
-          'To edit details in previous steps, click Back or any step on the left.')}
+                'To edit details in previous steps, click Back or any step on the left.')}
       />
       <TextContent>
         <TextList component={TextListVariants.dl}>
@@ -45,56 +39,76 @@ const ACSReview = () => {
           </TextListItem>
           <TextListItem component={TextListItemVariants.dt}>{__('Smart proxies')}</TextListItem>
           <TextListItem component={TextListItemVariants.dd}>
-            {smartProxies}
+            {smartProxies.join(', ')}
           </TextListItem>
-          <TextListItem component={TextListItemVariants.dt}>{__('Base URL')}</TextListItem>
-          <TextListItem component={TextListItemVariants.dd}>
-            {url}
-          </TextListItem>
-          <TextListItem component={TextListItemVariants.dt}>{__('Subpaths')}</TextListItem>
-          <TextListItem component={TextListItemVariants.dd}>
-            {subpaths}
-          </TextListItem>
-          <TextListItem component={TextListItemVariants.dt}>{__('Verify SSL')}</TextListItem>
-          <TextListItem component={TextListItemVariants.dd}>
-            {verifySSL ? __('Yes') : __('No')}
-          </TextListItem>
-          <TextListItem component={TextListItemVariants.dt}>{__('CA Cert')}</TextListItem>
-          <TextListItem component={TextListItemVariants.dd}>
-            {caCertName}
-          </TextListItem>
-          {authentication === 'manual' && (
+          {acsType === 'custom' &&
             <>
-              <TextListItem component={TextListItemVariants.dt}>{__('Authentication type')}</TextListItem>
-              <TextListItem component={TextListItemVariants.dd}>
-                {__('Manual')}
+              <TextListItem component={TextListItemVariants.dt}>
+                {__('Base URL')}
               </TextListItem>
-              <TextListItem component={TextListItemVariants.dt}>{__('Username')}</TextListItem>
               <TextListItem component={TextListItemVariants.dd}>
-                {username}
+                {url}
               </TextListItem>
-              <TextListItem component={TextListItemVariants.dt}>{__('Password')}</TextListItem>
+              <TextListItem component={TextListItemVariants.dt}>{__('Subpaths')}</TextListItem>
               <TextListItem component={TextListItemVariants.dd}>
-                {password}
+                {subpaths}
               </TextListItem>
-            </>
-          )}
-          {authentication === 'content_credentials' && (
-            <>
-              <TextListItem component={TextListItemVariants.dt}>{__('Authentication type')}</TextListItem>
+              <TextListItem component={TextListItemVariants.dt}>{__('Verify SSL')}</TextListItem>
               <TextListItem component={TextListItemVariants.dd}>
-                {__('Content credential')}
+                {verifySSL ? __('Yes') : __('No')}
               </TextListItem>
-              <TextListItem component={TextListItemVariants.dt}>{__('SSL Cert')}</TextListItem>
+              <TextListItem component={TextListItemVariants.dt}>{__('CA Cert')}</TextListItem>
               <TextListItem component={TextListItemVariants.dd}>
-                {sslCertName}
+                {caCertName}
               </TextListItem>
-              <TextListItem component={TextListItemVariants.dt}>{__('Client key')}</TextListItem>
+              {authentication === 'manual' && (
+                <>
+                  <TextListItem
+                    component={TextListItemVariants.dt}
+                  >{__('Authentication type')}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {__('Manual')}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dt}>{__('Username')}</TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {username}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dt}>{__('Password')}</TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {password}
+                  </TextListItem>
+                </>
+              )}
+              {authentication === 'content_credentials' && (
+                <>
+                  <TextListItem
+                    component={TextListItemVariants.dt}
+                  >{__('Authentication type')}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {__('Content credential')}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dt}>{__('SSL Cert')}</TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {sslCertName}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dt}>{__('Client key')}</TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {sslKeyName}
+                  </TextListItem>
+                </>
+              )}
+            </>
+            }
+          {acsType === 'simplified' &&
+            <>
+              <TextListItem component={TextListItemVariants.dt}>{__('Products')}</TextListItem>
               <TextListItem component={TextListItemVariants.dd}>
-                {sslKeyName}
+                {productNames.join(', ')}
               </TextListItem>
             </>
-          )}
+            }
         </TextList>
       </TextContent>
     </>

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

@@ -12,7 +12,8 @@ const ACSSmartProxies = () => {
   } = useContext(ACSCreateContext);
   const availableSmartProxies = useSelector(selectSmartProxy);
   const { results } = availableSmartProxies;
-  const [availableOptions, setAvailableOptions] = useState(results?.map(proxy => proxy.name));
+  const [availableOptions, setAvailableOptions] = useState(results?.map(proxy =>
+    proxy.name)?.filter(sp => !smartProxies.includes(sp)));
   const onListChange = (newAvailableOptions, newChosenOptions) => {
     setAvailableOptions(newAvailableOptions);
     setSmartProxies(newChosenOptions);
@@ -21,8 +22,8 @@ const ACSSmartProxies = () => {
   return (
     <>
       <WizardHeader
-        title={__('Name source')}
-        description={__('Enter a name for your source.')}
+        title={__('Select smart proxy')}
+        description={__('Select smart proxies to be used with this source.')}
       />
       <DualListSelector
         isSearchable

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

@@ -44,7 +44,6 @@ const AcsUrlPaths = () => {
           label={__('Subpaths')}
           type="string"
           fieldId="acs_subpaths"
-          isRequired
         >
           <TextArea
             placeholder="test/repo1/, test/repo2/,"

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

@@ -1,14 +1,6 @@
 import React, { useContext } from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import {
-  Tile,
-  Flex,
-  FlexItem,
-  Form,
-  FormGroup,
-  FormSelect,
-  FormSelectOption,
-} from '@patternfly/react-core';
+import { Flex, FlexItem, Form, FormGroup, FormSelect, FormSelectOption, Tile } from '@patternfly/react-core';
 import ACSCreateContext from '../ACSCreateContext';
 import WizardHeader from '../../../ContentViews/components/WizardHeader';
 
@@ -47,7 +39,24 @@ const SelectSource = () => {
         >
           <Flex>
             <FlexItem>
-              <Tile title={__('Custom')} isStacked id="custom" onClick={onSelect} onKeyDown={onKeyDown} isSelected={acsType === 'custom'} />{' '}
+              <Tile
+                title={__('Custom')}
+                isStacked
+                id="custom"
+                onClick={onSelect}
+                onKeyDown={onKeyDown}
+                isSelected={acsType === 'custom'}
+              />{' '}
+            </FlexItem>
+            <FlexItem>
+              <Tile
+                title={__('Simplified')}
+                isStacked
+                id="simplified"
+                onClick={onSelect}
+                onKeyDown={onKeyDown}
+                isSelected={acsType === 'simplified'}
+              />{' '}
             </FlexItem>
           </Flex>
         </FormGroup>
@@ -57,16 +66,23 @@ const SelectSource = () => {
           fieldId="content_type"
           isRequired
         >
-          <FormSelect isRequired value={contentType} onChange={(value) => { setContentType(value); }} aria-label="FormSelect Input">
+          <FormSelect
+            isRequired
+            value={contentType}
+            onChange={(value) => {
+              setContentType(value);
+            }}
+            aria-label="FormSelect Input"
+          >
             {
-          typeOptions.map(option => (
-            <FormSelectOption
-              key={option.value}
-              value={option.value}
-              label={option.label}
-            />
-          ))
-        }
+                            typeOptions.map(option => (
+                              <FormSelectOption
+                                key={option.value}
+                                value={option.value}
+                                label={option.label}
+                              />
+                            ))
+                        }
           </FormSelect>
         </FormGroup>
       </Form>

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

@@ -1,19 +1,23 @@
 import React from 'react';
 import * as reactRedux from 'react-redux';
-import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import { Route } from 'react-router-dom';
+import { act, fireEvent, patientlyWaitFor, renderWithRedux } from 'react-testing-lib-wrapper';
 import api, { foremanApi } from '../../../../services/api';
-import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../test-utils/nockWrapper';
+import { assertNockRequest, mockAutocomplete, mockSetting, nockInstance } from '../../../../test-utils/nockWrapper';
 import ACSTable from '../../MainTable/ACSTable';
 import contentCredentialResult from './contentCredentials.fixtures';
 import smartProxyResult from './smartProxy.fixtures';
+import productsResult from './products.fixtures.json';
 
+const withACSRoute = component => <Route path="/labs/alternate_content_sources/">{component}</Route>;
 const ACSIndexPath = api.getApiUrl('/alternate_content_sources');
 const ACSCreatePath = api.getApiUrl('/alternate_content_sources');
 const contentCredentialPath = api.getApiUrl('/content_credentials');
 const smartProxyPath = foremanApi.getApiUrl('/smart_proxies');
+const productsPath = api.getApiUrl('/products');
 const autocompleteUrl = '/alternate_content_sources/auto_complete_search';
 
-const createACSDetails = {
+const createCustomACSDetails = {
   upstream_username: 'username',
   upstream_password: 'password',
   name: 'acs_test',
@@ -27,6 +31,15 @@ const createACSDetails = {
   ssl_ca_cert_id: '',
 };
 
+const createSimplifiedACSDetails = {
+  name: 'acs_simplified_test',
+  description: '',
+  smart_proxy_names: ['centos7-katello-devel-stable.example.com'],
+  product_ids: [340, 19, 341],
+  content_type: 'yum',
+  alternate_content_source_type: 'simplified',
+};
+
 const noResults = {
   total: 0,
   subtotal: 0,
@@ -35,6 +48,12 @@ const noResults = {
   results: [],
 };
 
+const renderOptions = {
+  routerParams: {
+    initialEntries: [{ pathname: '/labs/alternate_content_sources/' }],
+  },
+};
+
 let searchDelayScope;
 let autoSearchScope;
 beforeEach(() => {
@@ -43,7 +62,6 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-  nock.cleanAll();
   assertNockRequest(searchDelayScope);
   assertNockRequest(autoSearchScope);
 });
@@ -61,10 +79,11 @@ test('Can show add ACS button', async (done) => {
   await patientlyWaitFor(() => expect(queryByText("You currently don't have any alternate content sources.")).toBeInTheDocument());
   expect(queryByText('Add source')).toBeInTheDocument();
   assertNockRequest(autocompleteScope);
-  assertNockRequest(scope, done);
+  assertNockRequest(scope);
+  act(done);
 });
 
-test('Can display create wizard and create ACS', async (done) => {
+test('Can display create wizard and create custom ACS', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(ACSIndexPath)
@@ -76,18 +95,23 @@ test('Can display create wizard and create ACS', async (done) => {
     .query(true)
     .reply(200, contentCredentialResult);
 
+  const productScope = nockInstance
+    .get(productsPath)
+    .query(true)
+    .reply(200, productsResult);
+
   const smartProxyScope = nockInstance
     .get(smartProxyPath)
     .query(true)
     .reply(200, smartProxyResult);
 
   const createScope = nockInstance
-    .post(ACSCreatePath, createACSDetails)
+    .post(ACSCreatePath, createCustomACSDetails)
     .reply(201, { id: 22 });
 
   const {
     getByLabelText, getByText, getAllByRole, queryByText,
-  } = renderWithRedux(<ACSTable />);
+  } = renderWithRedux(withACSRoute(<ACSTable />), renderOptions);
 
   expect(queryByText("You currently don't have any alternate content sources.")).toBeNull();
   await patientlyWaitFor(() => expect(queryByText("You currently don't have any alternate content sources.")).toBeInTheDocument());
@@ -113,11 +137,14 @@ test('Can display create wizard and create ACS', async (done) => {
   fireEvent.change(getByLabelText('acs_name_field'), { target: { value: 'acs_test' } });
 
   // Mock smart proxy selector to go to next page
-  const useSelectorMock = jest.spyOn(reactRedux, 'useSelector');
-  useSelectorMock.mockReturnValue(smartProxyResult);
+  const useSmartProxySelectorMock = jest.spyOn(reactRedux, 'useSelector');
+  useSmartProxySelectorMock.mockReturnValue(smartProxyResult);
   fireEvent.click(getByText('Next'));
+  await patientlyWaitFor(() => {
+    expect(getByText('centos7-katello-devel-stable.example.com')).toBeInTheDocument();
+  });
   fireEvent.click(getByLabelText('Add all'));
-
+  useSmartProxySelectorMock.mockRestore();
   // Go to URL and subpath step
   fireEvent.click(getByText('Next'));
 
@@ -126,7 +153,8 @@ test('Can display create wizard and create ACS', async (done) => {
   fireEvent.change(getByLabelText('acs_subpath_field'), { target: { value: 'test/repo1/,test/repo2/' } });
 
   // Mock content credential data
-  useSelectorMock.mockReturnValue(contentCredentialResult.results);
+  const useContentCredentialSelectorMock = jest.spyOn(reactRedux, 'useSelector');
+  useContentCredentialSelectorMock.mockReturnValue(contentCredentialResult.results);
   fireEvent.click(getByText('Next'));
   const manualAuthRadio = getAllByRole('radio', { name: 'Manual authentication' })[0];
   fireEvent.click(manualAuthRadio);
@@ -136,14 +164,93 @@ test('Can display create wizard and create ACS', async (done) => {
   });
   fireEvent.change(getByLabelText('acs_username_field'), { target: { value: 'username' } });
   fireEvent.change(getByLabelText('acs_password_field'), { target: { value: 'password' } });
-
+  useContentCredentialSelectorMock.mockRestore();
   fireEvent.click(getByText('Next'));
   fireEvent.click(getByText('Add'));
 
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(contentCredentialScope);
+  assertNockRequest(productScope);
+  assertNockRequest(smartProxyScope);
+  assertNockRequest(createScope, done);
+  act(done);
+});
+
+test('Can display create wizard and create simplified ACS', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(ACSIndexPath)
+    .query(true)
+    .reply(200, noResults);
+
+  const contentCredentialScope = nockInstance
+    .get(contentCredentialPath)
+    .query(true)
+    .reply(200, contentCredentialResult);
+
+  const smartProxyScope = nockInstance
+    .get(smartProxyPath)
+    .query(true)
+    .reply(200, smartProxyResult);
+
+  const productScope = nockInstance
+    .get(productsPath)
+    .query(true)
+    .reply(200, productsResult);
+
+  const createScope = nockInstance
+    .post(ACSCreatePath, createSimplifiedACSDetails)
+    .reply(201, { id: 22 });
+
+  const {
+    getByLabelText, getByText, queryByText,
+  } = renderWithRedux(withACSRoute(<ACSTable />), renderOptions);
+
+  expect(queryByText("You currently don't have any alternate content sources.")).toBeNull();
+  await patientlyWaitFor(() => expect(queryByText("You currently don't have any alternate content sources.")).toBeInTheDocument());
+  expect(queryByText('Add source')).toBeInTheDocument();
+  fireEvent.click(getByText('Add source'));
+
+  // First step: Select source
+  await patientlyWaitFor(() => {
+    expect(getByText('Add an alternate content source')).toBeInTheDocument();
+    expect(queryByText('Indicate the source type.')).toBeInTheDocument();
+  });
+
+  // Choose ACS type, content_type defaults to yum
+  fireEvent.click(getByText('Simplified'));
+
+  // Go to next step: Name source
+  fireEvent.click(getByText('Next'));
+
+  await patientlyWaitFor(() => {
+    expect(getByText('Enter a name for your source.')).toBeInTheDocument();
+  });
+  // Enter Name
+  fireEvent.change(getByLabelText('acs_name_field'), { target: { value: 'acs_simplified_test' } });
+
+  // Mock smart proxy selector to go to next page
+  const useSelectorMock = jest.spyOn(reactRedux, 'useSelector');
+  useSelectorMock.mockReturnValue(smartProxyResult);
+  fireEvent.click(getByText('Next'));
+  fireEvent.click(getByLabelText('Add all'));
   useSelectorMock.mockClear();
+  // Mock product selector to go to next page
+  const useProductSelectorMock = jest.spyOn(reactRedux, 'useSelector');
+  useProductSelectorMock.mockReturnValue(productsResult);
+  fireEvent.click(getByText('Next'));
+  fireEvent.click(getByLabelText('Add all'));
+
+  fireEvent.click(getByText('Next'));
+  useProductSelectorMock.mockClear();
+  fireEvent.click(getByText('Add'));
+
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
+  assertNockRequest(productScope);
   assertNockRequest(contentCredentialScope);
   assertNockRequest(smartProxyScope);
   assertNockRequest(createScope, done);
+  act(done);
 });

data/webpack/scenes/AlternateContentSources/Create/__tests__/products.fixtures.json

@@ -0,0 +1,92 @@
+{
+  "total": 3,
+  "subtotal": 3,
+  "selectable": 3,
+  "page": 1,
+  "per_page": 3,
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": "name",
+    "order": "asc"
+  },
+  "results": [
+    {
+      "id": 340,
+      "cp_id": "607918016883",
+      "name": "prod",
+      "label": "prod",
+      "description": null,
+      "provider_id": 1,
+      "sync_plan_id": null,
+      "sync_summary": {},
+      "gpg_key_id": null,
+      "ssl_ca_cert_id": null,
+      "ssl_client_cert_id": null,
+      "ssl_client_key_id": null,
+      "sync_state": null,
+      "last_sync": "2022-07-25 09:31:37 -0400",
+      "last_sync_words": "1 day",
+      "organization_id": 1,
+      "organization": {
+        "name": "Default Organization",
+        "label": "Default_Organization",
+        "id": 1
+      },
+      "sync_plan": null,
+      "repository_count": 2
+    },
+    {
+      "id": 19,
+      "cp_id": "479",
+      "name": "Red Hat Enterprise Linux for x86_64",
+      "label": "Red_Hat_Enterprise_Linux_for_x86_64",
+      "description": null,
+      "provider_id": 2,
+      "sync_plan_id": null,
+      "sync_summary": {
+        "success": 2
+      },
+      "gpg_key_id": null,
+      "ssl_ca_cert_id": null,
+      "ssl_client_cert_id": null,
+      "ssl_client_key_id": null,
+      "sync_state": "Syncing Complete.",
+      "last_sync": "2022-07-22 13:49:39 -0400",
+      "last_sync_words": "4 days",
+      "organization_id": 1,
+      "organization": {
+        "name": "Default Organization",
+        "label": "Default_Organization",
+        "id": 1
+      },
+      "sync_plan": null,
+      "repository_count": 2
+    },
+    {
+      "id": 341,
+      "cp_id": "805147203918",
+      "name": "yummy",
+      "label": "yummy",
+      "description": null,
+      "provider_id": 1,
+      "sync_plan_id": null,
+      "sync_summary": {},
+      "gpg_key_id": null,
+      "ssl_ca_cert_id": null,
+      "ssl_client_cert_id": null,
+      "ssl_client_key_id": null,
+      "sync_state": null,
+      "last_sync": "2022-07-25 21:25:33 -0400",
+      "last_sync_words": "about 15 hours",
+      "organization_id": 1,
+      "organization": {
+        "name": "Default Organization",
+        "label": "Default_Organization",
+        "id": 1
+      },
+      "sync_plan": null,
+      "repository_count": 1
+    }
+  ]
+}