katello 3.7.0 → 3.7.1

data/webpack/scenes/Products/__tests__/products.fixtures.js

@@ -0,0 +1,90 @@
+import Immutable from 'seamless-immutable';
+import { toastErrorAction, failureAction } from '../../../services/api/testHelpers';
+
+export const initialState = Immutable({
+  loading: true,
+  results: [],
+  pagination: {
+    page: 0,
+    perPage: 20,
+  },
+});
+
+export const loadingState = Immutable({
+  ...initialState,
+});
+
+export const emptyState = Immutable({
+  ...loadingState,
+  loading: false,
+});
+
+export const availableContent = Immutable({
+  enabled: true,
+  product_id: 114,
+  content: {
+    name: 'Red Hat Enterprise Linux 7 Server (RPMs)',
+    label: 'rhel-7-server-rpms',
+    vendor: 'Red Hat',
+    content_url: '/content/dist/rhel/server/7/$releasever/$basearch/os',
+    gpg_url: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release',
+    id: '2456',
+    type: 'yum',
+    gpgUrl: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release',
+    contentUrl: '/content/dist/rhel/server/7/$releasever/$basearch/os',
+  },
+});
+
+export const product = (content = []) => ({
+  id: 114,
+  cp_id: '69',
+  name: 'Red Hat Enterprise Linux Server',
+  label: 'Red_Hat_Enterprise_Linux_Server',
+  description: null,
+  provider_id: 2,
+  sync_plan_id: null,
+  sync_summary: {},
+  gpg_key_id: null,
+  ssl_ca_cert_id: null,
+  ssl_client_cert_id: null,
+  ssl_client_key_id: null,
+  sync_state: null,
+  last_sync: null,
+  last_sync_words: null,
+  organization_id: 1,
+  organization: {
+    name: 'Default Organization',
+    label: 'Default_Organization',
+    id: 1,
+  },
+  available_content: content,
+  sync_plan: null,
+  repository_count: 1,
+});
+
+export const requestSuccessResponse = Immutable({
+  results: [
+    product([availableContent]),
+  ],
+});
+
+const request = {
+  type: 'PRODUCTS_REQUEST',
+};
+
+export const successActions = [
+  request,
+  {
+    type: 'PRODUCTS_SUCCESS',
+    response: requestSuccessResponse,
+    search: undefined,
+  },
+];
+
+export const failureActions = [
+  {
+    type: 'PRODUCTS_REQUEST',
+  },
+  failureAction('PRODUCTS_FAILURE'),
+  toastErrorAction(),
+];

data/webpack/scenes/RedHatRepositories/components/EnabledRepository.js

@@ -1,12 +1,14 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import cx from 'classnames';
-import { ListView, Spinner, OverlayTrigger, Tooltip } from 'patternfly-react';
+import { ListView } from 'patternfly-react';
 import { connect } from 'react-redux';
 
 import RepositoryTypeIcon from './RepositoryTypeIcon';
 import { setRepositoryDisabled } from '../../../redux/actions/RedHatRepositories/enabled';
 import api from '../../../services/api';
+import { notify } from '../../../move_to_foreman/foreman_toast_notifications';
+import { getResponseErrorMsgs } from '../../../move_to_foreman/common/helpers';
+import EnabledRepositoryContent from './EnabledRepositoryContent';
 
 class EnabledRepository extends Component {
   constructor(props) {
@@ -49,9 +51,12 @@ class EnabledRepository extends Component {
       api
         .put(url, data)
         .then(this.setDisabled)
-        .catch(() => {
+        .catch(({ response }) => {
+          const errors = getResponseErrorMsgs(response);
+          errors.forEach((error) => {
+            notify({ message: error, type: 'error' });
+          });
           this.setState({ loading: false });
-          // TODO: Add error component
         });
     };
 
@@ -67,25 +72,11 @@ class EnabledRepository extends Component {
       <ListView.Item
         key={id}
         actions={
-          <Spinner loading={this.state.loading} inline>
-            <OverlayTrigger
-              overlay={<Tooltip id={this.disableTooltipId}>{__('Disable')}</Tooltip>}
-              placement="bottom"
-              trigger={['hover', 'focus']}
-              rootClose={false}
-            >
-              <button
-                onClick={this.disableRepository}
-                style={{
-                  backgroundColor: 'initial',
-                  border: 'none',
-                  color: '#0388ce',
-                }}
-              >
-                <i className={cx('fa-2x', 'fa fa-minus-circle')} />
-              </button>
-            </OverlayTrigger>
-          </Spinner>
+          <EnabledRepositoryContent
+            loading={this.state.loading}
+            disableTooltipId={this.disableTooltipId}
+            disableRepository={this.disableRepository}
+          />
         }
         leftContent={<RepositoryTypeIcon id={id} type={type} />}
         heading={name}

data/webpack/scenes/RedHatRepositories/components/EnabledRepositoryContent.js

@@ -0,0 +1,34 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import cx from 'classnames';
+import { Spinner, OverlayTrigger, Tooltip } from 'patternfly-react';
+
+const EnabledRepositoryContent = ({ loading, disableTooltipId, disableRepository }) => (
+  <Spinner loading={loading} inline>
+    <OverlayTrigger
+      overlay={<Tooltip id={disableTooltipId}>{__('Disable')}</Tooltip>}
+      placement="bottom"
+      trigger={['hover', 'focus']}
+      rootClose={false}
+    >
+      <button
+        onClick={disableRepository}
+        style={{
+            backgroundColor: 'initial',
+            border: 'none',
+            color: '#0388ce',
+          }}
+      >
+        <i className={cx('fa-2x', 'fa fa-minus-circle')} />
+      </button>
+    </OverlayTrigger>
+  </Spinner>
+);
+
+EnabledRepositoryContent.propTypes = {
+  loading: PropTypes.bool.isRequired,
+  disableTooltipId: PropTypes.string.isRequired,
+  disableRepository: PropTypes.func.isRequired,
+};
+
+export default EnabledRepositoryContent;

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository.js

@@ -50,7 +50,7 @@ class RepositorySetRepository extends Component {
       const data = {
         id: contentId,
         product_id: productId,
-        basearch: arch == UNSPECIFIED_ARCH ? undefined : arch,
+        basearch: arch === UNSPECIFIED_ARCH ? undefined : arch,
         releasever: releasever || undefined,
       };
 

data/webpack/scenes/RedHatRepositories/components/SearchBar.js

@@ -97,6 +97,7 @@ class SearchBar extends Component {
         <MultiSelect
           value={this.state.filters}
           options={filterOptions}
+          noneSelectedText={__('Filter by type')}
           onChange={(e) => {
             const values = [...e.target.options]
               .filter(({ selected }) => selected)

data/webpack/scenes/RedHatRepositories/components/__tests__/EnabledRepository.test.js

@@ -0,0 +1,36 @@
+import React from 'react';
+import thunk from 'redux-thunk';
+import { shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import configureMockStore from 'redux-mock-store';
+import EnabledRepository from '../EnabledRepository';
+
+jest.mock('../../../../move_to_foreman/foreman_toast_notifications');
+
+const mockStore = configureMockStore([thunk]);
+const store = mockStore({});
+
+describe('Enabled Repositories Component', () => {
+  let shallowWrapper;
+  beforeEach(() => {
+    shallowWrapper = shallow(<EnabledRepository
+      store={store}
+      id={1}
+      contentId={1}
+      productId={1}
+      name="foo"
+      type="foo"
+      arch="foo"
+      releaseVer="1.1.1"
+      setRepositoryDisabled={() => {}}
+    />);
+  });
+
+  afterEach(() => {
+    store.clearActions();
+  });
+
+  it('should render', async () => {
+    expect(toJson(shallowWrapper)).toMatchSnapshot();
+  });
+});

data/webpack/scenes/RedHatRepositories/components/__tests__/EnabledRepositoryContent.test.js

@@ -0,0 +1,27 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import EnabledRepositoryContent from '../EnabledRepositoryContent';
+
+describe('Enabled Repositories Content Component', () => {
+  const mockCallBack = jest.fn();
+
+  let shallowWrapper;
+  beforeEach(() => {
+    shallowWrapper = shallow(<EnabledRepositoryContent
+      loading
+      disableTooltipId="disable-1"
+      disableRepository={mockCallBack}
+    />);
+  });
+
+  it('should render', async () => {
+    expect(toJson(shallowWrapper)).toMatchSnapshot();
+  });
+
+  it('should run disableRepository on click', async () => {
+    expect(mockCallBack).not.toHaveBeenCalled();
+    shallowWrapper.find('button').at(0).simulate('click');
+    expect(mockCallBack).toHaveBeenCalled();
+  });
+});

data/webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/EnabledRepository.test.js.snap

@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Enabled Repositories Component should render 1`] = `
+<EnabledRepository
+  arch="foo"
+  contentId={1}
+  id={1}
+  name="foo"
+  productId={1}
+  releaseVer="1.1.1"
+  releasever=""
+  setRepositoryDisabled={[Function]}
+  store={
+    Object {
+      "clearActions": [Function],
+      "dispatch": [Function],
+      "getActions": [Function],
+      "getState": [Function],
+      "replaceReducer": [Function],
+      "subscribe": [Function],
+    }
+  }
+  type="foo"
+/>
+`;

data/webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/EnabledRepositoryContent.test.js.snap

@@ -0,0 +1,47 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Enabled Repositories Content Component should render 1`] = `
+<Spinner
+  className=""
+  inline={true}
+  inverse={false}
+  loading={true}
+  size="md"
+>
+  <OverlayTrigger
+    defaultOverlayShown={false}
+    overlay={
+      <Tooltip
+        bsClass="tooltip"
+        id="disable-1"
+        placement="right"
+      >
+        Disable
+      </Tooltip>
+    }
+    placement="bottom"
+    rootClose={false}
+    trigger={
+      Array [
+        "hover",
+        "focus",
+      ]
+    }
+  >
+    <button
+      onClick={[MockFunction]}
+      style={
+        Object {
+          "backgroundColor": "initial",
+          "border": "none",
+          "color": "#0388ce",
+        }
+      }
+    >
+      <i
+        className="fa-2x fa fa-minus-circle"
+      />
+    </button>
+  </OverlayTrigger>
+</Spinner>
+`;

data/webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/RecommendedRepositorySetsToggler.test.js.snap

@@ -30,8 +30,10 @@ exports[`RecommendedRepositorySetsToggler rendering renders recommended-reposito
   />
   some-children
   <FieldLevelHelp
-    close="true"
+    buttonClass=""
     content="some-help"
+    placement="top"
+    rootClose={true}
   />
 </div>
 `;

data/webpack/scenes/RedHatRepositories/index.js

@@ -7,7 +7,6 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { Grid, Row, Col } from 'react-bootstrap';
 import { LoadingState } from '../../move_to_pf/LoadingState';
-
 import { createEnabledRepoParams, loadEnabledRepos } from '../../redux/actions/RedHatRepositories/enabled';
 import { loadRepositorySets, updateRecommendedRepositorySets } from '../../redux/actions/RedHatRepositories/sets';
 import SearchBar from './components/SearchBar';
@@ -31,7 +30,6 @@ class RedHatRepositoriesPage extends Component {
     return (
       <Grid id="redhatRepositoriesPage" bsClass="container-fluid">
         <h1>{__('Red Hat Repositories')}</h1>
-
         <Row className="toolbar-pf">
           <Col sm={12}>
             <SearchBar repoParams={repoParams} />
@@ -87,9 +85,15 @@ RedHatRepositoriesPage.propTypes = {
   updateRecommendedRepositorySets: PropTypes.func.isRequired,
   enabledRepositories: PropTypes.shape({}).isRequired,
   repositorySets: PropTypes.shape({}).isRequired,
+  history: PropTypes.shape({}).isRequired,
+  location: PropTypes.shape({}).isRequired,
 };
 
-const mapStateToProps = ({ katello: { redHatRepositories: { enabled, sets } } }) => ({
+const mapStateToProps = ({
+  katello: {
+    redHatRepositories: { enabled, sets },
+  },
+}) => ({
   enabledRepositories: enabled,
   repositorySets: sets,
 });

data/webpack/scenes/RedHatRepositories/index.scss

@@ -46,6 +46,7 @@
 
       h2 {
         margin: 0;
+        margin-right: 40px;
       }
     }
   }

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

@@ -6,7 +6,7 @@ import {
 } from './SubscriptionDetailConstants';
 import { apiError } from '../../../move_to_foreman/common/helpers.js';
 
-export const loadSubscriptionDetails = subscriptionId => (dispatch) => {
+export const loadSubscriptionDetails = subscriptionId => (dispatch, getState) => {
   dispatch({ type: SUBSCRIPTION_DETAILS_REQUEST });
 
   return api

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

@@ -0,0 +1,54 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Col, ListView } from 'patternfly-react';
+import SubscriptionDetailProduct from './SubscriptionDetailProduct';
+
+const SubscriptionDetailEnabledProducts = ({ enabledProducts }) => {
+  const listItems = enabledProducts.results.map(product => ({
+    index: product.id,
+    title: product.name,
+    availableContent: (
+      product.available_content.map(c => (
+        {
+          enabled: c.enabled,
+          ...c.content,
+        }
+      ))
+    ),
+  }));
+
+  if (listItems.length > 0) {
+    return (
+      <ListView>
+        {listItems.map(({
+              index,
+              title,
+              availableContent,
+            }) => (
+              <ListView.Item
+                key={index}
+                heading={title}
+                hideCloseIcon
+              >
+
+                <Col sm={12}>
+                  {availableContent.map(content => (
+                    <SubscriptionDetailProduct key={content.id} content={content} />
+                  ))}
+                </Col>
+              </ListView.Item>
+        ))}
+      </ListView>
+    );
+  }
+
+  return (
+    <div>{ __('No products are enabled.') }</div>
+  );
+};
+
+SubscriptionDetailEnabledProducts.propTypes = {
+  enabledProducts: PropTypes.shape({}).isRequired,
+};
+
+export default SubscriptionDetailEnabledProducts;