katello 3.16.0.rc1.1 → 3.16.0.rc4

data/webpack/scenes/Subscriptions/SubscriptionsSelectors.js

@@ -16,5 +16,16 @@ export const selectActivePermissions = state =>
 export const selectSubscriptionsTask = state =>
   selectSubscriptionsState(state).task;
 
+export const selectIsTaskPending = (state) => {
+  const task = selectSubscriptionsTask(state);
+  if (task) {
+    return task.pending || task.result === 'pending';
+  }
+  return false;
+};
+
 export const selectTableSettings = (state, tableName) =>
   state.katello.settings.tables[tableName] || undefined;
+
+export const selectHasUpstreamConnection = state =>
+  selectSubscriptionsState(state).hasUpstreamConnection;

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

@@ -10,7 +10,21 @@ import {
   SAVE_UPSTREAM_SUBSCRIPTIONS_REQUEST,
   SAVE_UPSTREAM_SUBSCRIPTIONS_SUCCESS,
   SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE,
-} from './UpstreamSubscriptionsContstants';
+  PING_UPSTREAM_SUBSCRIPTIONS_SUCCESS,
+  PING_UPSTREAM_SUBSCRIPTIONS_FAILURE,
+} from './UpstreamSubscriptionsConstants';
+
+export const pingUpstreamSubscriptions = () => async (dispatch) => {
+  try {
+    const { data } = await api.get(`/organizations/${orgId()}/upstream_subscriptions/ping`);
+    return dispatch({
+      type: PING_UPSTREAM_SUBSCRIPTIONS_SUCCESS,
+      payload: data,
+    });
+  } catch (error) {
+    return dispatch(apiError(PING_UPSTREAM_SUBSCRIPTIONS_FAILURE, error));
+  }
+};
 
 export const loadUpstreamSubscriptions = (extendedParams = {}) => async (dispatch) => {
   dispatch({ type: UPSTREAM_SUBSCRIPTIONS_REQUEST });

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/{UpstreamSubscriptionsContstants.js → UpstreamSubscriptionsConstants.js}

@@ -5,3 +5,6 @@ export const UPSTREAM_SUBSCRIPTIONS_FAILURE = 'UPSTREAM_SUBSCRIPTIONS_FAILURE';
 export const SAVE_UPSTREAM_SUBSCRIPTIONS_REQUEST = 'SAVE_UPSTREAM_SUBSCRIPTIONS_REQUEST';
 export const SAVE_UPSTREAM_SUBSCRIPTIONS_SUCCESS = 'SAVE_UPSTREAM_SUBSCRIPTIONS_SUCCESS';
 export const SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE = 'SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE';
+
+export const PING_UPSTREAM_SUBSCRIPTIONS_SUCCESS = 'PING_UPSTREAM_SUBSCRIPTIONS_SUCCESS';
+export const PING_UPSTREAM_SUBSCRIPTIONS_FAILURE = 'PING_UPSTREAM_SUBSCRIPTIONS_FAILURE';

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

@@ -262,6 +262,8 @@ UpstreamSubscriptionsPage.propTypes = {
   upstreamSubscriptions: PropTypes.shape({
     loading: PropTypes.bool,
     itemCount: PropTypes.number,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
     pagination: PropTypes.shape({}),
     task: PropTypes.shape({

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

@@ -7,7 +7,7 @@ import {
   SAVE_UPSTREAM_SUBSCRIPTIONS_REQUEST,
   SAVE_UPSTREAM_SUBSCRIPTIONS_SUCCESS,
   SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE,
-} from './UpstreamSubscriptionsContstants';
+} from './UpstreamSubscriptionsConstants';
 
 const initialState = initialApiState;
 

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

@@ -1,4 +1,4 @@
-import * as types from '../UpstreamSubscriptionsContstants';
+import * as types from '../UpstreamSubscriptionsConstants';
 
 import {
   initialState,

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,
@@ -18,7 +16,8 @@ import {
   loadTableColumnsSuccessAction,
 } from './subscriptions.fixtures';
 import {
-  handleTask,
+  handleFinishedTask,
+  handleStartTask,
   pollTasks,
   cancelPollTasks,
   resetTasks,
@@ -33,7 +32,7 @@ import {
   enableDeleteButton,
 } from '../SubscriptionActions';
 
-import { getTaskPendingResponse, getTaskSuccessResponse } from '../../Tasks/__tests__/task.fixtures';
+import { getTaskSuccessResponse } from '../../Tasks/__tests__/task.fixtures';
 
 const mockStore = configureMockStore([thunk]);
 const store = mockStore(Immutable({
@@ -77,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', () => {
@@ -159,27 +147,15 @@ describe('subscription actions', () => {
     );
   });
 
-  describe('handleTask', () => {
-    describe('when not polling a task', () => {
-      it('starts polling the task', async () => {
-        await store.dispatch(handleTask(getTaskSuccessResponse));
-
-        expect(store.getActions()).toMatchSnapshot();
-      });
-    });
+  describe('handleStartTask', () => {
+    it('starts polling the task', async () => {
+      await store.dispatch(handleStartTask(getTaskSuccessResponse));
 
-    it('does nothing if already polling and task is pending', async () => {
-      const pollStore = configureMockStore([thunk])({
-        intervals: {
-          SUBSCRIPTIONS_POLL_TASK: 5,
-        },
-      });
-
-      await pollStore.dispatch(handleTask(getTaskPendingResponse));
-
-      expect(pollStore.getActions()).toMatchSnapshot();
+      expect(store.getActions()).toMatchSnapshot();
     });
+  });
 
+  describe('handleFinishedTask', () => {
     it('handles a finished task', async () => {
       const pollStore = configureMockStore([thunk])({
         intervals: {
@@ -187,7 +163,7 @@ describe('subscription actions', () => {
         },
       });
 
-      await pollStore.dispatch(handleTask(getTaskSuccessResponse));
+      await pollStore.dispatch(handleFinishedTask(getTaskSuccessResponse));
 
       expect(pollStore.getActions()).toMatchSnapshot();
     });

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');
@@ -16,11 +17,13 @@ const loadTables = () => new Promise((resolve) => {
 });
 
 const pollTasks = jest.fn();
-const handleTask = jest.fn();
+const handleStartTask = jest.fn();
+const handleFinishedTask = jest.fn();
 
 afterEach(() => {
   pollTasks.mockClear();
-  handleTask.mockClear();
+  handleStartTask.mockClear();
+  handleFinishedTask.mockClear();
 });
 
 describe('subscriptions page', () => {
@@ -38,8 +41,11 @@ describe('subscriptions page', () => {
     createColumns={createColumns}
     updateColumns={updateColumns}
     loadSubscriptions={loadSubscriptions}
+    loadAvailableQuantities={loadAvailableQuantities}
+    pingUpstreamSubscriptions={pingUpstreamSubscriptions}
     updateQuantity={updateQuantity}
-    handleTask={handleTask}
+    handleStartTask={handleStartTask}
+    handleFinishedTask={handleFinishedTask}
     pollTaskUntilDone={noop}
     pollBulkSearch={noop}
     pollTasks={pollTasks}
@@ -70,8 +76,11 @@ describe('subscriptions page', () => {
     createColumns={createColumns}
     updateColumns={updateColumns}
     loadSubscriptions={loadSubscriptions}
+    loadAvailableQuantities={loadAvailableQuantities}
+    pingUpstreamSubscriptions={pingUpstreamSubscriptions}
     updateQuantity={updateQuantity}
-    handleTask={handleTask}
+    handleStartTask={handleStartTask}
+    handleFinishedTask={handleFinishedTask}
     pollTaskUntilDone={noop}
     pollBulkSearch={noop}
     pollTasks={pollTasks}
@@ -118,8 +127,9 @@ describe('subscriptions page', () => {
       },
     };
 
-    page.setProps({ task: mockTask });
+    page.setProps({ isTaskPending: true, isPollingTask: true });
+    page.setProps({ task: mockTask, isPollingTask: true, isTaskPending: false });
 
-    expect(handleTask).toHaveBeenCalledWith(mockTask);
+    expect(handleFinishedTask).toHaveBeenCalledWith(mockTask);
   });
 });

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

@@ -35,9 +35,7 @@ Object {
 }
 `;
 
-exports[`subscription actions handleTask does nothing if already polling and task is pending 1`] = `Array []`;
-
-exports[`subscription actions handleTask handles a finished task 1`] = `
+exports[`subscription actions handleFinishedTask handles a finished task 1`] = `
 Array [
   Object {
     "key": "SUBSCRIPTIONS_POLL_TASK",
@@ -77,7 +75,7 @@ Array [
 ]
 `;
 
-exports[`subscription actions handleTask when not polling a task starts polling the task 1`] = `
+exports[`subscription actions handleStartTask starts polling the task 1`] = `
 Array [
   Object {
     "key": "SUBSCRIPTIONS_TASK_SEARCH",

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 {