katello 4.5.1 → 4.8.0.rc2

data/webpack/scenes/RedHatRepositories/index.scss

@@ -21,16 +21,35 @@
   }
   .search-bar-row {
     min-height: 26px;
-    margin-bottom: 10px;
+    margin-bottom: 20px;
 
     .form-group {
       box-sizing: border-box;
+      width: 50%;
+
+      div:first-child {
+        display: flex;
+        justify-content: space-between;
+        .foreman-search-bar {
+          flex-grow: 1;
+          margin-left: 0.7rem;
+          .pf-c-search-input {
+            width: 100%;
+          }
+        }
+      }
 
       &:first-child {
         padding-left: 0;
       }
     }
+
+    .dropdown.btn-group {
+      margin-right: 0.6rem;
+    }
+
     &.search-bar-selects-row {
+      width: 50%;
       .form-group {
         border: none;
 

data/webpack/scenes/SmartProxy/SmartProxyContentActions.js

@@ -12,7 +12,7 @@ export const getSmartProxies = () => get({
   type: API_OPERATIONS.GET,
   key: SMART_PROXY_KEY,
   url: foremanApi.getApiUrl('/smart_proxies'),
-  params: { organization_id: orgId() },
+  params: { organization_id: orgId(), per_page: 'all' },
 });
 
 export default getSmartProxyContent;

data/webpack/scenes/SmartProxy/SmartProxyContentTable.js

@@ -138,7 +138,18 @@ const SmartProxyContentTable = ({ smartProxyId }) => {
 
 
   return (
-    <MainTable onCollapse={onCollapse(rows, setRows)} status={status} cells={columnHeaders} rows={rows} error={error} emptyContentTitle="No content synced" emptyContentBody="No content synced to smart proxy" emptySearchTitle="Empty" emptySearchBody="Empty" />
+    <MainTable
+      onCollapse={onCollapse(rows, setRows)}
+      ouiaId="smart-proxy-content-table"
+      status={status}
+      cells={columnHeaders}
+      rows={rows}
+      error={error}
+      emptyContentTitle="No content synced"
+      emptyContentBody="No content synced to smart proxy"
+      emptySearchTitle="Empty"
+      emptySearchBody="Empty"
+    />
   );
 };
 

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

@@ -2,9 +2,10 @@ import { translate as __ } from 'foremanReact/common/I18n';
 
 export const CDN_URL = 'https://cdn.redhat.com';
 
-export const [CDN, NETWORK_SYNC, EXPORT_SYNC] = ['redhat_cdn', 'network_sync', 'export_sync'];
+export const [CDN, NETWORK_SYNC, EXPORT_SYNC, CUSTOM_CDN] = ['redhat_cdn', 'network_sync', 'export_sync', 'custom_cdn'];
 export const CDN_CONFIGURATION_TYPES = {
   redhat_cdn: __('Red Hat CDN'),
+  custom_cdn: __('Custom CDN'),
   network_sync: __('Network Sync'),
   export_sync: __('Export Sync'),
 };

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
@@ -16,37 +16,25 @@ import { noop } from 'foremanReact/common/helpers';
 import { CDN_URL, CDN } from './CdnConfigurationConstants';
 import { updateCdnConfiguration } from '../../../Organizations/OrganizationActions';
 import {
+  selectOrgLoading,
   selectUpdatingCdnConfiguration,
 } from '../../../Organizations/OrganizationSelectors';
 import './CdnConfigurationForm.scss';
 
-const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
+const CdnTypeForm = ({ typeChangeInProgress, onUpdate }) => {
   const dispatch = useDispatch();
-  const [cdnUrl, setCdnUrl] = useState(url);
-  const [updateEnabled, setUpdateEnabled] = useState(showUpdate);
   const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
-  const firstUpdate = useRef(true);
-
-  useEffect(() => {
-    if (firstUpdate.current) {
-      firstUpdate.current = false;
-      return;
-    }
-    setUpdateEnabled(true);
-  }, [cdnUrl]);
-
+  const orgIsLoading = useSelector(state => selectOrgLoading(state));
   const performUpdate = () => {
-    setUpdateEnabled(false);
     dispatch(updateCdnConfiguration({
       type: CDN,
-      url: cdnUrl,
     }, onUpdate));
   };
 
   return (
     <Form isHorizontal>
       <div id="update-hint-cdn" className="margin-top-16">
-        <Text>
+        <Text ouiaId="update-hint-cdn-text">
           <FormattedMessage
             id="cdn-configuration-type"
             defaultMessage={__('Red Hat content will be consumed from the {type}.')}
@@ -55,7 +43,7 @@ const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
             }}
           />
           <br />
-          {showUpdate &&
+          {typeChangeInProgress &&
           <FormattedMessage
             id="cdn-configuration-type-cdn"
             defaultMessage={__('Click {update} below to save changes.')}
@@ -69,11 +57,10 @@ const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
       <FormGroup label={__('URL')} isRequired>
         <TextInput
           ouiaId="cdn-configuration-url-input"
-          aria-label="cdn-url"
+          aria-label="redhat-cdn-url"
           type="text"
-          value={cdnUrl}
-          onChange={setCdnUrl}
-          isDisabled={updatingCdnConfiguration}
+          value={CDN_URL}
+          isDisabled
         />
       </FormGroup>
 
@@ -83,7 +70,7 @@ const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
           aria-label="update-cdn-configuration"
           variant="secondary"
           onClick={performUpdate}
-          isDisabled={updatingCdnConfiguration || !updateEnabled || !cdnUrl}
+          isDisabled={updatingCdnConfiguration || orgIsLoading || !typeChangeInProgress}
           isLoading={updatingCdnConfiguration}
         >
           {__('Update')}
@@ -95,13 +82,11 @@ const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
 };
 
 CdnTypeForm.propTypes = {
-  showUpdate: PropTypes.bool.isRequired,
+  typeChangeInProgress: PropTypes.bool.isRequired,
   onUpdate: PropTypes.func,
-  url: PropTypes.string,
 };
 
 CdnTypeForm.defaultProps = {
-  url: CDN_URL,
   onUpdate: noop,
 };
 

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

@@ -0,0 +1,154 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch, useSelector } from 'react-redux';
+import { FormattedMessage } from 'react-intl';
+import {
+  ActionGroup,
+  Button,
+  Form,
+  FormGroup,
+  FormSelect,
+  FormSelectOption,
+  TextInput,
+  Text,
+} from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { noop } from 'foremanReact/common/helpers';
+
+import { CUSTOM_CDN } from './CdnConfigurationConstants';
+import { updateCdnConfiguration } from '../../../Organizations/OrganizationActions';
+import {
+  selectOrgLoading,
+  selectUpdatingCdnConfiguration,
+} from '../../../Organizations/OrganizationSelectors';
+import './CdnConfigurationForm.scss';
+
+const CustomCdnTypeForm = ({
+  typeChangeInProgress, onUpdate, contentCredentials, cdnConfiguration,
+}) => {
+  const dispatch = useDispatch();
+  const urlValue = cdnConfiguration.type === CUSTOM_CDN ? cdnConfiguration.url : '';
+  const [url, setUrl] = useState(urlValue);
+  const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
+  const orgIsLoading = useSelector(state => selectOrgLoading(state));
+  const [sslCaCredentialId, setSslCaCredentialId] = useState(cdnConfiguration.ssl_ca_credential_id);
+
+  const disableUpdate = () => {
+    if (updatingCdnConfiguration || orgIsLoading) {
+      return true;
+    }
+
+    const sslCaCredentialIdOrNull = sslCaCredentialId === '' ? null : sslCaCredentialId;
+    if (!url || (url === cdnConfiguration.url
+              && sslCaCredentialIdOrNull?.toString() ===
+                      cdnConfiguration.ssl_ca_credential_id?.toString())) {
+      return true;
+    }
+
+    return false;
+  };
+
+  const performUpdate = () => {
+    dispatch(updateCdnConfiguration({
+      url,
+      ssl_ca_credential_id: sslCaCredentialId,
+      type: CUSTOM_CDN,
+    }, onUpdate));
+  };
+
+  const sslCaCredentialValue =
+    cdnConfiguration.type === CUSTOM_CDN || typeChangeInProgress ? sslCaCredentialId : null;
+
+  return (
+    <Form isHorizontal>
+      <div id="update-hint-cdn" className="margin-top-16">
+        <Text ouiaId="cdn-configuration-type-text">
+          <FormattedMessage
+            id="cdn-configuration-type"
+            defaultMessage={__('Red Hat content will be consumed from {type}.')}
+            values={{
+              type: <strong>{__('a custom CDN URL')}</strong>,
+            }}
+          />
+          <br />
+          {typeChangeInProgress &&
+          <FormattedMessage
+            id="cdn-configuration-type-cdn"
+            defaultMessage={__('Click {update} below to save changes.')}
+            values={{
+              update: <strong>{__('Update')}</strong>,
+            }}
+          />
+          }
+        </Text>
+      </div>
+
+      <FormGroup
+        label={__('URL')}
+        isRequired
+      >
+        <TextInput
+          ouiaId="custom-cdn-url-input"
+          aria-label="cdn-url"
+          type="text"
+          value={url || ''}
+          onChange={value => setUrl(value)}
+          isDisabled={updatingCdnConfiguration}
+        />
+      </FormGroup>
+
+      <FormGroup
+        label={__('SSL CA Content Credential')}
+      >
+        <FormSelect
+          ouiaId="custom-cdn-ca-content-credential-input"
+          aria-label="cdn-ssl-ca-content-credential"
+          value={sslCaCredentialValue || ''}
+          isDisabled={updatingCdnConfiguration}
+          onChange={value => setSslCaCredentialId(value)}
+        >
+          <FormSelectOption label={__('N/A')} />
+          {contentCredentials.map(cred =>
+            <FormSelectOption data-testid="ssl-ca-content-credential-option" key={cred.id} value={cred.id} label={cred.name} />)}
+        </FormSelect>
+      </FormGroup>
+
+      <ActionGroup>
+        <Button
+          ouiaId="custom-cdn-type-configuration-update-button"
+          aria-label="update-custom-cdn-configuration"
+          variant="secondary"
+          onClick={performUpdate}
+          isDisabled={disableUpdate()}
+          isLoading={updatingCdnConfiguration}
+        >
+          {__('Update')}
+        </Button>
+      </ActionGroup>
+    </Form>
+
+  );
+};
+
+CustomCdnTypeForm.propTypes = {
+  typeChangeInProgress: PropTypes.bool.isRequired,
+  onUpdate: PropTypes.func,
+  contentCredentials: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.number,
+    name: PropTypes.string,
+  })),
+  cdnConfiguration: PropTypes.shape({
+    type: PropTypes.string.isRequired,
+    url: PropTypes.string,
+    ssl_ca_credential_id: PropTypes.number,
+  }),
+
+};
+
+CustomCdnTypeForm.defaultProps = {
+  onUpdate: noop,
+  contentCredentials: [],
+  cdnConfiguration: {},
+};
+
+export default CustomCdnTypeForm;

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

@@ -18,8 +18,8 @@ import {
 
 import './CdnConfigurationForm.scss';
 
-const ExportSyncForm = ({ showUpdate, onUpdate }) => {
-  const [updateEnabled, setUpdateEnabled] = useState(showUpdate);
+const ExportSyncForm = ({ typeChangeInProgress, onUpdate }) => {
+  const [updateEnabled, setUpdateEnabled] = useState(typeChangeInProgress);
   const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
   const dispatch = useDispatch();
   const performUpdate = () => {
@@ -41,7 +41,7 @@ const ExportSyncForm = ({ showUpdate, onUpdate }) => {
             }}
           />
           <br />
-          {showUpdate &&
+          {typeChangeInProgress &&
             <FormattedMessage
               id="cdn-configuration-type-cdn"
               defaultMessage={__('Click {update} below to save changes.')}
@@ -71,7 +71,7 @@ const ExportSyncForm = ({ showUpdate, onUpdate }) => {
 
 
 ExportSyncForm.propTypes = {
-  showUpdate: PropTypes.bool.isRequired,
+  typeChangeInProgress: PropTypes.bool.isRequired,
   onUpdate: PropTypes.func,
 };
 

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
@@ -16,12 +16,13 @@ import {
 } from '@patternfly/react-core';
 
 import { translate as __ } from 'foremanReact/common/I18n';
-import { noop } from 'foremanReact/common/helpers';
+import { noop, propsToCamelCase } from 'foremanReact/common/helpers';
 
 import { NETWORK_SYNC, DEFAULT_CONTENT_VIEW_LABEL, DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL, DEFAULT_ORGANIZATION_LABEL } from './CdnConfigurationConstants';
 import EditableTextInput from '../../../../components/EditableTextInput';
 
 import {
+  selectOrgLoading,
   selectUpdatingCdnConfiguration,
 } from '../../../Organizations/OrganizationSelectors';
 
@@ -29,39 +30,30 @@ import { updateCdnConfiguration } from '../../../Organizations/OrganizationActio
 import './CdnConfigurationForm.scss';
 
 const NetworkSyncForm = ({
-  showUpdate, contentCredentials, cdnConfiguration, onUpdate,
+  typeChangeInProgress, contentCredentials, cdnConfiguration, onUpdate,
 }) => {
   const dispatch = useDispatch();
-  const urlValue = cdnConfiguration.type === NETWORK_SYNC ? cdnConfiguration.url : '';
+  const cdnConfigurationObject = propsToCamelCase(cdnConfiguration);
+  const urlValue = cdnConfigurationObject.type === NETWORK_SYNC ? cdnConfigurationObject.url : '';
   const [url, setUrl] = useState(urlValue);
-  const [username, setUsername] = useState(cdnConfiguration.username);
+  const [username, setUsername] = useState(cdnConfigurationObject.username);
   const [password, setPassword] = useState(null);
-  const [organizationLabel, setOrganizationLabel] =
-    useState(cdnConfiguration.upstream_organization_label || DEFAULT_ORGANIZATION_LABEL);
-  const [sslCaCredentialId, setSslCaCredentialId] = useState(cdnConfiguration.ssl_ca_credential_id);
-  const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
+  const [upstreamOrganizationLabel, setUpstreamOrganizationLabel] =
+    useState(cdnConfigurationObject.upstreamOrganizationLabel || DEFAULT_ORGANIZATION_LABEL);
+  const [sslCaCredentialId, setSslCaCredentialId] =
+    useState(cdnConfigurationObject.sslCaCredentialId);
+  const updatingCdnConfiguration =
+    useSelector(state => selectUpdatingCdnConfiguration(state));
+  const orgIsLoading = useSelector(state => selectOrgLoading(state));
 
-  const [contentViewLabel, setContentViewLabel] =
-    useState(cdnConfiguration.upstream_content_view_label ||
+  const [upstreamContentViewLabel, setUpstreamContentViewLabel] =
+    useState(cdnConfigurationObject.upstreamContentViewLabel ||
       DEFAULT_CONTENT_VIEW_LABEL);
 
-  const [lifecycleEnvironmentLabel, setLifecycleEnvironmentLabel] =
-    useState(cdnConfiguration.upstream_lifecycle_environment_label ||
+  const [upstreamLifecycleEnvironmentLabel, setUpstreamLifecycleEnvironmentLabel] =
+    useState(cdnConfigurationObject.upstreamLifecycleEnvironmentLabel ||
       DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL);
 
-  const [updateEnabled, setUpdateEnabled] = useState(false);
-
-  const firstUpdate = useRef(true);
-  useEffect(() => {
-    if (firstUpdate.current) {
-      firstUpdate.current = false;
-      return;
-    }
-    setUpdateEnabled(true);
-  }, [url, username, password, organizationLabel,
-    contentViewLabel, lifecycleEnvironmentLabel,
-    sslCaCredentialId, cdnConfiguration]);
-
   const editPassword = (value) => {
     if (value === null) {
       setPassword('');
@@ -69,31 +61,54 @@ const NetworkSyncForm = ({
       setPassword(value);
     }
   };
-  const hasPassword = (cdnConfiguration.password_exists && !password)
+
+  const hasPassword = (cdnConfigurationObject.passwordExists && !password)
       || password?.length > 0;
 
-  const requiredFields = [username, organizationLabel, sslCaCredentialId];
+  const requiredFields = [username, upstreamOrganizationLabel, sslCaCredentialId, url];
 
   if (!hasPassword) {
     requiredFields.push(password);
   }
 
   const validated = !requiredFields.some(field => !field);
-  const onError = () => setUpdateEnabled(true);
+  const disableUpdate = () => {
+    if (updatingCdnConfiguration || orgIsLoading || !validated) {
+      return true;
+    }
+    const needsUpdate = Object.entries({
+      url,
+      username,
+      upstreamOrganizationLabel,
+      upstreamContentViewLabel,
+      upstreamLifecycleEnvironmentLabel,
+    }).some(([key, value]) => value?.toString() !== cdnConfigurationObject[key]?.toString());
+
+    if (needsUpdate || password?.length > 0) {
+      return false;
+    }
+
+    const sslCaCredentialIdOrNull = sslCaCredentialId === '' ? null : sslCaCredentialId;
+    return sslCaCredentialIdOrNull?.toString() ===
+            cdnConfigurationObject.sslCaCredentialId?.toString();
+  };
+
+  const sslCaCredentialValue =
+    cdnConfigurationObject.type === NETWORK_SYNC || typeChangeInProgress ?
+      sslCaCredentialId : null;
 
   const performUpdate = () => {
-    setUpdateEnabled(false);
     dispatch(updateCdnConfiguration({
       url,
       username,
       password,
-      upstream_organization_label: organizationLabel || DEFAULT_ORGANIZATION_LABEL,
+      upstream_organization_label: upstreamOrganizationLabel || DEFAULT_ORGANIZATION_LABEL,
       ssl_ca_credential_id: sslCaCredentialId,
-      upstream_content_view_label: contentViewLabel || DEFAULT_CONTENT_VIEW_LABEL,
-      upstream_lifecycle_environment_label: lifecycleEnvironmentLabel ||
+      upstream_content_view_label: upstreamContentViewLabel || DEFAULT_CONTENT_VIEW_LABEL,
+      upstream_lifecycle_environment_label: upstreamLifecycleEnvironmentLabel ||
       DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL,
       type: NETWORK_SYNC,
-    }, onUpdate, onError));
+    }, onUpdate));
   };
 
   return (
@@ -120,7 +135,7 @@ const NetworkSyncForm = ({
               }}
             />
             <br />
-            {showUpdate &&
+            {typeChangeInProgress &&
             <FormattedMessage
               id="cdn-configuration-type-upstream-server"
               defaultMessage={__('Provide the required information and click {update} below to save changes.')}
@@ -179,9 +194,9 @@ const NetworkSyncForm = ({
             ouiaId="network-sync-organization-input"
             aria-label="cdn-organization-label"
             type="text"
-            value={organizationLabel || ''}
+            value={upstreamOrganizationLabel || ''}
             isDisabled={updatingCdnConfiguration}
-            onChange={setOrganizationLabel}
+            onChange={setUpstreamOrganizationLabel}
           />
         </FormGroup>
         <FormGroup
@@ -191,9 +206,9 @@ const NetworkSyncForm = ({
             ouiaId="network-sync-lifecycle-environment-input"
             aria-label="cdn-lifecycle-environment-label"
             type="text"
-            value={lifecycleEnvironmentLabel || ''}
+            value={upstreamLifecycleEnvironmentLabel || ''}
             isDisabled={updatingCdnConfiguration}
-            onChange={setLifecycleEnvironmentLabel}
+            onChange={setUpstreamLifecycleEnvironmentLabel}
           />
         </FormGroup>
         <FormGroup
@@ -203,9 +218,9 @@ const NetworkSyncForm = ({
             ouiaId="network-sync-content-view-input"
             aria-label="cdn-content-view-label"
             type="text"
-            value={contentViewLabel || ''}
+            value={upstreamContentViewLabel || ''}
             isDisabled={updatingCdnConfiguration}
-            onChange={setContentViewLabel}
+            onChange={setUpstreamContentViewLabel}
           />
         </FormGroup>
         <FormGroup
@@ -215,7 +230,7 @@ const NetworkSyncForm = ({
           <FormSelect
             ouiaId="network-sync-ca-content-credential-input"
             aria-label="cdn-ssl-ca-content-credential"
-            value={sslCaCredentialId || ''}
+            value={sslCaCredentialValue || ''}
             isDisabled={updatingCdnConfiguration}
             onChange={value => setSslCaCredentialId(value)}
           >
@@ -231,7 +246,7 @@ const NetworkSyncForm = ({
             aria-label="update-upstream-configuration"
             variant="secondary"
             onClick={performUpdate}
-            isDisabled={updatingCdnConfiguration || !validated || !updateEnabled}
+            isDisabled={disableUpdate()}
             isLoading={updatingCdnConfiguration}
           >
             {__('Update')}
@@ -243,7 +258,7 @@ const NetworkSyncForm = ({
 };
 
 NetworkSyncForm.propTypes = {
-  showUpdate: PropTypes.bool.isRequired,
+  typeChangeInProgress: PropTypes.bool.isRequired,
   contentCredentials: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.number,
     name: PropTypes.string,

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

@@ -4,7 +4,7 @@ import { renderWithRedux, fireEvent } from 'react-testing-lib-wrapper';
 import CdnTypeForm from '../CdnTypeForm';
 import { nockInstance, assertNockRequest } from '../../../../../test-utils/nockWrapper';
 import { updateCdnConfigurationSuccessResponse } from '../../../../Organizations/__tests__/organizations.fixtures';
-import { CDN, CDN_URL } from '../CdnConfigurationConstants';
+import { CDN } from '../CdnConfigurationConstants';
 
 import api from '../../../../../services/api';
 
@@ -24,44 +24,19 @@ const initialState = {
 
 test('Can update to cdn type', async (done) => {
   const { getByLabelText } = renderWithRedux(<CdnTypeForm
-    showUpdate
-    url={CDN_URL}
+    typeChangeInProgress
   />, { initialState });
 
   const updateCdnConfigurationRequest = nockInstance
     .put(updateCdnConfigurationPath, {
-      url: CDN_URL,
       type: CDN,
     })
     .reply(200, updateCdnConfigurationSuccessResponse);
 
   expect(getByLabelText(updateButtonName)).toHaveAttribute('aria-disabled', 'false');
+  expect(getByLabelText('redhat-cdn-url')).toHaveAttribute('disabled');
 
   const updateButton = getByLabelText(updateButtonName);
   fireEvent.click(updateButton);
   assertNockRequest(updateCdnConfigurationRequest, done);
 });
-
-test('Can update the cdn url', async (done) => {
-  const { getByLabelText } = renderWithRedux(<CdnTypeForm
-    showUpdate={false}
-    url={CDN_URL}
-  />, { initialState });
-
-  const updateCdnConfigurationRequest = nockInstance
-    .put(updateCdnConfigurationPath, {
-      url: 'http://cdn.example.com',
-      type: CDN,
-    })
-    .reply(200, updateCdnConfigurationSuccessResponse);
-
-  expect(getByLabelText(updateButtonName)).toHaveAttribute('aria-disabled', 'true');
-
-  const url = getByLabelText('cdn-url');
-  fireEvent.change(url, { target: { value: 'http://cdn.example.com' } });
-
-  const updateButton = getByLabelText(updateButtonName);
-  expect(updateButton).toHaveAttribute('aria-disabled', 'false');
-  fireEvent.click(updateButton);
-  assertNockRequest(updateCdnConfigurationRequest, done);
-});