katello 3.7.1.1 → 3.8.0.rc1

data/lib/katello/tasks/clean_backend_objects.rake

@@ -42,17 +42,17 @@ namespace :katello do
     def cleanup_hosts(cleaner)
       cleaner.hosts_with_nil_facets.each do |host|
         print "Host #{host.id} #{host.name} is partially missing subscription information.  Un-registering\n"
-        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host, host_unregister_options(host)) }
+        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host) }
       end
 
       cleaner.hosts_with_no_subscriptions.each do |host|
         print "Host #{host.id} #{host.name} #{host.subscription_facet.try(:uuid)} is partially missing subscription information.  Un-registering\n"
-        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host, host_unregister_options(host)) }
+        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host) }
       end
 
       cleaner.hosts_with_no_content.each do |host|
         print "Host #{host.id} #{host.name} #{host.content_facet.try(:uuid)} is partially missing content information.  Un-registering\n"
-        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host, host_unregister_options(host)) }
+        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host) }
       end
     end
 
@@ -72,15 +72,6 @@ namespace :katello do
       end
     end
 
-    def host_unregister_options(host)
-      if host.managed? || host.compute_resource
-        print "Leaving provisioning record for #{host.name} in place, it is either managed or assigned to a compute resource."
-        {:unregistering => true}
-      else
-        {}
-      end
-    end
-
     # rubocop:disable HandleExceptions
     def execute(error_msg)
       if ENV['COMMIT'] == 'true'

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.7.1.1".freeze
+  VERSION = "3.8.0.rc1".freeze
 end

data/package.json

@@ -9,9 +9,7 @@
     "test:current": "jest webpack --watch",
     "format": "prettier --single-quote --trailing-comma es5 --write 'webpack/**/*.js'",
     "build": "npm run format && npm run lint",
-    "lint": "eslint webpack/ || exit 0",
-    "lint:fix": "eslint --fix webpack/ || exit 0",
-    "lint:test": "npm run lint && npm test"
+    "lint": "eslint --fix webpack/ || exit 0"
   },
   "repository": {
     "type": "git",
@@ -24,11 +22,11 @@
     "@storybook/react": "^3.2.17",
     "@storybook/storybook-deployer": "^2.0.0",
     "babel-core": "^6.26.3",
-    "babel-jest": "^23.4.0",
+    "babel-jest": "^21.2.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.0",
+    "babel-polyfill": "^6.26.0",
     "babel-preset-react": "^6.24.1",
     "enzyme": "^3.2.0",
     "enzyme-adapter-react-16": "^1.1.0",
@@ -36,11 +34,11 @@
     "eslint": "^4.8.0",
     "eslint-config-airbnb": "^16.0.0",
     "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-jest": "^21.18.0",
+    "eslint-plugin-jest": "^21.2.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-react": "^7.4.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^23.4.1",
+    "jest": "^21.2.1",
     "prettier": "^1.7.4",
     "react-test-renderer": "^16.0.0",
     "redux-mock-store": "^1.3.0",
@@ -55,10 +53,10 @@
     "jed": "^1.1.1",
     "lodash": "^4.17.5",
     "patternfly": "^3.41.1",
-    "patternfly-react": "^2.5.1",
+    "patternfly-react": "2.5.1",
     "prop-types": "^15.6.0",
     "react": "^16.3.1",
-    "react-bootstrap": "^0.32.1",
+    "react-bootstrap": "^0.31.5",
     "react-bootstrap-tooltip-button": "^1.0.6",
     "react-dom": "^16.3.1",
     "react-ellipsis-with-tooltip": "^1.0.7",
@@ -74,7 +72,6 @@
       "raf/polyfill",
       "./webpack/test_setup.js"
     ],
-    "setupTestFrameworkScriptFile": "./webpack/global_test_setup.js",
     "testPathIgnorePatterns": [
       "/node_modules/",
       "<rootDir>/foreman/",

data/webpack/components/Search/Search.test.js

@@ -1,19 +1,17 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import { mock as mockApi } from '../../mockRequest';
 
 import Search from '../Search';
 
 describe('Search component', () => {
   const getBaseProps = () => ({
     onSearch: () => {},
-    getAutoCompleteParams: () => ({ endpoint: '/fake' }),
+    getAutoCompleteParams: () => ({}),
   });
 
   describe('rendering', () => {
     it('renders correctly', () => {
-      mockApi.onGet('/katello/api/v2/fake').reply(200, []);
       const component = shallow(<Search {...getBaseProps()} />);
 
       expect(toJson(component)).toMatchSnapshot();

data/webpack/containers/Application/config.js

@@ -2,32 +2,25 @@ 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: WithOrganization(Repos, '/redhat_repositories'),
+    component: Repos,
   },
   {
     text: 'RH Subscriptions',
     path: 'subscriptions',
-    component: WithOrganization(Subscriptions, '/subscriptions'),
+    component: 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,9 +20,7 @@ class Application extends Component {
   }
 
   loadData() {
-    if (orgId()) {
-      this.props.loadOrganization();
-    }
+    this.props.loadOrganization();
   }
 
   render() {

data/webpack/mockRequest.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
 
 // TODO: figure out way to reuse this from foreman
-export const mock = new MockAdapter(axios);
+const mock = new MockAdapter(axios);
 const methods = {
   GET: 'onGet',
   POST: 'onPost',
@@ -15,10 +15,10 @@ const errorResponse = msg => ({ displayMessage: msg });
 export const mockRequest = ({
   method = 'GET',
   url,
-  data,
+  data = null,
   status = 200,
   response = null,
-}) => mock[methods[method.toUpperCase()]](url, data).reply(status, response);
+}) => mock[methods[method]](url, data).reply(status, response);
 
 export const mockErrorRequest = ({
   status = 500,

data/webpack/move_to_foreman/common/helpers.js

@@ -1,41 +1,11 @@
-import { addToast } from 'foremanReact/redux/actions/toasts';
-
-const urlBuilder = (controller, action, id = undefined) =>
-  `/${controller}/${id ? `${id}/` : ''}${action}`;
-
-const urlWithSearch = (base, searchQuery) =>
-  `/${base}?search=${searchQuery}`;
-
-const stringIsInteger = (value) => {
-  // checking for positive integers only
-  const reg = new RegExp('^[0-9]+$');
-  return reg.test(value);
-};
-
-export const getResponseErrorMsgs = ({ data }) => {
-  if (data) {
-    const messages = (data.errors || data.displayMessage || data.message || data.error);
-    return (Array.isArray(messages) ? messages : [messages]);
-  }
-  return [];
-};
+export default {
+  urlBuilder(controller, action, id = undefined) {
+    return `/${controller}/${id ? `${id}/` : ''}${action}`;
+  },
 
-export const apiError = (actionType, result) => (dispatch) => {
-  const messages = getResponseErrorMsgs(result.response);
-  dispatch({
-    type: actionType,
-    payload: {
-      result,
-      messages,
-    },
-  });
-  messages.forEach((msg) => {
-    dispatch(addToast({
-      type: 'error',
-      message: msg,
-      sticky: true,
-    }));
-  });
+  urlWithSearch(base, searchQuery) {
+    return `/${base}?search=${searchQuery}`;
+  },
 };
 
 export const KEY_CODES = {
@@ -44,11 +14,4 @@ export const KEY_CODES = {
   ESCAPE_KEY: 27,
 };
 
-export default {
-  urlBuilder,
-  urlWithSearch,
-  getResponseErrorMsgs,
-  apiError,
-  KEY_CODES,
-  stringIsInteger,
-};
+export const getResponseError = ({ data }) => data && (data.displayMessage || data.error);

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

@@ -13,7 +13,6 @@ const EmptyState = (props) => {
     documentationButton = __('Documentation'),
     docUrl,
     action,
-    actionButton,
     secondayActions,
   } = props;
   const defaultDocumantion = `${documentationLabel} <a href=${docUrl}>${documentationButton}</a>`;
@@ -31,23 +30,11 @@ const EmptyState = (props) => {
       )}
       {action && (
         <PfEmptyState.Action>
-          {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">
+          <LinkContainer to={action.url}>
+            <Button href={action.url} bsStyle="primary" bsSize="large">
               {action.title}
             </Button>
-          )}
-        </PfEmptyState.Action>
-      )}
-      {actionButton && (
-        <PfEmptyState.Action>
-          {actionButton}
+          </LinkContainer>
         </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={[MockFunction]}
+  onClick={[Function]}
   type="fa"
 />
 `;
@@ -13,7 +13,7 @@ exports[`CollapseSubscriptionGroupButton renders CollapseSubscriptionGroupButton
 <Icon
   className="collapse-subscription-group-button"
   name="angle-down"
-  onClick={[MockFunction]}
+  onClick={[Function]}
   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={[MockFunction]}
+    onChange={[Function]}
   />
   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={[MockFunction]}
+    onChange={[Function]}
   />
 </TableSelectionHeading>
 `;

data/webpack/move_to_pf/LoadingState/LoadingState.js

@@ -1,48 +1,35 @@
-import React, { Component } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { Spinner } from 'patternfly-react';
 import './LoadingState.scss';
 
-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 = (
+const LoadingState = ({
+  loading,
+  loadingText,
+  children,
+}) => {
+  if (loading) {
+    return (
       <div className="loading-state">
         <Spinner loading={loading} size="lg" />
         <p>{loadingText}</p>
-      </div>);
-
-    if (loading) {
-      return this.state.render ? spinner : null;
-    }
-    return children;
+      </div>
+    );
   }
-}
+
+  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,7 +6,6 @@ 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(
@@ -14,10 +13,8 @@ test('Loading State renders properly while loading', () => {
       <p>Loading Complete</p>
     </LoadingState>
   );
-    jest.runAllTimers();
-    component.update();
-    expect(component.state('render')).toEqual(true);
-    expect(toJson(component.render())).toMatchSnapshot();
+
+  expect(toJson(component.render())).toMatchSnapshot();
 });
 
 test('Loading State renders properly while not loading', () => {
@@ -26,7 +23,6 @@ test('Loading State renders properly while not loading', () => {
       <p>Loading Complete</p>
     </LoadingState>
   );
-    jest.runAllTimers();
-    component.update();
-    expect(toJson(component.render())).toMatchSnapshot();
+
+  expect(toJson(component.render())).toMatchSnapshot();
 });

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

@@ -3,7 +3,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { FormControl } from 'react-bootstrap';
-import PropTypes from 'prop-types';
 
 require('jquery');
 require('bootstrap-select');
@@ -53,10 +52,8 @@ 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={noneSelectedText}
+                        data-none-selected-text={__('Nothing selected')}
                         data-selected-text-format="count>3"
                         data-count-selected-text={__('{0} items selected')}
                         componentClass="select"
@@ -65,12 +62,4 @@ class BootstrapSelect extends React.Component {
   }
 }
 
-BootstrapSelect.propTypes = {
-  noneSelectedText: PropTypes.string,
-}
-
-BootstrapSelect.defaultProps = {
-  noneSelectedText: __('Nothing selected'),
-}
-
 export default BootstrapSelect;