katello 3.7.1.1 → 3.8.0.rc1

data/webpack/scenes/Subscriptions/Details/__tests__/subscriptionDetails.fixtures.js

@@ -1,12 +1,7 @@
 import Immutable from 'seamless-immutable';
-import { toastErrorAction, failureAction } from '../../../../services/api/testHelpers';
 
 export const initialState = Immutable({
   loading: false,
-  enabledProducts: {
-    results: [],
-    total: 0,
-  },
 });
 
 
@@ -153,8 +148,10 @@ export const loadSubscriptionsDetailsFailureActions = [
   {
     type: 'SUBSCRIPTION_DETAILS_REQUEST',
   },
-  failureAction('SUBSCRIPTION_DETAILS_FAILURE', 'Request failed with status code 500'),
-  toastErrorAction('Request failed with status code 500'),
+  {
+    error: 'Request failed with status code 500',
+    type: 'SUBSCRIPTION_DETAILS_FAILURE',
+  },
 ];
 
 export const loadSubscriptionsDetailsSuccessActions = [

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

@@ -1,8 +1,7 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
+
 import reducer from './SubscriptionDetailReducer';
-import { loadProducts } from '../../Products/ProductActions';
 import * as subscriptionDetailActions from './SubscriptionDetailActions';
 import SubscriptionDetails from './SubscriptionDetails';
 
@@ -12,10 +11,9 @@ const mapStateToProps = state => ({
 });
 
 // map action dispatchers to props
-const actions = { ...subscriptionDetailActions, loadProducts };
-const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
+const mapDispatchToProps = dispatch => bindActionCreators(subscriptionDetailActions, dispatch);
 
 export const subscriptionDetails = reducer;
 
 // export connected component
-export default connect(mapStateToProps, mapDispatchToProps)(withRouter(SubscriptionDetails));
+export default connect(mapStateToProps, mapDispatchToProps)(SubscriptionDetails);

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

@@ -1,15 +1,13 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Col, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel, Row } from 'react-bootstrap';
+import { Col, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel } from 'react-bootstrap';
 import { bindMethods, Button, Icon, Modal, Spinner, OverlayTrigger, Tooltip } from 'patternfly-react';
 import { isEqual } from 'lodash';
 import TooltipButton from 'react-bootstrap-tooltip-button';
 import { LoadingState } from '../../../move_to_pf/LoadingState';
 import { Table } from '../../../move_to_foreman/components/common/table';
-import ConfirmDialog from '../../../move_to_foreman/components/common/ConfirmDialog';
-import { manifestExists } from '../SubscriptionHelpers';
 import { columns } from './ManifestHistoryTableSchema';
-import { renderTaskStartedToast } from '../../Tasks/helpers';
+import ConfirmDialog from '../../../move_to_foreman/components/common/ConfirmDialog';
 import DeleteManifestModalText from './DeleteManifestModalText';
 import {
   BLOCKING_FOREMAN_TASK_TYPES,
@@ -32,11 +30,15 @@ class ManageManifestModal extends Component {
       'uploadManifest',
       'refreshManifest',
       'deleteManifest',
+      'manifestExists',
       'disabledTooltipText',
-      'updateRepositoryUrl',
     ]);
   }
 
+  componentDidMount() {
+    this.loadData();
+  }
+
   static getDerivedStateFromProps(newProps, prevState) {
     if (
       !isEqual(newProps.showModal, prevState.showModal) ||
@@ -50,10 +52,6 @@ class ManageManifestModal extends Component {
     return null;
   }
 
-  componentDidMount() {
-    this.loadData();
-  }
-
   componentDidUpdate(prevProp, prevState) {
     const { actionInProgress } = this.state;
 
@@ -71,27 +69,14 @@ class ManageManifestModal extends Component {
     this.props.onClose();
   }
 
-  updateRepositoryUrl(event) {
-    this.setState({ redhat_repository_url: event.target.value });
-  }
-
-  saveOrganization() {
-    this.props.saveOrganization({ redhat_repository_url: this.state.redhat_repository_url });
+  saveOrganization(event) {
+    this.props.saveOrganization({ redhat_repository_url: event.target.value });
   }
 
   uploadManifest(fileList) {
     this.setState({ actionInProgress: true });
     if (fileList.length > 0) {
-      this.props
-        .uploadManifest(fileList[0])
-        .then(() =>
-          this.props.bulkSearch({
-            search_id: MANIFEST_TASKS_BULK_SEARCH_ID,
-            type: 'all',
-            active_only: true,
-            action_types: BLOCKING_FOREMAN_TASK_TYPES,
-          }))
-        .then(() => renderTaskStartedToast(this.props.taskDetails));
+      this.props.uploadManifest(fileList[0]);
     }
   }
 
@@ -102,16 +87,14 @@ class ManageManifestModal extends Component {
 
   deleteManifest() {
     this.setState({ actionInProgress: true });
-    this.props
-      .deleteManifest()
+    this.props.deleteManifest()
       .then(() =>
         this.props.bulkSearch({
           search_id: MANIFEST_TASKS_BULK_SEARCH_ID,
           type: 'all',
           active_only: true,
           action_types: BLOCKING_FOREMAN_TASK_TYPES,
-        }))
-      .then(() => renderTaskStartedToast(this.props.taskDetails));
+        }));
     this.showDeleteManifestModal(false);
   }
 
@@ -128,12 +111,15 @@ class ManageManifestModal extends Component {
     return __('This is disabled because no manifest exists');
   }
 
+  manifestExists() {
+    const { organization } = this.props;
+
+    return organization.owner_details && organization.owner_details.upstreamConsumer;
+  }
+
   render() {
     const {
-      manifestHistory,
-      organization,
-      disableManifestActions,
-      disabledReason,
+      manifestHistory, organization, disableManifestActions, disabledReason,
     } = this.props;
 
     const { actionInProgress } = this.state;
@@ -146,23 +132,13 @@ class ManageManifestModal extends Component {
         url: 'http://redhat.com',
       },
     });
-    const buttonLoading = (
-      <span>
-        {__('Updating...')}
-        <span className="fa fa-spinner fa-spin" />
-      </span>);
+
     const getManifestName = () => {
       let name = __('No Manifest Uploaded');
 
-      if (
-        organization.owner_details &&
-        organization.owner_details.upstreamConsumer
-      ) {
-        const link = [
-          'https://',
-          organization.owner_details.upstreamConsumer.webUrl,
-          organization.owner_details.upstreamConsumer.uuid,
-        ].join('/');
+      if (organization.owner_details && organization.owner_details.upstreamConsumer) {
+        const link = ['https://', organization.owner_details.upstreamConsumer.webUrl,
+          organization.owner_details.upstreamConsumer.uuid].join('/');
 
         name = (
           <a href={link}>{organization.owner_details.upstreamConsumer.name}</a>
@@ -175,11 +151,7 @@ class ManageManifestModal extends Component {
     return (
       <Modal show={this.state.showModal} onHide={this.hideModal}>
         <Modal.Header>
-          <button
-            className="close"
-            onClick={this.hideModal}
-            aria-label={__('Close')}
-          >
+          <button className="close" onClick={this.hideModal} aria-label={__('Close')}>
             <Icon type="pf" name="close" />
           </button>
           <Modal.Title>{__('Manage Manifest')}</Modal.Title>
@@ -191,43 +163,29 @@ class ManageManifestModal extends Component {
                 <h5>{__('Red Hat Provider Details')}</h5>
                 <hr />
                 <FormGroup>
-                  <Col sm={3}>
-                    <ControlLabel htmlFor="cdnUrl">
-                      {__('Red Hat CDN URL')}
-                    </ControlLabel>
-                  </Col>
+                  <ControlLabel className="col-sm-3" htmlFor="cdnUrl">
+                    {__('Red Hat CDN URL')}
+                  </ControlLabel>
                   <Col sm={9}>
                     <FormControl
                       id="cdnUrl"
                       type="text"
-                      value={this.state.redhat_repository_url || organization.redhat_repository_url || ''}
-                      onChange={this.updateRepositoryUrl}
+                      value={organization.redhat_repository_url || ''}
+                      onChange={this.saveOrganization}
                     />
                   </Col>
                 </FormGroup>
-                <FormGroup>
-                  <Col smOffset={3} sm={3}>
-                    <Button onClick={this.saveOrganization} disabled={organization.loading}>
-                      {organization.loading ? buttonLoading : __('Update')}
-                    </Button>
-                  </Col>
-                </FormGroup>
                 <br />
 
                 <h5>{__('Subscription Manifest')}</h5>
                 <hr />
 
                 <FormGroup>
-                  <ControlLabel
-                    className="col-sm-3 control-label"
-                    htmlFor="usmaFile"
-                  >
+                  <ControlLabel className="col-sm-3 control-label" htmlFor="usmaFile">
                     <OverlayTrigger
                       overlay={
-                        <Tooltip id="usma-tooltip">
-                          {__('Upstream Subscription Management Application')}
-                        </Tooltip>
-                      }
+                        <Tooltip id="usma-tooltip">{__('Upstream Subscription Management Application')}</Tooltip>
+                        }
                       placement="bottom"
                       trigger={['hover', 'focus']}
                       rootClose={false}
@@ -255,7 +213,7 @@ class ManageManifestModal extends Component {
                       tooltipText={disabledReason}
                       tooltipPlacement="top"
                       title={__('Refresh')}
-                      disabled={!manifestExists(organization) ||
+                      disabled={!this.manifestExists() ||
                         actionInProgress || disableManifestActions}
                     />
 
@@ -265,7 +223,7 @@ class ManageManifestModal extends Component {
                       tooltipText={this.disabledTooltipText()}
                       tooltipPlacement="top"
                       title={__('Delete')}
-                      disabled={!manifestExists(organization) || actionInProgress}
+                      disabled={!this.manifestExists() || actionInProgress}
                     />
 
                     <ConfirmDialog
@@ -320,11 +278,9 @@ ManageManifestModal.propTypes = {
   showModal: PropTypes.bool.isRequired,
   onClose: PropTypes.func,
   bulkSearch: PropTypes.func.isRequired,
-  taskDetails: PropTypes.shape({}),
 };
 
 ManageManifestModal.defaultProps = {
-  taskDetails: undefined,
   disableManifestActions: false,
   disabledReason: '',
   onClose() {},

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

@@ -1,6 +1,5 @@
 import api, { orgId } from '../../../services/api';
 import { propsToSnakeCase } from '../../../services/index';
-import { apiError } from '../../../move_to_foreman/common/helpers.js';
 
 import {
   UPLOAD_MANIFEST_REQUEST,
@@ -35,7 +34,12 @@ export const uploadManifest = file => (dispatch) => {
         response: data,
       });
     })
-    .catch(result => dispatch(apiError(UPLOAD_MANIFEST_FAILURE, result)));
+    .catch((result) => {
+      dispatch({
+        type: UPLOAD_MANIFEST_FAILURE,
+        result,
+      });
+    });
 };
 
 export const refreshManifest = (extendedParams = {}) => (dispatch) => {
@@ -53,7 +57,12 @@ export const refreshManifest = (extendedParams = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch(result => dispatch(apiError(REFRESH_MANIFEST_FAILURE, result)));
+    .catch((result) => {
+      dispatch({
+        type: REFRESH_MANIFEST_FAILURE,
+        result,
+      });
+    });
 };
 
 export const deleteManifest = (extendedParams = {}) => (dispatch) => {
@@ -71,7 +80,12 @@ export const deleteManifest = (extendedParams = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch(result => dispatch(apiError(DELETE_MANIFEST_FAILURE, result)));
+    .catch((result) => {
+      dispatch({
+        type: DELETE_MANIFEST_FAILURE,
+        result,
+      });
+    });
 };
 
 export const loadManifestHistory = (extendedParams = {}) => (dispatch) => {
@@ -89,7 +103,12 @@ export const loadManifestHistory = (extendedParams = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch(result => dispatch(apiError(MANIFEST_HISTORY_FAILURE, result)));
+    .catch((result) => {
+      dispatch({
+        type: MANIFEST_HISTORY_FAILURE,
+        result,
+      });
+    });
 };
 
 export default loadManifestHistory;

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

@@ -4,8 +4,6 @@ import {
   MANIFEST_HISTORY_REQUEST,
   MANIFEST_HISTORY_SUCCESS,
   MANIFEST_HISTORY_FAILURE,
-  UPLOAD_MANIFEST_SUCCESS,
-  DELETE_MANIFEST_SUCCESS,
 } from './ManifestConstants';
 
 const initialState = Immutable({ loading: true, results: [] });
@@ -26,16 +24,10 @@ export default (state = initialState, action) => {
 
     case MANIFEST_HISTORY_FAILURE:
       return state.merge({
-        error: action.payload.message,
+        error: action.error,
         loading: false,
       });
 
-    case UPLOAD_MANIFEST_SUCCESS:
-      return state.set('taskDetails', action.response);
-
-    case DELETE_MANIFEST_SUCCESS:
-      return state.set('taskDetails', action.response);
-
     default:
       return state;
   }

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

@@ -4,8 +4,6 @@ import toJson from 'enzyme-to-json';
 import ManageManifestModal from '../ManageManifestModal';
 import { manifestHistorySuccessState } from './manifest.fixtures';
 
-jest.mock('../../../../move_to_foreman/foreman_toast_notifications');
-
 describe('manage manifest modal', () => {
   const noop = () => {};
   const organization = { id: 1, redhat_repository_url: 'https://redhat.com' };
@@ -19,7 +17,6 @@ describe('manage manifest modal', () => {
       organization={organization}
       loadOrganization={noop}
       saveOrganization={noop}
-      bulkSearch={noop}
       manifestHistory={manifestHistorySuccessState}
       taskInProgress={false}
       showModal

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

@@ -1,3 +1,5 @@
+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';
@@ -13,11 +15,12 @@ import {
   deleteManifestSuccessActions,
   deleteManifestFailureActions,
 } from './manifest.fixtures';
+
 import { loadManifestHistory, uploadManifest, refreshManifest, deleteManifest } from '../ManifestActions';
-import { mock as mockApi, mockErrorRequest } from '../../../../mockRequest';
 
 const mockStore = configureMockStore([thunk]);
 const store = mockStore({ manifest: Immutable({}) });
+const mockApi = new MockAdapter(axios);
 
 beforeEach(() => {
   store.clearActions();
@@ -40,10 +43,7 @@ describe('manifest actions', () => {
     const url = '/katello/api/v2/organizations/1/subscriptions/manifest_history';
 
     it('and then fails with 422', () => {
-      mockErrorRequest({
-        url,
-        status: 422,
-      });
+      mockApi.onGet(url).reply(422);
 
       return store.dispatch(loadManifestHistory())
         .then(() => expect(store.getActions()).toEqual(manifestHistoryFailureActions));
@@ -61,11 +61,7 @@ describe('manifest actions', () => {
     const url = '/katello/api/v2/organizations/1/subscriptions/upload';
 
     it('and then fails with 422', () => {
-      mockErrorRequest({
-        url,
-        status: 422,
-        method: 'POST',
-      });
+      mockApi.onPost(url).reply(422);
 
       return store.dispatch(uploadManifest())
         .then(() => expect(store.getActions()).toEqual(uploadManifestFailureActions));
@@ -83,11 +79,7 @@ describe('manifest actions', () => {
     const url = '/katello/api/v2/organizations/1/subscriptions/refresh_manifest';
 
     it('and then fails with 422', () => {
-      mockErrorRequest({
-        url,
-        status: 422,
-        method: 'PUT',
-      });
+      mockApi.onPut(url).reply(422);
 
       return store.dispatch(refreshManifest())
         .then(() => expect(store.getActions()).toEqual(refreshManifestFailureActions));
@@ -105,11 +97,7 @@ describe('manifest actions', () => {
     const url = '/katello/api/v2/organizations/1/subscriptions/delete_manifest';
 
     it('and then fails with 422', () => {
-      mockErrorRequest({
-        url,
-        status: 422,
-        method: 'POST',
-      });
+      mockApi.onPost(url).reply(422);
 
       return store.dispatch(deleteManifest())
         .then(() => expect(store.getActions()).toEqual(deleteManifestFailureActions));