katello 3.15.0.rc1.1 → 3.15.0.rc1.2

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

@@ -0,0 +1,12 @@
+.form-horizontal {
+  padding-left: 40px;
+  padding-right: 20px;
+}
+
+form .row {
+  margin-left: -15px;
+}
+
+span.pficon.pficon-info {
+  margin: 0 5px 0 5px;
+}

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

@@ -13,3 +13,7 @@ export const DELETE_MANIFEST_FAILURE = 'DELETE_MANIFEST_FAILURE';
 export const MANIFEST_HISTORY_REQUEST = 'MANIFEST_HISTORY_REQUEST';
 export const MANIFEST_HISTORY_SUCCESS = 'MANIFEST_HISTORY_SUCCESS';
 export const MANIFEST_HISTORY_FAILURE = 'MANIFEST_HISTORY_FAILURE';
+
+// Modal IDs
+export const MANAGE_MANIFEST_MODAL_ID = 'manageManifestModal';
+export const DELETE_MANIFEST_MODAL_ID = 'deleteManifestModal';

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

@@ -5,13 +5,16 @@ import ManageManifestModal from '../ManageManifestModal';
 import { manifestHistorySuccessState } from './manifest.fixtures';
 
 jest.mock('foremanReact/components/Pagination/PaginationWrapper', () => (<div>Pagination Mock</div>));
+jest.mock('foremanReact/components/ForemanModal');
 
 describe('manage manifest modal', () => {
-  const noop = () => { };
+  const noop = jest.fn();
   const organization = { id: 1, redhat_repository_url: 'https://redhat.com' };
 
-  it('should render', async () => {
+  it('should render', () => {
     const page = shallow(<ManageManifestModal
+      setModalOpen={noop}
+      setModalClosed={noop}
       upload={noop}
       refresh={noop}
       delete={noop}
@@ -22,7 +25,6 @@ describe('manage manifest modal', () => {
       bulkSearch={noop}
       manifestHistory={manifestHistorySuccessState}
       taskInProgress={false}
-      showModal
     />);
     expect(toJson(page)).toMatchSnapshot();
   });

data/webpack/scenes/Subscriptions/Manifest/__tests__/__snapshots__/ManageManifestModal.test.js.snap

@@ -1,198 +1,147 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`manage manifest modal should render 1`] = `
-<Modal
-  animation={true}
-  autoFocus={true}
-  backdrop={true}
-  bsClass="modal"
-  dialogComponentClass={[Function]}
-  enforceFocus={true}
-  keyboard={true}
-  manager={
-    ModalManager {
-      "add": [Function],
-      "containers": Array [],
-      "data": Array [],
-      "handleContainerOverflow": true,
-      "hideSiblingNodes": true,
-      "isTopModal": [Function],
-      "modals": Array [],
-      "remove": [Function],
-    }
-  }
-  onHide={[Function]}
-  renderBackdrop={[Function]}
-  restoreFocus={true}
-  show={true}
+<ForemanModal
+  id="manageManifestModal"
+  title="Manage Manifest"
 >
-  <ModalHeader
-    bsClass="modal-header"
-    closeButton={false}
-    closeLabel="Close"
+  <Uncontrolled(Tabs)
+    id="manifest-history-tabs"
   >
-    <button
-      aria-label="Close"
-      className="close"
-      onClick={[Function]}
-    >
-      <Icon
-        name="close"
-        type="pf"
-      />
-    </button>
-    <ModalTitle
-      bsClass="modal-title"
-      componentClass="h4"
+    <Tab
+      eventKey={2}
+      title="Manifest History"
     >
-      Manage Manifest
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody
-    bsClass="modal-body"
-    componentClass="div"
-  >
-    <Uncontrolled(Tabs)
-      id="manifest-history-tabs"
-    >
-      <Tab
-        eventKey={2}
-        title="Manifest History"
+      <LoadingState
+        loading={false}
+        loadingText="Loading"
+        timeout={300}
       >
-        <LoadingState
-          loading={false}
-          loadingText="Loading"
-          timeout={300}
-        >
-          <Table
-            columns={
-              Array [
-                Object {
-                  "cell": Object {
-                    "formatters": Array [
-                      [Function],
-                    ],
-                  },
-                  "header": Object {
-                    "formatters": Array [
-                      [Function],
-                    ],
-                    "label": "Status",
-                    "props": Object {
-                      "index": 0,
-                    },
-                  },
-                  "property": "status",
-                },
-                Object {
-                  "cell": Object {
-                    "formatters": Array [
-                      [Function],
-                    ],
-                  },
-                  "header": Object {
-                    "formatters": Array [
-                      [Function],
-                    ],
-                    "label": "Message",
-                    "props": Object {
-                      "index": 1,
-                    },
-                  },
-                  "property": "statusMessage",
+        <Table
+          columns={
+            Array [
+              Object {
+                "cell": Object {
+                  "formatters": Array [
+                    [Function],
+                  ],
                 },
-                Object {
-                  "cell": Object {
-                    "formatters": Array [
-                      [Function],
-                    ],
-                  },
-                  "header": Object {
-                    "formatters": Array [
-                      [Function],
-                    ],
-                    "label": "Timestamp",
-                    "props": Object {
-                      "index": 2,
-                    },
+                "header": Object {
+                  "formatters": Array [
+                    [Function],
+                  ],
+                  "label": "Status",
+                  "props": Object {
+                    "index": 0,
                   },
-                  "property": "created",
                 },
-              ]
-            }
-            emptyState={
+                "property": "status",
+              },
               Object {
-                "description": "Import a Manifest using the manifest tab above.",
-                "documentation": Object {
-                  "label": "Learn more about adding Subscription Manifests",
-                  "url": "http://redhat.com",
-                },
-                "header": "There is no Manifest History to display.",
-              }
-            }
-            rows={
-              Array [
-                Object {
-                  "created": "2018-04-12T18:58:45+0000",
-                  "status": "SUCCESS",
-                  "statusMessage": "Default_Organization file imported successfully.",
-                },
-                Object {
-                  "created": "2018-04-12T14:28:57+0000",
-                  "status": "SUCCESS",
-                  "statusMessage": "Default_Organization file imported successfully.",
-                },
-                Object {
-                  "created": "2018-04-11T14:36:43+0000",
-                  "status": "SUCCESS",
-                  "statusMessage": "Default_Organization file imported successfully.",
-                },
-                Object {
-                  "created": "2018-04-11T04:29:51+0000",
-                  "status": "SUCCESS",
-                  "statusMessage": "Default_Organization file imported successfully.",
+                "cell": Object {
+                  "formatters": Array [
+                    [Function],
+                  ],
                 },
-                Object {
-                  "created": "2018-04-11T04:26:38+0000",
-                  "status": "SUCCESS",
-                  "statusMessage": "Default_Organization file imported successfully.",
-                },
-                Object {
-                  "created": "2018-04-11T04:23:05+0000",
-                  "status": "SUCCESS",
-                  "statusMessage": "Default_Organization file imported successfully.",
-                },
-                Object {
-                  "created": "2018-04-11T04:05:07+0000",
-                  "status": "SUCCESS",
-                  "statusMessage": "Default_Organization file imported successfully.",
-                },
-                Object {
-                  "created": "2018-04-11T03:29:44+0000",
-                  "status": "SUCCESS",
-                  "statusMessage": "Default_Organization file imported successfully.",
+                "header": Object {
+                  "formatters": Array [
+                    [Function],
+                  ],
+                  "label": "Message",
+                  "props": Object {
+                    "index": 1,
+                  },
                 },
-                Object {
-                  "created": "2018-04-10T18:44:38+0000",
-                  "status": "SUCCESS",
-                  "statusMessage": "Default_Organization file imported successfully.",
+                "property": "statusMessage",
+              },
+              Object {
+                "cell": Object {
+                  "formatters": Array [
+                    [Function],
+                  ],
                 },
-                Object {
-                  "created": "2018-04-10T18:40:17+0000",
-                  "status": "SUCCESS",
-                  "statusMessage": "Default_Organization file imported successfully.",
+                "header": Object {
+                  "formatters": Array [
+                    [Function],
+                  ],
+                  "label": "Timestamp",
+                  "props": Object {
+                    "index": 2,
+                  },
                 },
-              ]
+                "property": "created",
+              },
+            ]
+          }
+          emptyState={
+            Object {
+              "description": "Import a Manifest using the manifest tab above.",
+              "documentation": Object {
+                "label": "Learn more about adding Subscription Manifests",
+                "url": "http://redhat.com",
+              },
+              "header": "There is no Manifest History to display.",
             }
-          />
-        </LoadingState>
-      </Tab>
-    </Uncontrolled(Tabs)>
-  </ModalBody>
-  <ModalFooter
-    bsClass="modal-footer"
-    componentClass="div"
-  >
+          }
+          rows={
+            Array [
+              Object {
+                "created": "2018-04-12T18:58:45+0000",
+                "status": "SUCCESS",
+                "statusMessage": "Default_Organization file imported successfully.",
+              },
+              Object {
+                "created": "2018-04-12T14:28:57+0000",
+                "status": "SUCCESS",
+                "statusMessage": "Default_Organization file imported successfully.",
+              },
+              Object {
+                "created": "2018-04-11T14:36:43+0000",
+                "status": "SUCCESS",
+                "statusMessage": "Default_Organization file imported successfully.",
+              },
+              Object {
+                "created": "2018-04-11T04:29:51+0000",
+                "status": "SUCCESS",
+                "statusMessage": "Default_Organization file imported successfully.",
+              },
+              Object {
+                "created": "2018-04-11T04:26:38+0000",
+                "status": "SUCCESS",
+                "statusMessage": "Default_Organization file imported successfully.",
+              },
+              Object {
+                "created": "2018-04-11T04:23:05+0000",
+                "status": "SUCCESS",
+                "statusMessage": "Default_Organization file imported successfully.",
+              },
+              Object {
+                "created": "2018-04-11T04:05:07+0000",
+                "status": "SUCCESS",
+                "statusMessage": "Default_Organization file imported successfully.",
+              },
+              Object {
+                "created": "2018-04-11T03:29:44+0000",
+                "status": "SUCCESS",
+                "statusMessage": "Default_Organization file imported successfully.",
+              },
+              Object {
+                "created": "2018-04-10T18:44:38+0000",
+                "status": "SUCCESS",
+                "statusMessage": "Default_Organization file imported successfully.",
+              },
+              Object {
+                "created": "2018-04-10T18:40:17+0000",
+                "status": "SUCCESS",
+                "statusMessage": "Default_Organization file imported successfully.",
+              },
+            ]
+          }
+        />
+      </LoadingState>
+    </Tab>
+  </Uncontrolled(Tabs)>
+  <Component>
     <Button
       active={false}
       block={false}
@@ -203,6 +152,6 @@ exports[`manage manifest modal should render 1`] = `
     >
       Close
     </Button>
-  </ModalFooter>
-</Modal>
+  </Component>
+</ForemanModal>
 `;

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

@@ -1,11 +1,15 @@
 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 } from '../../Organizations/OrganizationSelectors';
 
 import ManifestModal from './ManageManifestModal';
 
@@ -16,10 +20,15 @@ const mapStateToProps = state => ({
   organization: state.katello.organization,
   manifestHistory: state.katello.manifestHistory,
   taskDetails: state.katello.manifestHistory.taskDetails,
+  simpleContentAccess: selectSimpleContentAccessEnabled(state),
+  modalOpenState: state.foremanModals.ManageManifestModal,
+  deleteManifestModalIsOpen: selectIsModalOpen(state, DELETE_MANIFEST_MODAL_ID),
 });
 
 // map action dispatchers to props
-const actions = { ...manifestActions, ...organizationActions, ...tasksActions };
+const actions = {
+  ...manifestActions, ...organizationActions, ...tasksActions, ...foremanModalActions,
+};
 const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 
 // export reducers

data/webpack/scenes/Subscriptions/SubscriptionActions.js

@@ -21,8 +21,6 @@ import {
   SUBSCRIPTION_TABLE_DEFAULT_COLUMNS,
   SUBSCRIPTIONS_COLUMNS_REQUEST,
   SUBSCRIPTIONS_UPDATE_SEARCH_QUERY,
-  SUBSCRIPTIONS_OPEN_MANIFEST_MODAL,
-  SUBSCRIPTIONS_CLOSE_MANIFEST_MODAL,
   SUBSCRIPTIONS_OPEN_DELETE_MODAL,
   SUBSCRIPTIONS_CLOSE_DELETE_MODAL,
   SUBSCRIPTIONS_OPEN_TASK_MODAL,
@@ -32,6 +30,8 @@ import {
 } from './SubscriptionConstants';
 import { filterRHSubscriptions, selectSubscriptionsQuantitiesFromResponse } from './SubscriptionHelpers.js';
 import { apiError } from '../../move_to_foreman/common/helpers.js';
+import { pollTaskUntilDone } from '../Tasks/TaskActions';
+import { POLL_TASK_INTERVAL } from '../Tasks/TaskConstants';
 
 export const createSubscriptionParams = (extendedParams = {}) => ({
   ...{
@@ -127,10 +127,8 @@ export const deleteSubscriptions = poolIds => async (dispatch) => {
 
   try {
     const { data } = await api.delete(`/organizations/${(orgId())}/upstream_subscriptions`, {}, params);
-    return dispatch({
-      type: DELETE_SUBSCRIPTIONS_SUCCESS,
-      response: data,
-    });
+    dispatch(pollTaskUntilDone(data.id, {}, POLL_TASK_INTERVAL, Number(orgId())));
+    return dispatch({ type: DELETE_SUBSCRIPTIONS_SUCCESS });
   } catch (error) {
     return dispatch(apiError(DELETE_SUBSCRIPTIONS_FAILURE, error));
   }
@@ -141,9 +139,6 @@ export const updateSearchQuery = query => ({
   payload: query,
 });
 
-export const openManageManifestModal = () => ({ type: SUBSCRIPTIONS_OPEN_MANIFEST_MODAL });
-export const closeManageManifestModal = () => ({ type: SUBSCRIPTIONS_CLOSE_MANIFEST_MODAL });
-
 export const openDeleteModal = () => ({ type: SUBSCRIPTIONS_OPEN_DELETE_MODAL });
 export const closeDeleteModal = () => ({ type: SUBSCRIPTIONS_CLOSE_DELETE_MODAL });