katello 3.17.0.rc1 → 3.17.0.rc2

data/webpack/containers/Application/config.js

@@ -38,19 +38,19 @@ export const links = [
   },
   {
     path: 'module_streams',
-    component: withHeader(ModuleStreams, { title: __('Module Streams') }),
+    component: WithOrganization(withHeader(ModuleStreams, { title: __('Module Streams') })),
   },
   {
     path: 'module_streams/:id([0-9]+)',
-    component: withHeader(ModuleStreamDetails, { title: __('Module Stream Details') }),
+    component: WithOrganization(withHeader(ModuleStreamDetails, { title: __('Module Stream Details') })),
   },
   {
     path: 'ansible_collections',
-    component: withHeader(AnsibleCollections, { title: __('Ansible Collections') }),
+    component: WithOrganization(withHeader(AnsibleCollections, { title: __('Ansible Collections') })),
   },
   {
     path: 'ansible_collections/:id([0-9]+)',
-    component: withHeader(AnsibleCollectionDetails, { title: __('Ansible Collection Details') }),
+    component: WithOrganization(withHeader(AnsibleCollectionDetails, { title: __('Ansible Collection Details') })),
   },
   {
     path: 'labs/content_views',

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -35,7 +35,7 @@ const recommendedRepositoriesSatTools = [
 const recommendedRepositoriesMisc = [
   'rhel-server-rhscl-7-rpms',
   'rhel-7-server-satellite-capsule-6.8-rpms',
-  'rhel-7-server-ansible-2.8-rpms',
+  'rhel-7-server-ansible-2.9-rpms',
 ];
 
 const recommendedRepositorySetLables = recommendedRepositoriesRHEL

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -21,28 +21,29 @@ class ManageManifestModal extends Component {
 
     this.state = {
       redhat_repository_url: null,
-      hideModalAfterAction: true,
     };
   }
 
-  componentWillMount() {
-    if (this.props.taskInProgress && this.state.hideModalAfterAction) {
+  componentDidMount() {
+    this.props.loadManifestHistory();
+  }
+
+  componentDidUpdate(prevProps) {
+    if (!prevProps.taskInProgress && this.props.taskInProgress) {
       this.hideModal();
-      this.setState({ hideModalAfterAction: false });
     }
-  }
 
-  componentDidMount() {
-    this.loadData();
-    this.props.loadOrganization();
-  }
+    if (prevProps.taskInProgress && !this.props.taskInProgress) {
+      this.props.loadOrganization();
+      this.props.loadManifestHistory();
+    }
 
-  loadData() {
-    this.props.loadManifestHistory();
+    if (!prevProps.manifestActionStarted && this.props.manifestActionStarted) {
+      this.hideDeleteManifestModal();
+    }
   }
 
   hideModal = () => {
-    if (this.props.deleteManifestModalIsOpen) this.hideDeleteManifestModal();
     this.props.setModalClosed({ id: MANAGE_MANIFEST_MODAL_ID });
   };
 
@@ -61,7 +62,6 @@ class ManageManifestModal extends Component {
   };
 
   uploadManifest = (fileList) => {
-    this.hideModal();
     if (fileList.length > 0) {
       this.props.upload(fileList[0]);
     }
@@ -72,12 +72,11 @@ class ManageManifestModal extends Component {
   };
 
   deleteManifest = () => {
-    this.hideModal();
     this.props.delete();
   };
 
   disabledTooltipText = () => {
-    if (this.state.actionInProgress) {
+    if (this.props.taskInProgress) {
       return __('This is disabled because a manifest task is in progress');
     }
     return __('This is disabled because no manifest exists');
@@ -97,10 +96,10 @@ class ManageManifestModal extends Component {
       enableSimpleContentAccess,
       disableSimpleContentAccess,
       taskInProgress,
-      manifestActionInProgress,
+      manifestActionStarted,
     } = this.props;
 
-    const actionInProgress = (taskInProgress || manifestActionInProgress);
+    const actionInProgress = (taskInProgress || manifestActionStarted);
     const showRedHatProviderDetails = canEditOrganizations;
     const showSubscriptionManifest = (canImportManifest || canDeleteManifest);
     const showManifestTab = (showRedHatProviderDetails || showSubscriptionManifest);
@@ -247,20 +246,13 @@ class ManageManifestModal extends Component {
                               {canDeleteManifest &&
                               <React.Fragment>
                                 <TooltipButton
-                                  renderedButton={(
-                                    <Button
-                                      disabled={!isManifestImported || actionInProgress}
-                                      bsStyle="danger"
-                                      onClick={this.showDeleteManifestModal}
-                                    >
-                                      {__('Delete')}
-                                    </Button>
-                                    )}
-
+                                  disabled={!isManifestImported || actionInProgress}
+                                  bsStyle="danger"
+                                  onClick={this.showDeleteManifestModal}
+                                  title={__('Delete')}
                                   tooltipId="delete-manifest-button-tooltip"
                                   tooltipText={this.disabledTooltipText()}
                                   tooltipPlacement="top"
-
                                 />
                               </React.Fragment>
                               }
@@ -341,8 +333,7 @@ ManageManifestModal.propTypes = {
   }).isRequired,
   setModalClosed: PropTypes.func.isRequired,
   setModalOpen: PropTypes.func.isRequired,
-  deleteManifestModalIsOpen: PropTypes.bool,
-  manifestActionInProgress: PropTypes.bool,
+  manifestActionStarted: PropTypes.bool,
 };
 
 ManageManifestModal.defaultProps = {
@@ -352,9 +343,8 @@ ManageManifestModal.defaultProps = {
   canDeleteManifest: false,
   isManifestImported: false,
   canEditOrganizations: false,
-  deleteManifestModalIsOpen: false,
   simpleContentAccess: false,
-  manifestActionInProgress: false,
+  manifestActionStarted: false,
 };
 
 export default ManageManifestModal;

data/webpack/scenes/Subscriptions/Manifest/__tests__/SimpleContentAccess.test.js

@@ -17,7 +17,6 @@ const defaultProps = {
   canImportManifest: true,
   canDeleteManifest: true,
   canEditOrganizations: true,
-  deleteManifestModalIsOpen: true,
   upload: noop,
   refresh: noop,
   delete: noop,
@@ -51,7 +50,6 @@ const initialState = {
 const enableSimpleContetAccessPath = api.getApiUrl('/organizations/1/upstream_subscriptions/simple_content_access/enable');
 const disableSimpleContetAccessPath = api.getApiUrl('/organizations/1/upstream_subscriptions/simple_content_access/disable');
 const manifestHistoryPath = api.getApiUrl('/organizations/1/subscriptions/manifest_history');
-const organizationPath = api.getApiUrl('/organizations/1');
 
 test('Enable Simple Content Access after toggle switch value to true', async (done) => {
   const { getByTestId } = renderWithRedux(<ManifestModal {...defaultProps} />, { initialState });
@@ -65,11 +63,6 @@ test('Enable Simple Content Access after toggle switch value to true', async (do
     .query(true)
     .reply(200, manifestHistorySuccessResponse);
 
-  const scope = nockInstance
-    .get(organizationPath)
-    .query(true)
-    .reply(200, 'Organization Success Response!');
-
   const toggleButton = getByTestId('switch');
 
   await patientlyWaitFor(() => { expect(toggleButton).toBeInTheDocument(); });
@@ -77,7 +70,6 @@ test('Enable Simple Content Access after toggle switch value to true', async (do
 
   fireEvent.click(toggleButton);
 
-  assertNockRequest(scope);
   assertNockRequest(getscope);
   assertNockRequest(updatescope, done);
 });
@@ -94,11 +86,6 @@ test('Disable Simple Content Access after toggle switch value to false', async (
     .query(true)
     .reply(200, manifestHistorySuccessResponse);
 
-  const scope = nockInstance
-    .get(organizationPath)
-    .query(true)
-    .reply(200, 'Organization Success Response!');
-
   const { getByTestId } = renderWithRedux(<ManifestModal {...defaultProps} />, { initialState });
 
   const toggleButton = getByTestId('switch');
@@ -108,7 +95,6 @@ test('Disable Simple Content Access after toggle switch value to false', async (
 
   fireEvent.click(toggleButton);
 
-  assertNockRequest(scope);
   assertNockRequest(getscope);
   assertNockRequest(updatescope, done);
 });

data/webpack/scenes/Subscriptions/Manifest/index.js

@@ -2,14 +2,12 @@ import { bindActionCreators } from 'redux';
 
 import { connect } from 'react-redux';
 import * as foremanModalActions from 'foremanReact/components/ForemanModal/ForemanModalActions';
-import { selectIsModalOpen } from 'foremanReact/components/ForemanModal/ForemanModalSelectors';
-import { DELETE_MANIFEST_MODAL_ID } from './ManifestConstants';
-
 import * as manifestActions from './ManifestActions';
 import * as organizationActions from '../../Organizations/OrganizationActions';
 import * as tasksActions from '../../Tasks/TaskActions';
 import history from './ManifestHistoryReducer';
 import { selectSimpleContentAccessEnabled, selectIsManifestImported } from '../../Organizations/OrganizationSelectors';
+import { selectManifestActionStarted } from '../SubscriptionsSelectors';
 
 import ManifestModal from './ManageManifestModal';
 
@@ -22,8 +20,7 @@ const mapStateToProps = state => ({
   simpleContentAccess: selectSimpleContentAccessEnabled(state),
   isManifestImported: selectIsManifestImported(state),
   modalOpenState: state.foremanModals.ManageManifestModal,
-  deleteManifestModalIsOpen: selectIsModalOpen(state, DELETE_MANIFEST_MODAL_ID),
-  manifestActionInProgress: state.katello.subscriptions.manifestActionInProgress,
+  manifestActionStarted: selectManifestActionStarted(state),
 });
 
 // map action dispatchers to props

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -11,8 +11,12 @@ import {
   SUBSCRIPTIONS_QUANTITIES_FAILURE,
   SUBSCRIPTIONS_COLUMNS_REQUEST,
   UPDATE_SUBSCRIPTION_COLUMNS,
+  UPDATE_QUANTITY_REQUEST,
   UPDATE_QUANTITY_SUCCESS,
+  UPDATE_QUANTITY_FAILURE,
+  DELETE_SUBSCRIPTIONS_REQUEST,
   DELETE_SUBSCRIPTIONS_SUCCESS,
+  DELETE_SUBSCRIPTIONS_FAILURE,
   SUBSCRIPTIONS_UPDATE_SEARCH_QUERY,
   SUBSCRIPTIONS_OPEN_DELETE_MODAL,
   SUBSCRIPTIONS_CLOSE_DELETE_MODAL,
@@ -59,7 +63,7 @@ const initialState = Immutable({
   tableColumns: [],
   selectedTableColumns: [],
   hasUpstreamConnection: false,
-  manifestActionInProgress: false,
+  manifestActionStarted: false,
 });
 
 export default (state = initialState, action) => {
@@ -154,41 +158,46 @@ export default (state = initialState, action) => {
       return state.merge({
         task: action.response,
         hasUpstreamConnection: false,
-        manifestActionInProgress: false,
+        manifestActionStarted: false,
       });
 
-    case UPDATE_QUANTITY_SUCCESS:
     case SUBSCRIPTIONS_POLL_TASK_SUCCESS:
       return state
         .set('task', action.response);
 
+    case UPDATE_QUANTITY_SUCCESS:
     case UPLOAD_MANIFEST_SUCCESS:
     case REFRESH_MANIFEST_SUCCESS:
     case ENABLE_SIMPLE_CONTENT_ACCESS_SUCCESS:
     case DISABLE_SIMPLE_CONTENT_ACCESS_SUCCESS:
       return state
         .set('task', action.response)
-        .set('manifestActionInProgress', false);
+        .set('manifestActionStarted', false);
 
     case ENABLE_SIMPLE_CONTENT_ACCESS_REQUEST:
     case DISABLE_SIMPLE_CONTENT_ACCESS_REQUEST:
     case REFRESH_MANIFEST_REQUEST:
     case UPLOAD_MANIFEST_REQUEST:
     case DELETE_MANIFEST_REQUEST:
+    case UPDATE_QUANTITY_REQUEST:
+    case DELETE_SUBSCRIPTIONS_REQUEST:
       return state
-        .set('manifestActionInProgress', true);
+        .set('manifestActionStarted', true);
 
     case ENABLE_SIMPLE_CONTENT_ACCESS_FAILURE:
     case DISABLE_SIMPLE_CONTENT_ACCESS_FAILURE:
     case REFRESH_MANIFEST_FAILURE:
     case UPLOAD_MANIFEST_FAILURE:
     case DELETE_MANIFEST_FAILURE:
+    case DELETE_SUBSCRIPTIONS_FAILURE:
+    case UPDATE_QUANTITY_FAILURE:
       return state
-        .set('manifestActionInProgress', false);
+        .set('manifestActionStarted', false);
 
     case DELETE_SUBSCRIPTIONS_SUCCESS:
       return state
         .set('task', action.response)
+        .set('manifestActionStarted', false)
         .set('deleteButtonDisabled', true);
 
     case SUBSCRIPTIONS_RESET_TASKS:

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -261,7 +261,6 @@ class SubscriptionsPage extends Component {
               upload={this.props.uploadManifest}
               delete={this.props.deleteManifest}
               refresh={this.props.refreshManifest}
-              key={task?.id}
             />
 
             <div id="subscriptions-table" className="modal-container">

data/webpack/scenes/Subscriptions/SubscriptionsSelectors.js

@@ -24,5 +24,8 @@ export const selectIsTaskPending = (state) => {
   return false;
 };
 
+export const selectManifestActionStarted = state =>
+  selectSubscriptionsState(state).manifestActionStarted;
+
 export const selectHasUpstreamConnection = state =>
   selectSubscriptionsState(state).hasUpstreamConnection;

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

@@ -10,8 +10,12 @@ import {
   SUBSCRIPTIONS_QUANTITIES_REQUEST,
   SUBSCRIPTIONS_QUANTITIES_SUCCESS,
   SUBSCRIPTIONS_QUANTITIES_FAILURE,
+  UPDATE_QUANTITY_REQUEST,
   UPDATE_QUANTITY_SUCCESS,
+  UPDATE_QUANTITY_FAILURE,
+  DELETE_SUBSCRIPTIONS_REQUEST,
   DELETE_SUBSCRIPTIONS_SUCCESS,
+  DELETE_SUBSCRIPTIONS_FAILURE,
   SUBSCRIPTIONS_UPDATE_SEARCH_QUERY,
   SUBSCRIPTIONS_OPEN_DELETE_MODAL,
   SUBSCRIPTIONS_CLOSE_DELETE_MODAL,
@@ -88,12 +92,32 @@ const fixtures = {
       response: mockTask,
     },
   },
+  'should handle DELETE_SUBSCRIPTIONS_REQUEST': {
+    action: {
+      type: DELETE_SUBSCRIPTIONS_REQUEST,
+    },
+  },
+  'should handle DELETE_SUBSCRIPTIONS_FAILURE': {
+    action: {
+      type: DELETE_SUBSCRIPTIONS_FAILURE,
+    },
+  },
+  'should handle UPDATE_QUANTITY_REQUEST': {
+    action: {
+      type: UPDATE_QUANTITY_REQUEST,
+    },
+  },
   'should handle UPDATE_QUANTITY_SUCCESS': {
     action: {
       type: UPDATE_QUANTITY_SUCCESS,
       response: mockTask,
     },
   },
+  'should handle UPDATE_QUANTITY_FAILURE': {
+    action: {
+      type: UPDATE_QUANTITY_FAILURE,
+    },
+  },
   'should handle SUBSCRIPTIONS_FAILURE': {
     action: {
       type: SUBSCRIPTIONS_FAILURE,

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

@@ -8,7 +8,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -27,6 +27,50 @@ Object {
 }
 `;
 
+exports[`Subscriptions reducer should handle DELETE_SUBSCRIPTIONS_FAILURE 1`] = `
+Object {
+  "availableQuantities": null,
+  "deleteButtonDisabled": true,
+  "deleteModalOpened": false,
+  "hasUpstreamConnection": false,
+  "itemCount": 0,
+  "loading": true,
+  "manifestActionStarted": false,
+  "pagination": Object {
+    "page": 0,
+    "perPage": 20,
+  },
+  "quantitiesLoading": false,
+  "results": Array [],
+  "searchQuery": "",
+  "selectedTableColumns": Array [],
+  "tableColumns": Array [],
+  "task": null,
+}
+`;
+
+exports[`Subscriptions reducer should handle DELETE_SUBSCRIPTIONS_REQUEST 1`] = `
+Object {
+  "availableQuantities": null,
+  "deleteButtonDisabled": true,
+  "deleteModalOpened": false,
+  "hasUpstreamConnection": false,
+  "itemCount": 0,
+  "loading": true,
+  "manifestActionStarted": true,
+  "pagination": Object {
+    "page": 0,
+    "perPage": 20,
+  },
+  "quantitiesLoading": false,
+  "results": Array [],
+  "searchQuery": "",
+  "selectedTableColumns": Array [],
+  "tableColumns": Array [],
+  "task": null,
+}
+`;
+
 exports[`Subscriptions reducer should handle DELETE_SUBSCRIPTIONS_SUCCESS 1`] = `
 Object {
   "availableQuantities": null,
@@ -35,7 +79,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -62,7 +106,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -84,7 +128,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -106,7 +150,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -133,7 +177,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -155,7 +199,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -181,7 +225,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -203,7 +247,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -225,7 +269,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": false,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "missingPermissions": undefined,
   "pagination": Object {
     "page": 0,
@@ -248,7 +292,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -270,7 +314,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -292,7 +336,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -319,7 +363,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -341,7 +385,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -363,7 +407,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -385,7 +429,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -407,7 +451,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -435,7 +479,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 20,
   "loading": false,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 1,
     "perPage": 10,
@@ -459,7 +503,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -481,7 +525,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -508,7 +552,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -522,6 +566,50 @@ Object {
 }
 `;
 
+exports[`Subscriptions reducer should handle UPDATE_QUANTITY_FAILURE 1`] = `
+Object {
+  "availableQuantities": null,
+  "deleteButtonDisabled": true,
+  "deleteModalOpened": false,
+  "hasUpstreamConnection": false,
+  "itemCount": 0,
+  "loading": true,
+  "manifestActionStarted": false,
+  "pagination": Object {
+    "page": 0,
+    "perPage": 20,
+  },
+  "quantitiesLoading": false,
+  "results": Array [],
+  "searchQuery": "",
+  "selectedTableColumns": Array [],
+  "tableColumns": Array [],
+  "task": null,
+}
+`;
+
+exports[`Subscriptions reducer should handle UPDATE_QUANTITY_REQUEST 1`] = `
+Object {
+  "availableQuantities": null,
+  "deleteButtonDisabled": true,
+  "deleteModalOpened": false,
+  "hasUpstreamConnection": false,
+  "itemCount": 0,
+  "loading": true,
+  "manifestActionStarted": true,
+  "pagination": Object {
+    "page": 0,
+    "perPage": 20,
+  },
+  "quantitiesLoading": false,
+  "results": Array [],
+  "searchQuery": "",
+  "selectedTableColumns": Array [],
+  "tableColumns": Array [],
+  "task": null,
+}
+`;
+
 exports[`Subscriptions reducer should handle UPDATE_QUANTITY_SUCCESS 1`] = `
 Object {
   "availableQuantities": null,
@@ -530,7 +618,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -557,7 +645,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -582,7 +670,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -609,7 +697,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
-  "manifestActionInProgress": false,
+  "manifestActionStarted": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,