katello 3.13.4 → 3.14.0.rc1

data/webpack/scenes/Organizations/__tests__/organizations.fixtures.js

@@ -73,7 +73,7 @@ export const getFailureActions = [
     type: 'GET_ORGANIZATION_REQUEST',
   },
   {
-    result: new Error('Request failed with status code 422'),
+    error: new Error('Request failed with status code 422'),
     type: 'GET_ORGANIZATION_FAILURE',
   },
 ];

data/webpack/scenes/Products/ProductActions.js

@@ -7,18 +7,18 @@ import {
 } from './ProductConstants';
 import { apiError } from '../../move_to_foreman/common/helpers.js';
 
-export const loadProducts = (params = {}) => (dispatch) => {
+export const loadProducts = (params = {}) => async (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)));
+  try {
+    const { data } = await api.get(`/organizations/${orgId()}/products/`, {}, params);
+    return dispatch({
+      type: PRODUCTS_SUCCESS,
+      response: data,
+    });
+  } catch (error) {
+    return dispatch(apiError(PRODUCTS_FAILURE, error));
+  }
 };
 
 export default loadProducts;

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

@@ -19,22 +19,22 @@ beforeEach(() => {
 
 describe('product actions', () => {
   describe('loadProducts', () => {
-    it('handles failed PRODUCTS_REQUEST', () => {
+    it('handles failed PRODUCTS_REQUEST', async () => {
       mockErrorRequest({
         url: '/katello/api/v2/organizations/1/products/',
         status: 422,
       });
-      return store.dispatch(loadProducts())
-        .then(() => expect(store.getActions()).toEqual(failureActions));
+      await store.dispatch(loadProducts());
+      expect(store.getActions()).toEqual(failureActions);
     });
 
-    it('handles successful PRODUCTS_REQUEST', () => {
+    it('handles successful PRODUCTS_REQUEST', async () => {
       mockRequest({
         url: '/katello/api/v2/organizations/1/products/',
         response: requestSuccessResponse,
       });
-      return store.dispatch(loadProducts())
-        .then(() => expect(store.getActions()).toEqual(successActions));
+      await store.dispatch(loadProducts());
+      expect(store.getActions()).toEqual(successActions);
     });
   });
 });

data/webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js

@@ -0,0 +1,118 @@
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint import/no-unresolved: [2, { ignore: [foremanReact/*] }] */
+/* eslint-disable import/no-unresolved */
+
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { isEmpty } from 'lodash';
+import { Grid, Row, Col } from 'react-bootstrap';
+import { Button } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import PermissionDenied from 'foremanReact/components/PermissionDenied';
+import { LoadingState } from '../../move_to_pf/LoadingState';
+import { createEnabledRepoParams } from '../../redux/actions/RedHatRepositories/enabled';
+import SearchBar from './components/SearchBar';
+import RecommendedRepositorySetsToggler from './components/RecommendedRepositorySetsToggler';
+import { getSetsComponent, getEnabledComponent } from './helpers';
+import api from '../../services/api';
+
+class RedHatRepositoriesPage extends Component {
+  componentDidMount() {
+    this.loadData();
+  }
+
+  loadData() {
+    this.props.loadEnabledRepos();
+    this.props.loadRepositorySets({ search: { filters: ['rpm'] } });
+  }
+
+  render() {
+    const { enabledRepositories, repositorySets } = this.props;
+    const { repoParams } = createEnabledRepoParams(enabledRepositories);
+
+    if (!isEmpty(repositorySets.missingPermissions)) {
+      return <PermissionDenied missingPermissions={repositorySets.missingPermissions} />;
+    }
+    if (!isEmpty(enabledRepositories.missingPermissions)) {
+      return <PermissionDenied missingPermissions={enabledRepositories.missingPermissions} />;
+    }
+
+    return (
+      <Grid id="redhatRepositoriesPage" bsClass="container-fluid">
+        <h1>{__('Red Hat Repositories')}</h1>
+        <Row className="toolbar-pf">
+          <Col sm={12}>
+            <SearchBar />
+          </Col>
+        </Row>
+
+        <Row className="row-eq-height">
+          <Col sm={6} className="available-repositories-container">
+            <div className="available-repositories-header">
+              <h2>{__('Available Repositories')}</h2>
+              <RecommendedRepositorySetsToggler
+                enabled={repositorySets.recommended}
+                onChange={value => this.props.updateRecommendedRepositorySets(value)}
+                className="recommended-repositories-toggler"
+              />
+            </div>
+            <LoadingState loading={repositorySets.loading} loadingText={__('Loading')}>
+              {getSetsComponent(
+                repositorySets,
+                (pagination) => {
+                  this.props.loadRepositorySets({
+                    ...pagination,
+                    search: repositorySets.search,
+                  });
+                },
+              )}
+            </LoadingState>
+          </Col>
+
+          <Col sm={6} className="enabled-repositories-container">
+            <h2>
+              {__('Enabled Repositories')}
+              <Button
+                className="pull-right"
+                onClick={() => { api.open('/repositories.csv', repoParams); }}
+              >
+                {__('Export as CSV')}
+              </Button>
+            </h2>
+
+            <LoadingState loading={enabledRepositories.loading} loadingText={__('Loading')}>
+              {getEnabledComponent(
+                enabledRepositories,
+                (pagination) => {
+                  this.props.loadEnabledRepos({
+                    ...pagination,
+                    search: enabledRepositories.search,
+                  });
+                },
+              )}
+            </LoadingState>
+          </Col>
+        </Row>
+      </Grid>
+    );
+  }
+}
+
+RedHatRepositoriesPage.propTypes = {
+  loadEnabledRepos: PropTypes.func.isRequired,
+  loadRepositorySets: PropTypes.func.isRequired,
+  updateRecommendedRepositorySets: PropTypes.func.isRequired,
+  enabledRepositories: PropTypes.shape({
+    loading: PropTypes.bool,
+    search: PropTypes.shape({}),
+    missingPermissions: PropTypes.arrayOf(PropTypes.string),
+  }).isRequired,
+  repositorySets: PropTypes.shape({
+    recommended: PropTypes.bool,
+    loading: PropTypes.bool,
+    search: PropTypes.shape({}),
+    missingPermissions: PropTypes.array,
+  }).isRequired,
+};
+
+export default RedHatRepositoriesPage;

data/webpack/scenes/RedHatRepositories/__tests__/RedHatRepositoriesPage.test.js

@@ -0,0 +1,51 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import RedHatRepositoriesPage from '../RedHatRepositoriesPage';
+
+jest.mock('foremanReact/components/PermissionDenied');
+
+describe('RedHatRepositories page', () => {
+  const page = shallow(<RedHatRepositoriesPage
+    loadEnabledRepos={jest.fn()}
+    loadRepositorySets={jest.fn()}
+    updateRecommendedRepositorySets={jest.fn()}
+    enabledRepositories={{
+      loading: false,
+      search: {},
+      missingPermissions: [],
+      repositories: [],
+    }}
+    repositorySets={{
+      recommended: false,
+      loading: false,
+      search: {},
+      missingPermissions: [],
+    }}
+  />);
+
+  const permissionDeniedPage = shallow(<RedHatRepositoriesPage
+    loadEnabledRepos={jest.fn()}
+    loadRepositorySets={jest.fn()}
+    updateRecommendedRepositorySets={jest.fn()}
+    enabledRepositories={{
+      loading: false,
+      search: {},
+      missingPermissions: ['view_organizations'],
+    }}
+    repositorySets={{
+      recommended: false,
+      loading: false,
+      search: {},
+      missingPermissions: ['view_organizations'],
+    }}
+  />);
+
+  it('should render', async () => {
+    expect(toJson(page)).toMatchSnapshot();
+  });
+
+  it('should render <PermissionDenied /> when permissions are missing', async () => {
+    expect(toJson(permissionDeniedPage)).toMatchSnapshot();
+  });
+});

data/webpack/scenes/RedHatRepositories/__tests__/__snapshots__/RedHatRepositoriesPage.test.js.snap

@@ -0,0 +1,117 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`RedHatRepositories page should render <PermissionDenied /> when permissions are missing 1`] = `
+<PermissionDenied
+  missingPermissions={
+    Array [
+      "view_organizations",
+    ]
+  }
+/>
+`;
+
+exports[`RedHatRepositories page should render 1`] = `
+<Grid
+  bsClass="container-fluid"
+  componentClass="div"
+  fluid={false}
+  id="redhatRepositoriesPage"
+>
+  <h1>
+    Red Hat Repositories
+  </h1>
+  <Row
+    bsClass="row"
+    className="toolbar-pf"
+    componentClass="div"
+  >
+    <Col
+      bsClass="col"
+      componentClass="div"
+      sm={12}
+    >
+      <Connect(SearchBar) />
+    </Col>
+  </Row>
+  <Row
+    bsClass="row"
+    className="row-eq-height"
+    componentClass="div"
+  >
+    <Col
+      bsClass="col"
+      className="available-repositories-container"
+      componentClass="div"
+      sm={6}
+    >
+      <div
+        className="available-repositories-header"
+      >
+        <h2>
+          Available Repositories
+        </h2>
+        <RecommendedRepositorySetsToggler
+          className="recommended-repositories-toggler"
+          enabled={false}
+          help="This shows repositories that are used in a typical setup."
+          onChange={[Function]}
+        >
+          Recommended Repositories
+        </RecommendedRepositorySetsToggler>
+      </div>
+      <LoadingState
+        loading={false}
+        loadingText="Loading"
+        timeout={300}
+      >
+        <p
+          dangerouslySetInnerHTML={
+            Object {
+              "__html": "No Red Hat products currently exist, please import a manifest <a href=\\"/subscriptions/\\"> here </a> to receive Red Hat content. No repository sets available.",
+            }
+          }
+        />
+      </LoadingState>
+    </Col>
+    <Col
+      bsClass="col"
+      className="enabled-repositories-container"
+      componentClass="div"
+      sm={6}
+    >
+      <h2>
+        Enabled Repositories
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsStyle="default"
+          className="pull-right"
+          disabled={false}
+          onClick={[Function]}
+        >
+          Export as CSV
+        </Button>
+      </h2>
+      <LoadingState
+        loading={false}
+        loadingText="Loading"
+        timeout={300}
+      >
+        <ListView
+          className=""
+        >
+          <div
+            className="sticky-pagination sticky-pagination-grey"
+          >
+            <PaginationWrapper
+              onChange={[Function]}
+              viewType="list"
+            />
+          </div>
+        </ListView>
+      </LoadingState>
+    </Col>
+  </Row>
+</Grid>
+`;

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

@@ -10,55 +10,54 @@ import EnabledRepositoryContent from './EnabledRepositoryContent';
 class EnabledRepository extends Component {
   constructor(props) {
     super(props);
+    this.disableTooltipId = `disable-${props.id}`;
+  }
 
-    this.repoForAction = () => {
-      const {
-        productId, contentId, arch, releasever, name, type,
-      } = this.props;
-
-      return {
-        contentId,
-        productId,
-        name,
-        type,
-        arch,
-        releasever,
-      };
-    };
-
-    this.setDisabled = () => {
-      this.props.setRepositoryDisabled(this.repoForAction());
-    };
-
-    this.reload = () => (
-      this.props.loadEnabledRepos({
-        ...this.props.pagination,
-        search: this.props.search,
-      }, true)
-    );
-
-    this.notifyDisabled = () => {
-      window.tfm.toastNotifications.notify({
-        message: sprintf(__("Repository '%(repoName)s' has been disabled."), { repoName: this.props.name }),
-        type: 'success',
-      });
-    };
+  setDisabled = () => {
+    this.props.setRepositoryDisabled(this.repoForAction());
+  };
 
-    this.reloadAndNotify = (result) => {
-      if (result.success) {
-        this.reload()
-          .then(this.setDisabled)
-          .then(this.notifyDisabled);
-      }
-    };
+  repoForAction = () => {
+    const {
+      productId, contentId, arch, releasever, name, type,
+    } = this.props;
 
-    this.disableRepository = () => {
-      this.props.disableRepository(this.repoForAction())
-        .then(this.reloadAndNotify);
+    return {
+      contentId,
+      productId,
+      name,
+      type,
+      arch,
+      releasever,
     };
-
-    this.disableTooltipId = `disable-${props.id}`;
-  }
+  };
+
+  reload = () => (
+    this.props.loadEnabledRepos({
+      ...this.props.pagination,
+      search: this.props.search,
+    }, true)
+  );
+
+  notifyDisabled = () => {
+    window.tfm.toastNotifications.notify({
+      message: sprintf(__("Repository '%(repoName)s' has been disabled."), { repoName: this.props.name }),
+      type: 'success',
+    });
+  };
+
+  reloadAndNotify = async (result) => {
+    if (result && result.success) {
+      await this.reload();
+      await this.setDisabled();
+      await this.notifyDisabled();
+    }
+  };
+
+  disableRepository = async () => {
+    await this.props.disableRepository(this.repoForAction());
+    this.reloadAndNotify();
+  };
 
   render() {
     const {