katello 3.7.0.rc2 → 3.7.0

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

@@ -24,7 +24,7 @@ export default (state = initialState, action) => {
 
     case MANIFEST_HISTORY_FAILURE:
       return state.merge({
-        error: action.error,
+        error: action.payload.message,
         loading: false,
       });
 

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);
   });
 });

data/webpack/scenes/Subscriptions/Manifest/__tests__/manifest.fixtures.js

@@ -1,4 +1,5 @@
 import Immutable from 'seamless-immutable';
+import { toastErrorAction, failureAction } from '../../../../services/api/testHelpers';
 
 export const manifestHistoryInitialState = Immutable({
   loading: true,
@@ -149,10 +150,8 @@ export const manifestHistoryFailureActions = [
   {
     type: 'MANIFEST_HISTORY_REQUEST',
   },
-  {
-    result: new Error('Request failed with status code 422'),
-    type: 'MANIFEST_HISTORY_FAILURE',
-  },
+  failureAction('MANIFEST_HISTORY_FAILURE'),
+  toastErrorAction(),
 ];
 
 export const uploadManifestSuccessActions = [
@@ -169,10 +168,8 @@ export const uploadManifestFailureActions = [
   {
     type: 'UPLOAD_MANIFEST_REQUEST',
   },
-  {
-    result: new Error('Request failed with status code 422'),
-    type: 'UPLOAD_MANIFEST_FAILURE',
-  },
+  failureAction('UPLOAD_MANIFEST_FAILURE'),
+  toastErrorAction(),
 ];
 
 export const refreshManifestSuccessActions = [
@@ -189,10 +186,8 @@ export const refreshManifestFailureActions = [
   {
     type: 'REFRESH_MANIFEST_REQUEST',
   },
-  {
-    result: new Error('Request failed with status code 422'),
-    type: 'REFRESH_MANIFEST_FAILURE',
-  },
+  failureAction('REFRESH_MANIFEST_FAILURE'),
+  toastErrorAction(),
 ];
 
 export const deleteManifestSuccessActions = [
@@ -209,8 +204,6 @@ export const deleteManifestFailureActions = [
   {
     type: 'DELETE_MANIFEST_REQUEST',
   },
-  {
-    result: new Error('Request failed with status code 422'),
-    type: 'DELETE_MANIFEST_FAILURE',
-  },
+  failureAction('DELETE_MANIFEST_FAILURE'),
+  toastErrorAction(),
 ];

data/webpack/scenes/Subscriptions/SubscriptionActions.js

@@ -16,7 +16,7 @@ import {
   DELETE_SUBSCRIPTIONS_FAILURE,
 } from './SubscriptionConstants';
 import { filterRHSubscriptions } from './SubscriptionHelpers.js';
-import { getResponseError } from '../../move_to_foreman/common/helpers.js';
+import { apiError } from '../../move_to_foreman/common/helpers.js';
 
 export const createSubscriptionParams = (extendedParams = {}) => ({
   ...{ organization_id: orgId() },
@@ -35,12 +35,7 @@ export const loadAvailableQuantities = (extendedParams = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: SUBSCRIPTIONS_QUANTITIES_FAILURE,
-        error: getResponseError(result.response),
-      });
-    });
+    .catch(result => dispatch(apiError(SUBSCRIPTIONS_QUANTITIES_FAILURE, result)));
 };
 
 export const loadSubscriptions = (extendedParams = {}) => (dispatch) => {
@@ -60,12 +55,7 @@ export const loadSubscriptions = (extendedParams = {}) => (dispatch) => {
         dispatch(loadAvailableQuantities({ poolIds }));
       }
     })
-    .catch((result) => {
-      dispatch({
-        type: SUBSCRIPTIONS_FAILURE,
-        error: getResponseError(result.response),
-      });
-    });
+    .catch(result => dispatch(apiError(SUBSCRIPTIONS_FAILURE, result)));
 };
 
 export const updateQuantity = (quantities = {}) => (dispatch) => {
@@ -83,12 +73,7 @@ export const updateQuantity = (quantities = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: UPDATE_QUANTITY_FAILURE,
-        error: getResponseError(result.response),
-      });
-    });
+    .catch(result => dispatch(apiError(UPDATE_QUANTITY_FAILURE, result)));
 };
 
 export const deleteSubscriptions = poolIds => (dispatch) => {
@@ -106,13 +91,7 @@ export const deleteSubscriptions = poolIds => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: DELETE_SUBSCRIPTIONS_FAILURE,
-        result,
-      });
-    });
+    .catch(result => dispatch(apiError(DELETE_SUBSCRIPTIONS_FAILURE, result)));
 };
 
-
 export default loadSubscriptions;

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -24,6 +24,7 @@ const initialState = Immutable({
   ...initialApiState,
   quantitiesLoading: false,
   availableQuantities: {},
+  tasks: [],
 });
 
 const mapQuantities = (pools) => {
@@ -72,10 +73,14 @@ export default (state = initialState, action) => {
       return state.set('loading', false);
 
     case SUBSCRIPTIONS_FAILURE:
+      return state
+        .set('loading', false)
+        .set('results', [])
+        .set('itemCount', 0);
+
     case UPDATE_QUANTITY_FAILURE:
     case DELETE_SUBSCRIPTIONS_FAILURE:
       return state.merge({
-        error: action.error,
         loading: false,
       });
 
@@ -92,7 +97,6 @@ export default (state = initialState, action) => {
     case SUBSCRIPTIONS_QUANTITIES_FAILURE: {
       return state.merge({
         quantitiesLoading: false,
-        quantitiesError: action.error,
       });
     }
 

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -38,36 +38,39 @@ class SubscriptionsPage extends Component {
   }
 
   static getDerivedStateFromProps(nextProps, prevState) {
-    const nextTaskId = nextProps.tasks[0] && nextProps.tasks[0].id;
+    const { tasks = [] } = nextProps;
+    const nextTaskId = tasks[0] && tasks[0].id;
 
-    if (nextProps.tasks.length === 0 && prevState.polledTask != null) {
+    if (tasks.length === 0 && prevState.polledTask != null) {
       return { showTaskModal: false, polledTask: undefined };
-    } else if (nextProps.tasks.length > 0 && nextTaskId !== prevState.polledTask) {
+    } else if (tasks.length > 0 && nextTaskId !== prevState.polledTask) {
       return {
         showTaskModal: true,
         manifestModalOpen: false,
-        polledTask: nextProps.tasks[0].id,
+        polledTask: nextTaskId,
       };
     }
     return null;
   }
 
   componentDidUpdate(prevProps) {
-    const { tasks } = this.props;
+    const { tasks = [] } = this.props;
+    const { tasks: prevTasks = [] } = prevProps;
+
     const numberOfTasks = tasks.length;
-    const numberOfPrevTasks = prevProps.tasks.length;
+    const numberOfPrevTasks = prevTasks.length;
     let task;
 
     if (numberOfTasks > 0) {
-      if (numberOfPrevTasks === 0 || prevProps.tasks[0].id !== tasks[0].id) {
-        [task] = this.props.tasks;
+      if (numberOfPrevTasks === 0 || prevTasks[0].id !== tasks[0].id) {
+        [task] = tasks;
         this.handleDoneTask(task);
       }
     }
   }
 
   getDisabledReason(deleteButton) {
-    const { tasks, subscriptions } = this.props;
+    const { tasks = [], subscriptions } = this.props;
     const { disconnected } = subscriptions;
     let disabledReason = null;
 
@@ -132,7 +135,7 @@ class SubscriptionsPage extends Component {
   }
 
   render() {
-    const { tasks, subscriptions } = this.props;
+    const { tasks = [], subscriptions } = this.props;
     const { disconnected } = subscriptions;
     const taskInProgress = tasks.length > 0;
     const disableManifestActions = taskInProgress || disconnected;

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsActions.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 {
   UPSTREAM_SUBSCRIPTIONS_REQUEST,
@@ -27,12 +28,7 @@ export const loadUpstreamSubscriptions = (extendedParams = {}) => (dispatch) =>
         search: extendedParams.search,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: UPSTREAM_SUBSCRIPTIONS_FAILURE,
-        result,
-      });
-    });
+    .catch(result => dispatch(apiError(UPSTREAM_SUBSCRIPTIONS_FAILURE, result)));
 };
 
 export const saveUpstreamSubscriptions = upstreamSubscriptions => (dispatch) => {
@@ -50,12 +46,7 @@ export const saveUpstreamSubscriptions = upstreamSubscriptions => (dispatch) =>
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE,
-        result,
-      });
-    });
+    .catch(result => dispatch(apiError(SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE, result)));
 };
 
 export default loadUpstreamSubscriptions;

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

@@ -5,6 +5,7 @@ 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';
@@ -22,6 +23,7 @@ class UpstreamSubscriptionsPage extends Component {
     bindMethods(this, [
       'onChange',
       'saveUpstreamSubscriptions',
+      'quantityValidationInput',
     ]);
   }
 
@@ -31,18 +33,17 @@ class UpstreamSubscriptionsPage extends Component {
 
   onChange(value, rowData) {
     const { selectedRows } = this.state;
-    const newValue = parseInt(value, 10);
     const pool = {
       ...rowData,
       id: rowData.id,
-      updatedQuantity: newValue,
+      updatedQuantity: value,
       selected: true,
     };
 
     const match = this.poolInSelectedRows(pool);
     const index = _.indexOf(selectedRows, match);
 
-    if (newValue > 0) {
+    if (value) {
       if (match) {
         selectedRows.splice(index, 1, pool);
       } else {
@@ -55,6 +56,25 @@ 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;
 
@@ -64,16 +84,30 @@ 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: pool.updatedQuantity }),
+      pool => ({ ...pool, quantity: parseInt(pool.updatedQuantity, 10) }),
     );
 
     const updatedSubscriptions = { pools: updatedPools };
 
     this.props.saveUpstreamSubscriptions(updatedSubscriptions).then(() => {
-      const { task, error } = this.props.upstreamSubscriptions;
+      const { task } = this.props.upstreamSubscriptions;
 
       // TODO: could probably factor this out into a task response component
       if (task) {
@@ -88,18 +122,6 @@ 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' });
-        }
       }
     });
   }
@@ -121,7 +143,8 @@ class UpstreamSubscriptionsPage extends Component {
               <Button
                 bsStyle="primary"
                 type="submit"
-                disabled={upstreamSubscriptions.loading}
+                disabled={upstreamSubscriptions.loading ||
+                          !this.validateSelectedRows()}
                 onClick={this.saveUpstreamSubscriptions}
               >
                 {__('Submit')}
@@ -212,7 +235,19 @@ class UpstreamSubscriptionsPage extends Component {
 
     return (
       <Grid bsClass="container-fluid">
-        <h1>{__('Add Subscriptions')}</h1>
+        <BreadcrumbsBar data={{
+          isSwitchable: false,
+          breadcrumbItems: [
+            {
+              caption: __('Subscriptions'),
+              onClick: () => this.props.history.push('/subscriptions'),
+            },
+            {
+              caption: __('Add Subscriptions'),
+            },
+          ],
+        }}
+        />
 
         <LoadingState loading={upstreamSubscriptions.loading} loadingText={__('Loading')}>
           <Row>
@@ -240,8 +275,8 @@ UpstreamSubscriptionsPage.propTypes = {
   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;