katello 3.16.0.rc3.1 → 3.16.0.rc4

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

@@ -5,9 +5,7 @@ import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
 import { mockRequest, mockErrorRequest, mockReset } from '../../../mockRequest';
 import {
   requestSuccessResponse,
-  requestSuccessResponseWithRHSubscriptions,
   successActions,
-  successActionsWithQuantityLoad,
   failureActions,
   updateQuantitySuccessActions,
   updateQuantityFailureActions,
@@ -78,17 +76,6 @@ describe('subscription actions', () => {
         expect(store.getActions()).toEqual(successActions);
       },
     );
-    it(
-      'creates SUBSCRIPTIONS_REQUEST and triggers loadAvailableQuantities when there is some RH subscription',
-      async () => {
-        mockRequest({
-          url: '/katello/api/v2/subscriptions',
-          response: requestSuccessResponseWithRHSubscriptions,
-        });
-        await store.dispatch(loadSubscriptions());
-        expect(store.getActions()).toEqual(successActionsWithQuantityLoad);
-      },
-    );
   });
 
   describe('updateQuantity', () => {

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

@@ -4,7 +4,8 @@ import toJson from 'enzyme-to-json';
 import { loadSetting } from 'foremanReact/components/Settings/SettingsActions';
 import SubscriptionsPage from '../SubscriptionsPage';
 import { successState, settingsSuccessState, permissionDeniedState } from './subscriptions.fixtures';
-import { loadSubscriptions, updateQuantity, loadTableColumns } from '../SubscriptionActions';
+import { loadAvailableQuantities, loadSubscriptions, updateQuantity, loadTableColumns } from '../SubscriptionActions';
+import { pingUpstreamSubscriptions } from '../UpstreamSubscriptions/UpstreamSubscriptionsActions';
 import { createColumns, updateColumns } from '../../../scenes/Settings/Tables/TableActions';
 
 jest.mock('foremanReact/components/PermissionDenied');
@@ -40,6 +41,8 @@ describe('subscriptions page', () => {
     createColumns={createColumns}
     updateColumns={updateColumns}
     loadSubscriptions={loadSubscriptions}
+    loadAvailableQuantities={loadAvailableQuantities}
+    pingUpstreamSubscriptions={pingUpstreamSubscriptions}
     updateQuantity={updateQuantity}
     handleStartTask={handleStartTask}
     handleFinishedTask={handleFinishedTask}
@@ -73,6 +76,8 @@ describe('subscriptions page', () => {
     createColumns={createColumns}
     updateColumns={updateColumns}
     loadSubscriptions={loadSubscriptions}
+    loadAvailableQuantities={loadAvailableQuantities}
+    pingUpstreamSubscriptions={pingUpstreamSubscriptions}
     updateQuantity={updateQuantity}
     handleStartTask={handleStartTask}
     handleFinishedTask={handleFinishedTask}

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

@@ -38,11 +38,11 @@ exports[`subscriptions page should render 1`] = `
       </h1>
       <SubscriptionsToolbar
         canManageSubscriptionAllocations={false}
-        disableAddButton={false}
+        disableAddButton={true}
         disableDeleteButton={true}
         disableDeleteReason="This is disabled because no subscriptions are selected."
-        disableManifestActions={false}
-        disableManifestReason={null}
+        disableManifestActions={true}
+        disableManifestReason="This is disabled because no connection could be made to the upstream Subscription Allocation."
         getAutoCompleteParams={[Function]}
         initialInputValue=""
         onDeleteButtonClick={[Function]}
@@ -57,7 +57,8 @@ exports[`subscriptions page should render 1`] = `
       <Connect(ManageManifestModal)
         canImportManifest={false}
         delete={[Function]}
-        disabledReason={null}
+        disableManifestActions={true}
+        disabledReason="This is disabled because no connection could be made to the upstream Subscription Allocation."
         refresh={[Function]}
         taskInProgress={false}
         upload={[Function]}
@@ -83,6 +84,7 @@ exports[`subscriptions page should render 1`] = `
           onSelectedRowsChange={[Function]}
           onSubscriptionDeleteModalClose={[Function]}
           selectedRows={Array []}
+          selectionEnabled={false}
           subscriptionDeleteModalOpen={false}
           subscriptions={
             Object {

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

@@ -5,7 +5,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -31,7 +31,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -58,6 +58,7 @@ Object {
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
   "disconnected": "some-value",
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -78,7 +79,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -99,7 +100,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -125,7 +126,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -146,7 +147,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -171,7 +172,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -192,7 +193,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": false,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -213,7 +214,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": false,
   "missingPermissions": undefined,
@@ -235,7 +236,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": true,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -256,7 +257,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -277,7 +278,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -303,7 +304,7 @@ Object {
   "availableQuantities": Object {},
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -324,7 +325,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -345,7 +346,7 @@ Object {
   "availableQuantities": "some-quantities-data",
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -366,7 +367,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -387,7 +388,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -414,7 +415,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 20,
   "loading": false,
   "pagination": Object {
@@ -437,7 +438,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -458,7 +459,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -484,7 +485,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -505,7 +506,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -531,7 +532,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -555,7 +556,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {
@@ -581,7 +582,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": false,
+  "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
   "pagination": Object {

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

@@ -93,50 +93,6 @@ export const requestSuccessResponse = Immutable({
   ],
 });
 
-export const requestSuccessResponseWithRHSubscriptions = Immutable({
-  organization: {},
-  total: 81,
-  subtotal: 1,
-  page: 1,
-  per_page: 2,
-  error: null,
-  search: null,
-  sort: {
-    by: 'cp_id',
-    order: 'asc',
-  },
-  results: [
-    {
-      id: 4,
-      cp_id: '4028f95a62ce96190162cf435202005b',
-      subscription_id: 5,
-      name: 'Some RH Product',
-      start_date: '2013-02-28 18:00:00 -1100',
-      end_date: '2021-12-31 17:59:59 -1100',
-      available: 12,
-      quantity: 12,
-      consumed: 0,
-      account_number: 1000000,
-      contract_number: 20000000,
-      support_level: 'Self-Support',
-      product_id: 'Z3BRU11',
-      sockets: null,
-      cores: null,
-      ram: null,
-      instance_multiplier: 1,
-      stacking_id: null,
-      multi_entitlement: null,
-      type: 'NORMAL',
-      product_name: 'Some RH Product',
-      unmapped_guest: false,
-      virt_only: false,
-      virt_who: false,
-      upstream: true,
-      upstream_pool_id: '8a85f98160f068060160f06e922a0201',
-    },
-  ],
-});
-
 export const quantitiesRequestSuccessResponse = Immutable({
   results: [
     {
@@ -399,20 +355,6 @@ export const successActions = [
   },
 ];
 
-export const successActionsWithQuantityLoad = [
-  {
-    type: 'SUBSCRIPTIONS_REQUEST',
-  },
-  {
-    type: 'SUBSCRIPTIONS_SUCCESS',
-    response: requestSuccessResponseWithRHSubscriptions,
-    search: undefined,
-  },
-  {
-    type: 'SUBSCRIPTIONS_QUANTITIES_REQUEST',
-  },
-];
-
 export const failureActions = [
   {
     type: 'SUBSCRIPTIONS_REQUEST',

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

@@ -106,7 +106,11 @@ class SubscriptionsTable extends Component {
 
   getTableProps = () => {
     const {
-      subscriptions, emptyState, tableColumns, loadSubscriptions, canManageSubscriptionAllocations,
+      subscriptions,
+      emptyState,
+      tableColumns,
+      loadSubscriptions,
+      selectionEnabled,
     } = this.props;
     const { groupedSubscriptions, rows, editing } = this.state;
 
@@ -117,8 +121,8 @@ class SubscriptionsTable extends Component {
       loadSubscriptions,
       rows,
       subscriptions,
+      selectionEnabled,
       tableColumns,
-      canManageSubscriptionAllocations,
       toggleSubscriptionGroup: this.toggleSubscriptionGroup,
       inlineEditController: this.getInlineEditController(),
       selectionController: this.getSelectionController(),
@@ -272,10 +276,11 @@ SubscriptionsTable.propTypes = {
   loadSubscriptions: PropTypes.func.isRequired,
   updateQuantity: PropTypes.func.isRequired,
   emptyState: PropTypes.shape({}).isRequired,
-  canManageSubscriptionAllocations: PropTypes.bool,
   subscriptions: PropTypes.shape({
     loading: PropTypes.bool,
     availableQuantities: PropTypes.shape({}),
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
   }).isRequired,
   subscriptionDeleteModalOpen: PropTypes.bool.isRequired,
@@ -284,10 +289,11 @@ SubscriptionsTable.propTypes = {
   toggleDeleteButton: PropTypes.func.isRequired,
   selectedRows: PropTypes.instanceOf(Array).isRequired,
   onSelectedRowsChange: PropTypes.func.isRequired,
+  selectionEnabled: PropTypes.bool,
 };
 
 SubscriptionsTable.defaultProps = {
-  canManageSubscriptionAllocations: false,
+  selectionEnabled: false,
 };
 
 export default SubscriptionsTable;

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

@@ -77,6 +77,7 @@ describe('subscriptions table', () => {
         emptyState={{}}
         selectedRows={[]}
         onSelectedRowsChange={() => {}}
+        selectionEnabled
       />
                         </MemoryRouter>);
     expect(page.find('#select1').is('[disabled]')).toBe(true);

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

@@ -2,13 +2,13 @@
 
 exports[`subscriptions table should render a loading state 1`] = `
 <SubscriptionsTable
-  canManageSubscriptionAllocations={false}
   emptyState={Object {}}
   loadSubscriptions={[Function]}
   onDeleteSubscriptions={[Function]}
   onSelectedRowsChange={[Function]}
   onSubscriptionDeleteModalClose={[Function]}
   selectedRows={Array []}
+  selectionEnabled={false}
   subscriptionDeleteModalOpen={false}
   subscriptions={
     Object {
@@ -74,21 +74,6 @@ exports[`subscriptions table should render a table 1`] = `
       <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=""
         >
@@ -120,20 +105,6 @@ exports[`subscriptions table should render a table 1`] = `
       <tr
         class=""
       >
-        <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/"
@@ -163,21 +134,6 @@ exports[`subscriptions table should render a table 1`] = `
       <tr
         class=""
       >
-        <td
-          class="table-view-pf-select"
-        >
-          <label
-            class="control-label sr-only"
-            for="select1"
-          >
-            Select row
-          </label>
-          <input
-            disabled=""
-            id="select1"
-            type="checkbox"
-          />
-        </td>
         <td>
           <a
             href="/subscriptions/4/"
@@ -224,21 +180,6 @@ exports[`subscriptions table should render subscription name without hyperlink f
       <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=""
         >
@@ -270,14 +211,6 @@ exports[`subscriptions table should render subscription name without hyperlink f
       <tr
         class=""
       >
-        <td
-          class="table-view-pf-select"
-        >
-          <span
-            aria-hidden="true"
-            class="fa fa-angle-right collapse-subscription-group-button"
-          />
-        </td>
         <td>
           hsdfhsdh
         </td>