katello 3.8.1 → 3.9.0.rc1

data/webpack/move_to_foreman/components/common/ConfirmDialog/ConfirmDialog.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { Button } from 'patternfly-react';
 import Dialog from '../Dialog';
 

data/webpack/move_to_foreman/components/common/Dialog/Dialog.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { Button, Modal, Icon } from 'patternfly-react';
 
 const Dialog = (props) => {

data/webpack/move_to_foreman/components/common/EmptyState/index.js

@@ -1,6 +1,7 @@
 /* eslint-disable */
 import React from 'react';
 import { EmptyState as PfEmptyState, Button } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { LinkContainer } from 'react-router-bootstrap';
 
 const EmptyState = (props) => {

data/webpack/move_to_foreman/components/common/ModalProgressBar/ModalProgressBar.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Modal, ProgressBar } from 'patternfly-react';
-import { sprintf } from 'jed';
+import { sprintf } from 'foremanReact/common/I18n';
 
 const ModalProgressBar = (props) => {
   const { show, container, task } = props;

data/webpack/move_to_foreman/components/common/table/formatters/selectionCellFormatter.js

@@ -13,5 +13,6 @@ export default (
     onChange={() => selectionController.selectRow(additionalData)}
     before={before}
     after={after}
+    disabled={additionalData.disabled}
   />
 );

data/webpack/move_to_pf/OptionTooltip/OptionTooltip.scss

@@ -0,0 +1,20 @@
+@import '~patternfly/dist/sass/patternfly/variables';
+.option-tooltip {
+  ul {
+    list-style-type: none;
+    padding: 0;
+  }
+  .popover-content{
+    min-width: 120px;
+    max-width: 160px;
+  }
+  span {
+    margin-left: 8px;
+  }
+}
+.tooltip-open {
+  color: $color-pf-blue-400;
+}
+.tooltip-button {
+  cursor: pointer;
+}

data/webpack/move_to_pf/OptionTooltip/__tests__/OptionTooltip.test.js

@@ -0,0 +1,32 @@
+import OptionTooltip from '../';
+import { testComponentSnapshotsWithFixtures } from '../../test-utils/testHelpers';
+
+const onClose = () => {};
+const options = [
+  {
+    key: 'option1',
+    value: true,
+    label: 'One',
+  },
+  {
+    key: 'option2',
+    value: false,
+    label: 'Two',
+  },
+];
+
+const fixtures = {
+  'renders ': {
+    icon: 'test',
+    id: 'test',
+    options: [],
+    onClose,
+  },
+  'renders a list of options with default values ': {
+    icon: 'test',
+    id: 'test',
+    options,
+    onClose,
+  },
+};
+describe('OptionTooltip', () => testComponentSnapshotsWithFixtures(OptionTooltip, fixtures));

data/webpack/move_to_pf/OptionTooltip/__tests__/__snapshots__/OptionTooltip.test.js.snap

@@ -0,0 +1,84 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`OptionTooltip renders  1`] = `
+<OverlayTrigger
+  defaultOverlayShown={false}
+  onEnter={[Function]}
+  onExit={[Function]}
+  overlay={
+    <Popover
+      bsClass="popover"
+      className="option-tooltip"
+      id="test"
+      placement="right"
+    >
+      <ul />
+    </Popover>
+  }
+  placement="bottom"
+  rootClose={true}
+  trigger={
+    Array [
+      "click",
+    ]
+  }
+>
+  <i
+    className="fa test tooltip-button"
+  />
+</OverlayTrigger>
+`;
+
+exports[`OptionTooltip renders a list of options with default values  1`] = `
+<OverlayTrigger
+  defaultOverlayShown={false}
+  onEnter={[Function]}
+  onExit={[Function]}
+  overlay={
+    <Popover
+      bsClass="popover"
+      className="option-tooltip"
+      id="test"
+      placement="right"
+    >
+      <ul>
+        <li>
+          <input
+            checked={true}
+            id="option1"
+            name="option1"
+            onChange={[Function]}
+            type="checkbox"
+          />
+          <span>
+            One
+          </span>
+        </li>
+        <li>
+          <input
+            checked={false}
+            id="option2"
+            name="option2"
+            onChange={[Function]}
+            type="checkbox"
+          />
+          <span>
+            Two
+          </span>
+        </li>
+      </ul>
+    </Popover>
+  }
+  placement="bottom"
+  rootClose={true}
+  trigger={
+    Array [
+      "click",
+    ]
+  }
+>
+  <i
+    className="fa test tooltip-button"
+  />
+</OverlayTrigger>
+`;

data/webpack/move_to_pf/OptionTooltip/index.js

@@ -0,0 +1,83 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { Popover, OverlayTrigger } from 'patternfly-react';
+import './OptionTooltip.scss';
+
+class OptionTooltip extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      tooltipOpen: false,
+    };
+    this.handleInputChange = this.handleInputChange.bind(this);
+    this.renderTooltip = this.renderTooltip.bind(this);
+  }
+
+  handleInputChange(event, index) {
+    const { options } = this.props;
+    options[index].value = event.target.checked;
+    this.setState(options);
+    this.props.onChange(options);
+  }
+  renderTooltip() {
+    const { options, id } = this.props;
+    return (
+      <Popover id={id} className="option-tooltip">
+        <ul>
+          {
+            options.map((option, index) => (
+              <li key={option.key}>
+                <input type="checkbox" checked={option.value} name={option.key} id={option.key} onChange={e => this.handleInputChange(e, index)} />
+                <span>{option.label}</span>
+              </li>
+            ))
+          }
+        </ul>
+      </Popover>
+    );
+  }
+  render() {
+    const { icon, options, rootClose } = this.props;
+    const onOpen = () => {
+      this.setState({ tooltipOpen: true });
+    };
+    const onClose = () => {
+      this.props.onClose(options);
+      this.setState({ tooltipOpen: false });
+    };
+
+    return (
+      <OverlayTrigger
+        overlay={this.renderTooltip()}
+        placement="bottom"
+        trigger={['click']}
+        rootClose={rootClose}
+        onEnter={onOpen}
+        onExit={onClose}
+      >
+        <i className={classNames('fa', icon, 'tooltip-button', { 'tooltip-open': this.state.tooltipOpen })} />
+      </OverlayTrigger>
+    );
+  }
+}
+
+OptionTooltip.propTypes = {
+  icon: PropTypes.string.isRequired,
+  id: PropTypes.string.isRequired,
+  options: PropTypes.arrayOf(PropTypes.shape({
+    key: PropTypes.string,
+    label: PropTypes.string,
+    value: PropTypes.bool,
+  })).isRequired,
+  onChange: PropTypes.func,
+  onClose: PropTypes.func,
+  rootClose: PropTypes.bool,
+};
+OptionTooltip.defaultProps = {
+  onChange: () => {},
+  onClose: () => {},
+  rootClose: true,
+};
+export default OptionTooltip;

data/webpack/move_to_pf/TypeAhead/TypeAhead.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import Downshift from 'downshift';
 import PropTypes from 'prop-types';
 
-import { InputGroup, Button } from 'patternfly-react';
+import { InputGroup, Button, Icon } from 'patternfly-react';
 import TypeAheadInput from './TypeAheadInput';
 import TypeAheadItems from './TypeAheadItems';
 import { getActiveItems } from './helpers';
@@ -16,7 +16,7 @@ class TypeAhead extends Component {
     super(props);
 
     this.state = {
-      inputValue: '',
+      inputValue: this.props.initialInputValue,
     };
 
     this.handleStateChange = this.handleStateChange.bind(this);
@@ -29,6 +29,10 @@ class TypeAhead extends Component {
     }
   }
 
+  clearSearch = () => {
+    this.setState({ inputValue: '' }, () => this.props.onSearch(this.state.inputValue));
+  };
+
   render() {
     const {
       onSearch, onInputUpdate, items, actionText, ...rest
@@ -90,6 +94,13 @@ class TypeAhead extends Component {
                   onInputFocus={openMenu}
                   passedProps={getInputProps()}
                 />
+                {this.state.inputValue &&
+                  <InputGroup.Button>
+                    <Button onClick={this.clearSearch}>
+                      <Icon name="times" />
+                    </Button>
+                  </InputGroup.Button>
+                }
                 <InputGroup.Button>
                   <Button onClick={() => onSearch(inputValue)}>{actionText}</Button>
                 </InputGroup.Button>
@@ -116,10 +127,12 @@ TypeAhead.propTypes = {
   onInputUpdate: PropTypes.func.isRequired,
   onSearch: PropTypes.func.isRequired,
   actionText: PropTypes.string,
+  initialInputValue: PropTypes.string,
 };
 
 TypeAhead.defaultProps = {
   actionText: 'Search',
+  initialInputValue: '',
 };
 
 export default TypeAhead;

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

@@ -53,12 +53,14 @@ 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;
+    const { noneSelectedText, defaultValue, defaultValues, value, ...props} = this.props;
+    const initialValue = defaultValues || defaultValue || value;
 
-    return <FormControl {...this.props}
+    return <FormControl {...props}
                         data-none-selected-text={noneSelectedText}
                         data-selected-text-format="count>3"
                         data-count-selected-text={__('{0} items selected')}
+                        defaultValue={initialValue}
                         componentClass="select"
                         className="without_select2 without_jquery_multiselect"
     />;
@@ -67,10 +69,14 @@ class BootstrapSelect extends React.Component {
 
 BootstrapSelect.propTypes = {
   noneSelectedText: PropTypes.string,
-}
+  defaultValue: PropTypes.string,
+  defaultValues: PropTypes.arrayOf(PropTypes.string),
+};
 
 BootstrapSelect.defaultProps = {
   noneSelectedText: __('Nothing selected'),
-}
+  defaultValue: null,
+  defaultValues: null,
+};
 
 export default BootstrapSelect;

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

@@ -53,11 +53,23 @@ export const testActionSnapshot = async (runAction) => {
 
 /**
  * Test actions with fixtures and snapshots
- * @param  {Object} fixtures key=fixture description, value=action runner function
+ * @param  {Object} fixtures  key=fixture description,
+ *                            value=action runner function or
+ *                                  object({
+ *                                    action = action runner function,
+ *                                    test = other function to run after the action
+ *                                  })
  */
 export const testActionSnapshotWithFixtures = fixtures =>
   Object.entries(fixtures).forEach(([description, runAction]) =>
-    it(description, () => testActionSnapshot(runAction)));
+    it(description, async () => {
+      if (typeof runAction === 'function') {
+        await testActionSnapshot(runAction);
+      } else {
+        await testActionSnapshot(runAction.action);
+        runAction.test();
+      }
+    }));
 
 /**
  * Test a reducer with fixtures and snapshots

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

@@ -1,10 +1,14 @@
 import api, { orgId } from '../../../services/api';
 import { normalizeRepositorySets, repoTypeFilterToSearchQuery, joinSearchQueries } from './helpers';
+import { apiError, apiSuccess } from '../../../move_to_foreman/common/helpers.js';
 
 import {
   ENABLED_REPOSITORIES_REQUEST,
   ENABLED_REPOSITORIES_SUCCESS,
   ENABLED_REPOSITORIES_FAILURE,
+  DISABLE_REPOSITORY_REQUEST,
+  DISABLE_REPOSITORY_SUCCESS,
+  DISABLE_REPOSITORY_FAILURE,
   REPOSITORY_DISABLED,
 } from '../../consts';
 import { propsToSnakeCase } from '../../../services/index';
@@ -31,10 +35,32 @@ export const createEnabledRepoParams = (extendedParams = {}) => {
   return { searchParams, repoParams };
 };
 
-export const loadEnabledRepos = (extendedParams = {}) => (dispatch) => {
-  dispatch({ type: ENABLED_REPOSITORIES_REQUEST, params: extendedParams });
+export const disableRepository = repository => (dispatch) => {
+  const {
+    productId, contentId, arch, releasever,
+  } = repository;
+
+  const repoData = {
+    id: contentId,
+    product_id: productId,
+    basearch: arch,
+    releasever,
+  };
+
+  dispatch({ type: DISABLE_REPOSITORY_REQUEST, repository });
+
+  const url = `/products/${productId}/repository_sets/${contentId}/disable`;
+  return api
+    .put(url, repoData)
+    .then(result => dispatch(apiSuccess(DISABLE_REPOSITORY_SUCCESS, result)))
+    .catch(result => dispatch(apiError(DISABLE_REPOSITORY_FAILURE, result, { repository })));
+};
+
+export const loadEnabledRepos = (extendedParams = {}, silent = false) => (dispatch) => {
+  dispatch({ type: ENABLED_REPOSITORIES_REQUEST, params: extendedParams, silent });
   const { searchParams, repoParams } = createEnabledRepoParams(extendedParams);
-  api
+
+  return api
     .get('/repositories', {}, repoParams)
     .then(({ data }) => {
       dispatch({

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

@@ -1,5 +1,5 @@
 const repoTypeSearchQueryMap = {
-  rpm: '(name !~ source rpm) and (name !~ debug rpm) and (content_type = yum)',
+  rpm: '(name !~ source rpm) and (name !~ debug rpm) and (content_type = yum) and (name !~ beta) and (product_name !~ beta)',
   sourceRpm: '(name ~ source rpm) and (content_type = yum)',
   debugRpm: '(name ~ debug rpm) and (content_type = yum)',
   kickstart: 'content_type = kickstart',

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

@@ -1,9 +1,13 @@
 import api from '../../../services/api';
+import { apiError, apiSuccess } from '../../../move_to_foreman/common/helpers.js';
 
 import {
   REPOSITORY_SET_REPOSITORIES_REQUEST,
   REPOSITORY_SET_REPOSITORIES_SUCCESS,
   REPOSITORY_SET_REPOSITORIES_FAILURE,
+  ENABLE_REPOSITORY_REQUEST,
+  ENABLE_REPOSITORY_SUCCESS,
+  ENABLE_REPOSITORY_FAILURE,
   REPOSITORY_ENABLED,
 } from '../../consts';
 
@@ -19,9 +23,32 @@ export function normalizeContentSetRepositories(repos, contentId, productId) {
     arch: repo.substitutions.basearch,
     releasever: repo.substitutions.releasever,
     enabled: repo.enabled,
+    error: false,
+    loading: false,
   }));
 }
 
+export const enableRepository = repository => (dispatch) => {
+  const {
+    productId, contentId, arch, releasever,
+  } = repository;
+
+  const repoData = {
+    id: contentId,
+    product_id: productId,
+    basearch: arch,
+    releasever,
+  };
+
+  dispatch({ type: ENABLE_REPOSITORY_REQUEST, repository });
+
+  const url = `/products/${productId}/repository_sets/${contentId}/enable`;
+  return api
+    .put(url, repoData)
+    .then(result => dispatch(apiSuccess(ENABLE_REPOSITORY_SUCCESS, result)))
+    .catch(result => dispatch(apiError(ENABLE_REPOSITORY_FAILURE, result, { repository })));
+};
+
 const loadRepositorySetRepos = (contentId, productId) => (dispatch) => {
   dispatch({
     type: REPOSITORY_SET_REPOSITORIES_REQUEST,