katello 3.7.1.1 → 3.8.0.rc1

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

@@ -30,9 +30,7 @@ describe('manifest history reducer', () => {
   it('should have error on MANIFEST_HISTORY_FAILURE', () => {
     expect(reducer(manifestHistoryInitialState, {
       type: types.MANIFEST_HISTORY_FAILURE,
-      payload: {
-        message: 'Unable to process request.',
-      },
+      error: 'Unable to process request.',
     })).toEqual(manifestHistoryErrorState);
   });
 });

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

@@ -73,19 +73,14 @@ exports[`manage manifest modal should render 1`] = `
           <FormGroup
             bsClass="form-group"
           >
-            <Col
-              bsClass="col"
-              componentClass="div"
-              sm={3}
+            <ControlLabel
+              bsClass="control-label"
+              className="col-sm-3"
+              htmlFor="cdnUrl"
+              srOnly={false}
             >
-              <ControlLabel
-                bsClass="control-label"
-                htmlFor="cdnUrl"
-                srOnly={false}
-              >
-                Red Hat CDN URL
-              </ControlLabel>
-            </Col>
+              Red Hat CDN URL
+            </ControlLabel>
             <Col
               bsClass="col"
               componentClass="div"
@@ -101,27 +96,6 @@ 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
@@ -241,7 +215,6 @@ exports[`manage manifest modal should render 1`] = `
         <LoadingState
           loading={false}
           loadingText="Loading"
-          timeout={300}
         >
           <Table
             columns={

data/webpack/scenes/Subscriptions/Manifest/__tests__/manifest.fixtures.js

@@ -1,5 +1,4 @@
 import Immutable from 'seamless-immutable';
-import { toastErrorAction, failureAction } from '../../../../services/api/testHelpers';
 
 export const manifestHistoryInitialState = Immutable({
   loading: true,
@@ -150,8 +149,10 @@ export const manifestHistoryFailureActions = [
   {
     type: 'MANIFEST_HISTORY_REQUEST',
   },
-  failureAction('MANIFEST_HISTORY_FAILURE'),
-  toastErrorAction(),
+  {
+    result: new Error('Request failed with status code 422'),
+    type: 'MANIFEST_HISTORY_FAILURE',
+  },
 ];
 
 export const uploadManifestSuccessActions = [
@@ -168,8 +169,10 @@ export const uploadManifestFailureActions = [
   {
     type: 'UPLOAD_MANIFEST_REQUEST',
   },
-  failureAction('UPLOAD_MANIFEST_FAILURE'),
-  toastErrorAction(),
+  {
+    result: new Error('Request failed with status code 422'),
+    type: 'UPLOAD_MANIFEST_FAILURE',
+  },
 ];
 
 export const refreshManifestSuccessActions = [
@@ -186,8 +189,10 @@ export const refreshManifestFailureActions = [
   {
     type: 'REFRESH_MANIFEST_REQUEST',
   },
-  failureAction('REFRESH_MANIFEST_FAILURE'),
-  toastErrorAction(),
+  {
+    result: new Error('Request failed with status code 422'),
+    type: 'REFRESH_MANIFEST_FAILURE',
+  },
 ];
 
 export const deleteManifestSuccessActions = [
@@ -204,6 +209,8 @@ export const deleteManifestFailureActions = [
   {
     type: 'DELETE_MANIFEST_REQUEST',
   },
-  failureAction('DELETE_MANIFEST_FAILURE'),
-  toastErrorAction(),
+  {
+    result: new Error('Request failed with status code 422'),
+    type: 'DELETE_MANIFEST_FAILURE',
+  },
 ];

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

@@ -15,7 +15,6 @@ 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/SubscriptionActions.js

@@ -16,7 +16,7 @@ import {
   DELETE_SUBSCRIPTIONS_FAILURE,
 } from './SubscriptionConstants';
 import { filterRHSubscriptions } from './SubscriptionHelpers.js';
-import { apiError } from '../../move_to_foreman/common/helpers.js';
+import { getResponseError } from '../../move_to_foreman/common/helpers.js';
 
 export const createSubscriptionParams = (extendedParams = {}) => ({
   ...{ organization_id: orgId() },
@@ -35,7 +35,12 @@ export const loadAvailableQuantities = (extendedParams = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch(result => dispatch(apiError(SUBSCRIPTIONS_QUANTITIES_FAILURE, result)));
+    .catch((result) => {
+      dispatch({
+        type: SUBSCRIPTIONS_QUANTITIES_FAILURE,
+        error: getResponseError(result.response),
+      });
+    });
 };
 
 export const loadSubscriptions = (extendedParams = {}) => (dispatch) => {
@@ -55,7 +60,12 @@ export const loadSubscriptions = (extendedParams = {}) => (dispatch) => {
         dispatch(loadAvailableQuantities({ poolIds }));
       }
     })
-    .catch(result => dispatch(apiError(SUBSCRIPTIONS_FAILURE, result)));
+    .catch((result) => {
+      dispatch({
+        type: SUBSCRIPTIONS_FAILURE,
+        error: getResponseError(result.response),
+      });
+    });
 };
 
 export const updateQuantity = (quantities = {}) => (dispatch) => {
@@ -73,7 +83,12 @@ export const updateQuantity = (quantities = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch(result => dispatch(apiError(UPDATE_QUANTITY_FAILURE, result)));
+    .catch((result) => {
+      dispatch({
+        type: UPDATE_QUANTITY_FAILURE,
+        error: getResponseError(result.response),
+      });
+    });
 };
 
 export const deleteSubscriptions = poolIds => (dispatch) => {
@@ -91,7 +106,13 @@ export const deleteSubscriptions = poolIds => (dispatch) => {
         response: data,
       });
     })
-    .catch(result => dispatch(apiError(DELETE_SUBSCRIPTIONS_FAILURE, result)));
+    .catch((result) => {
+      dispatch({
+        type: DELETE_SUBSCRIPTIONS_FAILURE,
+        result,
+      });
+    });
 };
 
+
 export default loadSubscriptions;

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -21,7 +21,6 @@ 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,6 +1,3 @@
 // 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: null,
+  availableQuantities: {},
   tasks: [],
 });
 
@@ -73,22 +73,15 @@ export default (state = initialState, action) => {
       return state.set('loading', false);
 
     case SUBSCRIPTIONS_FAILURE:
-      return state
-        .set('loading', false)
-        .set('results', [])
-        .set('itemCount', 0);
-
     case UPDATE_QUANTITY_FAILURE:
     case DELETE_SUBSCRIPTIONS_FAILURE:
       return state.merge({
+        error: action.error,
         loading: false,
       });
 
     case SUBSCRIPTIONS_QUANTITIES_REQUEST:
-      return state.merge({
-        quantitiesLoading: true,
-        availableQuantities: null,
-      });
+      return state.set('quantitiesLoading', true);
 
     case SUBSCRIPTIONS_QUANTITIES_SUCCESS: {
       return state.merge({
@@ -100,7 +93,7 @@ export default (state = initialState, action) => {
     case SUBSCRIPTIONS_QUANTITIES_FAILURE: {
       return state.merge({
         quantitiesLoading: false,
-        availableQuantities: {},
+        quantitiesError: action.error,
       });
     }
 

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -1,14 +1,15 @@
 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 { renderTaskFinishedToast } from '../Tasks/helpers';
+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 './components/SubscriptionsTable';
-import { manifestExists } from './SubscriptionHelpers';
 import Search from '../../components/Search/index';
 import api, { orgId } from '../../services/api';
 import { createSubscriptionParams } from './SubscriptionActions.js';
@@ -69,7 +70,7 @@ class SubscriptionsPage extends Component {
   }
 
   getDisabledReason(deleteButton) {
-    const { tasks = [], subscriptions, organization } = this.props;
+    const { tasks = [], subscriptions } = this.props;
     const { disconnected } = subscriptions;
     let disabledReason = null;
 
@@ -78,9 +79,7 @@ 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.');
-    } else if (!manifestExists(organization)) {
-      disabledReason = __('This is disabled because no manifest has been uploaded.');
+      disabledReason = __('This is disabled because no subscriptions are selected');
     }
 
     return disabledReason;
@@ -104,14 +103,39 @@ class SubscriptionsPage extends Component {
 
     pollTaskUntilDone(taskToPoll.id, {}, POLL_TASK_INTERVAL)
       .then((task) => {
-        renderTaskFinishedToast(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,
+        });
+
         loadSubscriptions();
       });
   }
 
   render() {
-    const { tasks = [], subscriptions, organization } = this.props;
-    const currentOrg = orgId();
+    const { tasks = [], subscriptions } = this.props;
     const { disconnected } = subscriptions;
     const taskInProgress = tasks.length > 0;
     const disableManifestActions = taskInProgress || disconnected;
@@ -129,7 +153,7 @@ class SubscriptionsPage extends Component {
     const getAutoCompleteParams = search => ({
       endpoint: '/subscriptions/auto_complete_search',
       params: {
-        organization_id: currentOrg,
+        organization_id: orgId(),
         search,
       },
     });
@@ -163,18 +187,8 @@ 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>
@@ -194,10 +208,7 @@ class SubscriptionsPage extends Component {
 
                   <div className="toolbar-pf-action-right">
                     <FormGroup>
-                      <LinkContainer
-                        to="subscriptions/add"
-                        disabled={disableManifestActions || !manifestExists(organization)}
-                      >
+                      <LinkContainer to="subscriptions/add" disabled={disableManifestActions}>
                         <TooltipButton
                           tooltipId="add-subscriptions-button-tooltip"
                           tooltipText={this.getDisabledReason()}
@@ -246,14 +257,11 @@ 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}
@@ -271,10 +279,8 @@ class SubscriptionsPage extends Component {
 SubscriptionsPage.propTypes = {
   loadSubscriptions: PropTypes.func.isRequired,
   updateQuantity: PropTypes.func.isRequired,
-  subscriptions: PropTypes.shape({}).isRequired,
-  organization: PropTypes.shape({}).isRequired,
+  subscriptions: PropTypes.shape().isRequired,
   pollBulkSearch: PropTypes.func.isRequired,
-  bulkSearch: PropTypes.func,
   pollTaskUntilDone: PropTypes.func.isRequired,
   loadSetting: PropTypes.func.isRequired,
   tasks: PropTypes.arrayOf(PropTypes.shape({})),
@@ -283,7 +289,6 @@ SubscriptionsPage.propTypes = {
 
 SubscriptionsPage.defaultProps = {
   tasks: [],
-  bulkSearch: undefined,
 };
 
 export default SubscriptionsPage;

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsActions.js

@@ -1,6 +1,5 @@
 import api, { orgId } from '../../../services/api';
 import { propsToSnakeCase } from '../../../services/index';
-import { apiError } from '../../../move_to_foreman/common/helpers.js';
 
 import {
   UPSTREAM_SUBSCRIPTIONS_REQUEST,
@@ -28,7 +27,12 @@ export const loadUpstreamSubscriptions = (extendedParams = {}) => (dispatch) =>
         search: extendedParams.search,
       });
     })
-    .catch(result => dispatch(apiError(UPSTREAM_SUBSCRIPTIONS_FAILURE, result)));
+    .catch((result) => {
+      dispatch({
+        type: UPSTREAM_SUBSCRIPTIONS_FAILURE,
+        result,
+      });
+    });
 };
 
 export const saveUpstreamSubscriptions = upstreamSubscriptions => (dispatch) => {
@@ -46,7 +50,12 @@ export const saveUpstreamSubscriptions = upstreamSubscriptions => (dispatch) =>
         response: data,
       });
     })
-    .catch(result => dispatch(apiError(SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE, result)));
+    .catch((result) => {
+      dispatch({
+        type: SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE,
+        result,
+      });
+    });
 };
 
 export default loadUpstreamSubscriptions;