katello 3.8.1 → 3.9.0.rc1

data/webpack/scenes/ModuleStreams/__tests__/moduleStreams.fixtures.js

@@ -0,0 +1,72 @@
+import Immutable from 'seamless-immutable';
+import { initialApiState } from '../../../services/api';
+import { toastErrorAction, failureAction } from '../../../services/api/testHelpers';
+
+export const initialState = initialApiState;
+
+export const loadingState = Immutable({
+  ...initialState,
+  loading: true,
+});
+
+export const results = [
+  {
+    id: 39,
+    name: 'ant',
+    uuid: 'db1d7b30-3db3-49c9-a141-1276dc0f8bb3',
+    version: '20180629154141',
+    context: '819b5873',
+    stream: '1.10',
+    arch: 'x86_64',
+    description: 'Apache Ant is a Java library and command-line tool whose mission is to drive processes described in build files as targets and extension points dependent upon each other. The main known usage of Ant is the build of Java applications. Ant supplies a number of built-in tasks allowing to compile, assemble, test and run Java applications. Ant can also be used effectively to build non Java applications, for instance C or C++ applications. More generally, Ant can be used to pilot any type of process which can be described in terms of targets and tasks.',
+    summary: 'Java build tool',
+    repositories: [
+      {
+        id: 9,
+        name: 'rawhide modularity repo',
+      },
+    ],
+  },
+  {
+    id: 31,
+    name: 'avocado',
+    uuid: '9e6a0c79-f838-40cf-b6c0-729f4ce23669',
+    version: '20180726175620',
+    context: '6c81f848',
+    stream: 'latest',
+    arch: 'x86_64',
+    description: 'Avocado is a set of tools and libraries (what people call these days a framework) to perform automated testing.',
+    summary: 'Framework with tools and libraries for Automated Testing',
+    repositories: [
+      {
+        id: 9,
+        name: 'rawhide modularity repo',
+      },
+    ],
+  },
+];
+
+export const successState = {
+  itemCount: NaN,
+  loading: false,
+  pagination: { page: NaN, perPage: 20 },
+  results,
+};
+
+export const moduleStreamsFailureActions = [
+  {
+    type: 'MODULE_STREAMS_REQUEST',
+  },
+  failureAction('MODULE_STREAMS_FAILURE', 'Request failed with status code 500'),
+  toastErrorAction('Request failed with status code 500'),
+];
+
+export const moduleStreamsSuccessActions = [
+  {
+    type: 'MODULE_STREAMS_REQUEST',
+  },
+  {
+    type: 'MODULE_STREAMS_SUCCESS',
+    response: results,
+  },
+];

data/webpack/scenes/ModuleStreams/index.js

@@ -0,0 +1,17 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import { withRouter } from 'react-router';
+
+import ModuleStreamsPage from './ModuleStreamsPage';
+import reducer from './ModuleStreamsReducer';
+import * as ModuleStreamsActions from './ModuleStreamsActions';
+
+const mapStateToProps = state => ({
+  moduleStreams: state.katello.moduleStreams,
+});
+
+const mapDispatchToProps = dispatch => bindActionCreators(ModuleStreamsActions, dispatch);
+
+export const moduleStreams = reducer;
+
+export default connect(mapStateToProps, mapDispatchToProps)(withRouter(ModuleStreamsPage));

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

@@ -0,0 +1,120 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { ListView } from 'patternfly-react';
+import { sprintf } from 'foremanReact/common/I18n';
+
+import RepositoryTypeIcon from '../RepositoryTypeIcon';
+
+import { notify } from '../../../../move_to_foreman/foreman_toast_notifications';
+import EnabledRepositoryContent from './EnabledRepositoryContent';
+
+class EnabledRepository extends Component {
+  constructor(props) {
+    super(props);
+
+    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 = () => {
+      notify({
+        message: sprintf(__("Repository '%(repoName)s' has been disabled."), { repoName: this.props.name }),
+        type: 'success',
+      });
+    };
+
+    this.reloadAndNotify = (result) => {
+      if (result.success) {
+        this.reload()
+          .then(this.setDisabled)
+          .then(this.notifyDisabled);
+      }
+    };
+
+    this.disableRepository = () => {
+      this.props.disableRepository(this.repoForAction())
+        .then(this.reloadAndNotify);
+    };
+
+    this.disableTooltipId = `disable-${props.id}`;
+  }
+
+  render() {
+    const {
+      name, id, type, orphaned, label,
+    } = this.props;
+
+    return (
+      <ListView.Item
+        key={id}
+        actions={
+          <EnabledRepositoryContent
+            loading={this.props.loading}
+            disableTooltipId={this.disableTooltipId}
+            disableRepository={this.disableRepository}
+          />
+        }
+        leftContent={<RepositoryTypeIcon id={id} type={type} />}
+        heading={`${name} ${orphaned ? __('(Orphaned)') : ''}`}
+        description={label}
+        stacked
+      />
+    );
+  }
+}
+
+EnabledRepository.propTypes = {
+  id: PropTypes.number.isRequired,
+  contentId: PropTypes.number.isRequired,
+  productId: PropTypes.number.isRequired,
+  label: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  type: PropTypes.string.isRequired,
+  arch: PropTypes.string.isRequired,
+  search: PropTypes.shape({
+    query: PropTypes.string,
+    searchList: PropTypes.string,
+    filters: PropTypes.array,
+  }),
+  pagination: PropTypes.shape({
+    page: PropTypes.number,
+    perPage: PropTypes.number,
+  }).isRequired,
+  loading: PropTypes.bool,
+  releasever: PropTypes.string,
+  orphaned: PropTypes.bool,
+  setRepositoryDisabled: PropTypes.func.isRequired,
+  loadEnabledRepos: PropTypes.func.isRequired,
+  disableRepository: PropTypes.func.isRequired,
+};
+
+EnabledRepository.defaultProps = {
+  releasever: '',
+  orphaned: false,
+  search: {},
+  loading: false,
+};
+
+export default EnabledRepository;

data/webpack/scenes/RedHatRepositories/components/{__tests__ → EnabledRepository/__tests__}/EnabledRepository.test.js

@@ -5,8 +5,6 @@ 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({});
 
@@ -19,10 +17,15 @@ describe('Enabled Repositories Component', () => {
       contentId={1}
       productId={1}
       name="foo"
+      orphaned={false}
       type="foo"
       arch="foo"
       releaseVer="1.1.1"
+      label="some label"
+      pagination={{}}
       setRepositoryDisabled={() => {}}
+      loadEnabledRepos={() => {}}
+      disableRepository={() => {}}
     />);
   });
 
@@ -34,3 +37,4 @@ describe('Enabled Repositories Component', () => {
     expect(toJson(shallowWrapper)).toMatchSnapshot();
   });
 });
+

data/webpack/scenes/RedHatRepositories/components/EnabledRepository/__tests__/__snapshots__/EnabledRepository.test.js.snap

@@ -0,0 +1,31 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Enabled Repositories Component should render 1`] = `
+<ListViewItem
+  actions={
+    <EnabledRepositoryContent
+      disableRepository={[Function]}
+      disableTooltipId="disable-1"
+      loading={false}
+    />
+  }
+  additionalInfo={null}
+  checkboxInput={null}
+  compoundExpand={false}
+  compoundExpanded={false}
+  description="some label"
+  heading="foo "
+  hideCloseIcon={false}
+  key="1"
+  leftContent={
+    <RepositoryTypeIcon
+      id={1}
+      type="foo"
+    />
+  }
+  onCloseCompoundExpand={[Function]}
+  onExpand={[Function]}
+  onExpandClose={[Function]}
+  stacked={true}
+/>
+`;

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

@@ -0,0 +1,17 @@
+import { connect } from 'react-redux';
+import { setRepositoryDisabled, loadEnabledRepos, disableRepository } from '../../../../redux/actions/RedHatRepositories/enabled';
+import EnabledRepository from './EnabledRepository';
+
+const mapStateToProps = (
+  { katello: { redHatRepositories: { enabled: { pagination, search } } } },
+  props,
+) => ({
+  ...props,
+  pagination,
+  search,
+});
+
+export default connect(
+  mapStateToProps,
+  { setRepositoryDisabled, loadEnabledRepos, disableRepository },
+)(EnabledRepository);

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

@@ -18,7 +18,7 @@ const RepositorySet = ({
     actions={recommended ? <Icon type="fa" name="star" className="recommended-repository-set-icon" /> : ''}
     hideCloseIcon
   >
-    <RepositorySetRepositories contentId={id} productId={product.id} />
+    <RepositorySetRepositories contentId={id} productId={product.id} type={type} label={label} />
   </ListView.Item>
 );
 

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

@@ -4,7 +4,8 @@ import { connect } from 'react-redux';
 import { Alert, Spinner } from 'patternfly-react';
 
 import loadRepositorySetRepos from '../../../redux/actions/RedHatRepositories/repositorySetRepositories';
-import RepositorySetRepository from './RepositorySetRepository';
+import RepositorySetRepository from './RepositorySetRepository/';
+import { yStream } from './RepositorySetRepositoriesHelpers';
 
 class RepositorySetRepositories extends Component {
   componentDidMount() {
@@ -15,8 +16,39 @@ class RepositorySetRepositories extends Component {
     }
   }
 
+  sortedRepos = repos => [...repos.filter(({ enabled }) => !enabled)]
+    .sort((repo1, repo2) => {
+      const repo1YStream = yStream(repo1.releasever || '');
+      const repo2YStream = yStream(repo2.releasever || '');
+
+      if (repo1YStream < repo2YStream) {
+        return -1;
+      }
+
+      if (repo2YStream < repo1YStream) {
+        return 1;
+      }
+
+      if (repo1.arch === repo2.arch) {
+        const repo1MajorMinor = repo1.releasever.split('.');
+        const repo2MajorMinor = repo2.releasever.split('.');
+
+        const repo1Major = parseInt(repo1MajorMinor[0], 10);
+        const repo2Major = parseInt(repo2MajorMinor[0], 10);
+
+        if (repo1Major === repo2Major) {
+          const repo1Minor = parseInt(repo1MajorMinor[1], 10);
+          const repo2Minor = parseInt(repo2MajorMinor[1], 10);
+
+          if (repo1Minor === repo2Minor) {
+            return 0;
+          } return (repo1Minor > repo2Minor) ? -1 : 1;
+        } return (repo1Major > repo2Major) ? -1 : 1;
+      } return (repo1.arch > repo2.arch) ? -1 : 1;
+    });
+
   render() {
-    const { data } = this.props;
+    const { data, type } = this.props;
 
     if (data.error) {
       return (
@@ -25,9 +57,10 @@ class RepositorySetRepositories extends Component {
         </Alert>
       );
     }
-    const availableRepos = data.repositories
-      .filter(({ enabled }) => !enabled)
-      .map(repo => <RepositorySetRepository key={repo.arch + repo.releasever} {...repo} />);
+
+    const availableRepos = this.sortedRepos(data.repositories).map(repo => (
+      <RepositorySetRepository key={repo.arch + repo.releasever} type={type} {...repo} />
+    ));
 
     const repoMessage = (data.repositories.length > 0 && availableRepos.length === 0 ?
       __('All available architectures for this repo are enabled.') : __('No repositories available.'));
@@ -44,12 +77,17 @@ RepositorySetRepositories.propTypes = {
   loadRepositorySetRepos: PropTypes.func.isRequired,
   contentId: PropTypes.number.isRequired,
   productId: PropTypes.number.isRequired,
+  type: PropTypes.string,
   data: PropTypes.shape({
     loading: PropTypes.bool.isRequired,
     repositories: PropTypes.arrayOf(PropTypes.object),
   }).isRequired,
 };
 
+RepositorySetRepositories.defaultProps = {
+  type: '',
+};
+
 const mapStateToProps = (
   { katello: { redHatRepositories: { repositorySetRepositories } } },
   props,

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

@@ -0,0 +1,3 @@
+export const yStream = releasever => releasever.match(/^\d+\.\d+$/) != null;
+
+export default yStream;

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

@@ -0,0 +1,168 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import cx from 'classnames';
+import { ListView, Spinner, OverlayTrigger, Tooltip, Icon, FieldLevelHelp } from 'patternfly-react';
+
+import { sprintf } from 'foremanReact/common/I18n';
+import { yStream } from '../RepositorySetRepositoriesHelpers';
+import { notify } from '../../../../move_to_foreman/foreman_toast_notifications';
+import '../../index.scss';
+
+class RepositorySetRepository extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {};
+
+    this.repoForAction = () => {
+      const {
+        productId, contentId, arch, releasever, label,
+      } = this.props;
+
+      return {
+        productId,
+        contentId,
+        arch,
+        releasever,
+        label,
+      };
+    };
+
+    this.setEnabled = () => {
+      this.props.setRepositoryEnabled(this.repoForAction());
+    };
+
+    this.reloadEnabledRepos = () => (
+      this.props.loadEnabledRepos({
+        ...this.props.enabledPagination,
+        search: this.props.enabledSearch,
+      }, true)
+    );
+
+    this.notifyEnabled = (data) => {
+      const repoName = data.output.repository.name;
+      notify({
+        message: sprintf(__("Repository '%(repoName)s' has been enabled."), { repoName }),
+        type: 'success',
+      });
+    };
+
+    this.reloadAndNotify = (result) => {
+      if (result.success) {
+        this.reloadEnabledRepos()
+          .then(this.setEnabled)
+          .then(() => this.notifyEnabled(result.data));
+      }
+    };
+
+    this.enableRepository = () => {
+      this.props.enableRepository(this.repoForAction())
+        .then(this.reloadAndNotify);
+    };
+  }
+
+  render() {
+    const { arch, releasever, type } = this.props;
+
+    const archLabel = arch || __('Unspecified');
+    const releaseverLabel = releasever || '';
+
+    const yStreamHelpText =
+      sprintf(
+        __('This repository is not suggested. Please see additional %(anchorBegin)sdocumentation%(anchorEnd)s prior to use.'),
+        {
+          anchorBegin: '<a href="https://access.redhat.com/articles/1586183">',
+          anchorEnd: '</a>',
+        },
+      );
+    // eslint-disable-next-line react/no-danger
+    const yStreamHelp = <span dangerouslySetInnerHTML={{ __html: yStreamHelpText }} />;
+    const shouldDeemphasize = () => type !== 'kickstart' && yStream(releaseverLabel);
+    const repositoryHeading = () => (
+      <span>
+        {archLabel} {releaseverLabel}
+        {shouldDeemphasize() ? (<FieldLevelHelp content={yStreamHelp} />) : null}
+      </span>
+    );
+
+    return (
+      <ListView.Item
+        heading={repositoryHeading()}
+        className={`list-item-with-divider ${shouldDeemphasize() ? 'deemphasize' : ''}`}
+        leftContent={
+          this.props.error ? (
+            <div className="list-error-danger">
+              <Icon name="times-circle-o" />
+            </div>
+          ) : null
+        }
+        additionalInfo={
+          this.state.error
+            ? [
+              <ListView.InfoItem key="error" stacked className="list-error-danger">
+                {this.state.error.displayMessage}
+              </ListView.InfoItem>,
+              ]
+            : null
+        }
+        actions={
+          <Spinner loading={this.props.loading} inline>
+            <OverlayTrigger
+              overlay={<Tooltip id="enable">Enable</Tooltip>}
+              placement="bottom"
+              trigger={['hover', 'focus']}
+              rootClose={false}
+            >
+              <button
+                onClick={this.enableRepository}
+                style={{
+                  backgroundColor: 'initial',
+                  border: 'none',
+                  color: '#0388ce',
+                }}
+              >
+                <i className={cx('fa-2x', 'fa fa-plus-circle')} />
+              </button>
+            </OverlayTrigger>
+          </Spinner>
+        }
+        stacked
+      />
+    );
+  }
+}
+
+RepositorySetRepository.propTypes = {
+  contentId: PropTypes.number.isRequired,
+  productId: PropTypes.number.isRequired,
+  arch: PropTypes.string,
+  releasever: PropTypes.string,
+  type: PropTypes.string,
+  label: PropTypes.string,
+  enabledSearch: PropTypes.shape({
+    query: PropTypes.string,
+    searchList: PropTypes.string,
+    filters: PropTypes.array,
+  }),
+  enabledPagination: PropTypes.shape({
+    page: PropTypes.number,
+    perPage: PropTypes.number,
+  }).isRequired,
+  loading: PropTypes.bool,
+  error: PropTypes.bool,
+  setRepositoryEnabled: PropTypes.func.isRequired,
+  loadEnabledRepos: PropTypes.func.isRequired,
+  enableRepository: PropTypes.func.isRequired,
+};
+
+RepositorySetRepository.defaultProps = {
+  type: '',
+  label: '',
+  releasever: undefined,
+  arch: undefined,
+  enabledSearch: {},
+  loading: false,
+  error: false,
+};
+
+export default RepositorySetRepository;