katello 3.8.0.rc1 → 3.8.0.rc2

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -1,9 +1,9 @@
 const repoTypeSearchQueryMap = {
-  rpm: '(name ~ rpms) and (name !~ source rpm) and (name !~ debug rpm)',
-  sourceRpm: 'name ~ source rpm',
-  debugRpm: 'name ~ debug rpm',
-  kickstart: 'name ~ kickstart',
-  ostree: 'name ~ ostree',
+  rpm: '(name !~ source rpm) and (name !~ debug rpm) and (content_type = yum)',
+  sourceRpm: '(name ~ source rpm) and (content_type = yum)',
+  debugRpm: '(name ~ debug rpm) and (content_type = yum)',
+  kickstart: 'content_type = kickstart',
+  ostree: 'content_type = ostree',
   beta: 'name ~ beta',
 };
 

data/webpack/redux/actions/RedHatRepositories/sets.js

@@ -28,7 +28,7 @@ export const loadRepositorySets = (extendedParams = {}) => (dispatch, getState)
   ]);
 
   const params = {
-    ...{ organization_id: orgId() },
+    ...{ organization_id: orgId(), with_active_subscription: true },
     ...propsToSnakeCase(extendedParams),
     search,
   };

data/webpack/redux/consts.js

@@ -17,3 +17,9 @@ export const REPOSITORY_SETS_UPDATE_RECOMMENDED = 'REPOSITORY_SETS_UPDATE_RECOMM
 
 export const REPOSITORY_ENABLED = 'REPOSITORY_ENABLED';
 export const REPOSITORY_DISABLED = 'REPOSITORY_DISABLED';
+
+export const GET_ORGANIZATIONS_LIST_SUCCESS = 'GET_ORGANIZATIONS_LIST_SUCCESS';
+export const GET_ORGANIZATIONS_LIST_FAILURE = 'GET_ORGANIZATIONS_LIST_FAILURE';
+export const CHANGE_CURRENT_ORGANIZATION_SUCCESS = 'CHANGE_CURRENT_ORGANIZATION_SUCCESS';
+export const CHANGE_CURRENT_ORGANIZATION_FAILURE = 'CHANGE_CURRENT_ORGANIZATION_FAILURE';
+export const GET_ORGANIZATIONS_LIST_REQUEST = 'GET_ORGANIZATIONS_LIST_REQUEST';

data/webpack/redux/reducers/index.js

@@ -5,6 +5,7 @@ import { subscriptions } from '../../scenes/Subscriptions';
 import { upstreamSubscriptions } from '../../scenes/Subscriptions/UpstreamSubscriptions';
 import { manifestHistory } from '../../scenes/Subscriptions/Manifest';
 import { subscriptionDetails } from '../../scenes/Subscriptions/Details';
+import { setOrganization } from '../../components/SelectOrg/SetOrganization';
 
 export default combineReducers({
   organization,
@@ -13,4 +14,5 @@ export default combineReducers({
   upstreamSubscriptions,
   manifestHistory,
   subscriptionDetails,
+  setOrganization,
 });

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

@@ -4,9 +4,9 @@ import {
   SUBSCRIPTION_DETAILS_SUCCESS,
   SUBSCRIPTION_DETAILS_FAILURE,
 } from './SubscriptionDetailConstants';
-import { getResponseError } from '../../../move_to_foreman/common/helpers.js';
+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
@@ -17,12 +17,7 @@ export const loadSubscriptionDetails = subscriptionId => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: SUBSCRIPTION_DETAILS_FAILURE,
-        error: getResponseError(result.response),
-      });
-    });
+    .catch(result => dispatch(apiError(SUBSCRIPTION_DETAILS_FAILURE, result)));
 };
 
 export default loadSubscriptionDetails;

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

@@ -1,15 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { ListGroup, ListGroupItem } from 'patternfly-react';
+import './SubscriptionDetails.scss';
 
 const SubscriptionDetailProducts = ({ subscriptionDetails }) => (
   <div>
     <h2>{__('Provided Products')}</h2>
-    <ul>
+    <ListGroup className="scrolld-list">
       {subscriptionDetails.provided_products &&
         subscriptionDetails.provided_products.map(prod => (
-          <li key={prod.id}>{prod.name}</li>
+          <ListGroupItem key={prod.id}> {prod.name} </ListGroupItem>
           ))}
-    </ul>
+    </ListGroup>
   </div>
 );
 

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

@@ -26,7 +26,7 @@ export default (state = initialState, action) => {
 
     case SUBSCRIPTION_DETAILS_FAILURE: {
       return state.merge({
-        error: action.error,
+        error: action.payload.message,
         loading: false,
       });
     }

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

@@ -1,33 +1,70 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { 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 { LoadingState } from '../../../move_to_pf/LoadingState';
 import { notify } from '../../../move_to_foreman/foreman_toast_notifications';
+import api from '../../../services/api';
 
 class SubscriptionDetails extends Component {
+  constructor() {
+    super();
+    this.handleBreadcrumbSwitcherItem = this.handleBreadcrumbSwitcherItem.bind(this);
+  }
   componentDidMount() {
     // eslint-disable-next-line react/prop-types
     const routerParams = this.props.match.params;
     this.props.loadSubscriptionDetails(parseInt(routerParams.id, 10));
   }
 
+  componentDidUpdate(prevProps) {
+    const routerParams = this.props.match.params;
+    if (routerParams.id !== prevProps.match.params.id) {
+      this.props.loadSubscriptionDetails(parseInt(routerParams.id, 10));
+    }
+  }
+
+  handleBreadcrumbSwitcherItem(e, url) {
+    this.props.history.push(url);
+    e.preventDefault();
+  }
+
   render() {
     const { subscriptionDetails } = this.props;
+    const resource = {
+      nameField: 'name',
+      resourceUrl: api.getApiUrl('/subscriptions'),
+      switcherItemUrl: '/subscriptions/:id',
+    };
 
-    if (subscriptionDetails.error) { notify({ message: subscriptionDetails.error }); }
+    if (subscriptionDetails.error) {
+      notify({ message: subscriptionDetails.error });
+    }
 
     return (
       <Grid bsClass="container-fluid">
+        {!subscriptionDetails.loading && <BreadcrumbsBar
+          onSwitcherItemClick={(e, url) => this.handleBreadcrumbSwitcherItem(e, url)}
+          data={{
+            isSwitchable: true,
+            breadcrumbItems: [
+              {
+                caption: __('Subscriptions'),
+                onClick: () =>
+                  this.props.history.push('/subscriptions'),
+              },
+              {
+                caption: String(subscriptionDetails.name),
+              },
+            ],
+            resource,
+          }}
+        />}
         <div>
           <LoadingState loading={subscriptionDetails.loading} loadingText={__('Loading')}>
-            <Row>
-              <Col sm={12}>
-                <h1>{subscriptionDetails.name}</h1>
-              </Col>
-            </Row>
             <Row>
               <Col sm={6}>
                 <SubscriptionDetailInfo
@@ -53,6 +90,7 @@ class SubscriptionDetails extends Component {
 SubscriptionDetails.propTypes = {
   loadSubscriptionDetails: PropTypes.func.isRequired,
   subscriptionDetails: PropTypes.shape({}).isRequired,
+  history: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired,
 };
 
 export default SubscriptionDetails;

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

@@ -0,0 +1,4 @@
+.scrolld-list {
+  max-height: 400px;
+  overflow-y: auto; 
+}

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

@@ -30,7 +30,9 @@ describe('subscriptions reducer', () => {
     const error = 'nothing worked';
     expect(reducer(initialState, {
       type: types.SUBSCRIPTION_DETAILS_FAILURE,
-      error,
+      payload: {
+        message: error,
+      },
     })).toEqual({
       ...initialState,
       error,

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

@@ -13,13 +13,14 @@ jest.mock('../../../../move_to_foreman/foreman_toast_notifications');
 describe('subscriptions details page', () => {
   it('should render and contain appropiate components', async () => {
     const match = { params: { id: 1 } };
+    const noop = () => {};
 
     const wrapper = shallow(<SubscriptionDetails
       loadSubscriptionDetails={loadSubscriptionDetails}
       subscriptionDetails={successState}
+      history={{ push: noop }}
       match={match}
     />);
-    expect(wrapper.find('h1').text()).toEqual(successState.name);
     expect(wrapper.find(SubscriptionDetailAssociations)).toHaveLength(1);
     expect(wrapper.find(SubscriptionDetailInfo)).toHaveLength(1);
     expect(wrapper.find(SubscriptionDetailProducts)).toHaveLength(1);