katello 3.7.1.1 → 3.8.0.rc1

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js

@@ -5,7 +5,6 @@ import PropTypes from 'prop-types';
 import { LinkContainer } from 'react-router-bootstrap';
 import { Grid, Row, Col } from 'react-bootstrap';
 import { bindMethods, Button } from 'patternfly-react';
-import BreadcrumbsBar from 'foremanReact/components/BreadcrumbBar';
 import { LoadingState } from '../../../move_to_pf/LoadingState';
 import { notify } from '../../../move_to_foreman/foreman_toast_notifications';
 import helpers from '../../../move_to_foreman/common/helpers';
@@ -23,7 +22,6 @@ class UpstreamSubscriptionsPage extends Component {
     bindMethods(this, [
       'onChange',
       'saveUpstreamSubscriptions',
-      'quantityValidationInput',
     ]);
   }
 
@@ -33,17 +31,18 @@ class UpstreamSubscriptionsPage extends Component {
 
   onChange(value, rowData) {
     const { selectedRows } = this.state;
+    const newValue = parseInt(value, 10);
     const pool = {
       ...rowData,
       id: rowData.id,
-      updatedQuantity: value,
+      updatedQuantity: newValue,
       selected: true,
     };
 
     const match = this.poolInSelectedRows(pool);
     const index = _.indexOf(selectedRows, match);
 
-    if (value) {
+    if (newValue > 0) {
       if (match) {
         selectedRows.splice(index, 1, pool);
       } else {
@@ -56,25 +55,6 @@ class UpstreamSubscriptionsPage extends Component {
     this.setState({ selectedRows });
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  quantityValidation(pool) {
-    const origQuantity = pool.updatedQuantity;
-    if (origQuantity && helpers.stringIsInteger(origQuantity)) {
-      const parsedQuantity = parseInt(origQuantity, 10);
-      const aboveZeroMsg = [false, __('Please enter a positive number above zero')];
-
-      if (parsedQuantity.toString().length > 10) return [false, __('Please limit number to 10 digits')];
-      if (!pool.available) return [false, __('No pools available')];
-      // handling unlimited subscriptions, they show as -1
-      if (pool.available === -1) return parsedQuantity ? [true, ''] : aboveZeroMsg;
-      if (parsedQuantity > pool.available) return [false, __(`Quantity must not be above ${pool.available}`)];
-      if (parsedQuantity <= 0) return aboveZeroMsg;
-    } else {
-      return [false, __('Please enter digits only')];
-    }
-    return [true, ''];
-  }
-
   poolInSelectedRows(pool) {
     const { selectedRows } = this.state;
 
@@ -84,30 +64,16 @@ class UpstreamSubscriptionsPage extends Component {
     );
   }
 
-  quantityValidationInput(pool) {
-    if (!pool || pool.updatedQuantity === undefined) return null;
-    if (this.quantityValidation(pool)[0]) {
-      return 'success';
-    }
-    return 'error';
-  }
-
-  validateSelectedRows() {
-    return Array.isArray(this.state.selectedRows) &&
-           this.state.selectedRows.length &&
-           this.state.selectedRows.every(pool => this.quantityValidation(pool)[0]);
-  }
-
   saveUpstreamSubscriptions() {
     const updatedPools = _.map(
       this.state.selectedRows,
-      pool => ({ ...pool, quantity: parseInt(pool.updatedQuantity, 10) }),
+      pool => ({ ...pool, quantity: pool.updatedQuantity }),
     );
 
     const updatedSubscriptions = { pools: updatedPools };
 
     this.props.saveUpstreamSubscriptions(updatedSubscriptions).then(() => {
-      const { task } = this.props.upstreamSubscriptions;
+      const { task, error } = this.props.upstreamSubscriptions;
 
       // TODO: could probably factor this out into a task response component
       if (task) {
@@ -122,6 +88,18 @@ class UpstreamSubscriptionsPage extends Component {
 
         notify({ message: ReactDOMServer.renderToStaticMarkup(message), type: 'success' });
         this.props.history.push('/subscriptions');
+      } else {
+        let errorMessages = [];
+
+        if (error.errors) {
+          errorMessages = error.errors;
+        } else if (error.message) {
+          errorMessages.push(error.message);
+        }
+
+        for (let i = 0; i < errorMessages.length; i += 1) {
+          notify({ message: errorMessages[i], type: 'error' });
+        }
       }
     });
   }
@@ -143,8 +121,7 @@ class UpstreamSubscriptionsPage extends Component {
               <Button
                 bsStyle="primary"
                 type="submit"
-                disabled={upstreamSubscriptions.loading ||
-                          !this.validateSelectedRows()}
+                disabled={upstreamSubscriptions.loading}
                 onClick={this.saveUpstreamSubscriptions}
               >
                 {__('Submit')}
@@ -193,9 +170,13 @@ class UpstreamSubscriptionsPage extends Component {
       description: __('Subscription Allocations allow you to export subscriptions from the Red Hat Customer Portal to ' +
           'an on-premise subscription management application such as Red Hat Satellite.'),
       docUrl: 'http://redhat.com',
+      documentation: {
+        title: __('Learn more about Subscription Allocations'),
+        url: 'http://redhat.com',
+      },
       action: {
-        title: __('Import a Manifest to Begin'),
-        url: '/subscriptions',
+        title: __('New Subscription Allocation'),
+        url: 'http://redhat.com',
       },
     });
 
@@ -231,19 +212,7 @@ class UpstreamSubscriptionsPage extends Component {
 
     return (
       <Grid bsClass="container-fluid">
-        <BreadcrumbsBar data={{
-          isSwitchable: false,
-          breadcrumbItems: [
-            {
-              caption: __('Subscriptions'),
-              onClick: () => this.props.history.push('/subscriptions'),
-            },
-            {
-              caption: __('Add Subscriptions'),
-            },
-          ],
-        }}
-        />
+        <h1>{__('Add Subscriptions')}</h1>
 
         <LoadingState loading={upstreamSubscriptions.loading} loadingText={__('Loading')}>
           <Row>
@@ -266,12 +235,13 @@ class UpstreamSubscriptionsPage extends Component {
 }
 
 UpstreamSubscriptionsPage.propTypes = {
+  history: PropTypes.shape({ push: PropTypes.func }).isRequired,
   loadUpstreamSubscriptions: PropTypes.func.isRequired,
   saveUpstreamSubscriptions: PropTypes.func.isRequired,
   upstreamSubscriptions: PropTypes.shape({
     task: PropTypes.shape({}),
+    error: PropTypes.shape({}),
   }).isRequired,
-  history: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired,
 };
 
 export default UpstreamSubscriptionsPage;

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsReducer.js

@@ -38,7 +38,7 @@ export default (state = initialState, action) => {
 
     case UPSTREAM_SUBSCRIPTIONS_FAILURE:
       return state.merge({
-        error: action.payload.message,
+        error: action.error,
         loading: false,
       });
 
@@ -49,7 +49,8 @@ export default (state = initialState, action) => {
       return state.set('task', action.response).set('loading', false);
 
     case SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE: {
-      return state.set('error', action.payload.message).set('loading', false);
+      const error = action.result.response.data;
+      return state.set('error', error).set('loading', false);
     }
 
     default:

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FormGroup, FormControl, ControlLabel, HelpBlock } from 'react-bootstrap';
+import { FormGroup, FormControl, ControlLabel } from 'react-bootstrap';
 import helpers from '../../../move_to_foreman/common/helpers';
 import {
   headerFormatter,
@@ -71,7 +71,7 @@ export const columns = (controller, selectionController) => [
     },
   },
   {
-    property: 'available',
+    property: 'quantity',
     header: {
       label: __('Available Entitlements'),
       formatters: [headerFormatter],
@@ -96,27 +96,22 @@ export const columns = (controller, selectionController) => [
       formatters: [
         (value, { rowData }) => (
           <td>
-            <FormGroup
-              validationState={controller.quantityValidationInput(rowData)}
-            >
+            <FormGroup>
               <ControlLabel srOnly>{__('Number to Allocate')}</ControlLabel>
               <FormControl
                 type="text"
                 onBlur={e => controller.onChange(e.target.value, rowData)}
                 defaultValue={rowData.updatedQuantity}
-                onChange={(e) => {
-                  controller.onChange(e.target.value, rowData);
-                }}
                 onKeyDown={(e) => {
                   const key = e.charCode ? e.charCode : e.keyCode;
                   if (key === 13) {
+                    controller.onChange(e.target.value, rowData);
                     controller.saveUpstreamSubscriptions();
                     e.preventDefault();
                   }
                 }}
               />
-              {controller.quantityValidationInput(rowData) === 'error' &&
-                <HelpBlock>{controller.quantityValidation(rowData)[1]}</HelpBlock>}
+              <div>{__('Max')} {rowData.quantity}</div>
             </FormGroup>
           </td>
         ),

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/UpstreamSubscriptionsActions.test.js

@@ -1,3 +1,5 @@
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import Immutable from 'seamless-immutable';
@@ -11,10 +13,10 @@ import {
 import { getTaskSuccessResponse } from '../../../Tasks/__tests__/task.fixtures';
 
 import { loadUpstreamSubscriptions, saveUpstreamSubscriptions } from '../UpstreamSubscriptionsActions';
-import { mock as mockApi, mockErrorRequest } from '../../../../mockRequest';
 
 const mockStore = configureMockStore([thunk]);
 const store = mockStore({ subscriptions: Immutable({}) });
+const mockApi = new MockAdapter(axios);
 
 afterEach(() => {
   store.clearActions();
@@ -26,10 +28,7 @@ describe('upstream subscription actions', () => {
 
   describe('creates UPSTREAM_SUBSCRIPTIONS_REQUEST', () => {
     it('and then fails with 422', () => {
-      mockErrorRequest({
-        url,
-        status: 422,
-      });
+      mockApi.onGet(url).reply(422);
 
       return store.dispatch(loadUpstreamSubscriptions())
         .then(() => expect(store.getActions()).toEqual(getFailureActions));
@@ -49,11 +48,7 @@ describe('upstream subscription actions', () => {
     };
 
     it('and then fails with 422', () => {
-      mockErrorRequest({
-        url,
-        status: 422,
-        method: 'POST',
-      });
+      mockApi.onPost(url).reply(422);
 
       return store.dispatch(saveUpstreamSubscriptions(subscriptionData))
         .then(() => expect(store.getActions()).toEqual(saveFailureActions));

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/UpstreamSubscriptionsPage.test.js

@@ -6,62 +6,17 @@ import { successState } from './upstreamSubscriptions.fixtures';
 import { loadUpstreamSubscriptions, saveUpstreamSubscriptions } from '../UpstreamSubscriptionsActions';
 
 jest.mock('../../../../move_to_foreman/foreman_toast_notifications');
-jest.mock('foremanReact/components/BreadcrumbBar');
 
 describe('upstream subscriptions page', () => {
-  let shallowWrapper;
   const mockHistory = { push: () => {} };
-  beforeEach(() => {
-    shallowWrapper = shallow(<UpstreamSubscriptionsPage
+
+  it('should render', async () => {
+    const page = shallow(<UpstreamSubscriptionsPage
       upstreamSubscriptions={successState}
       loadUpstreamSubscriptions={loadUpstreamSubscriptions}
       saveUpstreamSubscriptions={saveUpstreamSubscriptions}
       history={mockHistory}
     />);
-  });
-
-  it('should render', async () => {
-    expect(toJson(shallowWrapper)).toMatchSnapshot();
-  });
-
-  it('should validate correct subscription quantities', async () => {
-    const validPools = [
-      { available: 10, updatedQuantity: 5 },
-      { available: 10, updatedQuantity: '5' },
-      { available: 10, updatedQuantity: '10' },
-      { available: 10, updatedQuantity: '1' },
-      { available: -1, updatedQuantity: '1000' },
-    ];
-    validPools.forEach((pool, i) => {
-      // using object with index attribute to print out index on failure,
-      // jest doesn't support messages on failure :(
-      const result = shallowWrapper.instance().quantityValidation(pool)[0];
-      expect({ index: i, result }).toEqual({ index: i, result: true });
-    });
-  });
-
-  it('should invalidate incorrect subscription quantities', async () => {
-    const invalidPools = [
-      { available: 10, updatedQuantity: 11 },
-      { available: 10, updatedQuantity: 'foo' },
-      { available: 10, updatedQuantity: 0 },
-      { available: 10, updatedQuantity: '0' },
-      { available: 10, updatedQuantity: '11' },
-      { available: 10, updatedQuantity: '2.0' },
-      { available: 10, updatedQuantity: '2/3' },
-      { available: -1, updatedQuantity: '-1' },
-      { available: -1, updatedQuantity: '0' },
-      { available: -1, updatedQuantity: 'foo' },
-      { available: -1, updatedQuantity: '2/3' },
-      { available: -1, updatedQuantity: '2.0' },
-      { available: -1, updatedQuantity: '99999999999' },
-    ];
-
-    invalidPools.forEach((pool, i) => {
-      // using object with index attribute to print out index on failure,
-      // jest doesn't support messages on failure :(
-      const result = shallowWrapper.instance().quantityValidation(pool)[0];
-      expect({ index: i, result }).toEqual({ index: i, result: false });
-    });
+    expect(toJson(page)).toMatchSnapshot();
   });
 });

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/UpstreamSubscriptionsReducer.test.js

@@ -37,9 +37,7 @@ describe('upstream subscriptions reducer', () => {
   it('should have error on UPSTREAM_SUBSCRIPTIONS_FAILURE', () => {
     expect(reducer(initialState, {
       type: types.UPSTREAM_SUBSCRIPTIONS_FAILURE,
-      payload: {
-        message: 'Unable to process request.',
-      },
+      error: 'Unable to process request.',
     })).toEqual(errorState);
   });
 
@@ -50,13 +48,10 @@ describe('upstream subscriptions reducer', () => {
     })).toEqual(saveSuccessState);
   });
 
-  it('should have error on SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE', () => {
+  it('should have error on SAVE_UPSTREAM_SUBSCRIPTIONS_SUCCESS', () => {
     expect(reducer(initialSaveState, {
       type: types.SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE,
-      payload: {
-        message: 'Unable to process request.',
-        result: errorResult,
-      },
+      result: errorResult,
     })).toEqual(saveErrorState);
   });
 });

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/__snapshots__/UpstreamSubscriptionsPage.test.js.snap

@@ -6,26 +6,12 @@ exports[`upstream subscriptions page should render 1`] = `
   componentClass="div"
   fluid={false}
 >
-  <BreadcrumbsBar
-    data={
-      Object {
-        "breadcrumbItems": Array [
-          Object {
-            "caption": "Subscriptions",
-            "onClick": [Function],
-          },
-          Object {
-            "caption": "Add Subscriptions",
-          },
-        ],
-        "isSwitchable": false,
-      }
-    }
-  />
+  <h1>
+    Add Subscriptions
+  </h1>
   <LoadingState
     loading={false}
     loadingText="Loading"
-    timeout={300}
   >
     <Row
       bsClass="row"
@@ -121,7 +107,7 @@ exports[`upstream subscriptions page should render 1`] = `
                   ],
                   "label": "Available Entitlements",
                 },
-                "property": "available",
+                "property": "quantity",
               },
               Object {
                 "cell": Object {
@@ -142,11 +128,15 @@ exports[`upstream subscriptions page should render 1`] = `
           emptyState={
             Object {
               "action": Object {
-                "title": "Import a Manifest to Begin",
-                "url": "/subscriptions",
+                "title": "New Subscription Allocation",
+                "url": "http://redhat.com",
               },
               "description": "Subscription Allocations allow you to export subscriptions from the Red Hat Customer Portal to an on-premise subscription management application such as Red Hat Satellite.",
               "docUrl": "http://redhat.com",
+              "documentation": Object {
+                "title": "Learn more about Subscription Allocations",
+                "url": "http://redhat.com",
+              },
               "header": "There are no Subscription Allocations to display",
             }
           }
@@ -203,7 +193,7 @@ exports[`upstream subscriptions page should render 1`] = `
           block={false}
           bsClass="btn"
           bsStyle="primary"
-          disabled={true}
+          disabled={false}
           onClick={[Function]}
           type="submit"
         >

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/upstreamSubscriptions.fixtures.js

@@ -1,6 +1,5 @@
 import Immutable from 'seamless-immutable';
 import { getTaskSuccessResponse } from '../../../Tasks/__tests__/task.fixtures';
-import { toastErrorAction, failureAction } from '../../../../services/api/testHelpers';
 
 export const initialState = Immutable({
   loading: true,
@@ -136,8 +135,10 @@ export const getFailureActions = [
   {
     type: 'UPSTREAM_SUBSCRIPTIONS_REQUEST',
   },
-  failureAction('UPSTREAM_SUBSCRIPTIONS_FAILURE'),
-  toastErrorAction(),
+  {
+    result: new Error('Request failed with status code 422'),
+    type: 'UPSTREAM_SUBSCRIPTIONS_FAILURE',
+  },
 ];
 
 export const saveSuccessActions = [
@@ -154,6 +155,8 @@ export const saveFailureActions = [
   {
     type: 'SAVE_UPSTREAM_SUBSCRIPTIONS_REQUEST',
   },
-  failureAction('SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE'),
-  toastErrorAction(),
+  {
+    result: new Error('Request failed with status code 422'),
+    type: 'SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE',
+  },
 ];