katello 4.3.0.rc1 → 4.3.0.rc2

data/webpack/scenes/Organizations/__tests__/OrganizationActions.test.js

@@ -1,5 +1,3 @@
-import axios from 'axios';
-import MockAdapter from 'axios-mock-adapter';
 import thunk from 'redux-thunk';
 import Immutable from 'seamless-immutable';
 import configureMockStore from 'redux-mock-store';
@@ -8,11 +6,9 @@ import {
   requestSuccessResponse,
   getSuccessActions,
   getFailureActions,
-  saveSuccessActions,
-  saveFailureActions,
 } from './organizations.fixtures';
 
-import { loadOrganization, saveOrganization } from '../OrganizationActions';
+import { loadOrganization } from '../OrganizationActions';
 
 const mockStore = configureMockStore([thunk]);
 const store = mockStore({ organization: Immutable({}) });
@@ -40,20 +36,4 @@ describe('organization actions', () => {
     await store.dispatch(loadOrganization());
     expect(store.getActions()).toEqual(getSuccessActions);
   });
-
-  it('creates SAVE_ORGANIZATION_REQUEST and then fails with 422', async () => {
-    const mock = new MockAdapter(axios);
-    mock.onPut('/katello/api/v2/organizations/1').reply(422);
-
-    await store.dispatch(saveOrganization());
-    expect(store.getActions()).toEqual(saveFailureActions);
-  });
-
-  it('creates SAVE_ORGANIZATION_REQUEST and ends with success', async () => {
-    const mock = new MockAdapter(axios);
-    mock.onPut('/katello/api/v2/organizations/1').reply(200, requestSuccessResponse);
-
-    await store.dispatch(saveOrganization());
-    expect(store.getActions()).toEqual(saveSuccessActions);
-  });
 });

data/webpack/scenes/Organizations/__tests__/OrganizationReducer.test.js

@@ -33,24 +33,4 @@ describe('organizations reducer', () => {
       error: 'Unable to process request.',
     })).toEqual(errorState);
   });
-
-  it('should keep loading state on SAVE_ORGANIZATION_REQUEST', () => {
-    expect(reducer(initialState, {
-      type: types.SAVE_ORGANIZATION_REQUEST,
-    })).toEqual(loadingState);
-  });
-
-  it('should flatten organization response SAVE_ORGANIZATION_SUCCESS', () => {
-    expect(reducer(initialState, {
-      type: types.SAVE_ORGANIZATION_SUCCESS,
-      response: requestSuccessResponse,
-    })).toEqual(successState);
-  });
-
-  it('should have error on SAVE_ORGANIZATION_FAILURE', () => {
-    expect(reducer(initialState, {
-      type: types.SAVE_ORGANIZATION_FAILURE,
-      error: 'Unable to process request.',
-    })).toEqual(errorState);
-  });
 });

data/webpack/scenes/Organizations/__tests__/organizations.fixtures.js

@@ -8,6 +8,40 @@ export const loadingState = Immutable({
   loading: true,
 });
 
+export const updateCdnConfigurationSuccessResponse = Immutable({
+  id: '6c536461-e7e3-421a-9d7a-780a39cd8fb4',
+  label: 'Actions::Katello::CdnConfiguration::Update',
+  pending: false,
+  action: 'Update CDN Configuration',
+  username: 'admin',
+  started_at: '2021-11-16 12:00:46 -0500',
+  ended_at: '2021-11-16 12:00:47 -0500',
+  state: 'stopped',
+  result: 'success',
+  progress: 1,
+  input: {
+    locale: 'en',
+    current_request_id: '7a0d7e03-ced1-4925-8790-79b73d25d29b',
+    current_timezone: 'America/New_York',
+    current_organization_id: 4,
+    current_location_id: 2,
+    current_user_id: 4,
+  },
+  output: {},
+  humanized: {
+    action: 'Update CDN Configuration',
+    input: [],
+    output: '',
+    errors: [],
+  },
+  cli_example: null,
+  start_at: '2021-11-16 12:00:46 -0500',
+  available_actions: {
+    cancellable: false,
+    resumable: false,
+  },
+});
+
 export const requestSuccessResponse = Immutable({
   label: 'Default_Organization',
   owner_details: {
@@ -77,26 +111,3 @@ export const getFailureActions = [
     type: 'GET_ORGANIZATION_FAILURE',
   },
 ];
-
-export const saveSuccessActions = [
-  {
-    type: 'SAVE_ORGANIZATION_REQUEST',
-  },
-  {
-    response: requestSuccessResponse,
-    type: 'SAVE_ORGANIZATION_SUCCESS',
-  },
-  {
-    type: 'GET_ORGANIZATION_REQUEST',
-  },
-];
-
-export const saveFailureActions = [
-  {
-    type: 'SAVE_ORGANIZATION_REQUEST',
-  },
-  {
-    result: new Error('Request failed with status code 422'),
-    type: 'SAVE_ORGANIZATION_FAILURE',
-  },
-];

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -12,21 +12,28 @@ import { Table } from '../../../components/pf3Table';
 import { columns } from './ManifestHistoryTableSchema';
 import DeleteManifestModalText from './DeleteManifestModalText';
 import { MANAGE_MANIFEST_MODAL_ID, DELETE_MANIFEST_MODAL_ID } from './ManifestConstants';
+import { CONTENT_CREDENTIAL_CERT_TYPE } from '../../ContentCredentials/ContentCredentialConstants';
 import SimpleContentAccess from './SimpleContentAccess';
 
 import './ManageManifestModal.scss';
 
+const PASSWORD_PLACEHOLDER = '******';
+
 class ManageManifestModal extends Component {
   constructor(props) {
     super(props);
-
     this.state = {
-      redhat_repository_url: null,
+      cdn_url: null,
+      cdn_username: null,
+      cdn_password: null,
+      cdn_organization_label: null,
+      cdn_ssl_ca_credential_id: null,
     };
   }
 
   componentDidMount() {
     this.props.loadManifestHistory();
+    this.props.getContentCredentials({ content_type: CONTENT_CREDENTIAL_CERT_TYPE });
   }
 
   componentDidUpdate(prevProps) {
@@ -57,12 +64,46 @@ class ManageManifestModal extends Component {
     }
   };
 
-  updateRepositoryUrl = (event) => {
-    this.setState({ redhat_repository_url: event.target.value });
+  updateCdnUrl = (event) => {
+    this.setState({ cdn_url: event.target.value });
+  };
+
+  updateCdnUsername = (event) => {
+    this.setState({ cdn_username: event.target.value });
+  };
+
+  hidePasswordPlaceholder = (event) => {
+    const { target } = event;
+    target.value = this.state.cdn_password;
+  };
+
+  showPasswordPlaceholder = (event) => {
+    if (this.state.cdn_password || this.props.organization.cdn_configuration.password_exists) {
+      const { target } = event;
+      target.value = PASSWORD_PLACEHOLDER;
+    }
+  };
+
+  updateCdnPassword = (event) => {
+    this.setState({ cdn_password: event.target.value });
   };
 
-  saveOrganization = () => {
-    this.props.saveOrganization({ redhat_repository_url: this.state.redhat_repository_url });
+  updateCdnOrganizationLabel = (event) => {
+    this.setState({ cdn_organization_label: event.target.value });
+  };
+
+  updateCdnSSLCaCredentialId = (event) => {
+    this.setState({ cdn_ssl_ca_credential_id: event.target.value });
+  };
+
+  updateCdnConfiguration = () => {
+    this.props.updateCdnConfiguration({
+      url: this.state.cdn_url,
+      username: this.state.cdn_username,
+      password: this.state.cdn_password,
+      upstream_organization_label: this.state.cdn_organization_label,
+      ssl_ca_credential_id: this.state.cdn_ssl_ca_credential_id,
+    });
   };
 
   uploadManifest = (fileList) => {
@@ -102,8 +143,19 @@ class ManageManifestModal extends Component {
       disableSimpleContentAccess,
       taskInProgress,
       manifestActionStarted,
+      updatingCdnConfiguration,
+      contentCredentials,
     } = this.props;
 
+    const contentCredentialOptions = contentCredentials.map(({ name, id }) => (
+      <option key={id} value={id}>
+        {name}
+      </option>
+    ));
+
+    const cdnPasswordDefaultValue = organization?.cdn_configuration?.password_exists ?
+      PASSWORD_PLACEHOLDER : this.state.cdn_password;
+
     const actionInProgress = (taskInProgress || manifestActionStarted);
     const showRedHatProviderDetails = canEditOrganizations;
     const showSubscriptionManifest = (canImportManifest || canDeleteManifest);
@@ -159,22 +211,87 @@ class ManageManifestModal extends Component {
               <Form className="form-horizontal">
                 {showRedHatProviderDetails &&
                   <React.Fragment>
-                    <h3>{__('Red Hat Provider Details')}</h3>
+                    <h3>{__('CDN Configuration for Red Hat content')}</h3>
                     <hr />
                     <FormGroup>
                       <Grid>
                         <Row>
                           <Col sm={5}>
                             <ControlLabel htmlFor="cdnUrl">
-                              {__('Red Hat CDN URL')}
+                              {__('URL')}
                             </ControlLabel>
                           </Col>
                           <Col sm={7}>
                             <FormControl
                               id="cdnUrl"
                               type="text"
-                              defaultValue={this.state.redhat_repository_url || organization.redhat_repository_url || ''}
-                              onBlur={this.updateRepositoryUrl}
+                              defaultValue={this.state.cdn_url || organization.cdn_configuration.url || ''}
+                              onChange={this.updateCdnUrl}
+                            />
+                          </Col>
+                        </Row>
+                        <Row style={{ paddingTop: '10px' }} >
+                          <Col sm={5}>
+                            <ControlLabel htmlFor="cdnUsername">
+                              {__('Username')}
+                            </ControlLabel>
+                          </Col>
+                          <Col sm={7}>
+                            <FormControl
+                              id="cdnUsername"
+                              type="text"
+                              defaultValue={this.state.cdn_username || organization.cdn_configuration.username || ''}
+                              onChange={this.updateCdnUsername}
+                            />
+                          </Col>
+                        </Row>
+                        <Row style={{ paddingTop: '10px' }} >
+                          <Col sm={5}>
+                            <ControlLabel htmlFor="cdnPassword">
+                              {__('Password')}
+                            </ControlLabel>
+                          </Col>
+                          <Col sm={7}>
+                            <FormControl
+                              id="cdnPassword"
+                              type="text"
+                              defaultValue={cdnPasswordDefaultValue}
+                              onFocus={this.hidePasswordPlaceholder}
+                              onBlur={this.showPasswordPlaceholder}
+                              onChange={this.updateCdnPassword}
+                            />
+                          </Col>
+                        </Row>
+                        <Row style={{ paddingTop: '10px' }} >
+                          <Col sm={5}>
+                            <ControlLabel htmlFor="cdnSSLCaCredential">
+                              {__('SSL CA Content Credential')}
+                            </ControlLabel>
+                          </Col>
+                          <Col sm={7}>
+                            <FormControl
+                              componentClass="select"
+                              placeholder="select"
+                              defaultValue={organization.cdn_configuration.ssl_ca_credential_id}
+                              onChange={this.updateCdnSSLCaCredentialId}
+                            >
+                              <option value="" />
+                              {contentCredentialOptions}
+                            </FormControl>
+                          </Col>
+                        </Row>
+                        <Row style={{ paddingTop: '10px' }} >
+                          <Col sm={5}>
+                            <ControlLabel htmlFor="cdnOrganizationLabel">
+                              {__('Organization Label')}
+                            </ControlLabel>
+                          </Col>
+                          <Col sm={7}>
+                            <FormControl
+                              id="cdnOrganizationLabel"
+                              type="text"
+                              defaultValue={this.state.cdn_organization_label || organization.cdn_configuration.upstream_organization_label || ''}
+                              onChange={this.updateCdnOrganizationLabel}
                             />
                           </Col>
                         </Row>
@@ -184,8 +301,13 @@ class ManageManifestModal extends Component {
                       <Grid>
                         <Row>
                           <Col smOffset={5} sm={7}>
-                            <Button onClick={this.saveOrganization} disabled={organization.loading}>
-                              {organization.loading ? buttonLoading : __('Update')}
+                            <Button
+                              id="updateCdnConfiguration"
+                              data-testid="updateCdnConfiguration"
+                              onClick={this.updateCdnConfiguration}
+                              disabled={updatingCdnConfiguration}
+                            >
+                              {updatingCdnConfiguration ? buttonLoading : __('Update')}
                             </Button>
                           </Col>
                         </Row>
@@ -315,9 +437,17 @@ ManageManifestModal.propTypes = {
   enableSimpleContentAccess: PropTypes.func.isRequired,
   disableSimpleContentAccess: PropTypes.func.isRequired,
   loadManifestHistory: PropTypes.func.isRequired,
+  getContentCredentials: PropTypes.func.isRequired,
   organization: PropTypes.shape({
+    id: PropTypes.number,
     loading: PropTypes.bool,
-    redhat_repository_url: PropTypes.string,
+    cdn_configuration: PropTypes.shape({
+      url: PropTypes.string,
+      username: PropTypes.string,
+      upstream_organization_label: PropTypes.string,
+      ssl_ca_credential_id: PropTypes.number,
+      password_exists: PropTypes.bool,
+    }),
     owner_details: PropTypes.shape({
       upstreamConsumer: PropTypes.shape({
         uuid: PropTypes.string,
@@ -334,7 +464,7 @@ ManageManifestModal.propTypes = {
   disableManifestActions: PropTypes.bool,
   disabledReason: PropTypes.string,
   loadOrganization: PropTypes.func.isRequired,
-  saveOrganization: PropTypes.func.isRequired,
+  updateCdnConfiguration: PropTypes.func.isRequired,
   taskInProgress: PropTypes.bool.isRequired,
   simpleContentAccess: PropTypes.bool,
   simpleContentAccessEligible: PropTypes.bool,
@@ -347,6 +477,11 @@ ManageManifestModal.propTypes = {
   setModalClosed: PropTypes.func.isRequired,
   setModalOpen: PropTypes.func.isRequired,
   manifestActionStarted: PropTypes.bool,
+  contentCredentials: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.number,
+    name: PropTypes.string,
+  })),
+  updatingCdnConfiguration: PropTypes.bool,
 };
 
 ManageManifestModal.defaultProps = {
@@ -360,6 +495,8 @@ ManageManifestModal.defaultProps = {
   simpleContentAccess: false,
   simpleContentAccessEligible: undefined,
   manifestActionStarted: false,
+  updatingCdnConfiguration: false,
+  contentCredentials: [],
 };
 
 export default ManageManifestModal;

data/webpack/scenes/Subscriptions/Manifest/__tests__/ManageManifestModal.test.js

@@ -1,33 +1,152 @@
 import React from 'react';
-import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import ManageManifestModal from '../ManageManifestModal';
-import { manifestHistorySuccessState } from './manifest.fixtures';
-
-jest.mock('foremanReact/components/Pagination/PaginationWrapper', () => (<div>Pagination Mock</div>));
-jest.mock('foremanReact/components/ForemanModal');
-
-describe('manage manifest modal', () => {
-  const noop = jest.fn();
-  const organization = { id: 1, redhat_repository_url: 'https://redhat.com' };
-
-  it('should render', () => {
-    const page = shallow(<ManageManifestModal
-      setModalOpen={noop}
-      setModalClosed={noop}
-      upload={noop}
-      refresh={noop}
-      delete={noop}
-      enableSimpleContentAccess={noop}
-      disableSimpleContentAccess={noop}
-      loadManifestHistory={noop}
-      organization={organization}
-      loadOrganization={noop}
-      saveOrganization={noop}
-      bulkSearch={noop}
-      manifestHistory={manifestHistorySuccessState}
-      taskInProgress={false}
-    />);
-    expect(toJson(page)).toMatchSnapshot();
-  });
+import { cleanup } from '@testing-library/react';
+import { renderWithRedux, fireEvent, patientlyWaitFor } from 'react-testing-lib-wrapper';
+import ManifestModal from '../../Manifest';
+import { manifestHistorySuccessState, manifestHistorySuccessResponse } from './manifest.fixtures';
+import { updateCdnConfigurationSuccessResponse } from '../../../Organizations/__tests__/organizations.fixtures';
+import { contentCredentialsResponse } from '../../../ContentCredentials/__tests__/contentCredentials.fixtures';
+import { nockInstance, assertNockRequest } from '../../../../test-utils/nockWrapper';
+import api from '../../../../services/api';
+
+afterEach(cleanup);
+
+const noop = jest.fn();
+const organization = {
+  id: 1,
+  redhat_repository_url: 'https://redhat.com',
+  cdn_configuration: {
+
+  },
+  owner_details: {
+    upstreamConsumer: {
+      webUrl: 'https://example.com/',
+    },
+  },
+};
+
+const defaultProps = {
+  disableManifestActions: false,
+  disabledReason: '',
+  canImportManifest: true,
+  canDeleteManifest: true,
+  canEditOrganizations: true,
+  upload: noop,
+  refresh: noop,
+  delete: noop,
+  enableSimpleContentAccess: noop,
+  disableSimpleContentAccess: noop,
+  loadManifestHistory: noop,
+  organization,
+  loadOrganization: noop,
+  taskInProgress: false,
+  simpleContentAccess: true,
+  manifestHistory: manifestHistorySuccessState,
+  setModalClosed: noop,
+  setModalOpen: noop,
+  updateCdnConfiguration: noop,
+  getContentCredentials: noop,
+};
+
+const initialState = {
+  katello: {
+    organization: {
+      simple_content_access: false,
+      ...organization,
+    },
+  },
+  foremanModals: {
+    manageManifestModal: {
+      isOpen: true,
+    },
+  },
+};
+
+const enableSimpleContetAccessPath = api.getApiUrl('/organizations/1/simple_content_access/enable');
+const disableSimpleContetAccessPath = api.getApiUrl('/organizations/1/simple_content_access/disable');
+const manifestHistoryPath = api.getApiUrl('/organizations/1/subscriptions/manifest_history');
+const getContentCredentialsPath = api.getApiUrl('/content_credentials?organization_id=1&content_type=cert');
+const updateCdnConfigurationPath = api.getApiUrl('/organizations/1/cdn_configuration');
+
+test('Can update the CDN configuration', async (done) => {
+  const { getByTestId } = renderWithRedux(<ManifestModal {...defaultProps} />, { initialState });
+
+  const getscope = nockInstance
+    .get(manifestHistoryPath)
+    .query(true)
+    .reply(200, manifestHistorySuccessResponse);
+
+  const contentCredentialsRequest = nockInstance
+    .get(getContentCredentialsPath)
+    .reply(200, contentCredentialsResponse);
+
+  const updateCdnConfigurationRequest = nockInstance
+    .put(updateCdnConfigurationPath)
+    .reply(200, updateCdnConfigurationSuccessResponse);
+
+  const updateButton = getByTestId('updateCdnConfiguration');
+  await patientlyWaitFor(() => { expect(updateButton).toBeInTheDocument(); });
+
+  fireEvent.click(updateButton);
+
+  assertNockRequest(contentCredentialsRequest);
+  assertNockRequest(getscope);
+  assertNockRequest(updateCdnConfigurationRequest, done);
+});
+
+test('Enable Simple Content Access after toggle switch value to true', async (done) => {
+  const { getByTestId } = renderWithRedux(<ManifestModal {...defaultProps} />, { initialState });
+
+  const updatescope = nockInstance
+    .put(enableSimpleContetAccessPath)
+    .reply(202, true);
+
+  const getscope = nockInstance
+    .get(manifestHistoryPath)
+    .query(true)
+    .reply(200, manifestHistorySuccessResponse);
+
+  const contentCredentialsRequest = nockInstance
+    .get(getContentCredentialsPath)
+    .reply(200, {});
+
+  const toggleButton = getByTestId('switch');
+
+  await patientlyWaitFor(() => { expect(toggleButton).toBeInTheDocument(); });
+  expect(toggleButton.checked).toEqual(false);
+
+  fireEvent.click(toggleButton);
+
+  assertNockRequest(contentCredentialsRequest);
+  assertNockRequest(getscope);
+  assertNockRequest(updatescope, done);
+});
+
+test('Disable Simple Content Access after toggle switch value to false', async (done) => {
+  initialState.katello.organization.simple_content_access = true;
+
+  const updatescope = nockInstance
+    .put(disableSimpleContetAccessPath)
+    .reply(202, true);
+
+  const getscope = nockInstance
+    .get(manifestHistoryPath)
+    .query(true)
+    .reply(200, manifestHistorySuccessResponse);
+
+  const contentCredentialsRequest = nockInstance
+    .get(getContentCredentialsPath)
+    .reply(200, {});
+
+  const { getByTestId } = renderWithRedux(<ManifestModal {...defaultProps} />, { initialState });
+
+  const toggleButton = getByTestId('switch');
+
+  await patientlyWaitFor(() => { expect(toggleButton).toBeInTheDocument(); });
+  expect(toggleButton.checked).toEqual(true);
+
+  fireEvent.click(toggleButton);
+
+  assertNockRequest(contentCredentialsRequest);
+  assertNockRequest(getscope);
+  assertNockRequest(updatescope, done);
 });

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

@@ -4,10 +4,16 @@ import { connect } from 'react-redux';
 import * as foremanModalActions from 'foremanReact/components/ForemanModal/ForemanModalActions';
 import * as manifestActions from './ManifestActions';
 import * as organizationActions from '../../Organizations/OrganizationActions';
+import * as contentCredentialActions from '../../ContentCredentials/ContentCredentialActions';
 import * as tasksActions from '../../Tasks/TaskActions';
 import history from './ManifestHistoryReducer';
-import { selectSimpleContentAccessEnabled, selectIsManifestImported } from '../../Organizations/OrganizationSelectors';
+import {
+  selectSimpleContentAccessEnabled,
+  selectIsManifestImported,
+  selectUpdatingCdnConfiguration,
+} from '../../Organizations/OrganizationSelectors';
 import { selectManifestActionStarted, selectSimpleContentAccessEligible } from '../SubscriptionsSelectors';
+import { selectContentCredentials } from '../../ContentCredentials/ContentCredentialSelectors';
 
 import ManifestModal from './ManageManifestModal';
 
@@ -19,15 +25,20 @@ const mapStateToProps = state => ({
   manifestHistory: state.katello.manifestHistory,
   simpleContentAccess: selectSimpleContentAccessEnabled(state),
   isManifestImported: selectIsManifestImported(state),
-  modalOpenState: state.foremanModals.ManageManifestModal,
   deleteManifestModalExists: !!state.foremanModals.deleteManifestModal,
   manifestActionStarted: selectManifestActionStarted(state),
   simpleContentAccessEligible: selectSimpleContentAccessEligible(state),
+  updatingCdnConfiguration: selectUpdatingCdnConfiguration(state),
+  contentCredentials: selectContentCredentials(state),
 });
 
 // map action dispatchers to props
 const actions = {
-  ...manifestActions, ...organizationActions, ...tasksActions, ...foremanModalActions,
+  ...manifestActions,
+  ...organizationActions,
+  ...tasksActions,
+  ...foremanModalActions,
+  ...contentCredentialActions,
 };
 const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 

data/webpack/utils/dateTimeHelpers.js

@@ -0,0 +1,7 @@
+import moment from 'moment';
+
+// Example: "2021-11-08 12:01:23 -0700" => November 08, 2021, 12:01 PM
+export const makeReadableDate = dateString =>
+  moment(dateString, 'YYYY-MM-DD hh:mm:ss Z').format('MMMM DD, YYYY, h:mm A');
+
+export default { makeReadableDate };

data/webpack/utils/helpers.js

@@ -40,7 +40,7 @@ export const getResponseErrorMsgs = ({ data, actionType } = {}) => {
       data.displayMessage ||
       data.message ||
       data.errors ||
-      data.error;
+      data.error?.message;
     return Array.isArray(messages) ? messages : [messages];
   }
   return [];