katello 3.9.1 → 3.10.0.rc1

data/package.json

@@ -11,7 +11,8 @@
     "build": "npm run format && npm run lint",
     "lint": "eslint webpack/",
     "lint:fix": "eslint --fix webpack/",
-    "lint:test": "npm run lint && npm test"
+    "lint:test": "npm run lint && npm test",
+    "coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
   },
   "repository": {
     "type": "git",
@@ -33,6 +34,7 @@
     "babel-preset-react": "^6.24.1",
     "enzyme": "^3.4.0",
     "enzyme-adapter-react-16": "^1.4.0",
+    "coveralls": "^3.0.0",
     "enzyme-to-json": "^3.1.2",
     "eslint": "^4.19.1",
     "eslint-config-airbnb": "^16.0.0",
@@ -74,6 +76,14 @@
     "seamless-immutable": "^7.1.2"
   },
   "jest": {
+    "collectCoverage": true,
+    "collectCoverageFrom": [
+      "webpack/**/*.js",
+      "!webpack/**/bundle*"
+    ],
+    "coverageReporters": [
+      "lcov"
+    ],
     "testURL": "http://localhost/",
     "setupFiles": [
       "raf/polyfill",

data/webpack/__mocks__/foremanReact/components/common/EmptyState.js

@@ -0,0 +1,8 @@
+import React from 'react';
+
+const EmptyState = props => (
+  <div>
+    {`EmptyState: ${JSON.stringify(props)}`}
+  </div>
+);
+export default EmptyState;

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

@@ -2,7 +2,8 @@ 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 'foremanReact/components/common/EmptyState';
+
 import PaginationRow from '../../../../../components/PaginationRow/index';
 
 import TableBody from './TableBody';

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

@@ -53,12 +53,12 @@ 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, defaultValue, defaultValues, value, ...props} = this.props;
+    const { noneSelectedText, defaultValue, defaultValues, value, maxItemsCountForFullLabel, ...props} = this.props;
     const initialValue = defaultValues || defaultValue || value;
 
     return <FormControl {...props}
                         data-none-selected-text={noneSelectedText}
-                        data-selected-text-format="count>3"
+                        data-selected-text-format={`count>${maxItemsCountForFullLabel}`}
                         data-count-selected-text={__('{0} items selected')}
                         defaultValue={initialValue}
                         componentClass="select"
@@ -71,10 +71,12 @@ BootstrapSelect.propTypes = {
   noneSelectedText: PropTypes.string,
   defaultValue: PropTypes.string,
   defaultValues: PropTypes.arrayOf(PropTypes.string),
+  maxItemsCountForFullLabel: PropTypes.number,
 };
 
 BootstrapSelect.defaultProps = {
   noneSelectedText: __('Nothing selected'),
+  maxItemsCountForFullLabel: 3,
   defaultValue: null,
   defaultValues: null,
 };

data/webpack/move_to_pf/test-utils/testHelpers.js

@@ -81,3 +81,12 @@ export const testReducerSnapshotWithFixtures = (reducer, fixtures) => {
   Object.entries(fixtures).forEach(([description, action]) =>
     it(description, () => expect(reduce(action)).toMatchSnapshot()));
 };
+
+/**
+ * Test selectors with fixtures and snapshots
+ * @param  {Object} fixtures  key=fixture description,
+ *                            value=selector runner function
+ */
+export const testSelectorsSnapshotWithFixtures = fixtures =>
+  Object.entries(fixtures).forEach(([description, selectorRunner]) =>
+    it(description, () => expect(selectorRunner()).toMatchSnapshot()));

data/webpack/redux/OrganizationProducts/OrganizationProductsActions.js

@@ -0,0 +1,24 @@
+import api, { orgId as getOrgId } from '../../services/api';
+
+import {
+  ORGANIZATION_PRODUCTS_REQUEST,
+  ORGANIZATION_PRODUCTS_SUCCESS,
+  ORGANIZATION_PRODUCTS_FAILURE,
+} from './OrganizationProductsConstants';
+import { apiError } from '../../move_to_foreman/common/helpers';
+
+export const loadOrganizationProducts = (params = {}, orgId = getOrgId()) => (dispatch) => {
+  dispatch({ type: ORGANIZATION_PRODUCTS_REQUEST });
+
+  return api
+    .get(`/organizations/${orgId}/products/`, {}, params)
+    .then(({ data }) => {
+      dispatch({
+        type: ORGANIZATION_PRODUCTS_SUCCESS,
+        payload: { orgId, ...data },
+      });
+    })
+    .catch(result => dispatch(apiError(ORGANIZATION_PRODUCTS_FAILURE, result)));
+};
+
+export default loadOrganizationProducts;

data/webpack/redux/OrganizationProducts/OrganizationProductsConstants.js

@@ -0,0 +1,5 @@
+export const ORGANIZATION_PRODUCTS_KEY = 'organizationProducts';
+
+export const ORGANIZATION_PRODUCTS_REQUEST = 'ORGANIZATION_PRODUCTS_REQUEST';
+export const ORGANIZATION_PRODUCTS_SUCCESS = 'ORGANIZATION_PRODUCTS_SUCCESS';
+export const ORGANIZATION_PRODUCTS_FAILURE = 'ORGANIZATION_PRODUCTS_FAILURE';

data/webpack/redux/OrganizationProducts/OrganizationProductsReducer.js

@@ -0,0 +1,38 @@
+import Immutable from 'seamless-immutable';
+
+import {
+  ORGANIZATION_PRODUCTS_REQUEST,
+  ORGANIZATION_PRODUCTS_SUCCESS,
+  ORGANIZATION_PRODUCTS_FAILURE,
+} from './OrganizationProductsConstants';
+
+const initialState = Immutable({
+  loading: false,
+  error: null,
+  results: [],
+});
+
+export default (state = initialState, action) => {
+  const { type, payload } = action;
+
+  switch (type) {
+    case ORGANIZATION_PRODUCTS_REQUEST:
+      return state.set('loading', true);
+
+    case ORGANIZATION_PRODUCTS_SUCCESS:
+      return state.merge({
+        ...payload,
+        loading: false,
+      });
+
+    case ORGANIZATION_PRODUCTS_FAILURE:
+      return state.merge({
+        error: payload,
+        loading: false,
+        results: [],
+      });
+
+    default:
+      return state;
+  }
+};

data/webpack/redux/OrganizationProducts/OrganizationProductsSelectors.js

@@ -0,0 +1,7 @@
+import { ORGANIZATION_PRODUCTS_KEY } from './OrganizationProductsConstants';
+
+export const selectOrganizationProductsState = state =>
+  state.katello[ORGANIZATION_PRODUCTS_KEY];
+
+export const selectOrganizationProducts = state =>
+  selectOrganizationProductsState(state).results;

data/webpack/redux/OrganizationProducts/__tests__/OrganizationProductsActions.test.js

@@ -0,0 +1,47 @@
+import { testActionSnapshotWithFixtures } from '../../../move_to_pf/test-utils/testHelpers';
+import api, { orgId } from '../../../services/api';
+import { apiError } from '../../../move_to_foreman/common/helpers';
+
+import { loadOrganizationProducts } from '../OrganizationProductsActions';
+
+const params = {
+  search: 'some-search',
+};
+
+jest.mock('../../../services/api');
+jest.mock('../../../move_to_foreman/common/helpers');
+
+const fixtures = {
+  'should load organization products and success': {
+    action: () => loadOrganizationProducts(params),
+    test: () => {
+      expect(api.get.mock.calls).toMatchSnapshot();
+      expect(apiError).not.toHaveBeenCalled();
+    },
+  },
+  'should load organization products and fail': () => (dispatch) => {
+    api.get.mockImplementation(async () => {
+      throw new Error('some-error');
+    });
+
+    return loadOrganizationProducts(params)(dispatch);
+  },
+};
+
+describe('OrganizationProducts actions', () => {
+  beforeEach(() => {
+    orgId.mockImplementation(() => 'some-org-id');
+    api.get.mockImplementation(async () => ({
+      data: {
+        results: [{ id: 'some-id' }],
+      },
+    }));
+  });
+  afterEach(() => {
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    jest.resetModules();
+  });
+
+  testActionSnapshotWithFixtures(fixtures);
+});

data/webpack/redux/OrganizationProducts/__tests__/OrganizationProductsReducer.test.js

@@ -0,0 +1,33 @@
+import { testReducerSnapshotWithFixtures } from '../../../move_to_pf/test-utils/testHelpers';
+
+import {
+  ORGANIZATION_PRODUCTS_REQUEST,
+  ORGANIZATION_PRODUCTS_SUCCESS,
+  ORGANIZATION_PRODUCTS_FAILURE,
+} from '../OrganizationProductsConstants';
+import reducer from '../OrganizationProductsReducer';
+
+const fixtures = {
+  'should return the initial state': {},
+  'should handle ORGANIZATION_PRODUCTS_REQUEST': {
+    action: {
+      type: ORGANIZATION_PRODUCTS_REQUEST,
+    },
+  },
+  'should handle ORGANIZATION_PRODUCTS_SUCCESS': {
+    action: {
+      type: ORGANIZATION_PRODUCTS_SUCCESS,
+      payload: {
+        results: ['some', 'results'],
+      },
+    },
+  },
+  'should handle ORGANIZATION_PRODUCTS_FAILURE': {
+    action: {
+      type: ORGANIZATION_PRODUCTS_FAILURE,
+      payload: new Error('some error'),
+    },
+  },
+};
+
+describe('OrganizationProducts reducer', () => testReducerSnapshotWithFixtures(reducer, fixtures));

data/webpack/redux/OrganizationProducts/__tests__/OrganizationProductsSelectors.test.js

@@ -0,0 +1,19 @@
+import { testSelectorsSnapshotWithFixtures } from '../../../move_to_pf/test-utils/testHelpers';
+
+import { ORGANIZATION_PRODUCTS_KEY } from '../OrganizationProductsConstants';
+import { selectOrganizationProductsState, selectOrganizationProducts } from '../OrganizationProductsSelectors';
+
+const stateFixture = {
+  katello: {
+    [ORGANIZATION_PRODUCTS_KEY]: {
+      results: 'some-results',
+    },
+  },
+};
+
+const fixtures = {
+  'should select the organization products state': () => selectOrganizationProductsState(stateFixture),
+  'should select the organization products': () => selectOrganizationProducts(stateFixture),
+};
+
+describe('OrganizationProducts selectors', () => testSelectorsSnapshotWithFixtures(fixtures));

data/webpack/redux/OrganizationProducts/__tests__/__snapshots__/OrganizationProductsActions.test.js.snap

@@ -0,0 +1,49 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`OrganizationProducts actions should load organization products and fail 1`] = `
+Array [
+  Array [
+    Object {
+      "type": "ORGANIZATION_PRODUCTS_REQUEST",
+    },
+  ],
+  Array [
+    undefined,
+  ],
+]
+`;
+
+exports[`OrganizationProducts actions should load organization products and success 1`] = `
+Array [
+  Array [
+    Object {
+      "type": "ORGANIZATION_PRODUCTS_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "orgId": "some-org-id",
+        "results": Array [
+          Object {
+            "id": "some-id",
+          },
+        ],
+      },
+      "type": "ORGANIZATION_PRODUCTS_SUCCESS",
+    },
+  ],
+]
+`;
+
+exports[`OrganizationProducts actions should load organization products and success 2`] = `
+Array [
+  Array [
+    "/organizations/some-org-id/products/",
+    Object {},
+    Object {
+      "search": "some-search",
+    },
+  ],
+]
+`;

data/webpack/redux/OrganizationProducts/__tests__/__snapshots__/OrganizationProductsReducer.test.js.snap

@@ -0,0 +1,36 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`OrganizationProducts reducer should handle ORGANIZATION_PRODUCTS_FAILURE 1`] = `
+Object {
+  "error": [Error: some error],
+  "loading": false,
+  "results": Array [],
+}
+`;
+
+exports[`OrganizationProducts reducer should handle ORGANIZATION_PRODUCTS_REQUEST 1`] = `
+Object {
+  "error": null,
+  "loading": true,
+  "results": Array [],
+}
+`;
+
+exports[`OrganizationProducts reducer should handle ORGANIZATION_PRODUCTS_SUCCESS 1`] = `
+Object {
+  "error": null,
+  "loading": false,
+  "results": Array [
+    "some",
+    "results",
+  ],
+}
+`;
+
+exports[`OrganizationProducts reducer should return the initial state 1`] = `
+Object {
+  "error": null,
+  "loading": false,
+  "results": Array [],
+}
+`;

data/webpack/redux/OrganizationProducts/__tests__/__snapshots__/OrganizationProductsSelectors.test.js.snap

@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`OrganizationProducts selectors should select the organization products 1`] = `"some-results"`;
+
+exports[`OrganizationProducts selectors should select the organization products state 1`] = `
+Object {
+  "results": "some-results",
+}
+`;

data/webpack/redux/OrganizationProducts/index.js

@@ -0,0 +1,13 @@
+import { ORGANIZATION_PRODUCTS_KEY } from './OrganizationProductsConstants';
+import reducer from './OrganizationProductsReducer';
+import * as organizationProductsActions from './OrganizationProductsActions';
+import * as organizationProductsSelectors from './OrganizationProductsSelectors';
+
+// export actions
+export const actions = { ...organizationProductsActions };
+
+// export selectors
+export const selectors = { ...organizationProductsSelectors };
+
+// export reducers
+export const reducers = { [ORGANIZATION_PRODUCTS_KEY]: reducer };

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

@@ -1,5 +1,10 @@
 import api, { orgId } from '../../../services/api';
-import { normalizeRepositorySets, repoTypeFilterToSearchQuery, joinSearchQueries } from './helpers';
+import {
+  normalizeRepositorySets,
+  repoTypeFilterToSearchQuery,
+  productsIdsToSearchQuery,
+  joinSearchQueries,
+} from './helpers';
 import { apiError, apiSuccess } from '../../../move_to_foreman/common/helpers.js';
 
 import {
@@ -23,6 +28,7 @@ export const createEnabledRepoParams = (extendedParams = {}) => {
   const search = joinSearchQueries([
     'redhat = true',
     repoTypeFilterToSearchQuery(searchParams.filters || []),
+    productsIdsToSearchQuery(searchParams.products || []),
     searchParams.query,
   ]);
 

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

@@ -53,6 +53,10 @@ export const repoTypeFilterToSearchQuery = filters => filters
   .map(f => `(${maptToSearchQuery(f)})`)
   .join(' or ');
 
+export const productsIdsToSearchQuery = productIds => productIds
+  .map(id => `(product_id = "${id}")`)
+  .join(' or ');
+
 export const joinSearchQueries = parts => parts
   .filter(v => (v && v !== ''))
   .map(v => `(${v})`)

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

@@ -2,6 +2,7 @@ import api, { orgId } from '../../../services/api';
 import {
   normalizeRepositorySets,
   repoTypeFilterToSearchQuery,
+  productsIdsToSearchQuery,
   joinSearchQueries,
   recommendedRepositorySetsQuery,
 } from './helpers';
@@ -23,6 +24,7 @@ export const loadRepositorySets = (extendedParams = {}) => (dispatch, getState)
   const searchParams = extendedParams.search || {};
   const search = joinSearchQueries([
     repoTypeFilterToSearchQuery(searchParams.filters || []),
+    productsIdsToSearchQuery(searchParams.products || []),
     searchParams.query,
     recommended ? recommendedRepositorySetsQuery : '',
   ]);