katello 3.7.0 → 3.7.1

data/webpack/scenes/Subscriptions/Details/__tests__/subscriptionDetails.fixtures.js

@@ -3,6 +3,10 @@ import { toastErrorAction, failureAction } from '../../../../services/api/testHe
 
 export const initialState = Immutable({
   loading: false,
+  enabledProducts: {
+    results: [],
+    total: 0,
+  },
 });
 
 

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

@@ -2,6 +2,7 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router';
 import reducer from './SubscriptionDetailReducer';
+import { loadProducts } from '../../Products/ProductActions';
 import * as subscriptionDetailActions from './SubscriptionDetailActions';
 import SubscriptionDetails from './SubscriptionDetails';
 
@@ -11,7 +12,8 @@ const mapStateToProps = state => ({
 });
 
 // map action dispatchers to props
-const mapDispatchToProps = dispatch => bindActionCreators(subscriptionDetailActions, dispatch);
+const actions = { ...subscriptionDetailActions, loadProducts };
+const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 
 export const subscriptionDetails = reducer;
 

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

@@ -1,13 +1,15 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Col, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel } from 'react-bootstrap';
+import { Col, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel, Row } from 'react-bootstrap';
 import { bindMethods, Button, Icon, Modal, Spinner, OverlayTrigger, Tooltip } from 'patternfly-react';
 import { isEqual } from 'lodash';
 import TooltipButton from 'react-bootstrap-tooltip-button';
 import { LoadingState } from '../../../move_to_pf/LoadingState';
 import { Table } from '../../../move_to_foreman/components/common/table';
-import { columns } from './ManifestHistoryTableSchema';
 import ConfirmDialog from '../../../move_to_foreman/components/common/ConfirmDialog';
+import { manifestExists } from '../SubscriptionHelpers';
+import { columns } from './ManifestHistoryTableSchema';
+import { renderTaskStartedToast } from '../../Tasks/helpers';
 import DeleteManifestModalText from './DeleteManifestModalText';
 import {
   BLOCKING_FOREMAN_TASK_TYPES,
@@ -30,15 +32,11 @@ class ManageManifestModal extends Component {
       'uploadManifest',
       'refreshManifest',
       'deleteManifest',
-      'manifestExists',
       'disabledTooltipText',
+      'updateRepositoryUrl',
     ]);
   }
 
-  componentDidMount() {
-    this.loadData();
-  }
-
   static getDerivedStateFromProps(newProps, prevState) {
     if (
       !isEqual(newProps.showModal, prevState.showModal) ||
@@ -52,6 +50,10 @@ class ManageManifestModal extends Component {
     return null;
   }
 
+  componentDidMount() {
+    this.loadData();
+  }
+
   componentDidUpdate(prevProp, prevState) {
     const { actionInProgress } = this.state;
 
@@ -69,14 +71,27 @@ class ManageManifestModal extends Component {
     this.props.onClose();
   }
 
-  saveOrganization(event) {
-    this.props.saveOrganization({ redhat_repository_url: event.target.value });
+  updateRepositoryUrl(event) {
+    this.setState({ redhat_repository_url: event.target.value });
+  }
+
+  saveOrganization() {
+    this.props.saveOrganization({ redhat_repository_url: this.state.redhat_repository_url });
   }
 
   uploadManifest(fileList) {
     this.setState({ actionInProgress: true });
     if (fileList.length > 0) {
-      this.props.uploadManifest(fileList[0]);
+      this.props
+        .uploadManifest(fileList[0])
+        .then(() =>
+          this.props.bulkSearch({
+            search_id: MANIFEST_TASKS_BULK_SEARCH_ID,
+            type: 'all',
+            active_only: true,
+            action_types: BLOCKING_FOREMAN_TASK_TYPES,
+          }))
+        .then(() => renderTaskStartedToast(this.props.taskDetails));
     }
   }
 
@@ -87,14 +102,16 @@ class ManageManifestModal extends Component {
 
   deleteManifest() {
     this.setState({ actionInProgress: true });
-    this.props.deleteManifest()
+    this.props
+      .deleteManifest()
       .then(() =>
         this.props.bulkSearch({
           search_id: MANIFEST_TASKS_BULK_SEARCH_ID,
           type: 'all',
           active_only: true,
           action_types: BLOCKING_FOREMAN_TASK_TYPES,
-        }));
+        }))
+      .then(() => renderTaskStartedToast(this.props.taskDetails));
     this.showDeleteManifestModal(false);
   }
 
@@ -111,15 +128,12 @@ class ManageManifestModal extends Component {
     return __('This is disabled because no manifest exists');
   }
 
-  manifestExists() {
-    const { organization } = this.props;
-
-    return organization.owner_details && organization.owner_details.upstreamConsumer;
-  }
-
   render() {
     const {
-      manifestHistory, organization, disableManifestActions, disabledReason,
+      manifestHistory,
+      organization,
+      disableManifestActions,
+      disabledReason,
     } = this.props;
 
     const { actionInProgress } = this.state;
@@ -132,13 +146,23 @@ class ManageManifestModal extends Component {
         url: 'http://redhat.com',
       },
     });
-
+    const buttonLoading = (
+      <span>
+        {__('Updating...')}
+        <span className="fa fa-spinner fa-spin" />
+      </span>);
     const getManifestName = () => {
       let name = __('No Manifest Uploaded');
 
-      if (organization.owner_details && organization.owner_details.upstreamConsumer) {
-        const link = ['https://', organization.owner_details.upstreamConsumer.webUrl,
-          organization.owner_details.upstreamConsumer.uuid].join('/');
+      if (
+        organization.owner_details &&
+        organization.owner_details.upstreamConsumer
+      ) {
+        const link = [
+          'https://',
+          organization.owner_details.upstreamConsumer.webUrl,
+          organization.owner_details.upstreamConsumer.uuid,
+        ].join('/');
 
         name = (
           <a href={link}>{organization.owner_details.upstreamConsumer.name}</a>
@@ -151,7 +175,11 @@ class ManageManifestModal extends Component {
     return (
       <Modal show={this.state.showModal} onHide={this.hideModal}>
         <Modal.Header>
-          <button className="close" onClick={this.hideModal} aria-label={__('Close')}>
+          <button
+            className="close"
+            onClick={this.hideModal}
+            aria-label={__('Close')}
+          >
             <Icon type="pf" name="close" />
           </button>
           <Modal.Title>{__('Manage Manifest')}</Modal.Title>
@@ -163,29 +191,43 @@ class ManageManifestModal extends Component {
                 <h5>{__('Red Hat Provider Details')}</h5>
                 <hr />
                 <FormGroup>
-                  <ControlLabel className="col-sm-3" htmlFor="cdnUrl">
-                    {__('Red Hat CDN URL')}
-                  </ControlLabel>
+                  <Col sm={3}>
+                    <ControlLabel htmlFor="cdnUrl">
+                      {__('Red Hat CDN URL')}
+                    </ControlLabel>
+                  </Col>
                   <Col sm={9}>
                     <FormControl
                       id="cdnUrl"
                       type="text"
-                      value={organization.redhat_repository_url || ''}
-                      onChange={this.saveOrganization}
+                      value={this.state.redhat_repository_url || organization.redhat_repository_url || ''}
+                      onChange={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">
+                  <ControlLabel
+                    className="col-sm-3 control-label"
+                    htmlFor="usmaFile"
+                  >
                     <OverlayTrigger
                       overlay={
-                        <Tooltip id="usma-tooltip">{__('Upstream Subscription Management Application')}</Tooltip>
-                        }
+                        <Tooltip id="usma-tooltip">
+                          {__('Upstream Subscription Management Application')}
+                        </Tooltip>
+                      }
                       placement="bottom"
                       trigger={['hover', 'focus']}
                       rootClose={false}
@@ -213,7 +255,7 @@ class ManageManifestModal extends Component {
                       tooltipText={disabledReason}
                       tooltipPlacement="top"
                       title={__('Refresh')}
-                      disabled={!this.manifestExists() ||
+                      disabled={!manifestExists(organization) ||
                         actionInProgress || disableManifestActions}
                     />
 
@@ -223,7 +265,7 @@ class ManageManifestModal extends Component {
                       tooltipText={this.disabledTooltipText()}
                       tooltipPlacement="top"
                       title={__('Delete')}
-                      disabled={!this.manifestExists() || actionInProgress}
+                      disabled={!manifestExists(organization) || actionInProgress}
                     />
 
                     <ConfirmDialog
@@ -278,9 +320,11 @@ ManageManifestModal.propTypes = {
   showModal: PropTypes.bool.isRequired,
   onClose: PropTypes.func,
   bulkSearch: PropTypes.func.isRequired,
+  taskDetails: PropTypes.shape({}),
 };
 
 ManageManifestModal.defaultProps = {
+  taskDetails: undefined,
   disableManifestActions: false,
   disabledReason: '',
   onClose() {},

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

@@ -4,6 +4,8 @@ import {
   MANIFEST_HISTORY_REQUEST,
   MANIFEST_HISTORY_SUCCESS,
   MANIFEST_HISTORY_FAILURE,
+  UPLOAD_MANIFEST_SUCCESS,
+  DELETE_MANIFEST_SUCCESS,
 } from './ManifestConstants';
 
 const initialState = Immutable({ loading: true, results: [] });
@@ -28,6 +30,12 @@ export default (state = initialState, action) => {
         loading: false,
       });
 
+    case UPLOAD_MANIFEST_SUCCESS:
+      return state.set('taskDetails', action.response);
+
+    case DELETE_MANIFEST_SUCCESS:
+      return state.set('taskDetails', action.response);
+
     default:
       return state;
   }

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

@@ -4,6 +4,8 @@ import toJson from 'enzyme-to-json';
 import ManageManifestModal from '../ManageManifestModal';
 import { manifestHistorySuccessState } from './manifest.fixtures';
 
+jest.mock('../../../../move_to_foreman/foreman_toast_notifications');
+
 describe('manage manifest modal', () => {
   const noop = () => {};
   const organization = { id: 1, redhat_repository_url: 'https://redhat.com' };
@@ -17,6 +19,7 @@ describe('manage manifest modal', () => {
       organization={organization}
       loadOrganization={noop}
       saveOrganization={noop}
+      bulkSearch={noop}
       manifestHistory={manifestHistorySuccessState}
       taskInProgress={false}
       showModal

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

@@ -73,14 +73,19 @@ exports[`manage manifest modal should render 1`] = `
           <FormGroup
             bsClass="form-group"
           >
-            <ControlLabel
-              bsClass="control-label"
-              className="col-sm-3"
-              htmlFor="cdnUrl"
-              srOnly={false}
+            <Col
+              bsClass="col"
+              componentClass="div"
+              sm={3}
             >
-              Red Hat CDN URL
-            </ControlLabel>
+              <ControlLabel
+                bsClass="control-label"
+                htmlFor="cdnUrl"
+                srOnly={false}
+              >
+                Red Hat CDN URL
+              </ControlLabel>
+            </Col>
             <Col
               bsClass="col"
               componentClass="div"
@@ -96,6 +101,27 @@ exports[`manage manifest modal should render 1`] = `
               />
             </Col>
           </FormGroup>
+          <FormGroup
+            bsClass="form-group"
+          >
+            <Col
+              bsClass="col"
+              componentClass="div"
+              sm={3}
+              smOffset={3}
+            >
+              <Button
+                active={false}
+                block={false}
+                bsClass="btn"
+                bsStyle="default"
+                disabled={false}
+                onClick={[Function]}
+              >
+                Update
+              </Button>
+            </Col>
+          </FormGroup>
           <br />
           <h5>
             Subscription Manifest
@@ -215,6 +241,7 @@ exports[`manage manifest modal should render 1`] = `
         <LoadingState
           loading={false}
           loadingText="Loading"
+          timeout={300}
         >
           <Table
             columns={

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

@@ -15,6 +15,7 @@ import './Manifest.scss';
 const mapStateToProps = state => ({
   organization: state.katello.organization,
   manifestHistory: state.katello.manifestHistory,
+  taskDetails: state.katello.manifestHistory.taskDetails,
 });
 
 // map action dispatchers to props

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -21,6 +21,7 @@ export const BLOCKING_FOREMAN_TASK_TYPES = [
   'Actions::Katello::UpstreamSubscriptions::BindEntitlements',
   'Actions::Katello::UpstreamSubscriptions::UpdateEntitlement',
   'Actions::Katello::UpstreamSubscriptions::RemoveEntitlements',
+  'Actions::Katello::UpstreamSubscriptions::UpdateEntitlements',
 ];
 
 export const MANIFEST_TASKS_BULK_SEARCH_ID = 'activeManifestTasksSearch';

data/webpack/scenes/Subscriptions/SubscriptionHelpers.js

@@ -1,3 +1,6 @@
 // eslint-disable-next-line import/prefer-default-export
 export const filterRHSubscriptions = subscriptions =>
   subscriptions.filter(sub => sub.available >= 0);
+
+export const manifestExists = organization =>
+  organization.owner_details && organization.owner_details.upstreamConsumer;

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -23,7 +23,7 @@ import { GET_SETTING_SUCCESS } from '../../move_to_foreman/Settings/SettingsCons
 const initialState = Immutable({
   ...initialApiState,
   quantitiesLoading: false,
-  availableQuantities: {},
+  availableQuantities: null,
   tasks: [],
 });
 
@@ -85,7 +85,10 @@ export default (state = initialState, action) => {
       });
 
     case SUBSCRIPTIONS_QUANTITIES_REQUEST:
-      return state.set('quantitiesLoading', true);
+      return state.merge({
+        quantitiesLoading: true,
+        availableQuantities: null,
+      });
 
     case SUBSCRIPTIONS_QUANTITIES_SUCCESS: {
       return state.merge({
@@ -97,6 +100,7 @@ export default (state = initialState, action) => {
     case SUBSCRIPTIONS_QUANTITIES_FAILURE: {
       return state.merge({
         quantitiesLoading: false,
+        availableQuantities: {},
       });
     }
 

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -1,15 +1,14 @@
 import React, { Component } from 'react';
-import ReactDOMServer from 'react-dom/server';
 import PropTypes from 'prop-types';
 import { LinkContainer } from 'react-router-bootstrap';
 import { Grid, Row, Col, Form, FormGroup } from 'react-bootstrap';
 import { Button } from 'patternfly-react';
 import TooltipButton from 'react-bootstrap-tooltip-button';
-import { notify } from '../../move_to_foreman/foreman_toast_notifications';
-import helpers from '../../move_to_foreman/common/helpers';
+import { renderTaskFinishedToast } from '../Tasks/helpers';
 import ModalProgressBar from '../../move_to_foreman/components/common/ModalProgressBar';
 import ManageManifestModal from './Manifest/';
 import { SubscriptionsTable } from './components/SubscriptionsTable';
+import { manifestExists } from './SubscriptionHelpers';
 import Search from '../../components/Search/index';
 import api, { orgId } from '../../services/api';
 import { createSubscriptionParams } from './SubscriptionActions.js';
@@ -70,7 +69,7 @@ class SubscriptionsPage extends Component {
   }
 
   getDisabledReason(deleteButton) {
-    const { tasks = [], subscriptions } = this.props;
+    const { tasks = [], subscriptions, organization } = this.props;
     const { disconnected } = subscriptions;
     let disabledReason = null;
 
@@ -79,7 +78,9 @@ class SubscriptionsPage extends Component {
     } else if (tasks.length > 0) {
       disabledReason = __('This is disabled because a manifest related task is in progress.');
     } else if (deleteButton && !disabledReason) {
-      disabledReason = __('This is disabled because no subscriptions are selected');
+      disabledReason = __('This is disabled because no subscriptions are selected.');
+    } else if (!manifestExists(organization)) {
+      disabledReason = __('This is disabled because no manifest has been uploaded.');
     }
 
     return disabledReason;
@@ -103,39 +104,14 @@ class SubscriptionsPage extends Component {
 
     pollTaskUntilDone(taskToPoll.id, {}, POLL_TASK_INTERVAL)
       .then((task) => {
-        function getErrors() {
-          return (
-            <ul>
-              {task.humanized.errors.map(error => (
-                <li key={error}> {error} </li>
-              ))}
-            </ul>
-          );
-        }
-
-        const message = (
-          <span>
-            <span>
-              {`${__(`Task ${task.humanized.action} completed with a result of ${task.result}.`)} `}
-            </span>
-            {task.errors ? getErrors() : ''}
-            <a href={helpers.urlBuilder('foreman_tasks/tasks', '', task.id)}>
-              {__('Click here to go to the tasks page for the task.')}
-            </a>
-          </span>
-        );
-
-        notify({
-          message: ReactDOMServer.renderToStaticMarkup(message),
-          type: task.result,
-        });
-
+        renderTaskFinishedToast(task);
         loadSubscriptions();
       });
   }
 
   render() {
-    const { tasks = [], subscriptions } = this.props;
+    const { tasks = [], subscriptions, organization } = this.props;
+    const currentOrg = orgId();
     const { disconnected } = subscriptions;
     const taskInProgress = tasks.length > 0;
     const disableManifestActions = taskInProgress || disconnected;
@@ -153,7 +129,7 @@ class SubscriptionsPage extends Component {
     const getAutoCompleteParams = search => ({
       endpoint: '/subscriptions/auto_complete_search',
       params: {
-        organization_id: orgId(),
+        organization_id: currentOrg,
         search,
       },
     });
@@ -187,8 +163,18 @@ class SubscriptionsPage extends Component {
       this.setState({ disableDeleteButton: !rowsSelected });
     };
 
+
     const csvParams = createSubscriptionParams({ search: this.state.searchQuery });
 
+    const emptyStateData = {
+      header: __('There are no Subscriptions to display'),
+      description: __('Import a Manifest to manage your Entitlements.'),
+      action: {
+        onClick: showManageManifestModal,
+        title: __('Import a Manifest'),
+      },
+    };
+
     return (
       <Grid bsClass="container-fluid">
         <Row>
@@ -208,7 +194,10 @@ class SubscriptionsPage extends Component {
 
                   <div className="toolbar-pf-action-right">
                     <FormGroup>
-                      <LinkContainer to="subscriptions/add" disabled={disableManifestActions}>
+                      <LinkContainer
+                        to="subscriptions/add"
+                        disabled={disableManifestActions || !manifestExists(organization)}
+                      >
                         <TooltipButton
                           tooltipId="add-subscriptions-button-tooltip"
                           tooltipText={this.getDisabledReason()}
@@ -257,11 +246,14 @@ class SubscriptionsPage extends Component {
               <SubscriptionsTable
                 loadSubscriptions={this.props.loadSubscriptions}
                 updateQuantity={this.props.updateQuantity}
+                emptyState={emptyStateData}
                 subscriptions={this.props.subscriptions}
                 subscriptionDeleteModalOpen={this.state.subscriptionDeleteModalOpen}
                 onSubscriptionDeleteModalClose={onSubscriptionDeleteModalClose}
                 onDeleteSubscriptions={onDeleteSubscriptions}
                 toggleDeleteButton={toggleDeleteButton}
+                task={task}
+                bulkSearch={this.props.bulkSearch}
               />
               <ModalProgressBar
                 show={this.state.showTaskModal}
@@ -279,8 +271,10 @@ class SubscriptionsPage extends Component {
 SubscriptionsPage.propTypes = {
   loadSubscriptions: PropTypes.func.isRequired,
   updateQuantity: PropTypes.func.isRequired,
-  subscriptions: PropTypes.shape().isRequired,
+  subscriptions: PropTypes.shape({}).isRequired,
+  organization: PropTypes.shape({}).isRequired,
   pollBulkSearch: PropTypes.func.isRequired,
+  bulkSearch: PropTypes.func,
   pollTaskUntilDone: PropTypes.func.isRequired,
   loadSetting: PropTypes.func.isRequired,
   tasks: PropTypes.arrayOf(PropTypes.shape({})),
@@ -289,6 +283,7 @@ SubscriptionsPage.propTypes = {
 
 SubscriptionsPage.defaultProps = {
   tasks: [],
+  bulkSearch: undefined,
 };
 
 export default SubscriptionsPage;