katello 3.7.0 → 3.7.1

data/webpack/components/WithOrganization/withOrganization.js

@@ -0,0 +1,28 @@
+import React, { Component } from 'react';
+import { orgId } from '../../services/api';
+import SetOrganization from '../SelectOrg/SetOrganization';
+import titleWithCaret from '../../helpers/caret';
+
+function withOrganization(WrappedComponent, redirectPath) {
+  return class CheckOrg extends Component {
+    componentDidUpdate(prevProps) {
+      const { location } = this.props;
+
+      // TODO: use topbar react component
+      const orgTitle = location.state && location.state.orgChanged;
+      const prevOrgTitle = prevProps.location.state && prevProps.location.state.orgChanged;
+
+      if (orgTitle !== prevOrgTitle) {
+        document.getElementById('organization-dropdown').children[0].innerHTML = titleWithCaret(orgTitle);
+      }
+    }
+    render() {
+      if (!orgId()) {
+        return <SetOrganization redirectPath={redirectPath} />;
+      }
+      return <WrappedComponent {...this.props} />;
+    }
+  };
+}
+
+export default withOrganization;

data/webpack/containers/Application/config.js

@@ -2,25 +2,32 @@ import Repos from '../../scenes/RedHatRepositories';
 import Subscriptions from '../../scenes/Subscriptions';
 import UpstreamSubscriptions from '../../scenes/Subscriptions/UpstreamSubscriptions/index';
 import SubscriptionDetails from '../../scenes/Subscriptions/Details';
+import SetOrganization from '../../components/SelectOrg/SetOrganization';
+import WithOrganization from '../../components/WithOrganization/withOrganization';
 
 // eslint-disable-next-line import/prefer-default-export
 export const links = [
   {
     text: 'RH Repos',
     path: 'redhat_repositories',
-    component: Repos,
+    component: WithOrganization(Repos, '/redhat_repositories'),
   },
   {
     text: 'RH Subscriptions',
     path: 'subscriptions',
-    component: Subscriptions,
+    component: WithOrganization(Subscriptions, '/subscriptions'),
   },
   {
     path: 'subscriptions/add',
     component: UpstreamSubscriptions,
   },
   {
+    // eslint-disable-next-line no-useless-escape
     path: 'subscriptions/:id(\[0-9]*$\)',
     component: SubscriptionDetails,
   },
+  {
+    path: 'organization_select',
+    component: SetOrganization,
+  },
 ];

data/webpack/containers/Application/index.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-
+import { orgId } from '../../services/api';
 import * as actions from '../../scenes/Organizations/OrganizationActions';
 import reducer from '../../scenes/Organizations/OrganizationReducer';
 import Routes from './Routes';
@@ -20,7 +20,9 @@ class Application extends Component {
   }
 
   loadData() {
-    this.props.loadOrganization();
+    if (orgId()) {
+      this.props.loadOrganization();
+    }
   }
 
   render() {

data/webpack/global_test_setup.js

@@ -0,0 +1,6 @@
+// runs before each test to make sure console.error output will
+// fail a test (i.e. default PropType missing). Check the error
+// output and traceback for actual error.
+global.console.error = (error) => {
+  throw new Error(error);
+};

data/webpack/helpers/caret.js

@@ -0,0 +1,6 @@
+import React from 'react';
+import ReactDOMServer from 'react-dom/server';
+
+const htmlCaret = title => title + ReactDOMServer.renderToStaticMarkup(<span className="caret" />);
+
+export default htmlCaret;

data/webpack/move_to_foreman/components/common/{emptyState → EmptyState}/index.js

@@ -13,6 +13,7 @@ const EmptyState = (props) => {
     documentationButton = __('Documentation'),
     docUrl,
     action,
+    actionButton,
     secondayActions,
   } = props;
   const defaultDocumantion = `${documentationLabel} <a href=${docUrl}>${documentationButton}</a>`;
@@ -30,11 +31,23 @@ const EmptyState = (props) => {
       )}
       {action && (
         <PfEmptyState.Action>
-          <LinkContainer to={action.url}>
-            <Button href={action.url} bsStyle="primary" bsSize="large">
+          {action.url && (
+            <LinkContainer to={action.url}>
+              <Button href={action.url} bsStyle="primary" bsSize="large">
+                {action.title}
+              </Button>
+            </LinkContainer>
+          )}
+          {action.onClick && (
+            <Button onClick={action.onClick} bsStyle="primary" bsSize="large">
               {action.title}
             </Button>
-          </LinkContainer>
+          )}
+        </PfEmptyState.Action>
+      )}
+      {actionButton && (
+        <PfEmptyState.Action>
+          {actionButton}
         </PfEmptyState.Action>
       )}
       {secondayActions && (

data/webpack/move_to_foreman/components/common/table/components/Table.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Table as PfTable } from 'patternfly-react';
 import { noop } from 'foremanReact/common/helpers';
-import EmptyState from '../../emptyState';
+import EmptyState from '../../EmptyState';
 import PaginationRow from '../../../../../components/PaginationRow/index';
 
 import TableBody from './TableBody';

data/webpack/move_to_foreman/components/common/table/components/__snapshots__/CollapseSubscriptionGroupButton.test.js.snap

@@ -4,7 +4,7 @@ exports[`CollapseSubscriptionGroupButton renders CollapseSubscriptionGroupButton
 <Icon
   className="collapse-subscription-group-button"
   name="angle-right"
-  onClick={[Function]}
+  onClick={[MockFunction]}
   type="fa"
 />
 `;
@@ -13,7 +13,7 @@ exports[`CollapseSubscriptionGroupButton renders CollapseSubscriptionGroupButton
 <Icon
   className="collapse-subscription-group-button"
   name="angle-down"
-  onClick={[Function]}
+  onClick={[MockFunction]}
   type="fa"
 />
 `;

data/webpack/move_to_foreman/components/common/table/components/__snapshots__/TableSelectionCell.test.js.snap

@@ -9,7 +9,7 @@ exports[`TableSelectionCell renders TableSelectionCell 1`] = `
     checked={true}
     id="some id"
     label="some label"
-    onChange={[Function]}
+    onChange={[MockFunction]}
   />
   some after
 </TableSelectionCell>

data/webpack/move_to_foreman/components/common/table/components/__snapshots__/TableSelectionHeaderCell.test.js.snap

@@ -9,7 +9,7 @@ exports[`TableSelectionHeaderCell renders TableSelectionHeaderCell 1`] = `
     checked={true}
     id="some id"
     label="some label"
-    onChange={[Function]}
+    onChange={[MockFunction]}
   />
 </TableSelectionHeading>
 `;

data/webpack/move_to_pf/LoadingState/LoadingState.js

@@ -1,35 +1,48 @@
-import React from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Spinner } from 'patternfly-react';
 import './LoadingState.scss';
 
-const LoadingState = ({
-  loading,
-  loadingText,
-  children,
-}) => {
-  if (loading) {
-    return (
+class LoadingState extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      render: false,
+    };
+  }
+
+  componentDidMount() {
+    setTimeout(() => {
+      this.setState({ render: true });
+    }, this.props.timeout);
+  }
+
+  render() {
+    const { loading, loadingText, children } = this.props;
+    const spinner = (
       <div className="loading-state">
         <Spinner loading={loading} size="lg" />
         <p>{loadingText}</p>
-      </div>
-    );
-  }
-
-  return children;
-};
+      </div>);
 
+    if (loading) {
+      return this.state.render ? spinner : null;
+    }
+    return children;
+  }
+}
 LoadingState.propTypes = {
   loading: PropTypes.bool,
   loadingText: PropTypes.string,
   children: PropTypes.node,
+  timeout: PropTypes.number,
 };
 
 LoadingState.defaultProps = {
   loading: false,
   loadingText: __('Loading'),
   children: null,
+  timeout: 300,
 };
 
 export default LoadingState;

data/webpack/move_to_pf/LoadingState/LoadingState.test.js

@@ -6,6 +6,7 @@ import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 
 import { LoadingState } from './index';
+jest.useFakeTimers();
 
 test('Loading State renders properly while loading', () => {
   const component = shallow(
@@ -13,8 +14,10 @@ test('Loading State renders properly while loading', () => {
       <p>Loading Complete</p>
     </LoadingState>
   );
-
-  expect(toJson(component.render())).toMatchSnapshot();
+    jest.runAllTimers();
+    component.update();
+    expect(component.state('render')).toEqual(true);
+    expect(toJson(component.render())).toMatchSnapshot();
 });
 
 test('Loading State renders properly while not loading', () => {
@@ -23,6 +26,7 @@ test('Loading State renders properly while not loading', () => {
       <p>Loading Complete</p>
     </LoadingState>
   );
-
-  expect(toJson(component.render())).toMatchSnapshot();
+    jest.runAllTimers();
+    component.update();
+    expect(toJson(component.render())).toMatchSnapshot();
 });

data/webpack/move_to_pf/Select/Select.js

@@ -0,0 +1,40 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const Select = ({
+  placeholder, onChange, options, disabled, value,
+}) => {
+  const renderOptions = arr =>
+    arr.map(({ name, id }) => (
+      <option key={id} value={id}>
+        {name}
+      </option>
+    ));
+
+  return (
+    <select
+      disabled={disabled}
+      className="form-control"
+      value={value}
+      onChange={onChange}
+    >
+      <option value="" disabled >{placeholder}</option>
+      {renderOptions(options)}
+    </select>
+  );
+};
+
+export default Select;
+
+Select.propTypes = {
+  onChange: PropTypes.func.isRequired,
+  options: PropTypes.arrayOf(PropTypes.object).isRequired,
+  disabled: PropTypes.bool,
+  placeholder: PropTypes.string.isRequired,
+  value: PropTypes.string,
+};
+
+Select.defaultProps = {
+  disabled: false,
+  value: '',
+};

data/webpack/move_to_pf/react-bootstrap-select/index.js

@@ -3,6 +3,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { FormControl } from 'react-bootstrap';
+import PropTypes from 'prop-types';
 
 require('jquery');
 require('bootstrap-select');
@@ -52,8 +53,10 @@ class BootstrapSelect extends React.Component {
   render() {
     // TODO: these classes are required because foreman assumes that all selects should use select2 and jquery multiselect
     // TODO: see also http://projects.theforeman.org/issues/21952
+    const { noneSelectedText } = this.props;
+
     return <FormControl {...this.props}
-                        data-none-selected-text={__('Nothing selected')}
+                        data-none-selected-text={noneSelectedText}
                         data-selected-text-format="count>3"
                         data-count-selected-text={__('{0} items selected')}
                         componentClass="select"
@@ -62,4 +65,12 @@ class BootstrapSelect extends React.Component {
   }
 }
 
+BootstrapSelect.propTypes = {
+  noneSelectedText: PropTypes.string,
+}
+
+BootstrapSelect.defaultProps = {
+  noneSelectedText: __('Nothing selected'),
+}
+
 export default BootstrapSelect;

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

@@ -34,7 +34,6 @@ export const createEnabledRepoParams = (extendedParams = {}) => {
 export const loadEnabledRepos = (extendedParams = {}) => (dispatch) => {
   dispatch({ type: ENABLED_REPOSITORIES_REQUEST, params: extendedParams });
   const { searchParams, repoParams } = createEnabledRepoParams(extendedParams);
-
   api
     .get('/repositories', {}, repoParams)
     .then(({ data }) => {

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/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/Products/ProductActions.js

@@ -0,0 +1,24 @@
+import api, { orgId } from '../../services/api';
+
+import {
+  PRODUCTS_REQUEST,
+  PRODUCTS_SUCCESS,
+  PRODUCTS_FAILURE,
+} from './ProductConstants';
+import { apiError } from '../../move_to_foreman/common/helpers.js';
+
+export const loadProducts = (params = {}) => (dispatch) => {
+  dispatch({ type: PRODUCTS_REQUEST });
+
+  return api
+    .get(`/organizations/${orgId()}/products/`, {}, params)
+    .then(({ data }) => {
+      dispatch({
+        type: PRODUCTS_SUCCESS,
+        response: data,
+      });
+    })
+    .catch(result => dispatch(apiError(PRODUCTS_FAILURE, result)));
+};
+
+export default loadProducts;

data/webpack/scenes/Products/ProductConstants.js

@@ -0,0 +1,3 @@
+export const PRODUCTS_REQUEST = 'PRODUCTS_REQUEST';
+export const PRODUCTS_SUCCESS = 'PRODUCTS_SUCCESS';
+export const PRODUCTS_FAILURE = 'PRODUCTS_FAILURE';

data/webpack/scenes/Products/__tests__/ProductActions.test.js

@@ -0,0 +1,40 @@
+import thunk from 'redux-thunk';
+import Immutable from 'seamless-immutable';
+import configureMockStore from 'redux-mock-store';
+import { mock, mockRequest, mockErrorRequest } from '../../../mockRequest';
+import {
+  failureActions,
+  successActions,
+  requestSuccessResponse,
+} from './products.fixtures';
+import { loadProducts } from '../ProductActions';
+
+const mockStore = configureMockStore([thunk]);
+const store = mockStore({ e: Immutable({}) });
+
+beforeEach(() => {
+  store.clearActions();
+  mock.reset();
+});
+
+describe('product actions', () => {
+  describe('loadProducts', () => {
+    it('handles failed PRODUCTS_REQUEST', () => {
+      mockErrorRequest({
+        url: '/katello/api/v2/organizations/1/products/',
+        status: 422,
+      });
+      return store.dispatch(loadProducts())
+        .then(() => expect(store.getActions()).toEqual(failureActions));
+    });
+
+    it('handles successful PRODUCTS_REQUEST', () => {
+      mockRequest({
+        url: '/katello/api/v2/organizations/1/products/',
+        response: requestSuccessResponse,
+      });
+      return store.dispatch(loadProducts())
+        .then(() => expect(store.getActions()).toEqual(successActions));
+    });
+  });
+});