katello 3.7.0.rc1 → 3.7.0.rc2

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

@@ -0,0 +1,19 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+
+import reducer from './SubscriptionDetailReducer';
+import * as subscriptionDetailActions from './SubscriptionDetailActions';
+import SubscriptionDetails from './SubscriptionDetails';
+
+// map state to props
+const mapStateToProps = state => ({
+  subscriptionDetails: state.katello.subscriptionDetails,
+});
+
+// map action dispatchers to props
+const mapDispatchToProps = dispatch => bindActionCreators(subscriptionDetailActions, dispatch);
+
+export const subscriptionDetails = reducer;
+
+// export connected component
+export default connect(mapStateToProps, mapDispatchToProps)(SubscriptionDetails);

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

@@ -2,11 +2,17 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Col, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel } 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 DeleteManifestModalText from './DeleteManifestModalText';
+import {
+  BLOCKING_FOREMAN_TASK_TYPES,
+  MANIFEST_TASKS_BULK_SEARCH_ID,
+} from '../SubscriptionConstants';
 
 class ManageManifestModal extends Component {
   constructor(props) {
@@ -24,6 +30,8 @@ class ManageManifestModal extends Component {
       'uploadManifest',
       'refreshManifest',
       'deleteManifest',
+      'manifestExists',
+      'disabledTooltipText',
     ]);
   }
 
@@ -31,9 +39,25 @@ class ManageManifestModal extends Component {
     this.loadData();
   }
 
-  componentWillReceiveProps(props) {
-    this.setState({ showModal: props.showModal });
-    this.setState({ actionInProgress: props.taskInProgress });
+  static getDerivedStateFromProps(newProps, prevState) {
+    if (
+      !isEqual(newProps.showModal, prevState.showModal) ||
+      !isEqual(newProps.taskInProgress, prevState.actionInProgress)
+    ) {
+      return {
+        showModal: newProps.showModal,
+        actionInProgress: newProps.taskInProgress,
+      };
+    }
+    return null;
+  }
+
+  componentDidUpdate(prevProp, prevState) {
+    const { actionInProgress } = this.state;
+
+    if (prevState.actionInProgress && !actionInProgress) {
+      this.props.loadOrganization();
+    }
   }
 
   loadData() {
@@ -50,10 +74,10 @@ class ManageManifestModal extends Component {
   }
 
   uploadManifest(fileList) {
+    this.setState({ actionInProgress: true });
     if (fileList.length > 0) {
-      this.props.uploadManifest(fileList[0]).then(this.props.loadOrganization);
+      this.props.uploadManifest(fileList[0]);
     }
-    this.setState({ actionInProgress: true });
   }
 
   refreshManifest() {
@@ -62,8 +86,15 @@ class ManageManifestModal extends Component {
   }
 
   deleteManifest() {
-    this.props.deleteManifest().then(this.props.loadOrganization);
     this.setState({ actionInProgress: true });
+    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,
+        }));
     this.showDeleteManifestModal(false);
   }
 
@@ -73,6 +104,19 @@ class ManageManifestModal extends Component {
     });
   }
 
+  disabledTooltipText() {
+    if (this.state.actionInProgress) {
+      return __('This is disabled because a manifest task is in progress');
+    }
+    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,
@@ -126,7 +170,7 @@ class ManageManifestModal extends Component {
                     <FormControl
                       id="cdnUrl"
                       type="text"
-                      value={organization.redhat_repository_url}
+                      value={organization.redhat_repository_url || ''}
                       onChange={this.saveOrganization}
                     />
                   </Col>
@@ -169,16 +213,17 @@ class ManageManifestModal extends Component {
                       tooltipText={disabledReason}
                       tooltipPlacement="top"
                       title={__('Refresh')}
-                      disabled={actionInProgress || disableManifestActions}
+                      disabled={!this.manifestExists() ||
+                        actionInProgress || disableManifestActions}
                     />
 
                     <TooltipButton
                       onClick={() => this.showDeleteManifestModal(true)}
                       tooltipId="delete-manifest-button-tooltip"
-                      tooltipText={__('This is disabled because a manifest task is in progress.')}
+                      tooltipText={this.disabledTooltipText()}
                       tooltipPlacement="top"
                       title={__('Delete')}
-                      disabled={actionInProgress}
+                      disabled={!this.manifestExists() || actionInProgress}
                     />
 
                     <ConfirmDialog
@@ -198,13 +243,13 @@ class ManageManifestModal extends Component {
             </Tab>
 
             <Tab eventKey={2} title={__('Manifest History')}>
-              <Spinner loading={manifestHistory.loading} className="small-spacer">
+              <LoadingState loading={manifestHistory.loading} loadingText={__('Loading')}>
                 <Table
                   rows={manifestHistory.results}
                   columns={columns}
                   emptyState={emptyStateData()}
                 />
-              </Spinner>
+              </LoadingState>
             </Tab>
           </Tabs>
         </Modal.Body>
@@ -232,6 +277,7 @@ ManageManifestModal.propTypes = {
   manifestHistory: PropTypes.shape({}).isRequired,
   showModal: PropTypes.bool.isRequired,
   onClose: PropTypes.func,
+  bulkSearch: PropTypes.func.isRequired,
 };
 
 ManageManifestModal.defaultProps = {

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

@@ -1,3 +1,8 @@
 .manifest-actions > * {
   margin: 10px 5px 0 0 ;
-}
+}
+
+.modal-body {
+  overflow-y: auto;
+  overflow-x: hidden;
+}

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

@@ -27,7 +27,7 @@ export const uploadManifest = file => (dispatch) => {
   };
 
   return api
-    .post(`/organizations/${orgId}/subscriptions/upload`, formData, config)
+    .post(`/organizations/${orgId()}/subscriptions/upload`, formData, config)
     .then(({ data }) => {
       dispatch({
         type: UPLOAD_MANIFEST_SUCCESS,
@@ -50,7 +50,7 @@ export const refreshManifest = (extendedParams = {}) => (dispatch) => {
   };
 
   return api
-    .put(`/organizations/${orgId}/subscriptions/refresh_manifest`, {}, params)
+    .put(`/organizations/${orgId()}/subscriptions/refresh_manifest`, {}, params)
     .then(({ data }) => {
       dispatch({
         type: REFRESH_MANIFEST_SUCCESS,
@@ -73,7 +73,7 @@ export const deleteManifest = (extendedParams = {}) => (dispatch) => {
   };
 
   return api
-    .post(`/organizations/${orgId}/subscriptions/delete_manifest`, {}, params)
+    .post(`/organizations/${orgId()}/subscriptions/delete_manifest`, {}, params)
     .then(({ data }) => {
       dispatch({
         type: DELETE_MANIFEST_SUCCESS,
@@ -96,7 +96,7 @@ export const loadManifestHistory = (extendedParams = {}) => (dispatch) => {
   };
 
   return api
-    .get(`/organizations/${orgId}/subscriptions/manifest_history`, {}, params)
+    .get(`/organizations/${orgId()}/subscriptions/manifest_history`, {}, params)
     .then(({ data }) => {
       dispatch({
         type: MANIFEST_HISTORY_SUCCESS,

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

@@ -1,30 +1,30 @@
-import { headerFormat, cellFormat } from '../../../move_to_foreman/components/common/table';
+import { headerFormatter, cellFormatter } from '../../../move_to_foreman/components/common/table';
 
 export const columns = [
   {
     property: 'status',
     header: {
       label: __('Status'),
-      formatters: [headerFormat],
+      formatters: [headerFormatter],
       props: {
         index: 0,
       },
     },
     cell: {
-      formatters: [cellFormat],
+      formatters: [cellFormatter],
     },
   },
   {
     property: 'statusMessage',
     header: {
       label: __('Message'),
-      formatters: [headerFormat],
+      formatters: [headerFormatter],
       props: {
         index: 1,
       },
     },
     cell: {
-      formatters: [cellFormat],
+      formatters: [cellFormatter],
     },
   },
   // TODO: use date formatter from tomas' PR
@@ -32,13 +32,13 @@ export const columns = [
     property: 'created',
     header: {
       label: __('Timestamp'),
-      formatters: [headerFormat],
+      formatters: [headerFormatter],
       props: {
         index: 2,
       },
     },
     cell: {
-      formatters: [cellFormat],
+      formatters: [cellFormatter],
     },
   },
 ];

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

@@ -159,7 +159,7 @@ exports[`manage manifest modal should render 1`] = `
                 type="file"
               />
               <TooltipButton
-                disabled={false}
+                disabled={true}
                 onClick={[Function]}
                 title="Refresh"
                 tooltipId="refresh-manifest-button-tooltip"
@@ -167,12 +167,12 @@ exports[`manage manifest modal should render 1`] = `
                 tooltipText=""
               />
               <TooltipButton
-                disabled={false}
+                disabled={true}
                 onClick={[Function]}
                 title="Delete"
                 tooltipId="delete-manifest-button-tooltip"
                 tooltipPlacement="top"
-                tooltipText="This is disabled because a manifest task is in progress."
+                tooltipText="This is disabled because no manifest exists"
               />
               <ConfirmDialog
                 active={false}
@@ -212,12 +212,9 @@ exports[`manage manifest modal should render 1`] = `
         eventKey={2}
         title="Manifest History"
       >
-        <Spinner
-          className="small-spacer"
-          inline={false}
-          inverse={false}
+        <LoadingState
           loading={false}
-          size="md"
+          loadingText="Loading"
         >
           <Table
             columns={
@@ -340,7 +337,7 @@ exports[`manage manifest modal should render 1`] = `
               ]
             }
           />
-        </Spinner>
+        </LoadingState>
       </Tab>
     </Uncontrolled(Tabs)>
   </ModalBody>

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

@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 
 import * as manifestActions from './ManifestActions';
 import * as organizationActions from '../../Organizations/OrganizationActions';
-
+import * as tasksActions from '../../Tasks/TaskActions';
 import history from './ManifestHistoryReducer';
 
 import ManifestModal from './ManageManifestModal';
@@ -18,7 +18,7 @@ const mapStateToProps = state => ({
 });
 
 // map action dispatchers to props
-const actions = { ...manifestActions, ...organizationActions };
+const actions = { ...manifestActions, ...organizationActions, ...tasksActions };
 const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 
 // export reducers

data/webpack/scenes/Subscriptions/SubscriptionActions.js

@@ -16,11 +16,10 @@ import {
   DELETE_SUBSCRIPTIONS_FAILURE,
 } from './SubscriptionConstants';
 import { filterRHSubscriptions } from './SubscriptionHelpers.js';
-
-const getResponseError = ({ data }) => data && (data.displayMessage || data.error);
+import { getResponseError } from '../../move_to_foreman/common/helpers.js';
 
 export const createSubscriptionParams = (extendedParams = {}) => ({
-  ...{ organization_id: orgId },
+  ...{ organization_id: orgId() },
   ...propsToSnakeCase(extendedParams),
 });
 
@@ -29,7 +28,7 @@ export const loadAvailableQuantities = (extendedParams = {}) => (dispatch) => {
 
   const params = createSubscriptionParams(extendedParams);
   return api
-    .get(`/organizations/${orgId}/upstream_subscriptions`, {}, params)
+    .get(`/organizations/${orgId()}/upstream_subscriptions`, {}, params)
     .then(({ data }) => {
       dispatch({
         type: SUBSCRIPTIONS_QUANTITIES_SUCCESS,
@@ -77,7 +76,7 @@ export const updateQuantity = (quantities = {}) => (dispatch) => {
   };
 
   return api
-    .put(`/organizations/${orgId}/upstream_subscriptions`, params)
+    .put(`/organizations/${orgId()}/upstream_subscriptions`, params)
     .then(({ data }) => {
       dispatch({
         type: UPDATE_QUANTITY_SUCCESS,
@@ -100,7 +99,7 @@ export const deleteSubscriptions = poolIds => (dispatch) => {
   };
 
   return api
-    .delete(`/organizations/${orgId}/upstream_subscriptions`, {}, params)
+    .delete(`/organizations/${(orgId())}/upstream_subscriptions`, {}, params)
     .then(({ data }) => {
       dispatch({
         type: DELETE_SUBSCRIPTIONS_SUCCESS,

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -97,15 +97,14 @@ export default (state = initialState, action) => {
     }
 
     case TASK_BULK_SEARCH_SUCCESS: {
-      let tasks = [];
+      let tasks;
 
       const search = find(action.response, bulkSearch =>
         bulkSearch.search_params.search_id === MANIFEST_TASKS_BULK_SEARCH_ID);
 
-      if (search) {
+      if (search && search.results.length > 0) {
         tasks = search.results;
       }
-
       return state.set('tasks', tasks);
     }
 

data/webpack/scenes/Subscriptions/SubscriptionValidations.js

@@ -8,7 +8,7 @@ export const validateQuantity = (quantity, availableQuantity) => {
   if (Number.isNaN(numberValue)) {
     state = 'error';
     message = __('Not a number');
-  } else if (numberValue < 0) {
+  } else if (numberValue <= 0) {
     state = 'error';
     message = __('Has to be > 0');
   } else if (availableQuantity && availableQuantity >= 0 && numberValue > availableQuantity) {

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -9,7 +9,7 @@ import { notify } from '../../move_to_foreman/foreman_toast_notifications';
 import helpers from '../../move_to_foreman/common/helpers';
 import ModalProgressBar from '../../move_to_foreman/components/common/ModalProgressBar';
 import ManageManifestModal from './Manifest/';
-import SubscriptionsTable from './SubscriptionsTable';
+import { SubscriptionsTable } from './components/SubscriptionsTable';
 import Search from '../../components/Search/index';
 import api, { orgId } from '../../services/api';
 import { createSubscriptionParams } from './SubscriptionActions.js';
@@ -19,6 +19,7 @@ import {
   BULK_TASK_SEARCH_INTERVAL,
 } from './SubscriptionConstants';
 
+import './SubscriptionsPage.scss';
 
 class SubscriptionsPage extends Component {
   constructor(props) {
@@ -27,7 +28,6 @@ class SubscriptionsPage extends Component {
       manifestModalOpen: false,
       subscriptionDeleteModalOpen: false,
       disableDeleteButton: true,
-      polledTask: null,
       showTaskModal: false,
       searchQuery: '',
     };
@@ -37,6 +37,35 @@ class SubscriptionsPage extends Component {
     this.loadData();
   }
 
+  static getDerivedStateFromProps(nextProps, prevState) {
+    const nextTaskId = nextProps.tasks[0] && nextProps.tasks[0].id;
+
+    if (nextProps.tasks.length === 0 && prevState.polledTask != null) {
+      return { showTaskModal: false, polledTask: undefined };
+    } else if (nextProps.tasks.length > 0 && nextTaskId !== prevState.polledTask) {
+      return {
+        showTaskModal: true,
+        manifestModalOpen: false,
+        polledTask: nextProps.tasks[0].id,
+      };
+    }
+    return null;
+  }
+
+  componentDidUpdate(prevProps) {
+    const { tasks } = this.props;
+    const numberOfTasks = tasks.length;
+    const numberOfPrevTasks = prevProps.tasks.length;
+    let task;
+
+    if (numberOfTasks > 0) {
+      if (numberOfPrevTasks === 0 || prevProps.tasks[0].id !== tasks[0].id) {
+        [task] = this.props.tasks;
+        this.handleDoneTask(task);
+      }
+    }
+  }
+
   getDisabledReason(deleteButton) {
     const { tasks, subscriptions } = this.props;
     const { disconnected } = subscriptions;
@@ -53,16 +82,6 @@ class SubscriptionsPage extends Component {
     return disabledReason;
   }
 
-  showTaskModal(show) {
-    if (this.state.showTaskModal !== show) {
-      this.setState({ showTaskModal: show });
-
-      if (show && this.state.manifestModalOpen) {
-        this.setState({ manifestModalOpen: false });
-      }
-    }
-  }
-
   loadData() {
     this.props.pollBulkSearch({
       search_id: MANIFEST_TASKS_BULK_SEARCH_ID,
@@ -77,23 +96,25 @@ class SubscriptionsPage extends Component {
 
   handleDoneTask(taskToPoll) {
     const POLL_TASK_INTERVAL = 5000;
+    const { pollTaskUntilDone, loadSubscriptions } = this.props;
 
-    if (!this.state.polledTask) {
-      this.setState({ polledTask: taskToPoll });
-      this.props.pollTaskUntilDone(taskToPoll.id, {}, POLL_TASK_INTERVAL).then((task) => {
+    pollTaskUntilDone(taskToPoll.id, {}, POLL_TASK_INTERVAL)
+      .then((task) => {
         function getErrors() {
           return (
             <ul>
-              {
-                task.humanized.errors.map(error => <li key={error}> {error} </li>)
-              }
+              {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>
+            <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.')}
@@ -101,11 +122,13 @@ class SubscriptionsPage extends Component {
           </span>
         );
 
-        notify({ message: ReactDOMServer.renderToStaticMarkup(message), type: task.result });
+        notify({
+          message: ReactDOMServer.renderToStaticMarkup(message),
+          type: task.result,
+        });
 
-        this.props.loadSubscriptions();
+        loadSubscriptions();
       });
-    }
   }
 
   render() {
@@ -118,13 +141,6 @@ class SubscriptionsPage extends Component {
 
     if (taskInProgress) {
       [task] = tasks;
-      this.handleDoneTask(task);
-    }
-
-    if (task) {
-      this.showTaskModal(true);
-    } else {
-      this.showTaskModal(false);
     }
 
     const onSearch = (search) => {
@@ -134,7 +150,7 @@ class SubscriptionsPage extends Component {
     const getAutoCompleteParams = search => ({
       endpoint: '/subscriptions/auto_complete_search',
       params: {
-        organization_id: orgId,
+        organization_id: orgId(),
         search,
       },
     });