katello 4.4.1 → 4.5.0

data/webpack/scenes/ContentViews/components/TaskPresenter/TaskPresenter.js

@@ -1,62 +1,66 @@
 import React, { useState, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import useDeepCompareEffect from 'use-deep-compare-effect';
 import { InProgressIcon } from '@patternfly/react-icons';
 import PropTypes from 'prop-types';
-import { Progress,
+import {
+  Progress,
   ProgressSize,
   ProgressMeasureLocation,
-  ProgressVariant } from '@patternfly/react-core';
+  ProgressVariant,
+} from '@patternfly/react-core';
 import { STATUS } from 'foremanReact/constants';
-import { stopPollingTask, toastTaskFinished } from '../../../Tasks/TaskActions';
+import { startPollingTask, toastTaskFinished } from '../../../Tasks/TaskActions';
 import { selectTaskPoll, selectTaskPollStatus } from '../../Details/ContentViewDetailSelectors';
+import { getContentViewVersions } from '../../Details/ContentViewDetailActions';
+import { cvVersionTaskPollingKey } from '../../ContentViewsConstants';
+import { selectIsPollingTask } from '../../../Tasks/TaskSelectors';
 
-const TaskPresenter = ({ activeHistory, setPollingFinished }) => {
+const TaskPresenter = ({ activeHistory, cvId, allowCallback }) => {
   const { task } = activeHistory;
   const dispatch = useDispatch();
-  const [polling, setPolling] = useState(true);
-  const [taskErrored, setTaskErrored] = useState(task.result === 'error');
+  const [taskPausedOrErrored, setTaskPausedOrErrored] =
+    useState(task.result === 'error' || task.result === 'paused');
+  const [resolved, setResolved] = useState(false);
+  const POLLING_TASK_KEY = cvVersionTaskPollingKey(cvId);
+  const isTaskRunning = useSelector(state =>
+    selectIsPollingTask(state, POLLING_TASK_KEY));
+
   const pollResponse = useSelector(state =>
-    selectTaskPoll(state, task.id));
+    selectTaskPoll(state, POLLING_TASK_KEY));
   const pollResponseStatus = useSelector(state =>
-    selectTaskPollStatus(state, task.id));
-  const loading = pollResponseStatus === STATUS.PENDING;
+    selectTaskPollStatus(state, POLLING_TASK_KEY));
 
-  const progressCompleted = () => (
-    pollResponse.progress ?
-      pollResponse.progress * 100 :
-      task.progress * 100
-  );
 
   useEffect(() => {
-    if (!polling) {
-      const { id } = task;
-      dispatch(stopPollingTask(id));
-      dispatch(toastTaskFinished(pollResponse));
-      setPollingFinished(true); // Use this boolean as activeListener in referring page table
+    if (allowCallback && !isTaskRunning && !taskPausedOrErrored) {
+      dispatch(startPollingTask(POLLING_TASK_KEY, task));
     }
-  }, [polling, dispatch, setPollingFinished, pollResponse, task]);
+  }, [POLLING_TASK_KEY, allowCallback, dispatch, isTaskRunning, task, taskPausedOrErrored]);
 
-  useDeepCompareEffect(() => {
-    if (!loading && polling) {
-      const { state, result } = pollResponse;
-      if ((state === 'paused' || result === 'error') && !taskErrored) {
-        setTaskErrored(true);
-        setPolling(false);
-      } else if (state === 'stopped' && result === 'success') {
-        setPolling(false);
-      }
-    }
-  }, [pollResponse, loading, taskErrored, setTaskErrored, polling, setPolling]);
+  const { state, result } = pollResponse;
+
+  if ((state === 'paused' || result === 'error' || pollResponseStatus === STATUS.ERROR)) {
+    setTaskPausedOrErrored(true);
+  }
+
+  if (allowCallback && !resolved && state === 'stopped' && result === 'success') {
+    setResolved(true);
+    dispatch(toastTaskFinished(pollResponse));
+    dispatch(getContentViewVersions(cvId));
+  }
+
+  const progressCompleted = pollResponse.progress ?
+    pollResponse.progress * 100 :
+    task.progress * 100;
 
   if (pollResponse) {
     return (
       <a href={`/foreman_tasks/tasks/${task.id}`} target="_blank" rel="noreferrer">
         <Progress
           aria-label="task_presenter"
-          value={progressCompleted()}
+          value={progressCompleted}
           measureLocation={ProgressMeasureLocation.inside}
-          variant={taskErrored ? ProgressVariant.danger : ProgressVariant.default}
+          variant={taskPausedOrErrored ? ProgressVariant.danger : ProgressVariant.default}
           size={ProgressSize.sm}
         />
       </a>
@@ -78,7 +82,8 @@ TaskPresenter.propTypes = {
       progress: PropTypes.number.isRequired,
     }).isRequired,
   }).isRequired,
-  setPollingFinished: PropTypes.func.isRequired,
+  cvId: PropTypes.number.isRequired,
+  allowCallback: PropTypes.bool.isRequired,
 };
 
 

data/webpack/scenes/ContentViews/expansions/RelatedCompositeContentViewsModal.js

@@ -30,7 +30,7 @@ const RelatedCompositeContentViewsModal = ({
   const columns = ['Name'];
   return (
     <>
-      <Button aria-label={`button_${cvId}`} variant="link" isInline onClick={handleModalToggle}>
+      <Button ouiaId="related-cv-count" aria-label={`button_${cvId}`} variant="link" isInline onClick={handleModalToggle}>
         {relatedCVCount}
       </Button>
       <Modal

data/webpack/scenes/ContentViews/expansions/RelatedContentViewComponentsModal.js

@@ -43,7 +43,7 @@ const RelatedContentViewsModal = ({ cvName, cvId, relatedCVCount }) => {
 
   return (
     <>
-      <Button aria-label={`button_${cvId}`} variant="link" isInline onClick={handleModalToggle}>
+      <Button ouiaId="related-cv-count" aria-label={`button_${cvId}`} variant="link" isInline onClick={handleModalToggle}>
         {relatedCVCount}
       </Button>
       <Grid>
@@ -58,7 +58,6 @@ const RelatedContentViewsModal = ({ cvName, cvId, relatedCVCount }) => {
             }}
             appendTo={document.body}
           >
-
             <TableWrapper
               {...{
                 metadata,
@@ -67,6 +66,7 @@ const RelatedContentViewsModal = ({ cvName, cvId, relatedCVCount }) => {
                 error,
                 status,
               }}
+              ouiaId="related-content-view-components-table"
               fetchItems={useCallback(params => getContentViewComponents(cvId, params, 'Added'), [cvId])}
               variant={TableVariant.compact}
               autocompleteEndpoint="/content_views/auto_complete_search"

data/webpack/scenes/ContentViews/helpers.js

@@ -11,4 +11,7 @@ export const autoPublishHelpText = __('Automatically publish a new version of th
 export const importOnlyHelpText = __('Designate whether this content view is for importing from an upstream server. ' +
   'Import-only content views cannot be published directly.');
 
+export const generatedContentViewHelpText = __('This content view is generated for importing or exporting content view versions. ' +
+  'Generated content views cannot be published directly and can only be updated via import/export process.');
+
 export const hasPermission = (permissions, perm) => permissions && permissions[perm];

data/webpack/scenes/Hosts/ChangeContentSource/helpers.js

@@ -1,6 +1,11 @@
 import { STATUS } from 'foremanReact/constants';
 
 export const getHostIds = () => {
+  const url = new URL(window.location);
+  const hostId = url.searchParams.get('host_id');
+
+  if (hostId) return [hostId];
+
   const cookie = document.cookie.split('; ')
     .find(row => row.startsWith('_ForemanSelectedhosts'));
   const params = new URLSearchParams(cookie);

data/webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js

@@ -16,7 +16,7 @@ import SearchBar from './components/SearchBar';
 import RecommendedRepositorySetsToggler from './components/RecommendedRepositorySetsToggler';
 import { getSetsComponent, getEnabledComponent } from './helpers';
 import api from '../../services/api';
-import { AIRGAPPED } from '../Subscriptions/Manifest/CdnConfigurationTab/CdnConfigurationConstants';
+import { EXPORT_SYNC } from '../Subscriptions/Manifest/CdnConfigurationTab/CdnConfigurationConstants';
 
 class RedHatRepositoriesPage extends Component {
   componentDidMount() {
@@ -42,7 +42,7 @@ class RedHatRepositoriesPage extends Component {
     if (!(organization?.cdn_configuration)) {
       return <Skeleton />;
     }
-    if (organization.cdn_configuration.type === AIRGAPPED) {
+    if (organization.cdn_configuration.type === EXPORT_SYNC) {
       return (
         <Grid id="redhatRepositoriesPage" bsClass="container-fluid">
           <h1>{__('Red Hat Repositories')}</h1>
@@ -52,7 +52,7 @@ class RedHatRepositoriesPage extends Component {
                 variant="info"
                 className="repo-sets-alert"
                 isInline
-                title={__('CDN configuration is set to Air-gapped (disconnected). Repository enablement/disablement is not permitted on this page.')}
+                title={__('CDN configuration is set to Export Sync (disconnected). Repository enablement/disablement is not permitted on this page.')}
               />
             </Col>
           </Row>

data/webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepository.js

@@ -19,10 +19,11 @@ class EnabledRepository extends Component {
 
   repoForAction = () => {
     const {
-      productId, contentId, arch, releasever, name, type,
+      id, productId, contentId, arch, releasever, name, type,
     } = this.props;
 
     return {
+      id,
       contentId,
       productId,
       name,

data/webpack/scenes/RedHatRepositories/components/EnabledRepository/__tests__/EnabledRepository.test.js

@@ -60,6 +60,7 @@ describe('Enabled Repositories Component', () => {
         type: 'foo',
         arch: 'foo',
         releasever: '1.1.1',
+        id: 1,
       };
       expect(instance.repoForAction()).toEqual(expected);
     });
@@ -109,6 +110,7 @@ describe('Enabled Repositories Component', () => {
         type: 'foo',
         arch: 'foo',
         releasever: '1.1.1',
+        id: 1,
       };
       instance.reloadAndNotify = jest.fn();
       await instance.disableRepository();

data/webpack/scenes/RedHatRepositories/components/Search.js

@@ -2,7 +2,7 @@
 import React, { Component } from 'react';
 import { DropdownButton, MenuItem } from 'patternfly-react';
 import PropTypes from 'prop-types';
-
+import { translate as __ } from 'foremanReact/common/I18n';
 import '../index.scss';
 import Search from '../../../components/Search/index';
 import { orgId } from '../../../services/api';
@@ -14,17 +14,17 @@ class RepositorySearch extends Component {
       {
         key: 'available',
         endpoint: 'repository_sets',
-        title: 'Available',
+        title: __('Available'),
       },
       {
         key: 'enabled',
         endpoint: 'enabled_repositories',
-        title: 'Enabled',
+        title: __('Enabled'),
       },
       {
         key: 'both',
         endpoint: false,
-        title: 'Both',
+        title: __('Both'),
       },
     ];
     this.state = { searchList: this.dropDownItems[0] };

data/webpack/scenes/SmartProxy/SmartProxyContentActions.js

@@ -1,6 +1,6 @@
 import { API_OPERATIONS, get } from 'foremanReact/redux/API';
-import api, { orgId } from '../../services/api';
-import SMART_PROXY_CONTENT_KEY from './SmartProxyContentConstants';
+import api, { foremanApi, orgId } from '../../services/api';
+import SMART_PROXY_CONTENT_KEY, { SMART_PROXY_KEY } from './SmartProxyContentConstants';
 
 const getSmartProxyContent = ({ smartProxyId }) => get({
   type: API_OPERATIONS.GET,
@@ -8,4 +8,11 @@ const getSmartProxyContent = ({ smartProxyId }) => get({
   url: api.getApiUrl(`/capsules/${smartProxyId}/content/sync?${orgId()}`),
 });
 
+export const getSmartProxies = () => get({
+  type: API_OPERATIONS.GET,
+  key: SMART_PROXY_KEY,
+  url: foremanApi.getApiUrl('/smart_proxies'),
+  params: { organization_id: orgId() },
+});
+
 export default getSmartProxyContent;

data/webpack/scenes/SmartProxy/SmartProxyContentConstants.js

@@ -1,3 +1,3 @@
 const SMART_PROXY_CONTENT_KEY = 'SMART_PROXY_CONTENT';
-
+export const SMART_PROXY_KEY = 'SMART_PROXY';
 export default SMART_PROXY_CONTENT_KEY;

data/webpack/scenes/SmartProxy/SmartProxyContentSelectors.js

@@ -4,7 +4,7 @@ import {
   selectAPIResponse,
 } from 'foremanReact/redux/API/APISelectors';
 import { STATUS } from 'foremanReact/constants';
-import SMART_PROXY_CONTENT_KEY from './SmartProxyContentConstants';
+import SMART_PROXY_CONTENT_KEY, { SMART_PROXY_KEY } from './SmartProxyContentConstants';
 
 export const selectSmartProxyContent = state =>
   selectAPIResponse(state, SMART_PROXY_CONTENT_KEY) || {};
@@ -14,3 +14,12 @@ export const selectSmartProxyContentStatus = state =>
 
 export const selectSmartProxyContentError = state =>
   selectAPIError(state, SMART_PROXY_CONTENT_KEY);
+
+export const selectSmartProxy = state =>
+  selectAPIResponse(state, SMART_PROXY_KEY) || {};
+
+export const selectSmartProxyStatus = state =>
+  selectAPIStatus(state, SMART_PROXY_KEY) || STATUS.PENDING;
+
+export const selectSmartProxyError = state =>
+  selectAPIError(state, SMART_PROXY_KEY);

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnConfigurationConstants.js

@@ -2,11 +2,11 @@ import { translate as __ } from 'foremanReact/common/I18n';
 
 export const CDN_URL = 'https://cdn.redhat.com';
 
-export const [CDN, UPSTREAM_SERVER, AIRGAPPED] = ['redhat_cdn', 'upstream_server', 'airgapped'];
+export const [CDN, NETWORK_SYNC, EXPORT_SYNC] = ['redhat_cdn', 'network_sync', 'export_sync'];
 export const CDN_CONFIGURATION_TYPES = {
   redhat_cdn: __('Red Hat CDN'),
-  upstream_server: __('Upstream Foreman server'),
-  airgapped: __('Air-gapped'),
+  network_sync: __('Network Sync'),
+  export_sync: __('Export Sync'),
 };
 
 export const DEFAULT_ORGANIZATION_LABEL = 'Default_Organization';

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnTypeForm.js

@@ -68,6 +68,7 @@ const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
       </div>
       <FormGroup label={__('URL')} isRequired>
         <TextInput
+          ouiaId="cdn-configuration-url-input"
           aria-label="cdn-url"
           type="text"
           value={cdnUrl}
@@ -78,6 +79,7 @@ const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
 
       <ActionGroup>
         <Button
+          ouiaId="cdn-configuration-update-button"
           aria-label="update-cdn-configuration"
           variant="secondary"
           onClick={performUpdate}

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/{AirGappedTypeForm.js → ExportSyncForm.js}

@@ -10,7 +10,7 @@ import {
 import { translate as __ } from 'foremanReact/common/I18n';
 import { noop } from 'foremanReact/common/helpers';
 
-import { AIRGAPPED } from './CdnConfigurationConstants';
+import { EXPORT_SYNC } from './CdnConfigurationConstants';
 import { updateCdnConfiguration } from '../../../Organizations/OrganizationActions';
 import {
   selectUpdatingCdnConfiguration,
@@ -18,14 +18,14 @@ import {
 
 import './CdnConfigurationForm.scss';
 
-const AirGappedTypeForm = ({ showUpdate, onUpdate }) => {
+const ExportSyncForm = ({ showUpdate, onUpdate }) => {
   const [updateEnabled, setUpdateEnabled] = useState(showUpdate);
   const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
   const dispatch = useDispatch();
   const performUpdate = () => {
     setUpdateEnabled(false);
     dispatch(updateCdnConfiguration({
-      type: AIRGAPPED,
+      type: EXPORT_SYNC,
     }, onUpdate));
   };
 
@@ -55,6 +55,7 @@ const AirGappedTypeForm = ({ showUpdate, onUpdate }) => {
 
       <ActionGroup>
         <Button
+          ouiaId="export-sync-configuration-update-button"
           aria-label="update-airgapped-configuration"
           variant="secondary"
           onClick={performUpdate}
@@ -69,13 +70,13 @@ const AirGappedTypeForm = ({ showUpdate, onUpdate }) => {
 };
 
 
-AirGappedTypeForm.propTypes = {
+ExportSyncForm.propTypes = {
   showUpdate: PropTypes.bool.isRequired,
   onUpdate: PropTypes.func,
 };
 
-AirGappedTypeForm.defaultProps = {
+ExportSyncForm.defaultProps = {
   onUpdate: noop,
 };
 
-export default AirGappedTypeForm;
+export default ExportSyncForm;

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/{UpstreamServerTypeForm.js → NetworkSyncForm.js}

@@ -18,7 +18,7 @@ import {
 import { translate as __ } from 'foremanReact/common/I18n';
 import { noop } from 'foremanReact/common/helpers';
 
-import { UPSTREAM_SERVER, DEFAULT_CONTENT_VIEW_LABEL, DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL, DEFAULT_ORGANIZATION_LABEL } from './CdnConfigurationConstants';
+import { NETWORK_SYNC, DEFAULT_CONTENT_VIEW_LABEL, DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL, DEFAULT_ORGANIZATION_LABEL } from './CdnConfigurationConstants';
 import EditableTextInput from '../../../../components/EditableTextInput';
 
 import {
@@ -28,11 +28,11 @@ import {
 import { updateCdnConfiguration } from '../../../Organizations/OrganizationActions';
 import './CdnConfigurationForm.scss';
 
-const UpstreamServerTypeForm = ({
+const NetworkSyncForm = ({
   showUpdate, contentCredentials, cdnConfiguration, onUpdate,
 }) => {
   const dispatch = useDispatch();
-  const urlValue = cdnConfiguration.type === UPSTREAM_SERVER ? cdnConfiguration.url : '';
+  const urlValue = cdnConfiguration.type === NETWORK_SYNC ? cdnConfiguration.url : '';
   const [url, setUrl] = useState(urlValue);
   const [username, setUsername] = useState(cdnConfiguration.username);
   const [password, setPassword] = useState(null);
@@ -92,7 +92,7 @@ const UpstreamServerTypeForm = ({
       upstream_content_view_label: contentViewLabel || DEFAULT_CONTENT_VIEW_LABEL,
       upstream_lifecycle_environment_label: lifecycleEnvironmentLabel ||
       DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL,
-      type: UPSTREAM_SERVER,
+      type: NETWORK_SYNC,
     }, onUpdate, onError));
   };
 
@@ -136,6 +136,7 @@ const UpstreamServerTypeForm = ({
           isRequired
         >
           <TextInput
+            ouiaId="network-sync-url-input"
             aria-label="cdn-url"
             type="text"
             value={url || ''}
@@ -148,6 +149,7 @@ const UpstreamServerTypeForm = ({
           isRequired
         >
           <TextInput
+            ouiaId="network-sync-username-input"
             aria-label="cdn-username"
             type="text"
             value={username || ''}
@@ -160,6 +162,7 @@ const UpstreamServerTypeForm = ({
           isRequired
         >
           <EditableTextInput
+            ouiaId="network-sync-password-input"
             attribute="cdn-password"
             value={password}
             isPassword
@@ -173,6 +176,7 @@ const UpstreamServerTypeForm = ({
           isRequired
         >
           <TextInput
+            ouiaId="network-sync-organization-input"
             aria-label="cdn-organization-label"
             type="text"
             value={organizationLabel || ''}
@@ -184,6 +188,7 @@ const UpstreamServerTypeForm = ({
           label={__('Lifecycle Environment Label')}
         >
           <TextInput
+            ouiaId="network-sync-lifecycle-environment-input"
             aria-label="cdn-lifecycle-environment-label"
             type="text"
             value={lifecycleEnvironmentLabel || ''}
@@ -195,6 +200,7 @@ const UpstreamServerTypeForm = ({
           label={__('Content view label')}
         >
           <TextInput
+            ouiaId="network-sync-content-view-input"
             aria-label="cdn-content-view-label"
             type="text"
             value={contentViewLabel || ''}
@@ -207,6 +213,7 @@ const UpstreamServerTypeForm = ({
           isRequired
         >
           <FormSelect
+            ouiaId="network-sync-ca-content-credential-input"
             aria-label="cdn-ssl-ca-content-credential"
             value={sslCaCredentialId || ''}
             isDisabled={updatingCdnConfiguration}
@@ -220,6 +227,7 @@ const UpstreamServerTypeForm = ({
 
         <ActionGroup>
           <Button
+            ouiaId="network-sync-configuration-update-button"
             aria-label="update-upstream-configuration"
             variant="secondary"
             onClick={performUpdate}
@@ -234,7 +242,7 @@ const UpstreamServerTypeForm = ({
   );
 };
 
-UpstreamServerTypeForm.propTypes = {
+NetworkSyncForm.propTypes = {
   showUpdate: PropTypes.bool.isRequired,
   contentCredentials: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.number,
@@ -253,10 +261,10 @@ UpstreamServerTypeForm.propTypes = {
   onUpdate: PropTypes.func,
 };
 
-UpstreamServerTypeForm.defaultProps = {
+NetworkSyncForm.defaultProps = {
   contentCredentials: [],
   cdnConfiguration: {},
   onUpdate: noop,
 };
 
-export default UpstreamServerTypeForm;
+export default NetworkSyncForm;

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/{AirGappedTypeForm.test.js → ExportSyncForm.test.js}

@@ -1,10 +1,10 @@
 import React from 'react';
 import { cleanup } from '@testing-library/react';
 import { renderWithRedux, fireEvent } from 'react-testing-lib-wrapper';
-import AirGappedTypeForm from '../AirGappedTypeForm';
+import ExportSyncForm from '../ExportSyncForm';
 import { nockInstance, assertNockRequest } from '../../../../../test-utils/nockWrapper';
 import { updateCdnConfigurationSuccessResponse } from '../../../../Organizations/__tests__/organizations.fixtures';
-import { AIRGAPPED } from '../CdnConfigurationConstants';
+import { EXPORT_SYNC } from '../CdnConfigurationConstants';
 
 import api from '../../../../../services/api';
 
@@ -25,13 +25,13 @@ const initialState = {
 
 
 test('Can update to Airgapped type', async (done) => {
-  const { getByLabelText } = renderWithRedux(<AirGappedTypeForm
+  const { getByLabelText } = renderWithRedux(<ExportSyncForm
     showUpdate
   />, { initialState });
 
   const updateCdnConfigurationRequest = nockInstance
     .put(updateCdnConfigurationPath, {
-      type: AIRGAPPED,
+      type: EXPORT_SYNC,
     })
     .reply(200, updateCdnConfigurationSuccessResponse);
 

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/{UpstreamServerTypeForm.test.js → NetworkSyncForm.test.js}

@@ -2,10 +2,10 @@ import React from 'react';
 import { cleanup } from '@testing-library/react';
 import { renderWithRedux, fireEvent, patientlyWaitFor } from 'react-testing-lib-wrapper';
 import userEvent from '@testing-library/user-event';
-import UpstreamServerTypeForm from '../UpstreamServerTypeForm';
+import NetworkSyncForm from '../NetworkSyncForm';
 import { nockInstance, assertNockRequest } from '../../../../../test-utils/nockWrapper';
 import { updateCdnConfigurationSuccessResponse } from '../../../../Organizations/__tests__/organizations.fixtures';
-import { UPSTREAM_SERVER } from '../CdnConfigurationConstants';
+import { NETWORK_SYNC } from '../CdnConfigurationConstants';
 
 import api from '../../../../../services/api';
 
@@ -20,7 +20,7 @@ const cdnConfiguration = {
   password_exists: false,
   upstream_organization_label: 'CurrentOrg',
   ssl_ca_credential_id: 2,
-  type: UPSTREAM_SERVER,
+  type: NETWORK_SYNC,
   upstream_lifecycle_environment_label: 'Library',
   upstream_content_view_label: 'CV',
 };
@@ -47,7 +47,7 @@ const contentCredentials = [
 ];
 
 test('Can update the upstream server configuration', async (done) => {
-  const { getByLabelText } = renderWithRedux(<UpstreamServerTypeForm
+  const { getByLabelText } = renderWithRedux(<NetworkSyncForm
     showUpdate
     cdnConfiguration={cdnConfiguration}
     contentCredentials={contentCredentials}
@@ -60,7 +60,7 @@ test('Can update the upstream server configuration', async (done) => {
       password: 'changeme',
       upstream_organization_label: 'Default_Organization',
       ssl_ca_credential_id: '1',
-      type: UPSTREAM_SERVER,
+      type: NETWORK_SYNC,
       upstream_lifecycle_environment_label: 'Library',
       upstream_content_view_label: 'CV',
     })
@@ -92,7 +92,7 @@ test('Can update the upstream server configuration', async (done) => {
 });
 
 test('the form shall reflect the given cdnConfiguration', () => {
-  const { getAllByTestId, getByLabelText } = renderWithRedux(<UpstreamServerTypeForm
+  const { getAllByTestId, getByLabelText } = renderWithRedux(<NetworkSyncForm
     showUpdate
     cdnConfiguration={cdnConfiguration}
     contentCredentials={contentCredentials}
@@ -109,7 +109,7 @@ test('the form shall reflect the given cdnConfiguration', () => {
 });
 
 test('resetting the password enables/disables appropriately', async (done) => {
-  const { getByLabelText } = renderWithRedux(<UpstreamServerTypeForm
+  const { getByLabelText } = renderWithRedux(<NetworkSyncForm
     showUpdate
     cdnConfiguration={{ ...cdnConfiguration, password_exists: true }}
   />, { initialState });
@@ -130,7 +130,7 @@ test('resetting the password enables/disables appropriately', async (done) => {
 });
 
 test('update button disabled on incomplete information', async (done) => {
-  const { getByLabelText } = renderWithRedux(<UpstreamServerTypeForm
+  const { getByLabelText } = renderWithRedux(<NetworkSyncForm
     showUpdate
     cdnConfiguration={{ ...cdnConfiguration, password_exists: true }}
     contentCredentials={contentCredentials}

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/index.js

@@ -7,11 +7,11 @@ import {
 } from '@patternfly/react-core';
 import { noop } from 'foremanReact/common/helpers';
 import CdnTypeForm from './CdnTypeForm';
-import AirGappedTypeForm from './AirGappedTypeForm';
-import UpstreamServerTypeForm from './UpstreamServerTypeForm';
+import ExportSyncForm from './ExportSyncForm';
+import NetworkSyncForm from './NetworkSyncForm';
 
 import './CdnConfigurationForm.scss';
-import { CDN_URL, CDN, AIRGAPPED, UPSTREAM_SERVER, CDN_CONFIGURATION_TYPES } from './CdnConfigurationConstants';
+import { CDN_URL, CDN, EXPORT_SYNC, NETWORK_SYNC, CDN_CONFIGURATION_TYPES } from './CdnConfigurationConstants';
 
 const CdnConfigurationForm = (props) => {
   const {
@@ -35,17 +35,17 @@ const CdnConfigurationForm = (props) => {
       <ToggleGroup aria-label="Default with multiple selectable">
         <ToggleGroupItem text={CDN_CONFIGURATION_TYPES[CDN]} key={0} buttonId="cdn" isSelected={type === CDN} onChange={() => updateType(CDN)} />
         <ToggleGroupItem
-          text={CDN_CONFIGURATION_TYPES[UPSTREAM_SERVER]}
+          text={CDN_CONFIGURATION_TYPES[NETWORK_SYNC]}
           key={1}
           buttonId="usptream_server"
-          isSelected={type === UPSTREAM_SERVER}
-          onChange={() => updateType(UPSTREAM_SERVER)}
+          isSelected={type === NETWORK_SYNC}
+          onChange={() => updateType(NETWORK_SYNC)}
         />
-        <ToggleGroupItem text={CDN_CONFIGURATION_TYPES[AIRGAPPED]} key={2} buttonId="airgapped" isSelected={type === AIRGAPPED} onChange={() => updateType(AIRGAPPED)} />
+        <ToggleGroupItem text={CDN_CONFIGURATION_TYPES[EXPORT_SYNC]} key={2} buttonId="airgapped" isSelected={type === EXPORT_SYNC} onChange={() => updateType(EXPORT_SYNC)} />
       </ToggleGroup>
 
-      { type === UPSTREAM_SERVER &&
-        <UpstreamServerTypeForm
+      { type === NETWORK_SYNC &&
+        <NetworkSyncForm
           cdnConfiguration={cdnConfiguration}
           contentCredentials={contentCredentials}
           onUpdate={onUpdate}
@@ -60,8 +60,8 @@ const CdnConfigurationForm = (props) => {
           url={cdnUrl}
         />
       }
-      { type === AIRGAPPED &&
-        <AirGappedTypeForm
+      { type === EXPORT_SYNC &&
+        <ExportSyncForm
           showUpdate={type !== cdnConfiguration.type}
           onUpdate={onUpdate}
         />