katello 3.10.2 → 3.11.0.rc1

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

@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Subscriptions selectors should select delete-button-disabled 1`] = `true`;
+
 exports[`Subscriptions selectors should select delete-modal-opened 1`] = `false`;
 
 exports[`Subscriptions selectors should select manifest-modal-opened 1`] = `false`;
@@ -13,11 +15,15 @@ Array [
 ]
 `;
 
+exports[`Subscriptions selectors should select task-modal-opened 1`] = `false`;
+
 exports[`Subscriptions selectors should select the subscriptions state 1`] = `
 Object {
+  "deleteButtonDisabled": true,
   "deleteModalOpened": false,
   "manifestModalOpened": false,
   "searchQuery": "some-query",
+  "taskModalOpened": false,
   "tasks": Array [
     "task1",
     "task2",

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

@@ -34,20 +34,22 @@ export const entitlementsInlineEditFormatter =
       );
     },
     renderEdit: (value, additionalData) => {
-      const { availableQuantity, availableQuantityLoaded } = additionalData.rowData;
+      const {
+        upstreamAvailable, upstreamAvailableLoaded, maxQuantity,
+      } = additionalData.rowData;
 
       const className = inlineEditController.hasChanged(additionalData)
         ? 'editable editing changed'
         : 'editable editing';
 
       let maxMessage;
-      if (availableQuantityLoaded && (availableQuantity !== undefined)) {
-        maxMessage = (availableQuantity < 1)
+      if (maxQuantity && upstreamAvailableLoaded && (upstreamAvailable !== undefined)) {
+        maxMessage = (upstreamAvailable < 0)
           ? __('Unlimited')
-          : sprintf(__('Max %(availableQuantity)s'), { availableQuantity });
+          : sprintf(__('Max %(maxQuantity)s'), { maxQuantity });
       }
 
-      const validation = validateQuantity(value, availableQuantity);
+      const validation = validateQuantity(value, maxQuantity);
 
       const formGroup = (
         // We have to block editing until available quantities are loaded.
@@ -58,7 +60,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={!upstreamAvailableLoaded} size="xs">
           <FormGroup
             validationState={validation.state}
           >

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

@@ -1,23 +1,36 @@
+const getMaxQuantity = (subscription, upstreamAvailable) => {
+  if (upstreamAvailable === -1) {
+    return upstreamAvailable;
+  }
+  return upstreamAvailable + subscription.quantity;
+};
+
 const buildTableRow = (subscription, availableQuantities, updatedQuantity) => {
-  const availableQuantityLoaded = !!availableQuantities;
-  const availableQuantity = availableQuantityLoaded
+  const upstreamAvailableLoaded = !!availableQuantities;
+  const upstreamAvailable = upstreamAvailableLoaded
     ? availableQuantities[subscription.id]
     : null;
 
+  let maxQuantity;
+  if (upstreamAvailableLoaded) {
+    maxQuantity = getMaxQuantity(subscription, upstreamAvailable);
+  }
+
+  const baseSubscription = {
+    ...subscription,
+    upstreamAvailable,
+    upstreamAvailableLoaded,
+    maxQuantity,
+  };
+
   if (updatedQuantity[subscription.id]) {
     return {
-      ...subscription,
+      ...baseSubscription,
       entitlementsChanged: true,
       quantity: updatedQuantity[subscription.id],
-      availableQuantity,
-      availableQuantityLoaded,
     };
   }
-  return {
-    ...subscription,
-    availableQuantity,
-    availableQuantityLoaded,
-  };
+  return baseSubscription;
 };
 
 const buildTableRowsFromGroup = (subscriptionGroup, availableQuantities, updatedQuantity) => {
@@ -36,7 +49,6 @@ const buildTableRowsFromGroup = (subscriptionGroup, availableQuantities, updated
 
 export const buildTableRows = (groupedSubscriptions, availableQuantities, updatedQuantity) => {
   const rows = [];
-
   Object.values(groupedSubscriptions).forEach(subscriptionGroup =>
     rows.push(...buildTableRowsFromGroup(subscriptionGroup, availableQuantities, updatedQuantity)));
 

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

@@ -22,7 +22,7 @@ describe('EntitlementsInlineEditFormatter', () => {
         const controller = mockController();
         const value = 100;
         const formatter = editFormatter(controller)(value, data({
-          availableQuantityLoaded: false,
+          upstreamAvailableLoaded: false,
         }));
 
         expect(toJson(shallow(formatter))).toMatchSnapshot();
@@ -34,8 +34,9 @@ describe('EntitlementsInlineEditFormatter', () => {
         const controller = mockController();
         const value = 100;
         const formatter = editFormatter(controller)(value, data({
-          availableQuantityLoaded: true,
-          availableQuantity: 500,
+          upstreamAvailableLoaded: true,
+          upstreamAvailable: 500,
+          maxQuantity: 600,
         }));
 
         expect(toJson(shallow(formatter))).toMatchSnapshot();
@@ -45,8 +46,9 @@ describe('EntitlementsInlineEditFormatter', () => {
         const controller = mockController();
         const value = 100;
         const formatter = editFormatter(controller)(value, data({
-          availableQuantityLoaded: true,
-          availableQuantity: -1,
+          upstreamAvailableLoaded: true,
+          upstreamAvailable: -1,
+          maxQuantity: -1,
         }));
 
         expect(toJson(shallow(formatter))).toMatchSnapshot();
@@ -56,8 +58,9 @@ describe('EntitlementsInlineEditFormatter', () => {
         const controller = mockController();
         const value = 200;
         const formatter = editFormatter(controller)(value, data({
-          availableQuantityLoaded: true,
-          availableQuantity: 100,
+          upstreamAvailableLoaded: true,
+          upstreamAvailable: 100,
+          maxQuantity: 150,
         }));
 
         expect(toJson(shallow(formatter))).toMatchSnapshot();
@@ -67,8 +70,9 @@ describe('EntitlementsInlineEditFormatter', () => {
         const controller = mockController({ changed: true });
         const value = 100;
         const formatter = editFormatter(controller)(value, data({
-          availableQuantityLoaded: true,
-          availableQuantity: 200,
+          upstreamAvailableLoaded: true,
+          upstreamAvailable: 200,
+          maxQuantity: 300,
         }));
 
         expect(toJson(shallow(formatter))).toMatchSnapshot();
@@ -80,7 +84,7 @@ describe('EntitlementsInlineEditFormatter', () => {
         const controller = mockController();
         const value = 200;
         const formatter = editFormatter(controller)(value, data({
-          availableQuantityLoaded: true,
+          upstreamAvailableLoaded: true,
         }));
 
         expect(toJson(shallow(formatter))).toMatchSnapshot();

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

@@ -0,0 +1,105 @@
+import Immutable from 'seamless-immutable';
+
+const groupedSubscriptions = Immutable({
+  RH00001: {
+    open: false,
+    subscriptions: [
+      {
+        id: 1,
+        name: 'Alpha',
+        quantity: 10,
+        consumed: 0,
+        product_id: 'RH00001',
+      },
+      {
+        id: 2,
+        name: 'Alpha',
+        quantity: 15,
+        consumed: 5,
+        product_id: 'RH00001',
+      },
+    ],
+  },
+  RH00002: {
+    open: false,
+    subscriptions: [
+      {
+        id: 3,
+        name: 'Charlie',
+        quantity: 10,
+        consumed: 0,
+        product_id: 'RH00002',
+      },
+    ],
+  },
+  RH00003: {
+    open: false,
+    subscriptions: [
+      {
+        id: 4,
+        name: 'Bravo',
+        quantity: 100,
+        consumed: 0,
+        product_id: 'RH00003',
+      },
+    ],
+  },
+  RH00004: {
+    open: false,
+    subscriptions: [
+      {
+        id: 5,
+        name: 'Delta',
+        quantity: 15,
+        consumed: 5,
+        product_id: 'RH00004',
+      },
+    ],
+  },
+});
+
+export const subOne = Immutable({
+  consumed: 0,
+  id: 1,
+  maxQuantity: 60,
+  name: 'Alpha',
+  product_id: 'RH00001',
+  quantity: 10,
+  upstreamAvailable: 50,
+  upstreamAvailableLoaded: true,
+});
+
+export const subTwo = Immutable({
+  consumed: 0,
+  id: 3,
+  maxQuantity: -1,
+  name: 'Charlie',
+  product_id: 'RH00002',
+  quantity: 10,
+  upstreamAvailable: -1,
+  upstreamAvailableLoaded: true,
+});
+
+export const subThree = Immutable({
+  consumed: 0,
+  id: 4,
+  maxQuantity: 200,
+  name: 'Bravo',
+  product_id: 'RH00003',
+  quantity: 100,
+  upstreamAvailable: 100,
+  upstreamAvailableLoaded: true,
+});
+
+export const subFour = Immutable({
+  consumed: 5,
+  id: 5,
+  maxQuantity: 65,
+  name: 'Delta',
+  product_id: 'RH00004',
+  quantity: 15,
+  upstreamAvailable: 50,
+  upstreamAvailableLoaded: true,
+});
+
+export default groupedSubscriptions;

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

@@ -7,7 +7,9 @@ import { successState, loadingState, emptyState } from '../../../__tests__/subsc
 import { loadSubscriptions, updateQuantity } from '../../../SubscriptionActions';
 
 jest.mock('../../../../../move_to_foreman/foreman_toast_notifications');
+jest.mock('foremanReact/components/Pagination/PaginationWrapper');
 jest.useFakeTimers();
+
 const tableColumns = [
   'id',
   'product_id',

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

@@ -0,0 +1,44 @@
+import groupedSubscriptions, { subOne, subTwo, subThree, subFour } from './SubscriptionsTable.fixtures';
+import { buildTableRows } from '../SubscriptionsTableHelpers';
+
+describe('Build Table Rows', () => {
+  it('should display correct maxQuantity', () => {
+    const availableQuantities = {
+      1: 50,
+      2: 50,
+      3: -1,
+      4: 100,
+      5: 50,
+    };
+
+    const rows = [subOne, subTwo, subThree, subFour];
+
+    expect(buildTableRows(groupedSubscriptions, availableQuantities, {}))
+      .toEqual(rows);
+  });
+
+  it('should update quantities', () => {
+    const availableQuantities = {
+      1: 50,
+      2: 50,
+      3: -1,
+      4: 100,
+      5: 50,
+    };
+
+    const updatedQuantities = {
+      1: 20,
+      4: 150,
+    };
+
+    const rows = [
+      { ...subOne, entitlementsChanged: true, quantity: 20 },
+      subTwo,
+      { ...subThree, entitlementsChanged: true, quantity: 150 },
+      subFour,
+    ];
+
+    expect(buildTableRows(groupedSubscriptions, availableQuantities, updatedQuantities))
+      .toEqual(rows);
+  });
+});

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

@@ -57,7 +57,7 @@ exports[`EntitlementsInlineEditFormatter edit mode when available quantities are
       <HelpBlock
         bsClass="help-block"
       >
-        Max 200
+        Max 300
         <div
           className="validationMessages"
         />
@@ -91,7 +91,7 @@ exports[`EntitlementsInlineEditFormatter edit mode when available quantities are
       <HelpBlock
         bsClass="help-block"
       >
-        Max 500
+        Max 600
         <div
           className="validationMessages"
         />
@@ -160,7 +160,7 @@ exports[`EntitlementsInlineEditFormatter edit mode when available quantities are
       <HelpBlock
         bsClass="help-block"
       >
-        Max 100
+        Max 150
         <div
           className="validationMessages"
         >

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap

@@ -209,231 +209,11 @@ exports[`subscriptions table should render a table 1`] = `
       </tr>
     </tbody>
   </table>
-  <form
-    class="content-view-pf-pagination table-view-pf-pagination clearfix"
-  >
-    <div
-      class="form-group"
-    >
-      <div
-        class="dropup pagination-pf-pagesize btn-group"
-      >
-        <button
-          aria-expanded="false"
-          aria-haspopup="true"
-          class="dropdown-toggle btn btn-default"
-          id="pagination-row-dropdown"
-          role="button"
-          type="button"
-        >
-          2 
-          <span
-            class="caret"
-          />
-        </button>
-        <ul
-          aria-labelledby="pagination-row-dropdown"
-          class="dropdown-menu"
-          role="menu"
-        >
-          <li
-            class=""
-            role="presentation"
-          >
-            <a
-              href="#"
-              role="menuitem"
-              tabindex="-1"
-            >
-              5
-            </a>
-          </li>
-          <li
-            class=""
-            role="presentation"
-          >
-            <a
-              href="#"
-              role="menuitem"
-              tabindex="-1"
-            >
-              10
-            </a>
-          </li>
-          <li
-            class=""
-            role="presentation"
-          >
-            <a
-              href="#"
-              role="menuitem"
-              tabindex="-1"
-            >
-              15
-            </a>
-          </li>
-          <li
-            class=""
-            role="presentation"
-          >
-            <a
-              href="#"
-              role="menuitem"
-              tabindex="-1"
-            >
-              20
-            </a>
-          </li>
-          <li
-            class=""
-            role="presentation"
-          >
-            <a
-              href="#"
-              role="menuitem"
-              tabindex="-1"
-            >
-              25
-            </a>
-          </li>
-          <li
-            class=""
-            role="presentation"
-          >
-            <a
-              href="#"
-              role="menuitem"
-              tabindex="-1"
-            >
-              50
-            </a>
-          </li>
-        </ul>
-      </div>
-      <span>
-        per page
-      </span>
-    </div>
-    <div
-      class="form-group"
-    >
-      <span>
-        <span
-          class="pagination-pf-items-current"
-        >
-          1-2
-        </span>
-         of 
-        <span
-          class="pagination-pf-items-total"
-        >
-          81
-        </span>
-      </span>
-      <ul
-        class="pagination pagination-pf-back"
-      >
-        <li
-          class="disabled"
-        >
-          <a
-            href="#"
-            title="First Page"
-          >
-            <span
-              aria-hidden="true"
-              class="fa fa-angle-double-left i"
-            />
-          </a>
-        </li>
-        <li
-          class="disabled"
-        >
-          <a
-            href="#"
-            title="Previous Page"
-          >
-            <span
-              aria-hidden="true"
-              class="fa fa-angle-left i"
-            />
-          </a>
-        </li>
-      </ul>
-      <label
-        class="sr-only control-label"
-      >
-        Current Page
-      </label>
-      <input
-        class="pagination-pf-page form-control"
-        type="text"
-        value="1"
-      />
-      <span>
-         of 
-        <span
-          class="pagination-pf-pages"
-        >
-          41
-        </span>
-      </span>
-      <ul
-        class="pagination pagination-pf-forward"
-      >
-        <li
-          class=""
-        >
-          <a
-            href="#"
-            title="Next Page"
-          >
-            <span
-              aria-hidden="true"
-              class="fa fa-angle-right i"
-            />
-          </a>
-        </li>
-        <li
-          class=""
-        >
-          <a
-            href="#"
-            title="Last Page"
-          >
-            <span
-              aria-hidden="true"
-              class="fa fa-angle-double-right i"
-            />
-          </a>
-        </li>
-      </ul>
-    </div>
-  </form>
 </div>
 `;
 
 exports[`subscriptions table should render an empty state 1`] = `
-<div
-  class="blank-slate-pf"
->
-  <div
-    class="blank-slate-pf-icon"
-  >
-    <span
-      aria-hidden="true"
-      class="pficon pficon-add-circle-o"
-    />
-  </div>
-  <h4
-    class="h1 blank-slate-pf-title"
-  >
-    Yay empty state
-  </h4>
-  <p
-    class="blank-slate-pf-info"
-  >
-    There is nothing to see here
-  </p>
+<div>
+  EmptyState: {"header":"Yay empty state","description":"There is nothing to see here"}
 </div>
 `;