index.js in katello-4.7.0.rc1

- old
+ new

@@ -7,13 +7,13 @@
 } from '@patternfly/react-core';
 import { noop } from 'foremanReact/common/helpers';
 import CdnTypeForm from './CdnTypeForm';
 import ExportSyncForm from './ExportSyncForm';
 import NetworkSyncForm from './NetworkSyncForm';
-
+import CustomCdnTypeForm from './CustomCdnTypeForm';
 import './CdnConfigurationForm.scss';
-import { CDN_URL, CDN, EXPORT_SYNC, NETWORK_SYNC, CDN_CONFIGURATION_TYPES } from './CdnConfigurationConstants';
+import { CDN, EXPORT_SYNC, CUSTOM_CDN, NETWORK_SYNC, CDN_CONFIGURATION_TYPES } from './CdnConfigurationConstants';
 
 const CdnConfigurationForm = (props) => {
   const {
     contentCredentials,
     cdnConfiguration,
@@ -26,44 +26,57 @@
     if (type !== connectionType) {
       setType(connectionType);
     }
   };
 
-  const cdnUrl = type !== cdnConfiguration.type ? CDN_URL : cdnConfiguration.url;
-
   return (
     <div id="cdn-configuration">
       <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[NETWORK_SYNC]}
+          text={CDN_CONFIGURATION_TYPES[CUSTOM_CDN]}
           key={1}
+          buttonId="customCdn"
+          isSelected={type === CUSTOM_CDN}
+          onChange={() => updateType(CUSTOM_CDN)}
+        />
+        <ToggleGroupItem
+          text={CDN_CONFIGURATION_TYPES[NETWORK_SYNC]}
+          key={2}
           buttonId="usptream_server"
           isSelected={type === NETWORK_SYNC}
           onChange={() => updateType(NETWORK_SYNC)}
         />
-        <ToggleGroupItem text={CDN_CONFIGURATION_TYPES[EXPORT_SYNC]} key={2} buttonId="airgapped" isSelected={type === EXPORT_SYNC} onChange={() => updateType(EXPORT_SYNC)} />
+        <ToggleGroupItem text={CDN_CONFIGURATION_TYPES[EXPORT_SYNC]} key={3} buttonId="airgapped" isSelected={type === EXPORT_SYNC} onChange={() => updateType(EXPORT_SYNC)} />
       </ToggleGroup>
 
       { type === NETWORK_SYNC &&
         <NetworkSyncForm
           cdnConfiguration={cdnConfiguration}
           contentCredentials={contentCredentials}
           onUpdate={onUpdate}
-          showUpdate={type !== cdnConfiguration.type}
+          typeChangeInProgress={type !== cdnConfiguration.type}
         />
       }
 
       { type === CDN &&
         <CdnTypeForm
-          showUpdate={type !== cdnConfiguration.type}
+          typeChangeInProgress={type !== cdnConfiguration.type}
           onUpdate={onUpdate}
-          url={cdnUrl}
         />
       }
+      { type === CUSTOM_CDN &&
+        <CustomCdnTypeForm
+          cdnConfiguration={cdnConfiguration}
+          contentCredentials={contentCredentials}
+          typeChangeInProgress={type !== cdnConfiguration.type}
+          onUpdate={onUpdate}
+        />
+      }
+
       { type === EXPORT_SYNC &&
         <ExportSyncForm
-          showUpdate={type !== cdnConfiguration.type}
+          typeChangeInProgress={type !== cdnConfiguration.type}
           onUpdate={onUpdate}
         />
       }
     </div>
   );