katello 3.8.0.rc1 → 3.8.0.rc2

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetailProducts.test.js.snap

@@ -5,72 +5,162 @@ exports[`subscription detail product page renders correctly 1`] = `
   <h2>
     Provided Products
   </h2>
-  <ul>
-    <li>
+  <ul
+    className="scrolld-list list-group"
+  >
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat OpenShift Container Platform
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Oracle Java for RHEL Server
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat OpenShift Enterprise JBoss EAP add-on
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat CloudForms Beta
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat CloudForms
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat OpenShift Enterprise Client Tools
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat Enterprise Linux Atomic Host
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       JBoss Enterprise Application Platform
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat JBoss AMQ Clients
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat Beta
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat OpenShift Enterprise Infrastructure
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat Enterprise Linux Fast Datapath Beta
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat Ansible Engine
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat OpenShift Enterprise Application Node
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat OpenShift Enterprise JBoss FUSE add-on
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat Software Collections Beta for RHEL Server
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat Software Collections for RHEL Server
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat Enterprise Linux Fast Datapath
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat Enterprise Linux Server
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat OpenShift Enterprise JBoss A-MQ add-on
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       JBoss Enterprise Web Server
+       
     </li>
-    <li>
+    <li
+      className="list-group-item"
+    >
+       
       Red Hat JBoss Core Services
+       
     </li>
   </ul>
 </div>

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap

@@ -6,25 +6,34 @@ exports[`subscriptions details page should render and contain appropiate compone
   componentClass="div"
   fluid={false}
 >
+  <BreadcrumbsBar
+    data={
+      Object {
+        "breadcrumbItems": Array [
+          Object {
+            "caption": "Subscriptions",
+            "onClick": [Function],
+          },
+          Object {
+            "caption": "OpenShift Employee Subscription",
+          },
+        ],
+        "isSwitchable": true,
+        "resource": Object {
+          "nameField": "name",
+          "resourceUrl": "/katello/api/v2/subscriptions",
+          "switcherItemUrl": "/subscriptions/:id",
+        },
+      }
+    }
+    onSwitcherItemClick={[Function]}
+  />
   <div>
     <LoadingState
       loading={false}
       loadingText="Loading"
+      timeout={300}
     >
-      <Row
-        bsClass="row"
-        componentClass="div"
-      >
-        <Col
-          bsClass="col"
-          componentClass="div"
-          sm={12}
-        >
-          <h1>
-            OpenShift Employee Subscription
-          </h1>
-        </Col>
-      </Row>
       <Row
         bsClass="row"
         componentClass="div"

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

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

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

@@ -1,6 +1,6 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-
+import { withRouter } from 'react-router';
 import reducer from './SubscriptionDetailReducer';
 import * as subscriptionDetailActions from './SubscriptionDetailActions';
 import SubscriptionDetails from './SubscriptionDetails';
@@ -16,4 +16,4 @@ const mapDispatchToProps = dispatch => bindActionCreators(subscriptionDetailActi
 export const subscriptionDetails = reducer;
 
 // export connected component
-export default connect(mapStateToProps, mapDispatchToProps)(SubscriptionDetails);
+export default connect(mapStateToProps, mapDispatchToProps)(withRouter(SubscriptionDetails));

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

@@ -1,13 +1,15 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Col, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel } from 'react-bootstrap';
+import { Col, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel, Row } 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 { columns } from './ManifestHistoryTableSchema';
 import ConfirmDialog from '../../../move_to_foreman/components/common/ConfirmDialog';
+import { manifestExists } from '../SubscriptionHelpers';
+import { columns } from './ManifestHistoryTableSchema';
+import { renderTaskStartedToast } from '../../Tasks/helpers';
 import DeleteManifestModalText from './DeleteManifestModalText';
 import {
   BLOCKING_FOREMAN_TASK_TYPES,
@@ -30,15 +32,11 @@ class ManageManifestModal extends Component {
       'uploadManifest',
       'refreshManifest',
       'deleteManifest',
-      'manifestExists',
       'disabledTooltipText',
+      'updateRepositoryUrl',
     ]);
   }
 
-  componentDidMount() {
-    this.loadData();
-  }
-
   static getDerivedStateFromProps(newProps, prevState) {
     if (
       !isEqual(newProps.showModal, prevState.showModal) ||
@@ -52,6 +50,10 @@ class ManageManifestModal extends Component {
     return null;
   }
 
+  componentDidMount() {
+    this.loadData();
+  }
+
   componentDidUpdate(prevProp, prevState) {
     const { actionInProgress } = this.state;
 
@@ -69,14 +71,27 @@ class ManageManifestModal extends Component {
     this.props.onClose();
   }
 
-  saveOrganization(event) {
-    this.props.saveOrganization({ redhat_repository_url: event.target.value });
+  updateRepositoryUrl(event) {
+    this.setState({ redhat_repository_url: event.target.value });
+  }
+
+  saveOrganization() {
+    this.props.saveOrganization({ redhat_repository_url: this.state.redhat_repository_url });
   }
 
   uploadManifest(fileList) {
     this.setState({ actionInProgress: true });
     if (fileList.length > 0) {
-      this.props.uploadManifest(fileList[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));
     }
   }
 
@@ -87,14 +102,16 @@ 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);
   }
 
@@ -111,15 +128,12 @@ 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;
@@ -132,13 +146,23 @@ 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>
@@ -151,7 +175,11 @@ 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>
@@ -163,29 +191,43 @@ class ManageManifestModal extends Component {
                 <h5>{__('Red Hat Provider Details')}</h5>
                 <hr />
                 <FormGroup>
-                  <ControlLabel className="col-sm-3" htmlFor="cdnUrl">
-                    {__('Red Hat CDN URL')}
-                  </ControlLabel>
+                  <Col sm={3}>
+                    <ControlLabel htmlFor="cdnUrl">
+                      {__('Red Hat CDN URL')}
+                    </ControlLabel>
+                  </Col>
                   <Col sm={9}>
                     <FormControl
                       id="cdnUrl"
                       type="text"
-                      value={organization.redhat_repository_url || ''}
-                      onChange={this.saveOrganization}
+                      value={this.state.redhat_repository_url || organization.redhat_repository_url || ''}
+                      onChange={this.updateRepositoryUrl}
                     />
                   </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}
@@ -213,7 +255,7 @@ class ManageManifestModal extends Component {
                       tooltipText={disabledReason}
                       tooltipPlacement="top"
                       title={__('Refresh')}
-                      disabled={!this.manifestExists() ||
+                      disabled={!manifestExists(organization) ||
                         actionInProgress || disableManifestActions}
                     />
 
@@ -223,7 +265,7 @@ class ManageManifestModal extends Component {
                       tooltipText={this.disabledTooltipText()}
                       tooltipPlacement="top"
                       title={__('Delete')}
-                      disabled={!this.manifestExists() || actionInProgress}
+                      disabled={!manifestExists(organization) || actionInProgress}
                     />
 
                     <ConfirmDialog
@@ -278,9 +320,11 @@ 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,5 +1,6 @@
 import api, { orgId } from '../../../services/api';
 import { propsToSnakeCase } from '../../../services/index';
+import { apiError } from '../../../move_to_foreman/common/helpers.js';
 
 import {
   UPLOAD_MANIFEST_REQUEST,
@@ -34,12 +35,7 @@ export const uploadManifest = file => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: UPLOAD_MANIFEST_FAILURE,
-        result,
-      });
-    });
+    .catch(result => dispatch(apiError(UPLOAD_MANIFEST_FAILURE, result)));
 };
 
 export const refreshManifest = (extendedParams = {}) => (dispatch) => {
@@ -57,12 +53,7 @@ export const refreshManifest = (extendedParams = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: REFRESH_MANIFEST_FAILURE,
-        result,
-      });
-    });
+    .catch(result => dispatch(apiError(REFRESH_MANIFEST_FAILURE, result)));
 };
 
 export const deleteManifest = (extendedParams = {}) => (dispatch) => {
@@ -80,12 +71,7 @@ export const deleteManifest = (extendedParams = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: DELETE_MANIFEST_FAILURE,
-        result,
-      });
-    });
+    .catch(result => dispatch(apiError(DELETE_MANIFEST_FAILURE, result)));
 };
 
 export const loadManifestHistory = (extendedParams = {}) => (dispatch) => {
@@ -103,12 +89,7 @@ export const loadManifestHistory = (extendedParams = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: MANIFEST_HISTORY_FAILURE,
-        result,
-      });
-    });
+    .catch(result => dispatch(apiError(MANIFEST_HISTORY_FAILURE, result)));
 };
 
 export default loadManifestHistory;

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

@@ -4,6 +4,8 @@ import {
   MANIFEST_HISTORY_REQUEST,
   MANIFEST_HISTORY_SUCCESS,
   MANIFEST_HISTORY_FAILURE,
+  UPLOAD_MANIFEST_SUCCESS,
+  DELETE_MANIFEST_SUCCESS,
 } from './ManifestConstants';
 
 const initialState = Immutable({ loading: true, results: [] });
@@ -24,10 +26,16 @@ export default (state = initialState, action) => {
 
     case MANIFEST_HISTORY_FAILURE:
       return state.merge({
-        error: action.error,
+        error: action.payload.message,
         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,6 +4,8 @@ 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' };
@@ -17,6 +19,7 @@ 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,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';
@@ -15,12 +13,11 @@ 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();
@@ -43,7 +40,10 @@ describe('manifest actions', () => {
     const url = '/katello/api/v2/organizations/1/subscriptions/manifest_history';
 
     it('and then fails with 422', () => {
-      mockApi.onGet(url).reply(422);
+      mockErrorRequest({
+        url,
+        status: 422,
+      });
 
       return store.dispatch(loadManifestHistory())
         .then(() => expect(store.getActions()).toEqual(manifestHistoryFailureActions));
@@ -61,7 +61,11 @@ describe('manifest actions', () => {
     const url = '/katello/api/v2/organizations/1/subscriptions/upload';
 
     it('and then fails with 422', () => {
-      mockApi.onPost(url).reply(422);
+      mockErrorRequest({
+        url,
+        status: 422,
+        method: 'POST',
+      });
 
       return store.dispatch(uploadManifest())
         .then(() => expect(store.getActions()).toEqual(uploadManifestFailureActions));
@@ -79,7 +83,11 @@ describe('manifest actions', () => {
     const url = '/katello/api/v2/organizations/1/subscriptions/refresh_manifest';
 
     it('and then fails with 422', () => {
-      mockApi.onPut(url).reply(422);
+      mockErrorRequest({
+        url,
+        status: 422,
+        method: 'PUT',
+      });
 
       return store.dispatch(refreshManifest())
         .then(() => expect(store.getActions()).toEqual(refreshManifestFailureActions));
@@ -97,7 +105,11 @@ describe('manifest actions', () => {
     const url = '/katello/api/v2/organizations/1/subscriptions/delete_manifest';
 
     it('and then fails with 422', () => {
-      mockApi.onPost(url).reply(422);
+      mockErrorRequest({
+        url,
+        status: 422,
+        method: 'POST',
+      });
 
       return store.dispatch(deleteManifest())
         .then(() => expect(store.getActions()).toEqual(deleteManifestFailureActions));

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

@@ -30,7 +30,9 @@ describe('manifest history reducer', () => {
   it('should have error on MANIFEST_HISTORY_FAILURE', () => {
     expect(reducer(manifestHistoryInitialState, {
       type: types.MANIFEST_HISTORY_FAILURE,
-      error: 'Unable to process request.',
+      payload: {
+        message: 'Unable to process request.',
+      },
     })).toEqual(manifestHistoryErrorState);
   });
 });