katello 3.7.1.1 → 3.8.0.rc1

data/webpack/scenes/Subscriptions/__tests__/SubscriptionsPage.test.js

@@ -10,11 +10,9 @@ jest.mock('../../../move_to_foreman/foreman_toast_notifications');
 
 describe('subscriptions page', () => {
   const noop = () => {};
-  const organization = { owner_details: { upstreamConsumer: 'blah' } };
 
   it('should render', async () => {
     const page = shallow(<SubscriptionsPage
-      organization={organization}
       subscriptions={successState}
       loadSetting={loadSetting}
       loadSubscriptions={loadSubscriptions}

data/webpack/scenes/Subscriptions/__tests__/SubscriptionsReducer.test.js

@@ -34,18 +34,14 @@ describe('subscriptions reducer', () => {
   it('should have error on SUBSCRIPTIONS_FAILURE', () => {
     expect(reducer(initialState, {
       type: types.SUBSCRIPTIONS_FAILURE,
-      payload: {
-        message: 'Unable to process request.',
-      },
+      error: 'Unable to process request.',
     })).toEqual(errorState);
   });
 
   it('should have error on UPDATE_QUANTITY_FAILURE', () => {
     expect(reducer(initialState, {
       type: types.UPDATE_QUANTITY_FAILURE,
-      payload: {
-        message: 'Unable to process request.',
-      },
+      error: 'Unable to process request.',
     })).toEqual(errorState);
   });
 
@@ -65,9 +61,7 @@ describe('subscriptions reducer', () => {
   it('should have error on SUBSCRIPTIONS_QUANTITIES_FAILURE', () => {
     expect(reducer(successState, {
       type: types.SUBSCRIPTIONS_QUANTITIES_FAILURE,
-      payload: {
-        message: 'Unable to process request.',
-      },
+      error: 'Unable to process request.',
     })).toEqual(quantitiesErrorState);
   });
 });

data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsPage.test.js.snap

@@ -53,7 +53,6 @@ exports[`subscriptions page should render 1`] = `
               >
                 <LinkContainer
                   activeClassName="active"
-                  disabled={false}
                   exact={false}
                   replace={false}
                   strict={false}
@@ -94,7 +93,7 @@ exports[`subscriptions page should render 1`] = `
                   title="Delete"
                   tooltipId="delete-subscriptions-button-tooltip"
                   tooltipPlacement="top"
-                  tooltipText="This is disabled because no subscriptions are selected."
+                  tooltipText="This is disabled because no subscriptions are selected"
                 />
               </FormGroup>
             </div>
@@ -112,23 +111,13 @@ exports[`subscriptions page should render 1`] = `
         id="subscriptions-table"
       >
         <SubscriptionsTable
-          emptyState={
-            Object {
-              "action": Object {
-                "onClick": [Function],
-                "title": "Import a Manifest",
-              },
-              "description": "Import a Manifest to manage your Entitlements.",
-              "header": "There are no Subscriptions to display",
-            }
-          }
           loadSubscriptions={[Function]}
           onDeleteSubscriptions={[Function]}
           onSubscriptionDeleteModalClose={[Function]}
           subscriptionDeleteModalOpen={false}
           subscriptions={
             Object {
-              "availableQuantities": null,
+              "availableQuantities": Object {},
               "itemCount": 81,
               "loading": false,
               "pagination": Object {
@@ -195,7 +184,6 @@ exports[`subscriptions page should render 1`] = `
               "tasks": Array [],
             }
           }
-          task={null}
           toggleDeleteButton={[Function]}
           updateQuantity={[Function]}
         />

data/webpack/scenes/Subscriptions/__tests__/subscriptions.fixtures.js

@@ -1,5 +1,4 @@
 import Immutable from 'seamless-immutable';
-import { toastErrorAction, failureAction } from '../../../services/api/testHelpers';
 
 export const initialState = Immutable({
   loading: true,
@@ -10,7 +9,7 @@ export const initialState = Immutable({
   },
   itemCount: 0,
   quantitiesLoading: false,
-  availableQuantities: null,
+  availableQuantities: {},
   tasks: [],
 });
 
@@ -243,12 +242,13 @@ export const successState = Immutable({
   },
   itemCount: 81,
   quantitiesLoading: false,
-  availableQuantities: null,
+  availableQuantities: {},
   tasks: [],
 });
 
 export const errorState = Immutable({
   loading: false,
+  error: 'Unable to process request.',
   pagination: {
     page: 0,
     perPage: 20,
@@ -256,7 +256,7 @@ export const errorState = Immutable({
   itemCount: 0,
   results: [],
   quantitiesLoading: false,
-  availableQuantities: null,
+  availableQuantities: {},
   tasks: [],
 });
 
@@ -278,7 +278,7 @@ export const loadingQuantitiesState = Immutable({
 export const quantitiesErrorState = Immutable({
   ...successState,
   quantitiesLoading: false,
-  availableQuantities: {},
+  quantitiesError: 'Unable to process request.',
 });
 
 export const successActions = [
@@ -310,8 +310,10 @@ export const failureActions = [
   {
     type: 'SUBSCRIPTIONS_REQUEST',
   },
-  failureAction('SUBSCRIPTIONS_FAILURE'),
-  toastErrorAction(),
+  {
+    error: 'Request failed with status code 422',
+    type: 'SUBSCRIPTIONS_FAILURE',
+  },
 ];
 
 export const poolsUpdate = [{
@@ -338,16 +340,20 @@ export const updateQuantityFailureActions = [
     type: 'UPDATE_QUANTITY_REQUEST',
     quantities: poolsUpdate,
   },
-  failureAction('UPDATE_QUANTITY_FAILURE'),
-  toastErrorAction(),
+  {
+    error: 'Request failed with status code 422',
+    type: 'UPDATE_QUANTITY_FAILURE',
+  },
 ];
 
 export const loadQuantitiesFailureActions = [
   {
     type: 'SUBSCRIPTIONS_QUANTITIES_REQUEST',
   },
-  failureAction('SUBSCRIPTIONS_QUANTITIES_FAILURE', 'Request failed with status code 500'),
-  toastErrorAction('Request failed with status code 500'),
+  {
+    error: 'Request failed with status code 500',
+    type: 'SUBSCRIPTIONS_QUANTITIES_FAILURE',
+  },
 ];
 
 export const loadQuantitiesSuccessActions = [

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/EntitlementsInlineEditFormatter.js

@@ -34,18 +34,15 @@ export const entitlementsInlineEditFormatter =
       );
     },
     renderEdit: (value, additionalData) => {
-      const { availableQuantity, availableQuantityLoaded } = additionalData.rowData;
+      const { availableQuantity } = additionalData.rowData;
 
       const className = inlineEditController.hasChanged(additionalData)
         ? 'editable editing changed'
         : 'editable editing';
 
-      let maxMessage;
-      if (availableQuantityLoaded && (availableQuantity !== undefined)) {
-        maxMessage = (availableQuantity < 1)
-          ? __('Unlimited')
-          : sprintf(__('Max %(availableQuantity)s'), { availableQuantity });
-      }
+      const maxMessage = (availableQuantity < 1)
+        ? __('Unlimited')
+        : sprintf(__('Max %(availableQuantity)s'), { availableQuantity });
 
       const validation = validateQuantity(value, availableQuantity);
 
@@ -58,7 +55,7 @@ export const entitlementsInlineEditFormatter =
         // The same issue prevents from correct switching inputs on TAB.
         // See the reactabular code for details:
         // https://github.com/reactabular/reactabular/blob/master/packages/reactabular-table/src/body-row.js#L58
-        <Spinner loading={!availableQuantityLoaded} size="xs">
+        <Spinner loading={availableQuantity === undefined} size="xs">
           <FormGroup
             validationState={validation.state}
           >

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { sprintf } from 'jed';
 import { cloneDeep, findIndex, isEqual } from 'lodash';
-import { Table } from 'patternfly-react';
+import { Table, Alert } from 'patternfly-react';
 import { LoadingState } from '../../../../move_to_pf/LoadingState';
 import { Table as ForemanTable, TableBody as ForemanTableBody } from '../../../../move_to_foreman/components/common/table';
 import ConfirmDialog from '../../../../move_to_foreman/components/common/ConfirmDialog';
@@ -11,11 +11,36 @@ import Dialog from '../../../../move_to_foreman/components/common/Dialog';
 import { recordsValid } from '../../SubscriptionValidations';
 import { createSubscriptionsTableSchema } from './SubscriptionsTableSchema';
 import { buildTableRows, groupSubscriptionsByProductId, buildPools } from './SubscriptionsTableHelpers';
-import { renderTaskStartedToast } from '../../../Tasks/helpers';
-import {
-  BLOCKING_FOREMAN_TASK_TYPES,
-  MANIFEST_TASKS_BULK_SEARCH_ID,
-} from '../../SubscriptionConstants';
+
+const emptyStateData = {
+  header: __('There are no Subscriptions to display'),
+  description: __('Add Subscriptions to this Allocation to manage your Entitlements.'),
+  documentation: {
+    title: __('Learn more about adding Subscriptions to Allocations'),
+    url: 'http://redhat.com',
+  },
+  action: {
+    title: __('Add Subscriptions'),
+    url: 'subscriptions/add',
+  },
+};
+
+const ErrorAlerts = ({ errors }) => {
+  const alerts = errors.filter(Boolean).map(e => (
+    <Alert type={Alert.ALERT_TYPE_ERROR} key={e}>
+      <span>{e}</span>
+    </Alert>
+  ));
+
+  return (
+    <div>
+      {alerts}
+    </div>
+  );
+};
+ErrorAlerts.propTypes = {
+  errors: PropTypes.arrayOf(PropTypes.string).isRequired,
+};
 
 class SubscriptionsTable extends Component {
   constructor(props) {
@@ -24,7 +49,7 @@ class SubscriptionsTable extends Component {
     this.state = {
       rows: undefined,
       subscriptions: undefined,
-      groupedSubscriptions: undefined,
+      groupdSubscriptions: undefined,
       updatedQuantity: {},
       editing: false,
       showUpdateConfirmDialog: false,
@@ -39,14 +64,14 @@ class SubscriptionsTable extends Component {
       nextProps.subscriptions !== undefined &&
       !isEqual(nextProps.subscriptions, prevState.subscriptions)
     ) {
-      const groupedSubscriptions = groupSubscriptionsByProductId(nextProps.subscriptions);
+      const groupdSubscriptions = groupSubscriptionsByProductId(nextProps.subscriptions);
       const rows = buildTableRows(
-        groupedSubscriptions,
+        groupdSubscriptions,
         nextProps.subscriptions.availableQuantities,
         prevState.updatedQuantity,
       );
 
-      return { rows, groupedSubscriptions, subscriptions: nextProps.subscriptions };
+      return { rows, groupdSubscriptions, subscriptions: nextProps.subscriptions };
     }
 
     return null;
@@ -54,19 +79,19 @@ class SubscriptionsTable extends Component {
 
   toggleSubscriptionGroup(groupId) {
     const { subscriptions } = this.props;
-    const { groupedSubscriptions, updatedQuantity } = this.state;
-    const { open } = groupedSubscriptions[groupId];
+    const { groupdSubscriptions, updatedQuantity } = this.state;
+    const { open } = groupdSubscriptions[groupId];
 
-    groupedSubscriptions[groupId].open = !open;
+    groupdSubscriptions[groupId].open = !open;
 
 
     const rows = buildTableRows(
-      groupedSubscriptions,
+      groupdSubscriptions,
       subscriptions.availableQuantities,
       updatedQuantity,
     );
 
-    this.setState({ rows, groupedSubscriptions });
+    this.setState({ rows, groupdSubscriptions });
   }
 
   enableEditing(editingState) {
@@ -77,11 +102,11 @@ class SubscriptionsTable extends Component {
   }
 
   updateRows(updatedQuantity) {
-    const { groupedSubscriptions } = this.state;
+    const { groupdSubscriptions } = this.state;
     const { subscriptions } = this.props;
 
     const rows = buildTableRows(
-      groupedSubscriptions,
+      groupdSubscriptions,
       subscriptions.availableQuantities,
       updatedQuantity,
     );
@@ -109,15 +134,7 @@ class SubscriptionsTable extends Component {
   confirmEdit() {
     this.showUpdateConfirm(false);
     if (Object.keys(this.state.updatedQuantity).length > 0) {
-      this.props.updateQuantity(buildPools(this.state.updatedQuantity))
-        .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.task));
+      this.props.updateQuantity(buildPools(this.state.updatedQuantity));
     }
     this.enableEditing(false);
   }
@@ -140,17 +157,16 @@ class SubscriptionsTable extends Component {
   }
 
   render() {
-    const { subscriptions, emptyState } = this.props;
-    const { groupedSubscriptions } = this.state;
-    const allSubscriptionResults = subscriptions.results;
+    const { subscriptions } = this.props;
+    const { groupdSubscriptions } = this.state;
 
     const groupingController = {
       isCollapseable: ({ rowData }) =>
         // it is the first subscription in the group
-        rowData.id === groupedSubscriptions[rowData.product_id].subscriptions[0].id &&
+        rowData.id === groupdSubscriptions[rowData.product_id].subscriptions[0].id &&
         // the group contains more then one subscription
-        groupedSubscriptions[rowData.product_id].subscriptions.length > 1,
-      isCollapsed: ({ rowData }) => !groupedSubscriptions[rowData.product_id].open,
+        groupdSubscriptions[rowData.product_id].subscriptions.length > 1,
+      isCollapsed: ({ rowData }) => !groupdSubscriptions[rowData.product_id].open,
       toggle: ({ rowData }) => this.toggleSubscriptionGroup(rowData.product_id),
     };
 
@@ -186,8 +202,7 @@ class SubscriptionsTable extends Component {
       },
     };
 
-    const checkAllRowsSelected = () =>
-      allSubscriptionResults.length === this.state.selectedRows.length;
+    const checkAllRowsSelected = () => this.state.rows.length === this.state.selectedRows.length;
 
     const updateDeleteButton = () => {
       this.props.toggleDeleteButton(this.state.selectedRows.length > 0);
@@ -203,7 +218,7 @@ class SubscriptionsTable extends Component {
           );
         } else {
           this.setState(
-            { selectedRows: allSubscriptionResults.map(row => row.id) },
+            { selectedRows: this.state.rows.map(row => row.id) },
             updateDeleteButton,
           );
         }
@@ -231,7 +246,7 @@ class SubscriptionsTable extends Component {
     };
 
     let bodyMessage;
-    if (allSubscriptionResults.length === 0 && subscriptions.searchIsActive) {
+    if (subscriptions.results.length === 0 && subscriptions.searchIsActive) {
       bodyMessage = __('No subscriptions match your search criteria.');
     }
 
@@ -243,9 +258,15 @@ class SubscriptionsTable extends Component {
 
     return (
       <LoadingState loading={subscriptions.loading} loadingText={__('Loading')}>
+        <ErrorAlerts
+          errors={[
+            subscriptions.error,
+            subscriptions.quantitiesError,
+          ]}
+        />
         <ForemanTable
           columns={columnsDefinition}
-          emptyState={emptyState}
+          emptyState={emptyStateData}
           bodyMessage={bodyMessage}
           rows={this.state.rows}
           components={{
@@ -331,7 +352,6 @@ class SubscriptionsTable extends Component {
 SubscriptionsTable.propTypes = {
   loadSubscriptions: PropTypes.func.isRequired,
   updateQuantity: PropTypes.func.isRequired,
-  emptyState: PropTypes.shape({}).isRequired,
   subscriptions: PropTypes.shape({
     results: PropTypes.array,
   }).isRequired,
@@ -339,13 +359,6 @@ SubscriptionsTable.propTypes = {
   onDeleteSubscriptions: PropTypes.func.isRequired,
   onSubscriptionDeleteModalClose: PropTypes.func.isRequired,
   toggleDeleteButton: PropTypes.func.isRequired,
-  task: PropTypes.shape({}),
-  bulkSearch: PropTypes.func,
-};
-
-SubscriptionsTable.defaultProps = {
-  task: { humanized: {} },
-  bulkSearch: undefined,
 };
 
 export default SubscriptionsTable;

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers.js

@@ -1,22 +1,15 @@
 const buildTableRow = (subscription, availableQuantities, updatedQuantity) => {
-  const availableQuantityLoaded = !!availableQuantities;
-  const availableQuantity = availableQuantityLoaded
-    ? availableQuantities[subscription.id]
-    : null;
-
   if (updatedQuantity[subscription.id]) {
     return {
       ...subscription,
       entitlementsChanged: true,
       quantity: updatedQuantity[subscription.id],
-      availableQuantity,
-      availableQuantityLoaded,
+      availableQuantity: availableQuantities[subscription.id],
     };
   }
   return {
     ...subscription,
-    availableQuantity,
-    availableQuantityLoaded,
+    availableQuantity: availableQuantities[subscription.id],
   };
 };
 
@@ -34,10 +27,10 @@ const buildTableRowsFromGroup = (subscriptionGroup, availableQuantities, updated
   return [buildTableRow(firstSubscription, availableQuantities, updatedQuantity)];
 };
 
-export const buildTableRows = (groupedSubscriptions, availableQuantities, updatedQuantity) => {
+export const buildTableRows = (groupdSubscriptions, availableQuantities, updatedQuantity) => {
   const rows = [];
 
-  Object.values(groupedSubscriptions).forEach(subscriptionGroup =>
+  Object.values(groupdSubscriptions).forEach(subscriptionGroup =>
     rows.push(...buildTableRowsFromGroup(subscriptionGroup, availableQuantities, updatedQuantity)));
 
   return rows;