katello 3.8.1 → 3.9.0.rc1

data/webpack/scenes/Subscriptions/Details/{SubscriptionDetailEnabledProducts.js → SubscriptionDetailProductContent.js}

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { Col, ListView } from 'patternfly-react';
 import SubscriptionDetailProduct from './SubscriptionDetailProduct';
 
-const SubscriptionDetailEnabledProducts = ({ enabledProducts }) => {
-  const listItems = enabledProducts.results.map(product => ({
+const SubscriptionDetailProductContent = ({ productContent }) => {
+  const listItems = productContent.results.map(product => ({
     index: product.id,
     title: product.name,
     availableContent: (
@@ -47,8 +47,8 @@ const SubscriptionDetailEnabledProducts = ({ enabledProducts }) => {
   );
 };
 
-SubscriptionDetailEnabledProducts.propTypes = {
-  enabledProducts: PropTypes.shape({}).isRequired,
+SubscriptionDetailProductContent.propTypes = {
+  productContent: PropTypes.shape({}).isRequired,
 };
 
-export default SubscriptionDetailEnabledProducts;
+export default SubscriptionDetailProductContent;

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

@@ -12,7 +12,7 @@ import {
 
 const initialState = Immutable({
   loading: false,
-  enabledProducts: {
+  productContent: {
     results: [],
     total: 0,
   },
@@ -38,10 +38,10 @@ export default (state = initialState, action) => {
     }
 
     case PRODUCTS_SUCCESS: {
-      const enabledProducts = { enabledProducts: action.response };
+      const productContent = { productContent: action.response };
 
       return state.merge({
-        ...enabledProducts,
+        ...productContent,
         loading: false,
       });
     }

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

@@ -1,14 +1,15 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { Nav, NavItem, TabPane, TabContent, TabContainer, Grid, Row, Col } from 'patternfly-react';
 import BreadcrumbsBar from 'foremanReact/components/BreadcrumbBar';
 import SubscriptionDetailInfo from './SubscriptionDetailInfo';
 import SubscriptionDetailAssociations from './SubscriptionDetailAssociations';
 import SubscriptionDetailProducts from './SubscriptionDetailProducts';
-import SubscriptionDetailEnabledProducts from './SubscriptionDetailEnabledProducts';
+import SubscriptionDetailProductContent from './SubscriptionDetailProductContent';
 import { LoadingState } from '../../../move_to_pf/LoadingState';
 import { notify } from '../../../move_to_foreman/foreman_toast_notifications';
-import api from '../../../services/api';
+import api, { orgId } from '../../../services/api';
 
 class SubscriptionDetails extends Component {
   constructor() {
@@ -49,7 +50,7 @@ class SubscriptionDetails extends Component {
 
     const resource = {
       nameField: 'name',
-      resourceUrl: api.getApiUrl('/subscriptions'),
+      resourceUrl: api.getApiUrl(`/organizations/${orgId()}/subscriptions`),
       switcherItemUrl: '/subscriptions/:id',
     };
 
@@ -85,7 +86,7 @@ class SubscriptionDetails extends Component {
                   <div>{__('Details')}</div>
                 </NavItem>
                 <NavItem eventKey={2}>
-                  <div>{__('Enabled Products')}</div>
+                  <div>{__('Product Content')}</div>
                 </NavItem>
               </Nav>
               <Grid bsClass="container-fluid">
@@ -114,8 +115,8 @@ class SubscriptionDetails extends Component {
                     <div>
                       <Row>
                         <Col sm={12}>
-                          <SubscriptionDetailEnabledProducts
-                            enabledProducts={subscriptionDetails.enabledProducts}
+                          <SubscriptionDetailProductContent
+                            productContent={subscriptionDetails.productContent}
                           />
                         </Col>
                       </Row>

data/webpack/scenes/Subscriptions/Details/__tests__/{SubscriptionDetailEnabledProducts.test.js → SubscriptionDetailProductContent.test.js}

@@ -1,14 +1,14 @@
 import React from 'react';
 import TestRenderer from 'react-test-renderer';
 import { ListView } from 'patternfly-react';
-import SubscriptionDetailEnabledProducts from '../SubscriptionDetailEnabledProducts';
+import SubscriptionDetailProductContent from '../SubscriptionDetailProductContent';
 import { availableContent, product } from '../../../Products/__tests__/products.fixtures.js';
 
-describe('subscription detail enabled products page', () => {
+describe('subscription detail product content page', () => {
   it('renders correctly', () => {
     const testRenderer = TestRenderer
-      .create(<SubscriptionDetailEnabledProducts
-        enabledProducts={{ results: [product([availableContent])] }}
+      .create(<SubscriptionDetailProductContent
+        productContent={{ results: [product([availableContent])] }}
       />);
     const testInstance = testRenderer.root;
 

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

@@ -5,7 +5,7 @@ import SubscriptionDetails from '../SubscriptionDetails';
 import SubscriptionDetailAssociations from '../SubscriptionDetailAssociations';
 import SubscriptionDetailInfo from '../SubscriptionDetailInfo';
 import SubscriptionDetailProducts from '../SubscriptionDetailProducts';
-import SubscriptionDetailEnabledProducts from '../SubscriptionDetailEnabledProducts';
+import SubscriptionDetailProductContent from '../SubscriptionDetailProductContent';
 import { loadSubscriptionDetails } from '../SubscriptionDetailActions';
 import { loadProducts } from '../../../Products/ProductActions';
 import { successState } from './subscriptionDetails.fixtures';
@@ -27,7 +27,7 @@ describe('subscriptions details page', () => {
     expect(wrapper.find(SubscriptionDetailAssociations)).toHaveLength(1);
     expect(wrapper.find(SubscriptionDetailInfo)).toHaveLength(1);
     expect(wrapper.find(SubscriptionDetailProducts)).toHaveLength(1);
-    expect(wrapper.find(SubscriptionDetailEnabledProducts)).toHaveLength(1);
+    expect(wrapper.find(SubscriptionDetailProductContent)).toHaveLength(1);
     expect(toJson(wrapper)).toMatchSnapshot();
   });
 });

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

@@ -16,51 +16,63 @@ exports[`subscription detail enabled product component renders correctly 1`] = `
     </div>
   </div>
   <div
-    className="col-sm-3"
+    className="row"
   >
     <div
-      className="row"
+      className="col-sm-3"
     >
       Content Download URL
     </div>
     <div
-      className="row"
+      className="col-sm-9"
     >
-      GPG Key URL
+      /content/dist/rhel/server/7/$releasever/$basearch/os
+       
     </div>
+  </div>
+  <div
+    className="row"
+  >
     <div
-      className="row"
+      className="col-sm-3"
     >
-      Repo Type
+      GPG Key URL
     </div>
     <div
-      className="row"
+      className="col-sm-9"
     >
-      Enabled?
+      file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+       
     </div>
   </div>
   <div
-    className="col-sm-9"
+    className="row"
   >
     <div
-      className="row"
+      className="col-sm-3"
     >
-      /content/dist/rhel/server/7/$releasever/$basearch/os
+      Repo Type
     </div>
     <div
-      className="row"
+      className="col-sm-9"
     >
-      file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+      yum
+       
     </div>
+  </div>
+  <div
+    className="row"
+  >
     <div
-      className="row"
+      className="col-sm-3"
     >
-      yum
+      Enabled
     </div>
     <div
-      className="row"
+      className="col-sm-9"
     >
       no
+       
     </div>
   </div>
 </div>

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/{SubscriptionDetailEnabledProducts.test.js.snap → SubscriptionDetailProductContent.test.js.snap}

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`subscription detail enabled products page renders correctly 1`] = `
+exports[`subscription detail product content page renders correctly 1`] = `
 <div
   className="list-group list-view-pf list-view-pf-view"
 >

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

@@ -17,7 +17,7 @@ exports[`subscriptions details page should render and contain appropiate compone
         "isSwitchable": true,
         "resource": Object {
           "nameField": "name",
-          "resourceUrl": "/katello/api/v2/subscriptions",
+          "resourceUrl": "/katello/api/v2/organizations/1/subscriptions",
           "switcherItemUrl": "/subscriptions/:id",
         },
       }
@@ -56,7 +56,7 @@ exports[`subscriptions details page should render and contain appropiate compone
             eventKey={2}
           >
             <div>
-              Enabled Products
+              Product Content
             </div>
           </NavItem>
         </Nav>
@@ -98,10 +98,6 @@ exports[`subscriptions details page should render and contain appropiate compone
                           "cores": 4,
                           "cp_id": "4028f92a6317cfbd0163b419377f3bee",
                           "description": "OpenShift Enterprise",
-                          "enabledProducts": Object {
-                            "results": Array [],
-                            "total": 0,
-                          },
                           "end_date": "2021-12-31 23:59:59 -0500",
                           "error": null,
                           "host_count": 0,
@@ -110,6 +106,10 @@ exports[`subscriptions details page should render and contain appropiate compone
                           "loading": false,
                           "multi_entitlement": true,
                           "name": "OpenShift Employee Subscription",
+                          "productContent": Object {
+                            "results": Array [],
+                            "total": 0,
+                          },
                           "product_id": "SER0421",
                           "product_name": "OpenShift Employee Subscription",
                           "provided_products": Array [
@@ -236,10 +236,6 @@ exports[`subscriptions details page should render and contain appropiate compone
                           "cores": 4,
                           "cp_id": "4028f92a6317cfbd0163b419377f3bee",
                           "description": "OpenShift Enterprise",
-                          "enabledProducts": Object {
-                            "results": Array [],
-                            "total": 0,
-                          },
                           "end_date": "2021-12-31 23:59:59 -0500",
                           "error": null,
                           "host_count": 0,
@@ -248,6 +244,10 @@ exports[`subscriptions details page should render and contain appropiate compone
                           "loading": false,
                           "multi_entitlement": true,
                           "name": "OpenShift Employee Subscription",
+                          "productContent": Object {
+                            "results": Array [],
+                            "total": 0,
+                          },
                           "product_id": "SER0421",
                           "product_name": "OpenShift Employee Subscription",
                           "provided_products": Array [
@@ -368,10 +368,6 @@ exports[`subscriptions details page should render and contain appropiate compone
                           "cores": 4,
                           "cp_id": "4028f92a6317cfbd0163b419377f3bee",
                           "description": "OpenShift Enterprise",
-                          "enabledProducts": Object {
-                            "results": Array [],
-                            "total": 0,
-                          },
                           "end_date": "2021-12-31 23:59:59 -0500",
                           "error": null,
                           "host_count": 0,
@@ -380,6 +376,10 @@ exports[`subscriptions details page should render and contain appropiate compone
                           "loading": false,
                           "multi_entitlement": true,
                           "name": "OpenShift Employee Subscription",
+                          "productContent": Object {
+                            "results": Array [],
+                            "total": 0,
+                          },
                           "product_id": "SER0421",
                           "product_name": "OpenShift Employee Subscription",
                           "provided_products": Array [
@@ -506,8 +506,8 @@ exports[`subscriptions details page should render and contain appropiate compone
                     componentClass="div"
                     sm={12}
                   >
-                    <SubscriptionDetailEnabledProducts
-                      enabledProducts={
+                    <SubscriptionDetailProductContent
+                      productContent={
                         Object {
                           "results": Array [],
                           "total": 0,

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

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

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

@@ -1,3 +1,5 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
 const question = __('Are you sure you want to delete the manifest?');
 const note = __(`Note: Deleting a subscription manifest is STRONGLY discouraged.
                  Deleting a manifest will:`);

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

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Col, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel, Row } from 'react-bootstrap';
-import { bindMethods, Button, Icon, Modal, Spinner, OverlayTrigger, Tooltip } from 'patternfly-react';
+import { Col, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel } from 'react-bootstrap';
+import { 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';
@@ -9,12 +9,7 @@ import { Table } from '../../../move_to_foreman/components/common/table';
 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,
-  MANIFEST_TASKS_BULK_SEARCH_ID,
-} from '../SubscriptionConstants';
 
 class ManageManifestModal extends Component {
   constructor(props) {
@@ -25,16 +20,6 @@ class ManageManifestModal extends Component {
       actionInProgress: props.taskInProgress,
       showDeleteManifestModalDialog: false,
     };
-
-    bindMethods(this, [
-      'hideModal',
-      'saveOrganization',
-      'uploadManifest',
-      'refreshManifest',
-      'deleteManifest',
-      'disabledTooltipText',
-      'updateRepositoryUrl',
-    ]);
   }
 
   static getDerivedStateFromProps(newProps, prevState) {
@@ -66,67 +51,52 @@ class ManageManifestModal extends Component {
     this.props.loadManifestHistory();
   }
 
-  hideModal() {
+  hideModal = () => {
     this.setState({ showModal: false, showDeleteManifestModalDialog: false });
     this.props.onClose();
-  }
+  };
 
-  updateRepositoryUrl(event) {
+  updateRepositoryUrl = (event) => {
     this.setState({ redhat_repository_url: event.target.value });
-  }
+  };
 
-  saveOrganization() {
+  saveOrganization = () => {
     this.props.saveOrganization({ redhat_repository_url: this.state.redhat_repository_url });
-  }
+  };
 
-  uploadManifest(fileList) {
+  uploadManifest = (fileList) => {
+    this.hideModal();
     this.setState({ actionInProgress: true });
     if (fileList.length > 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));
+      this.props.upload(fileList[0]);
     }
-  }
+  };
 
-  refreshManifest() {
-    this.props.refreshManifest();
+  refreshManifest = () => {
+    this.hideModal();
     this.setState({ actionInProgress: true });
-  }
+    this.props.refresh();
+  };
 
-  deleteManifest() {
+  deleteManifest = () => {
+    this.hideModal();
     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,
-        }))
-      .then(() => renderTaskStartedToast(this.props.taskDetails));
+    this.props.delete();
     this.showDeleteManifestModal(false);
-  }
+  };
 
-  showDeleteManifestModal(show) {
+  showDeleteManifestModal = (show) => {
     this.setState({
       showDeleteManifestModalDialog: show,
     });
-  }
+  };
 
-  disabledTooltipText() {
+  disabledTooltipText = () => {
     if (this.state.actionInProgress) {
       return __('This is disabled because a manifest task is in progress');
     }
     return __('This is disabled because no manifest exists');
-  }
+  };
 
   render() {
     const {
@@ -260,12 +230,20 @@ class ManageManifestModal extends Component {
                     />
 
                     <TooltipButton
-                      onClick={() => this.showDeleteManifestModal(true)}
+                      renderedButton={(
+                        <Button
+                          disabled={!manifestExists(organization) || actionInProgress}
+                          bsStyle="danger"
+                          onClick={() => this.showDeleteManifestModal(true)}
+                        >
+                          {__('Delete')}
+                        </Button>
+                        )}
+
                       tooltipId="delete-manifest-button-tooltip"
                       tooltipText={this.disabledTooltipText()}
                       tooltipPlacement="top"
-                      title={__('Delete')}
-                      disabled={!manifestExists(organization) || actionInProgress}
+
                     />
 
                     <ConfirmDialog
@@ -306,9 +284,9 @@ class ManageManifestModal extends Component {
 }
 
 ManageManifestModal.propTypes = {
-  uploadManifest: PropTypes.func.isRequired,
-  refreshManifest: PropTypes.func.isRequired,
-  deleteManifest: PropTypes.func.isRequired,
+  upload: PropTypes.func.isRequired,
+  refresh: PropTypes.func.isRequired,
+  delete: PropTypes.func.isRequired,
   loadManifestHistory: PropTypes.func.isRequired,
   organization: PropTypes.shape({}).isRequired,
   disableManifestActions: PropTypes.bool,
@@ -319,7 +297,6 @@ ManageManifestModal.propTypes = {
   manifestHistory: PropTypes.shape({}).isRequired,
   showModal: PropTypes.bool.isRequired,
   onClose: PropTypes.func,
-  bulkSearch: PropTypes.func.isRequired,
   taskDetails: PropTypes.shape({}),
 };