katello 3.7.0 → 3.7.1

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

@@ -193,13 +193,9 @@ 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: __('New Subscription Allocation'),
-        url: 'http://redhat.com',
+        title: __('Import a Manifest to Begin'),
+        url: '/subscriptions',
       },
     });
 
@@ -270,7 +266,6 @@ class UpstreamSubscriptionsPage extends Component {
 }
 
 UpstreamSubscriptionsPage.propTypes = {
-  history: PropTypes.shape({ push: PropTypes.func }).isRequired,
   loadUpstreamSubscriptions: PropTypes.func.isRequired,
   saveUpstreamSubscriptions: PropTypes.func.isRequired,
   upstreamSubscriptions: PropTypes.shape({

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

@@ -10,6 +10,7 @@ jest.mock('foremanReact/components/BreadcrumbBar');
 
 describe('upstream subscriptions page', () => {
   let shallowWrapper;
+  const mockHistory = { push: () => {} };
   beforeEach(() => {
     shallowWrapper = shallow(<UpstreamSubscriptionsPage
       upstreamSubscriptions={successState}
@@ -18,7 +19,6 @@ describe('upstream subscriptions page', () => {
       history={mockHistory}
     />);
   });
-  const mockHistory = { push: () => {} };
 
   it('should render', async () => {
     expect(toJson(shallowWrapper)).toMatchSnapshot();

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

@@ -25,6 +25,7 @@ exports[`upstream subscriptions page should render 1`] = `
   <LoadingState
     loading={false}
     loadingText="Loading"
+    timeout={300}
   >
     <Row
       bsClass="row"
@@ -141,15 +142,11 @@ exports[`upstream subscriptions page should render 1`] = `
           emptyState={
             Object {
               "action": Object {
-                "title": "New Subscription Allocation",
-                "url": "http://redhat.com",
+                "title": "Import a Manifest to Begin",
+                "url": "/subscriptions",
               },
               "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",
             }
           }

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

@@ -10,9 +10,11 @@ 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__/__snapshots__/SubscriptionsPage.test.js.snap

@@ -53,6 +53,7 @@ exports[`subscriptions page should render 1`] = `
               >
                 <LinkContainer
                   activeClassName="active"
+                  disabled={false}
                   exact={false}
                   replace={false}
                   strict={false}
@@ -93,7 +94,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>
@@ -111,13 +112,23 @@ 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": Object {},
+              "availableQuantities": null,
               "itemCount": 81,
               "loading": false,
               "pagination": Object {
@@ -184,6 +195,7 @@ exports[`subscriptions page should render 1`] = `
               "tasks": Array [],
             }
           }
+          task={null}
           toggleDeleteButton={[Function]}
           updateQuantity={[Function]}
         />

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

@@ -10,7 +10,7 @@ export const initialState = Immutable({
   },
   itemCount: 0,
   quantitiesLoading: false,
-  availableQuantities: {},
+  availableQuantities: null,
   tasks: [],
 });
 
@@ -243,7 +243,7 @@ export const successState = Immutable({
   },
   itemCount: 81,
   quantitiesLoading: false,
-  availableQuantities: {},
+  availableQuantities: null,
   tasks: [],
 });
 
@@ -256,7 +256,7 @@ export const errorState = Immutable({
   itemCount: 0,
   results: [],
   quantitiesLoading: false,
-  availableQuantities: {},
+  availableQuantities: null,
   tasks: [],
 });
 
@@ -278,6 +278,7 @@ export const loadingQuantitiesState = Immutable({
 export const quantitiesErrorState = Immutable({
   ...successState,
   quantitiesLoading: false,
+  availableQuantities: {},
 });
 
 export const successActions = [

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

@@ -34,15 +34,18 @@ export const entitlementsInlineEditFormatter =
       );
     },
     renderEdit: (value, additionalData) => {
-      const { availableQuantity } = additionalData.rowData;
+      const { availableQuantity, availableQuantityLoaded } = additionalData.rowData;
 
       const className = inlineEditController.hasChanged(additionalData)
         ? 'editable editing changed'
         : 'editable editing';
 
-      const maxMessage = (availableQuantity < 1)
-        ? __('Unlimited')
-        : sprintf(__('Max %(availableQuantity)s'), { availableQuantity });
+      let maxMessage;
+      if (availableQuantityLoaded && (availableQuantity !== undefined)) {
+        maxMessage = (availableQuantity < 1)
+          ? __('Unlimited')
+          : sprintf(__('Max %(availableQuantity)s'), { availableQuantity });
+      }
 
       const validation = validateQuantity(value, availableQuantity);
 
@@ -55,7 +58,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={availableQuantity === undefined} size="xs">
+        <Spinner loading={!availableQuantityLoaded} size="xs">
           <FormGroup
             validationState={validation.state}
           >

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

@@ -11,19 +11,11 @@ import Dialog from '../../../../move_to_foreman/components/common/Dialog';
 import { recordsValid } from '../../SubscriptionValidations';
 import { createSubscriptionsTableSchema } from './SubscriptionsTableSchema';
 import { buildTableRows, groupSubscriptionsByProductId, buildPools } from './SubscriptionsTableHelpers';
-
-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',
-  },
-};
+import { renderTaskStartedToast } from '../../../Tasks/helpers';
+import {
+  BLOCKING_FOREMAN_TASK_TYPES,
+  MANIFEST_TASKS_BULK_SEARCH_ID,
+} from '../../SubscriptionConstants';
 
 class SubscriptionsTable extends Component {
   constructor(props) {
@@ -117,7 +109,15 @@ class SubscriptionsTable extends Component {
   confirmEdit() {
     this.showUpdateConfirm(false);
     if (Object.keys(this.state.updatedQuantity).length > 0) {
-      this.props.updateQuantity(buildPools(this.state.updatedQuantity));
+      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.enableEditing(false);
   }
@@ -140,8 +140,9 @@ class SubscriptionsTable extends Component {
   }
 
   render() {
-    const { subscriptions } = this.props;
+    const { subscriptions, emptyState } = this.props;
     const { groupedSubscriptions } = this.state;
+    const allSubscriptionResults = subscriptions.results;
 
     const groupingController = {
       isCollapseable: ({ rowData }) =>
@@ -185,7 +186,8 @@ class SubscriptionsTable extends Component {
       },
     };
 
-    const checkAllRowsSelected = () => this.state.rows.length === this.state.selectedRows.length;
+    const checkAllRowsSelected = () =>
+      allSubscriptionResults.length === this.state.selectedRows.length;
 
     const updateDeleteButton = () => {
       this.props.toggleDeleteButton(this.state.selectedRows.length > 0);
@@ -201,7 +203,7 @@ class SubscriptionsTable extends Component {
           );
         } else {
           this.setState(
-            { selectedRows: this.state.rows.map(row => row.id) },
+            { selectedRows: allSubscriptionResults.map(row => row.id) },
             updateDeleteButton,
           );
         }
@@ -229,7 +231,7 @@ class SubscriptionsTable extends Component {
     };
 
     let bodyMessage;
-    if (subscriptions.results.length === 0 && subscriptions.searchIsActive) {
+    if (allSubscriptionResults.length === 0 && subscriptions.searchIsActive) {
       bodyMessage = __('No subscriptions match your search criteria.');
     }
 
@@ -243,7 +245,7 @@ class SubscriptionsTable extends Component {
       <LoadingState loading={subscriptions.loading} loadingText={__('Loading')}>
         <ForemanTable
           columns={columnsDefinition}
-          emptyState={emptyStateData}
+          emptyState={emptyState}
           bodyMessage={bodyMessage}
           rows={this.state.rows}
           components={{
@@ -329,6 +331,7 @@ 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,
@@ -336,6 +339,13 @@ 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,15 +1,22 @@
 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: availableQuantities[subscription.id],
+      availableQuantity,
+      availableQuantityLoaded,
     };
   }
   return {
     ...subscription,
-    availableQuantity: availableQuantities[subscription.id],
+    availableQuantity,
+    availableQuantityLoaded,
   };
 };
 

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

@@ -97,9 +97,9 @@ export const createSubscriptionsTableSchema = (
     },
     cell: {
       formatters: [
-        cell => (
+        (value, { rowData }) => (
           <td>
-            <Icon type="fa" name={cell.virt_who ? 'check' : 'minus'} />
+            <Icon type="fa" name={rowData.virt_who ? 'check' : 'minus'} />
           </td>
         ),
       ],

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

@@ -0,0 +1,110 @@
+// import React from 'react';
+import { shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import editFormatter from '../EntitlementsInlineEditFormatter';
+
+describe('EntitlementsInlineEditFormatter', () => {
+  const data = rowData => ({
+    rowData,
+  });
+
+  const mockController = (options = {}) => {
+    const { editing = true, changed = false } = options;
+    return {
+      isEditing: () => editing,
+      hasChanged: () => changed,
+    };
+  };
+
+  describe('edit mode', () => {
+    describe('when available quantities are being loaded', () => {
+      it('renders spinner', async () => {
+        const controller = mockController();
+        const value = 100;
+        const formatter = editFormatter(controller)(value, data({
+          availableQuantityLoaded: false,
+        }));
+
+        expect(toJson(shallow(formatter))).toMatchSnapshot();
+      });
+    });
+
+    describe('when available quantities are loaded', () => {
+      it('renders edit field and max available', async () => {
+        const controller = mockController();
+        const value = 100;
+        const formatter = editFormatter(controller)(value, data({
+          availableQuantityLoaded: true,
+          availableQuantity: 500,
+        }));
+
+        expect(toJson(shallow(formatter))).toMatchSnapshot();
+      });
+
+      it('renders edit field and unlimited message', async () => {
+        const controller = mockController();
+        const value = 100;
+        const formatter = editFormatter(controller)(value, data({
+          availableQuantityLoaded: true,
+          availableQuantity: -1,
+        }));
+
+        expect(toJson(shallow(formatter))).toMatchSnapshot();
+      });
+
+      it('renders validation message', async () => {
+        const controller = mockController();
+        const value = 200;
+        const formatter = editFormatter(controller)(value, data({
+          availableQuantityLoaded: true,
+          availableQuantity: 100,
+        }));
+
+        expect(toJson(shallow(formatter))).toMatchSnapshot();
+      });
+
+      it('renders changed values', async () => {
+        const controller = mockController({ changed: true });
+        const value = 100;
+        const formatter = editFormatter(controller)(value, data({
+          availableQuantityLoaded: true,
+          availableQuantity: 200,
+        }));
+
+        expect(toJson(shallow(formatter))).toMatchSnapshot();
+      });
+    });
+
+    describe('when available quantities failed to load', () => {
+      it('renders just the edit field', async () => {
+        const controller = mockController();
+        const value = 200;
+        const formatter = editFormatter(controller)(value, data({
+          availableQuantityLoaded: true,
+        }));
+
+        expect(toJson(shallow(formatter))).toMatchSnapshot();
+      });
+    });
+  });
+
+  describe('value mode', () => {
+    it('renders the value', async () => {
+      const controller = mockController({ editing: false });
+      const value = 200;
+      const formatter = editFormatter(controller)(value, data({}));
+
+      expect(toJson(shallow(formatter))).toMatchSnapshot();
+    });
+
+    it('renders unlimited for -1', async () => {
+      const controller = mockController({ editing: false });
+      const value = 200;
+      const formatter = editFormatter(controller)(value, data({
+        available: -1,
+      }));
+
+      expect(toJson(shallow(formatter))).toMatchSnapshot();
+    });
+  });
+});