katello 3.7.1.1 → 3.8.0.rc1

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

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

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

@@ -1,13 +1,11 @@
 import React from 'react';
-import { render, mount } from 'enzyme';
+import { render } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { MemoryRouter } from 'react-router-dom';
 import SubscriptionsTable from '../SubscriptionsTable';
 import { successState, loadingState, emptyState } from '../../../__tests__/subscriptions.fixtures';
 import { loadSubscriptions, updateQuantity } from '../../../SubscriptionActions';
 
-jest.mock('../../../../../move_to_foreman/foreman_toast_notifications');
-jest.useFakeTimers();
 describe('subscriptions table', () => {
   it('should render a table', async () => {
     // Wrapping SubscriptionTable in MemoryRouter here since it contains
@@ -22,23 +20,16 @@ describe('subscriptions table', () => {
             onSubscriptionDeleteModalClose={() => { }}
             onDeleteSubscriptions={() => {}}
             toggleDeleteButton={() => {}}
-            emptyState={{}}
           />
                         </MemoryRouter>);
     expect(toJson(page)).toMatchSnapshot();
   });
+  /* eslint-enable react/jsx-indent */
 
   it('should render an empty state', async () => {
-    const emptyStateData = {
-      header: __('Yay empty state'),
-      description: __('There is nothing to see here'),
-    };
-
-    /* eslint-disable react/jsx-indent */
     const page = render(<MemoryRouter>
       <SubscriptionsTable
         subscriptions={emptyState}
-        emptyState={emptyStateData}
         loadSubscriptions={loadSubscriptions}
         updateQuantity={updateQuantity}
         subscriptionDeleteModalOpen={false}
@@ -49,10 +40,9 @@ describe('subscriptions table', () => {
                         </MemoryRouter>);
     expect(toJson(page)).toMatchSnapshot();
   });
-  /* eslint-enable react/jsx-indent */
 
   it('should render a loading state', async () => {
-    const page = mount(<SubscriptionsTable
+    const page = render(<SubscriptionsTable
       subscriptions={loadingState}
       loadSubscriptions={loadSubscriptions}
       updateQuantity={updateQuantity}
@@ -60,10 +50,7 @@ describe('subscriptions table', () => {
       onSubscriptionDeleteModalClose={() => { }}
       onDeleteSubscriptions={() => {}}
       toggleDeleteButton={() => {}}
-      emptyState={{}}
     />);
-    jest.runAllTimers();
-    page.update();
     expect(toJson(page)).toMatchSnapshot();
   });
 });

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

@@ -1,457 +1,430 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`subscriptions table should render a loading state 1`] = `
-<SubscriptionsTable
-  emptyState={Object {}}
-  loadSubscriptions={[Function]}
-  onDeleteSubscriptions={[Function]}
-  onSubscriptionDeleteModalClose={[Function]}
-  subscriptionDeleteModalOpen={false}
-  subscriptions={
-    Object {
-      "availableQuantities": null,
-      "itemCount": 0,
-      "loading": true,
-      "pagination": Object {
-        "page": 0,
-        "perPage": 20,
-      },
-      "quantitiesLoading": false,
-      "results": Array [],
-      "tasks": Array [],
-    }
-  }
-  task={
-    Object {
-      "humanized": Object {},
-    }
-  }
-  toggleDeleteButton={[Function]}
-  updateQuantity={[Function]}
+<div
+  class="loading-state"
 >
-  <LoadingState
-    loading={true}
-    loadingText="Loading"
-    timeout={300}
-  >
-    <div
-      className="loading-state"
-    >
-      <Spinner
-        className=""
-        inline={false}
-        inverse={false}
-        loading={true}
-        size="lg"
-      >
-        <div
-          className="spinner spinner-lg"
-        />
-      </Spinner>
-      <p>
-        Loading
-      </p>
-    </div>
-  </LoadingState>
-</SubscriptionsTable>
+  <div
+    class="spinner spinner-lg"
+  />
+  <p>
+    Loading
+  </p>
+</div>
 `;
 
 exports[`subscriptions table should render a table 1`] = `
-<div>
-  <table
-    class="table table-striped table-bordered table-hover pf-table-inline-edit table-fixed"
-  >
-    <thead>
-      <tr
-        class=""
-      >
-        <th
-          aria-label="Select all rows"
-          class="table-view-pf-select"
-        >
-          <label
-            class="control-label sr-only"
-            for="selectAll"
-          >
-            Select all rows
-          </label>
-          <input
-            id="selectAll"
-            type="checkbox"
-          />
-        </th>
-        <th
-          class=""
-        >
-          Name
-        </th>
-        <th
-          class=""
-        >
-          SKU
-        </th>
-        <th
-          class=""
-        >
-          Contract
-        </th>
-        <th
-          class=""
-        >
-          Start Date
-        </th>
-        <th
-          class=""
-        >
-          End Date
-        </th>
-        <th
-          class=""
-        >
-          Requires Virt-Who
-        </th>
-        <th
-          class=""
-        >
-          Consumed
-        </th>
-        <th
+Array [
+  <div />,
+  <div>
+    <table
+      class="table table-striped table-bordered table-hover pf-table-inline-edit table-fixed"
+    >
+      <thead>
+        <tr
           class=""
         >
-          Entitlements
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr
-        class=""
-      >
-        <td
-          class="table-view-pf-select"
-        >
-          <label
-            class="control-label sr-only"
-            for="select0"
+          <th
+            aria-label="Select all rows"
+            class="table-view-pf-select"
           >
-            Select row
-          </label>
-          <input
-            id="select0"
-            type="checkbox"
-          />
-        </td>
-        <td>
-          <a
-            href="/subscriptions/3/"
+            <label
+              class="control-label sr-only"
+              for="selectAll"
+            >
+              Select all rows
+            </label>
+            <input
+              id="selectAll"
+              type="checkbox"
+            />
+          </th>
+          <th
+            class=""
           >
-            zoo
-          </a>
-        </td>
-        <td
-          class=""
-        >
-          853987721546
-        </td>
-        <td
-          class=""
-        />
-        <td
-          class=""
-        >
-          2017-09-21 16:18:44 -0400
-        </td>
-        <td
-          class=""
-        >
-          2047-09-14 15:18:44 -0500
-        </td>
-        <td>
-          <span
-            aria-hidden="true"
-            class="fa fa-minus"
-          />
-        </td>
-        <td
+            Name
+          </th>
+          <th
+            class=""
+          >
+            SKU
+          </th>
+          <th
+            class=""
+          >
+            Contract
+          </th>
+          <th
+            class=""
+          >
+            Start Date
+          </th>
+          <th
+            class=""
+          >
+            End Date
+          </th>
+          <th
+            class=""
+          >
+            Requires Virt-Who
+          </th>
+          <th
+            class=""
+          >
+            Consumed
+          </th>
+          <th
+            class=""
+          >
+            Entitlements
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr
           class=""
         >
-          1
-        </td>
-        <td>
-          Unlimited
-        </td>
-      </tr>
-      <tr
-        class=""
-      >
-        <td
-          class="table-view-pf-select"
-        >
-          <label
-            class="control-label sr-only"
-            for="select1"
+          <td
+            class="table-view-pf-select"
+          >
+            <label
+              class="control-label sr-only"
+              for="select0"
+            >
+              Select row
+            </label>
+            <input
+              id="select0"
+              type="checkbox"
+            />
+          </td>
+          <td>
+            <a
+              href="/subscriptions/3/"
+            >
+              zoo
+            </a>
+          </td>
+          <td
+            class=""
           >
-            Select row
-          </label>
-          <input
-            id="select1"
-            type="checkbox"
+            853987721546
+          </td>
+          <td
+            class=""
           />
-        </td>
-        <td>
-          <a
-            href="/subscriptions/4/"
+          <td
+            class=""
           >
-            hsdfhsdh
-          </a>
-        </td>
-        <td
-          class=""
-        >
-          947637693017
-        </td>
-        <td
-          class=""
-        />
-        <td
-          class=""
-        >
-          2017-09-25 17:54:36 -0400
-        </td>
-        <td
+            2017-09-21 16:18:44 -0400
+          </td>
+          <td
+            class=""
+          >
+            2047-09-14 15:18:44 -0500
+          </td>
+          <td>
+            <span
+              aria-hidden="true"
+              class="fa fa-minus"
+            />
+          </td>
+          <td
+            class=""
+          >
+            1
+          </td>
+          <td>
+            Unlimited
+          </td>
+        </tr>
+        <tr
           class=""
         >
-          2047-09-18 16:54:36 -0500
-        </td>
-        <td>
-          <span
-            aria-hidden="true"
-            class="fa fa-minus"
+          <td
+            class="table-view-pf-select"
+          >
+            <label
+              class="control-label sr-only"
+              for="select1"
+            >
+              Select row
+            </label>
+            <input
+              id="select1"
+              type="checkbox"
+            />
+          </td>
+          <td>
+            <a
+              href="/subscriptions/4/"
+            >
+              hsdfhsdh
+            </a>
+          </td>
+          <td
+            class=""
+          >
+            947637693017
+          </td>
+          <td
+            class=""
           />
-        </td>
-        <td
-          class=""
-        >
-          0
-        </td>
-        <td>
-          Unlimited
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <form
-    class="content-view-pf-pagination table-view-pf-pagination clearfix"
-  >
-    <div
-      class="form-group"
+          <td
+            class=""
+          >
+            2017-09-25 17:54:36 -0400
+          </td>
+          <td
+            class=""
+          >
+            2047-09-18 16:54:36 -0500
+          </td>
+          <td>
+            <span
+              aria-hidden="true"
+              class="fa fa-minus"
+            />
+          </td>
+          <td
+            class=""
+          >
+            0
+          </td>
+          <td>
+            Unlimited
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <form
+      class="content-view-pf-pagination table-view-pf-pagination clearfix"
     >
       <div
-        class="dropup pagination-pf-pagesize btn-group"
+        class="form-group"
       >
-        <button
-          aria-expanded="false"
-          aria-haspopup="true"
-          class="dropdown-toggle btn btn-default"
-          id="pagination-row-dropdown"
-          role="button"
-          type="button"
+        <div
+          class="dropup pagination-pf-pagesize btn-group"
         >
-          2 
+          <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"
+              >
+                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="caret"
-          />
-        </button>
+            class="pagination-pf-items-current"
+          >
+            1-2
+          </span>
+           of 
+          <span
+            class="pagination-pf-items-total"
+          >
+            81
+          </span>
+        </span>
         <ul
-          aria-labelledby="pagination-row-dropdown"
-          class="dropdown-menu"
-          role="menu"
+          class="pagination pagination-pf-back"
         >
           <li
-            class=""
-            role="presentation"
+            class="disabled"
           >
             <a
               href="#"
-              role="menuitem"
-              tabindex="-1"
+              title="First Page"
             >
-              5
+              <span
+                aria-hidden="true"
+                class="fa fa-angle-double-left i"
+              />
             </a>
           </li>
           <li
-            class=""
-            role="presentation"
+            class="disabled"
           >
             <a
               href="#"
-              role="menuitem"
-              tabindex="-1"
+              title="Previous Page"
             >
-              10
+              <span
+                aria-hidden="true"
+                class="fa fa-angle-left i"
+              />
             </a>
           </li>
-          <li
-            class=""
-            role="presentation"
+        </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"
           >
-            <a
-              href="#"
-              role="menuitem"
-              tabindex="-1"
-            >
-              15
-            </a>
-          </li>
+            41
+          </span>
+        </span>
+        <ul
+          class="pagination pagination-pf-forward"
+        >
           <li
             class=""
-            role="presentation"
           >
             <a
               href="#"
-              role="menuitem"
-              tabindex="-1"
+              title="Next Page"
             >
-              25
+              <span
+                aria-hidden="true"
+                class="fa fa-angle-right i"
+              />
             </a>
           </li>
           <li
             class=""
-            role="presentation"
           >
             <a
               href="#"
-              role="menuitem"
-              tabindex="-1"
+              title="Last Page"
             >
-              50
+              <span
+                aria-hidden="true"
+                class="fa fa-angle-double-right i"
+              />
             </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>
+    </form>
+  </div>,
+]
 `;
 
 exports[`subscriptions table should render an empty state 1`] = `
-<div
-  class="blank-slate-pf"
->
+Array [
+  <div />,
   <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"
+    class="blank-slate-pf"
   >
-    There is nothing to see here
-  </p>
-</div>
+    <div
+      class="blank-slate-pf-icon"
+    >
+      <span
+        aria-hidden="true"
+        class="pficon pficon-add-circle-o"
+      />
+    </div>
+    <h4
+      class="h1 blank-slate-pf-title"
+    >
+      There are no Subscriptions to display
+    </h4>
+    <p
+      class="blank-slate-pf-info"
+    >
+      Add Subscriptions to this Allocation to manage your Entitlements.
+    </p>
+    <div
+      class="blank-slate-pf-main-action"
+    >
+      <a
+        class="btn btn-lg btn-primary"
+        href="subscriptions/add"
+      >
+        Add Subscriptions
+      </a>
+    </div>
+  </div>,
+]
 `;