katello 3.13.4 → 3.14.0.rc1

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailActions.js

@@ -6,18 +6,18 @@ import {
 } from './SubscriptionDetailConstants';
 import { apiError } from '../../../move_to_foreman/common/helpers.js';
 
-export const loadSubscriptionDetails = subscriptionId => (dispatch) => {
+export const loadSubscriptionDetails = subscriptionId => async (dispatch) => {
   dispatch({ type: SUBSCRIPTION_DETAILS_REQUEST });
 
-  return api
-    .get(`/organizations/${orgId()}/subscriptions/${subscriptionId}`)
-    .then(({ data }) => {
-      dispatch({
-        type: SUBSCRIPTION_DETAILS_SUCCESS,
-        response: data,
-      });
-    })
-    .catch(result => dispatch(apiError(SUBSCRIPTION_DETAILS_FAILURE, result)));
+  try {
+    const { data } = await api.get(`/organizations/${orgId()}/subscriptions/${subscriptionId}`);
+    return dispatch({
+      type: SUBSCRIPTION_DETAILS_SUCCESS,
+      response: data,
+    });
+  } catch (error) {
+    return dispatch(apiError(SUBSCRIPTION_DETAILS_FAILURE, error));
+  }
 };
 
 export default loadSubscriptionDetails;

data/webpack/scenes/Subscriptions/Details/SubscriptionDetails.js

@@ -59,23 +59,24 @@ class SubscriptionDetails extends Component {
 
     return (
       <div>
-        {!subscriptionDetails.loading && <BreadcrumbsBar
-          onSwitcherItemClick={(e, url) => this.handleBreadcrumbSwitcherItem(e, url)}
-          data={{
+        {!subscriptionDetails.loading &&
+          <BreadcrumbsBar
+            onSwitcherItemClick={(e, url) => this.handleBreadcrumbSwitcherItem(e, url)}
+            data={{
             isSwitchable: true,
             breadcrumbItems: [
               {
                 caption: __('Subscriptions'),
                 onClick: () =>
-                  this.props.history.push('/subscriptions'),
+                this.props.history.push('/subscriptions'),
               },
               {
-                caption: String(subscriptionDetails.name),
+                caption: String(subscriptionDetails.name || __('Subscription Details')),
               },
             ],
             resource,
           }}
-        />}
+          />}
 
         <TabContainer id="subscription-tabs-container" defaultActiveKey={1}>
           <div>

data/webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetailActions.test.js

@@ -22,25 +22,25 @@ describe('subscription detail actions', () => {
   describe('loadSubscriptionDetails', () => {
     it(
       'creates SUBSCRIPTION_DETAILS_REQUEST and then fails with 500',
-      () => {
+      async () => {
         mockErrorRequest({
           url: endpoint,
         });
-        return store.dispatch(loadSubscriptionDetails(1))
-          .then(() => expect(store.getActions())
-            .toEqual(loadSubscriptionsDetailsFailureActions));
+        await store.dispatch(loadSubscriptionDetails(1));
+        expect(store.getActions())
+          .toEqual(loadSubscriptionsDetailsFailureActions);
       },
     );
     it(
       'creates SUBSCRIPTION_DETAILS_SUCCESS and ends with success',
-      () => {
+      async () => {
         mockRequest({
           url: endpoint,
           response: subDetails,
         });
-        return store.dispatch(loadSubscriptionDetails(1))
-          .then(() => expect(store.getActions())
-            .toEqual(loadSubscriptionsDetailsSuccessActions));
+        await store.dispatch(loadSubscriptionDetails(1));
+        expect(store.getActions())
+          .toEqual(loadSubscriptionsDetailsSuccessActions);
       },
     );
   });

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap

@@ -24,7 +24,7 @@ exports[`subscriptions details page should render and contain appropiate compone
     }
     onSwitcherItemClick={[Function]}
   />
-  <ForwardRef
+  <Uncontrolled(TabContainer)
     defaultActiveKey={1}
     id="subscription-tabs-container"
   >
@@ -531,6 +531,6 @@ exports[`subscriptions details page should render and contain appropiate compone
         </Grid>
       </LoadingState>
     </div>
-  </ForwardRef>
+  </Uncontrolled(TabContainer)>
 </div>
 `;

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

@@ -104,8 +104,15 @@ class ManageManifestModal extends Component {
       organization,
       disableManifestActions,
       disabledReason,
+      canImportManifest,
+      canDeleteManifest,
+      canEditOrganizations,
     } = this.props;
 
+    const showRedHatProviderDetails = canEditOrganizations;
+    const showSubscriptionManifest = (canImportManifest || canDeleteManifest);
+    const showManifestTab = (showRedHatProviderDetails || showSubscriptionManifest);
+
     const { actionInProgress } = this.state;
 
     const emptyStateData = () => ({
@@ -156,120 +163,136 @@ class ManageManifestModal extends Component {
         </Modal.Header>
         <Modal.Body>
           <Tabs id="manifest-history-tabs">
-            <Tab eventKey={1} title={__('Manifest')}>
-              <Form className="form-horizontal">
-                <h5>{__('Red Hat Provider Details')}</h5>
-                <hr />
-                <FormGroup>
-                  <Col sm={3}>
-                    <ControlLabel htmlFor="cdnUrl">
-                      {__('Red Hat CDN URL')}
-                    </ControlLabel>
-                  </Col>
-                  <Col sm={9}>
-                    <FormControl
-                      id="cdnUrl"
-                      type="text"
-                      defaultValue={this.state.redhat_repository_url || organization.redhat_repository_url || ''}
-                      onBlur={this.updateRepositoryUrl}
-                    />
-                  </Col>
-                </FormGroup>
-                <FormGroup>
-                  <Col smOffset={3} sm={3}>
-                    <Button onClick={this.saveOrganization} disabled={organization.loading}>
-                      {organization.loading ? buttonLoading : __('Update')}
-                    </Button>
-                  </Col>
-                </FormGroup>
-                <br />
-
-                <h5>{__('Subscription Manifest')}</h5>
-                <hr />
-
-                <FormGroup>
-                  <ControlLabel
-                    className="col-sm-3 control-label"
-                    htmlFor="usmaFile"
-                  >
-                    <OverlayTrigger
-                      overlay={
-                        <Tooltip id="usma-tooltip">
-                          {__('Upstream Subscription Management Application')}
-                        </Tooltip>
-                      }
-                      placement="bottom"
-                      trigger={['hover', 'focus']}
-                      rootClose={false}
-                    >
-                      <span>{__('USMA')}</span>
-                    </OverlayTrigger>
-                  </ControlLabel>
-
-                  <Col sm={9} className="manifest-actions">
-                    <Spinner loading={actionInProgress} inline />
-
-                    {getManifestName()}
-
-                    <FormControl
-                      id="usmaFile"
-                      type="file"
-                      accept=".zip"
-                      disabled={actionInProgress}
-                      onChange={e => this.uploadManifest(e.target.files)}
-                    />
-
-                    <TooltipButton
-                      onClick={this.refreshManifest}
-                      tooltipId="refresh-manifest-button-tooltip"
-                      tooltipText={disabledReason}
-                      tooltipPlacement="top"
-                      title={__('Refresh')}
-                      disabled={!manifestExists(organization) ||
-                        actionInProgress || disableManifestActions}
-                    />
-
-                    <TooltipButton
-                      renderedButton={(
-                        <Button
-                          disabled={!manifestExists(organization) || actionInProgress}
-                          bsStyle="danger"
-                          onClick={() => this.showDeleteManifestModal(true)}
+            {showManifestTab &&
+              <Tab eventKey={1} title={__('Manifest')}>
+                <Form className="form-horizontal">
+                  {showRedHatProviderDetails &&
+                    <React.Fragment>
+                      <h5>{__('Red Hat Provider Details')}</h5>
+                      <hr />
+                      <FormGroup>
+                        <Col sm={3}>
+                          <ControlLabel htmlFor="cdnUrl">
+                            {__('Red Hat CDN URL')}
+                          </ControlLabel>
+                        </Col>
+                        <Col sm={9}>
+                          <FormControl
+                            id="cdnUrl"
+                            type="text"
+                            defaultValue={this.state.redhat_repository_url || organization.redhat_repository_url || ''}
+                            onBlur={this.updateRepositoryUrl}
+                          />
+                        </Col>
+                      </FormGroup>
+                      <FormGroup>
+                        <Col smOffset={3} sm={3}>
+                          <Button onClick={this.saveOrganization} disabled={organization.loading}>
+                            {organization.loading ? buttonLoading : __('Update')}
+                          </Button>
+                        </Col>
+                      </FormGroup>
+                      <br />
+                    </React.Fragment>
+                  }
+                  {showSubscriptionManifest &&
+                    <React.Fragment>
+                      <h5>{__('Subscription Manifest')}</h5>
+                      <hr />
+
+                      <FormGroup>
+                        <ControlLabel
+                          className="col-sm-3 control-label"
+                          htmlFor="usmaFile"
+                          style={{ paddingTop: '0' }}
                         >
-                          {__('Delete')}
-                        </Button>
-                        )}
-
-                      tooltipId="delete-manifest-button-tooltip"
-                      tooltipText={this.disabledTooltipText()}
-                      tooltipPlacement="top"
-
-                    />
-
-                    <MessageDialog
-                      show={this.state.showDeleteManifestModalDialog}
-                      title={__('Confirm delete manifest')}
-                      secondaryContent={
-                        // eslint-disable-next-line react/no-danger
-                        <p dangerouslySetInnerHTML={{
-                        __html: DeleteManifestModalText,
-                        }}
-                        />
-                      }
-                      primaryActionButtonContent={__('Delete')}
-                      primaryActionButtonBsStyle="danger"
-                      primaryAction={() => this.deleteManifest()}
-                      secondaryActionButtonContent={__('Cancel')}
-                      secondaryAction={() => this.showDeleteManifestModal(false)}
-                      onHide={() => this.showDeleteManifestModal(false)}
-                      accessibleName="deleteConfirmationDialog"
-                      accessibleDescription="deleteConfirmationDialogContent"
-                    />
-                  </Col>
-                </FormGroup>
-              </Form>
-            </Tab>
-
+                          <OverlayTrigger
+                            overlay={
+                              <Tooltip id="usma-tooltip">
+                                {__('Upstream Subscription Management Application')}
+                              </Tooltip>
+                            }
+                            placement="bottom"
+                            trigger={['hover', 'focus']}
+                            rootClose={false}
+                          >
+                            <span>{__('USMA')}</span>
+                          </OverlayTrigger>
+                        </ControlLabel>
+
+                        <Col sm={9} className="manifest-actions">
+                          <Spinner loading={actionInProgress} inline />
+
+                          {getManifestName()}
+                          {canImportManifest &&
+                            <FormControl
+                              id="usmaFile"
+                              type="file"
+                              accept=".zip"
+                              disabled={actionInProgress}
+                              onChange={e => this.uploadManifest(e.target.files)}
+                            />
+                          }
+                          <div id="manifest-actions-row">
+                            {canImportManifest &&
+                              <TooltipButton
+                                onClick={this.refreshManifest}
+                                tooltipId="refresh-manifest-button-tooltip"
+                                tooltipText={disabledReason}
+                                tooltipPlacement="top"
+                                title={__('Refresh')}
+                                disabled={!manifestExists(organization) ||
+                                  actionInProgress || disableManifestActions}
+                              />
+                            }
+                            {canDeleteManifest &&
+                            <React.Fragment>
+                              <TooltipButton
+                                renderedButton={(
+                                  <Button
+                                    disabled={!manifestExists(organization) || actionInProgress}
+                                    bsStyle="danger"
+                                    onClick={() => this.showDeleteManifestModal(true)}
+                                  >
+                                    {__('Delete')}
+                                  </Button>
+                                  )}
+
+                                tooltipId="delete-manifest-button-tooltip"
+                                tooltipText={this.disabledTooltipText()}
+                                tooltipPlacement="top"
+
+                              />
+                            </React.Fragment>
+                            }
+                          </div>
+
+                          <MessageDialog
+                            show={this.state.showDeleteManifestModalDialog}
+                            title={__('Confirm delete manifest')}
+                            secondaryContent={
+                              // eslint-disable-next-line react/no-danger
+                              <p dangerouslySetInnerHTML={{
+                              __html: DeleteManifestModalText,
+                              }}
+                              />
+                            }
+                            primaryActionButtonContent={__('Delete')}
+                            primaryActionButtonBsStyle="danger"
+                            primaryAction={() => this.deleteManifest()}
+                            secondaryActionButtonContent={__('Cancel')}
+                            secondaryAction={() => this.showDeleteManifestModal(false)}
+                            onHide={() => this.showDeleteManifestModal(false)}
+                            accessibleName="deleteConfirmationDialog"
+                            accessibleDescription="deleteConfirmationDialogContent"
+                          />
+                        </Col>
+                      </FormGroup>
+                    </React.Fragment>
+                  }
+                </Form>
+              </Tab>
+            }
             <Tab eventKey={2} title={__('Manifest History')}>
               <LoadingState loading={manifestHistory.loading} loadingText={__('Loading')}>
                 <Table
@@ -307,6 +330,9 @@ ManageManifestModal.propTypes = {
       }),
     }),
   }).isRequired,
+  canImportManifest: PropTypes.bool,
+  canDeleteManifest: PropTypes.bool,
+  canEditOrganizations: PropTypes.bool,
   disableManifestActions: PropTypes.bool,
   disabledReason: PropTypes.string,
   loadOrganization: PropTypes.func.isRequired,
@@ -323,6 +349,9 @@ ManageManifestModal.propTypes = {
 ManageManifestModal.defaultProps = {
   disableManifestActions: false,
   disabledReason: '',
+  canImportManifest: false,
+  canDeleteManifest: false,
+  canEditOrganizations: false,
   onClose() {},
 };
 

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

@@ -2,6 +2,14 @@
   margin: 10px 5px 0 0 ;
 }
 
+#manifest-actions-row {
+  display: flex;
+  flex-direction: row;
+  & > * {
+    margin-right: 8px;
+  }
+}
+
 .modal-body {
   overflow-y: auto;
   overflow-x: hidden;

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

@@ -18,7 +18,7 @@ import {
   MANIFEST_HISTORY_FAILURE,
 } from './ManifestConstants';
 
-export const uploadManifest = file => (dispatch) => {
+export const uploadManifest = file => async (dispatch) => {
   dispatch({ type: UPLOAD_MANIFEST_REQUEST });
 
   const formData = new FormData();
@@ -28,69 +28,69 @@ export const uploadManifest = file => (dispatch) => {
     'Content-Type': 'multipart/form-data',
   };
 
-  return api
-    .post(`/organizations/${orgId()}/subscriptions/upload`, formData, config)
-    .then(({ data }) => {
-      dispatch({
-        type: UPLOAD_MANIFEST_SUCCESS,
-        response: data,
-      });
-    })
-    .catch(result => dispatch(apiError(UPLOAD_MANIFEST_FAILURE, result)));
+  try {
+    const { data } = await api.post(`/organizations/${orgId()}/subscriptions/upload`, formData, config);
+    return dispatch({
+      type: UPLOAD_MANIFEST_SUCCESS,
+      response: data,
+    });
+  } catch (error) {
+    return dispatch(apiError(UPLOAD_MANIFEST_FAILURE, error));
+  }
 };
 
-export const refreshManifest = (extendedParams = {}) => (dispatch) => {
+export const refreshManifest = (extendedParams = {}) => async (dispatch) => {
   dispatch({ type: REFRESH_MANIFEST_REQUEST });
 
   const params = {
     ...propsToSnakeCase(extendedParams),
   };
 
-  return api
-    .put(`/organizations/${orgId()}/subscriptions/refresh_manifest`, {}, params)
-    .then(({ data }) => {
-      dispatch({
-        type: REFRESH_MANIFEST_SUCCESS,
-        response: data,
-      });
-    })
-    .catch(result => dispatch(apiError(REFRESH_MANIFEST_FAILURE, result)));
+  try {
+    const { data } = await api.put(`/organizations/${orgId()}/subscriptions/refresh_manifest`, {}, params);
+    return dispatch({
+      type: REFRESH_MANIFEST_SUCCESS,
+      response: data,
+    });
+  } catch (error) {
+    return dispatch(apiError(REFRESH_MANIFEST_FAILURE, error));
+  }
 };
 
-export const deleteManifest = (extendedParams = {}) => (dispatch) => {
+export const deleteManifest = (extendedParams = {}) => async (dispatch) => {
   dispatch({ type: DELETE_MANIFEST_REQUEST });
 
   const params = {
     ...propsToSnakeCase(extendedParams),
   };
 
-  return api
-    .post(`/organizations/${orgId()}/subscriptions/delete_manifest`, {}, params)
-    .then(({ data }) => {
-      dispatch({
-        type: DELETE_MANIFEST_SUCCESS,
-        response: data,
-      });
-    })
-    .catch(result => dispatch(apiError(DELETE_MANIFEST_FAILURE, result)));
+  try {
+    const { data } = await api.post(`/organizations/${orgId()}/subscriptions/delete_manifest`, {}, params);
+    return dispatch({
+      type: DELETE_MANIFEST_SUCCESS,
+      response: data,
+    });
+  } catch (error) {
+    return dispatch(apiError(DELETE_MANIFEST_FAILURE, error));
+  }
 };
 
-export const loadManifestHistory = (extendedParams = {}) => (dispatch) => {
+export const loadManifestHistory = (extendedParams = {}) => async (dispatch) => {
   dispatch({ type: MANIFEST_HISTORY_REQUEST });
 
   const params = {
     ...propsToSnakeCase(extendedParams),
   };
 
-  return api
-    .get(`/organizations/${orgId()}/subscriptions/manifest_history`, {}, params)
-    .then(({ data }) => {
-      dispatch({
-        type: MANIFEST_HISTORY_SUCCESS,
-        response: data,
-      });
-    })
-    .catch(result => dispatch(apiError(MANIFEST_HISTORY_FAILURE, result)));
+  try {
+    const { data } = await api.get(`/organizations/${orgId()}/subscriptions/manifest_history`, {}, params);
+    return dispatch({
+      type: MANIFEST_HISTORY_SUCCESS,
+      response: data,
+    });
+  } catch (error) {
+    return dispatch(apiError(MANIFEST_HISTORY_FAILURE, error));
+  }
 };
 
 export default loadManifestHistory;