katello 4.0.3 → 4.1.0.rc1

data/package.json

@@ -44,8 +44,8 @@
   },
   "_comment": "We don't include @theforeman/vendor because it's assumed to be present in Foreman",
   "dependencies": {
-    "angular": "1.7.9",
-    "bootstrap-select": "1.12.4",
+    "angular": "1.8.2",
+    "bootstrap-select": "1.13.6",
     "downshift": "^5.4.2",
     "ngreact": "^0.5.0",
     "query-string": "^6.1.0",

data/webpack/{scenes/ContentViews/Details/Repositories/RepoAddedStatus.js → components/AddedStatusLabel.js}

@@ -1,17 +1,17 @@
 import React from 'react';
 import { Label } from '@patternfly/react-core';
 import { CheckCircleIcon } from '@patternfly/react-icons';
-import { ADDED, NOT_ADDED } from '../../ContentViewsConstants';
+import { translate as __ } from 'foremanReact/common/I18n';
 
-const RepoAddedStatus = ({ added }) => {
+const AddedStatusLabel = ({ added }) => {
   if (added) {
     return (
       <Label variant="outline" color="green" icon={<CheckCircleIcon />}>
-        {ADDED}
+        {__('Added')}
       </Label>
     );
   }
-  return NOT_ADDED;
+  return __('Not added');
 };
 
-export default RepoAddedStatus;
+export default AddedStatusLabel;

data/webpack/components/RoutedTabs/RoutedTabs.js

@@ -0,0 +1,91 @@
+import React, { useEffect } from 'react';
+import { shape, string, number, element, arrayOf } from 'prop-types';
+import { Tab, Tabs, TabTitleText } from '@patternfly/react-core';
+import { useHistory, useLocation } from 'react-router-dom';
+import paramsFromHash from '../../utils/paramsFromHash';
+
+/*
+  Creates tabs that change url hash based on the tab selected.
+  Also can show a subpage within a tab based on query params.
+  The url format is: "/my/base/url#currentTab?subContentId=1"
+  Influenced by https://github.com/ansible/awx/blob/devel/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx
+*/
+const RoutedTabs = ({
+  tabs, baseUrl, defaultTabIndex, titleComponent,
+}) => {
+  const history = useHistory();
+  const { hash } = useLocation();
+  const { hash: tabFromUrl, params: { subContentId } } = paramsFromHash(hash);
+
+  const buildLink = tabKey => `${baseUrl}#${tabKey}`;
+
+  const changeTab = (eventKey) => {
+    const matchedTab = tabs.find(tab => tab.key === eventKey);
+    if (matchedTab) {
+      history.push(buildLink(matchedTab.key));
+    } else {
+      history.push(buildLink(tabs[defaultTabIndex].key)); // go to first tab if no tab selected
+    }
+  };
+
+  const handleTabSelect = (_event, eventKey) => changeTab(eventKey);
+
+  const getActiveTab = () => {
+    const matchedTab = tabs.find(tab => tab.key === tabFromUrl);
+    if (matchedTab) return matchedTab.key;
+
+    return tabs[defaultTabIndex].key; // Default to first tab
+  };
+
+  // Useful when first navigating to the page, switches to default tab in url
+  useEffect(() => {
+    if (tabFromUrl !== getActiveTab()) changeTab(tabFromUrl);
+  }, [tabFromUrl]);
+
+  // Handle subroutes to show item's detail content while staying on a tab
+  const showContent = (tab) => {
+    const { content, detailContent } = tab;
+    if (subContentId && detailContent) return detailContent;
+
+    return content; // show main content if no subroute
+  };
+
+  return (
+    <Tabs activeKey={getActiveTab()} onSelect={handleTabSelect}>
+      {tabs.map((tab) => {
+        const { key, title } = tab;
+
+        return (
+          <Tab
+            aria-label={title}
+            eventKey={key}
+            key={key}
+            title={titleComponent || <TabTitleText>{title}</TabTitleText>}
+          >
+            <div className="tab-body-with-spacing">
+              {showContent(tab)}
+            </div>
+          </Tab>
+        );
+})}
+    </Tabs>
+  );
+};
+
+RoutedTabs.propTypes = {
+  tabs: arrayOf(shape({
+    key: string.isRequired,
+    title: string.isRequired,
+    content: element.isRequired,
+  })).isRequired,
+  baseUrl: string.isRequired,
+  defaultTabIndex: number,
+  titleComponent: element, // when you want to a custom tab title
+};
+
+RoutedTabs.defaultProps = {
+  defaultTabIndex: 0,
+  titleComponent: null,
+};
+
+export default RoutedTabs;

data/webpack/components/RoutedTabs/__tests__/RoutedTabs.test.js

@@ -0,0 +1,32 @@
+import React from 'react';
+import { renderWithRouter } from 'react-testing-lib-wrapper';
+
+import RoutedTabs from '../';
+
+const tabs = [
+  {
+    key: 'apples',
+    title: 'Apples',
+    content: <>good for pies!</>,
+  },
+  {
+    key: 'pears',
+    title: 'Pears',
+    content: <>good for a snack!</>,
+  },
+];
+
+test('can render tabs and show default tab', async () => {
+  const { getByText } = renderWithRouter(<RoutedTabs tabs={tabs} baseUrl="/fruits" defaultTabIndex={1} />);
+
+  expect(getByText('Pears')).toBeInTheDocument();
+  expect(getByText('good for a snack!')).toBeInTheDocument();
+});
+
+test('can switch tabs and render content', async () => {
+  const { getByText } = renderWithRouter(<RoutedTabs tabs={tabs} baseUrl="/fruits" />);
+
+  expect(getByText('good for pies!')).toBeInTheDocument();
+  getByText('Pears').click();
+  expect(getByText('good for a snack!')).toBeInTheDocument();
+});

data/webpack/components/RoutedTabs/index.js

@@ -0,0 +1,4 @@
+import { withRouter } from 'react-router-dom';
+import RoutedTabs from './RoutedTabs';
+
+export default withRouter(RoutedTabs);

data/webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageConstants.js

@@ -0,0 +1,2 @@
+export default 'REGISTRATION_COMMANDS_DATA';
+

data/webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageHelpers.js

@@ -0,0 +1,21 @@
+// Activation Keys helpers
+
+export const validateAKField = (hostGroupId, userKeys, hgKeys) => {
+  if (hostGroupId === '') {
+    return (userKeys?.length > 0 ? 'success' : 'error');
+  }
+
+  if (userKeys === undefined && hgKeys === undefined) {
+    return ('default');
+  }
+
+  return ((userKeys?.length > 0 || hgKeys?.length > 0) ? 'success' : 'error');
+};
+
+export const akHasValidValue = (hostGroupId, userKeys, hgKeys) => {
+  if (hostGroupId === '') {
+    return (userKeys?.length > 0);
+  }
+
+  return (hgKeys?.length > 0 || userKeys?.length > 0);
+};

data/webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageSelectors.js

@@ -0,0 +1,21 @@
+import {
+  selectAPIResponse,
+} from 'foremanReact/redux/API/APISelectors';
+
+import {
+  REGISTRATION_COMMANDS_DATA,
+} from './RegistrationCommandsPageConstants';
+
+
+export const selectActivationKeys = state =>
+  selectAPIResponse(state, REGISTRATION_COMMANDS_DATA).pluginData?.activationKeys || [];
+
+export const selectHostGroupActivationKeys = state =>
+  selectAPIResponse(state, REGISTRATION_COMMANDS_DATA).pluginData?.hostGroupActivationKeys;
+
+export const selectLifecycleEnvironments = state =>
+  selectAPIResponse(state, REGISTRATION_COMMANDS_DATA).pluginData?.lifecycleEnvironments || [];
+
+export const selectHostGroupEnvironment = state =>
+    selectAPIResponse(state, REGISTRATION_COMMANDS_DATA).pluginData?.hostGroupEnvironment;
+

data/webpack/components/extensions/RegistrationCommands/__tests__/ActivationKeys.test.js

@@ -0,0 +1,18 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import ActivationKeys from '../fields/ActivationKeys';
+
+const fixtures = {
+  renders: {
+    activationKeys: [],
+    selectedKeys: [],
+    hostGroupActivationKeys: [],
+    hostGroupId: '',
+    pluginValues: {},
+    onChange: () => {},
+    handleInvalidField: () => {},
+    isLoading: false,
+  },
+};
+
+describe('ActivationKeys', () =>
+  testComponentSnapshotsWithFixtures(ActivationKeys, fixtures));

data/webpack/components/extensions/RegistrationCommands/__tests__/Force.test.js

@@ -0,0 +1,9 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import Force from '../fields/Force';
+
+const fixtures = {
+  renders: { value: false, isLoading: false, onChange: () => {} },
+};
+
+describe('Force', () =>
+  testComponentSnapshotsWithFixtures(Force, fixtures));

data/webpack/components/extensions/RegistrationCommands/__tests__/IgnoreSubmanErrors.test.js

@@ -0,0 +1,9 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import IgnoreSubmanErrors from '../fields/IgnoreSubmanErrors';
+
+const fixtures = {
+  renders: { value: false, isLoading: false, onChange: () => {} },
+};
+
+describe('IgnoreSubmanErrors', () =>
+  testComponentSnapshotsWithFixtures(IgnoreSubmanErrors, fixtures));

data/webpack/components/extensions/RegistrationCommands/__tests__/LifeCycleEnvironment.test.js

@@ -0,0 +1,11 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import LifecycleEnvironment from '../fields/LifecycleEnvironment';
+
+const fixtures = {
+  renders: {
+    pluginValues: {}, isLoading: false, onChange: () => {}, hostGroupEnvironment: '', lifecycleEnvironments: [],
+  },
+};
+
+describe('LifecycleEnvironment', () =>
+  testComponentSnapshotsWithFixtures(LifecycleEnvironment, fixtures));

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/ActivationKeys.test.js.snap

@@ -0,0 +1,58 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ActivationKeys renders 1`] = `
+<FormGroup
+  fieldId="reg_katello_ak"
+  helperText="From host group: "
+  helperTextInvalid="No Activation Keys selected"
+  isRequired={true}
+  label="Activation Keys"
+  labelIcon={
+    <LabelIcon
+      text="Activation key(s) for Subscription Manager."
+    />
+  }
+  validated="error"
+>
+  <Select
+    aria-label=""
+    aria-labelledby=""
+    chipGroupComponent={null}
+    className="without_select2"
+    clearSelectionsAriaLabel="Clear all"
+    createText="Create"
+    customBadgeText={null}
+    customContent={null}
+    direction="down"
+    favorites={Array []}
+    favoritesLabel="Favorites"
+    hasInlineFilter={false}
+    id="reg_katello_ak"
+    inlineFilterPlaceholderText={null}
+    inputIdPrefix=""
+    isCreatable={false}
+    isDisabled={true}
+    isGrouped={false}
+    isOpen={false}
+    isPlain={false}
+    menuAppendTo="inline"
+    noResultsFoundText="No results found"
+    onClear={[Function]}
+    onCreateOption={[Function]}
+    onFilter={null}
+    onSelect={[Function]}
+    onToggle={[Function]}
+    onTypeaheadInputChanged={null}
+    ouiaSafe={true}
+    placeholderText="No Activation keys to select"
+    removeSelectionAriaLabel="Remove"
+    selections={Array []}
+    toggleAriaLabel="Options menu"
+    toggleIcon={null}
+    toggleId={null}
+    typeAheadAriaLabel=""
+    variant="typeaheadmulti"
+    width=""
+  />
+</FormGroup>
+`;

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/Force.test.js.snap

@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Force renders 1`] = `
+<FormGroup
+  fieldId="reg_katello_force"
+>
+  <Checkbox
+    className=""
+    id="reg_katello_force"
+    isChecked={false}
+    isDisabled={false}
+    isValid={true}
+    label={
+      <span>
+        Force
+         
+        <LabelIcon
+          text="Remove any \`katello-ca-consumer\` rpms before registration and run subscription-manager with \`--force\` argument."
+        />
+      </span>
+    }
+    onChange={[Function]}
+  />
+</FormGroup>
+`;

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/IgnoreSubmanErrors.test.js.snap

@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`IgnoreSubmanErrors renders 1`] = `
+<FormGroup
+  fieldId="reg_katello_ignore"
+>
+  <Checkbox
+    className=""
+    id="reg_katello_ignore"
+    isChecked={false}
+    isDisabled={false}
+    isValid={true}
+    label={
+      <span>
+        Ignore errors
+         
+        <LabelIcon
+          text="Ignore subscription manager errors"
+        />
+      </span>
+    }
+    onChange={[Function]}
+  />
+</FormGroup>
+`;

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/LifeCycleEnvironment.test.js.snap

@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`LifecycleEnvironment renders 1`] = `
+<FormGroup
+  fieldId="reg_katello_lce"
+  helperText=""
+  label="Lifecycle environment"
+>
+  <FormSelect
+    className="without_select2"
+    id="reg_katello_lce"
+    isDisabled={true}
+    isRequired={false}
+    onBlur={[Function]}
+    onChange={[Function]}
+    onFocus={[Function]}
+    ouiaSafe={true}
+    validated="default"
+    value=""
+  >
+    <FormSelectOption
+      label="No Lifecycle environment to select"
+      value=""
+    />
+  </FormSelect>
+</FormGroup>
+`;

data/webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js

@@ -0,0 +1,99 @@
+
+/* eslint-disable max-len, react/forbid-prop-types */
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import {
+  FormGroup,
+  Select, SelectOption, SelectVariant,
+} from '@patternfly/react-core';
+
+import LabelIcon from 'foremanReact/components/common/LabelIcon';
+import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+
+import { validateAKField, akHasValidValue } from '../RegistrationCommandsPageHelpers';
+
+const ActivationKeys = ({
+  activationKeys,
+  selectedKeys,
+  hostGroupActivationKeys,
+  hostGroupId,
+  pluginValues,
+  onChange,
+  isLoading,
+  handleInvalidField,
+}) => {
+  const [isOpen, setIsOpen] = useState(false);
+
+  const updatePluginValues = (keys) => {
+    onChange({ activationKeys: keys });
+    handleInvalidField('Activation Keys', akHasValidValue(hostGroupId, pluginValues?.activationKeys, hostGroupActivationKeys));
+  };
+
+  const onSelect = (_e, value) => {
+    if (selectedKeys.find((key => key === value))) {
+      updatePluginValues(selectedKeys.filter(sk => sk !== value));
+    } else {
+      updatePluginValues([...selectedKeys, value]);
+    }
+  };
+
+  // Validate field when hostgroup is changed (host group may have some keys)
+  useEffect(() => {
+    handleInvalidField('Activation Keys', akHasValidValue(hostGroupId, pluginValues?.activationKeys, hostGroupActivationKeys));
+  }, [hostGroupId, hostGroupActivationKeys, pluginValues]);
+
+  return (
+    <FormGroup
+      label={__('Activation Keys')}
+      fieldId="reg_katello_ak"
+      helperText={hostGroupActivationKeys && sprintf('From host group: %s', hostGroupActivationKeys)}
+      helperTextInvalid={__('No Activation Keys selected')}
+      validated={validateAKField(hostGroupId, pluginValues?.activationKeys, hostGroupActivationKeys)}
+      labelIcon={<LabelIcon text={__('Activation key(s) for Subscription Manager.')} />}
+      isRequired
+    >
+      <Select
+        selections={selectedKeys}
+        variant={SelectVariant.typeaheadMulti}
+        onToggle={() => setIsOpen(!isOpen)}
+        onSelect={onSelect}
+        onClear={() => updatePluginValues([])}
+        isOpen={isOpen}
+        id="reg_katello_ak"
+        className="without_select2"
+        isDisabled={isLoading || activationKeys?.length === 0}
+        placeholderText={activationKeys?.length === 0 ? __('No Activation keys to select') : ''}
+      >
+        {activationKeys && activationKeys.map(ack => (
+          <SelectOption
+            key={ack.name}
+            value={ack.name}
+            description={(ack?.lce ? ack.lce : __('No environment'))}
+          />
+        ))}
+      </Select>
+    </FormGroup>);
+};
+
+
+ActivationKeys.propTypes = {
+  activationKeys: PropTypes.array,
+  selectedKeys: PropTypes.array,
+  hostGroupActivationKeys: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
+  hostGroupId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  pluginValues: PropTypes.object,
+  onChange: PropTypes.func.isRequired,
+  handleInvalidField: PropTypes.func.isRequired,
+  isLoading: PropTypes.bool,
+};
+
+ActivationKeys.defaultProps = {
+  activationKeys: undefined,
+  selectedKeys: [],
+  hostGroupActivationKeys: undefined,
+  hostGroupId: undefined,
+  pluginValues: {},
+  isLoading: false,
+};
+
+export default ActivationKeys;

data/webpack/components/extensions/RegistrationCommands/fields/Force.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { noop } from 'foremanReact/common/helpers';
+
+import { FormGroup, Checkbox } from '@patternfly/react-core';
+import LabelIcon from 'foremanReact/components/common/LabelIcon';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const Force = ({ value, onChange, isLoading }) => (
+  <FormGroup fieldId="reg_katello_force">
+    <Checkbox
+      label={
+        <span>
+          {__('Force')}{' '}
+          <LabelIcon text={__('Remove any `katello-ca-consumer` rpms before registration and run subscription-manager with `--force` argument.')} />
+        </span>
+      }
+      id="reg_katello_force"
+      onChange={() => onChange({ force: !value })}
+      isDisabled={isLoading}
+      isChecked={value}
+    />
+  </FormGroup>
+);
+
+Force.propTypes = {
+  value: PropTypes.bool,
+  onChange: PropTypes.func,
+  isLoading: PropTypes.bool,
+};
+
+Force.defaultProps = {
+  value: false,
+  onChange: noop,
+  isLoading: false,
+};
+
+export default Force;

data/webpack/components/extensions/RegistrationCommands/fields/IgnoreSubmanErrors.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { noop } from 'foremanReact/common/helpers';
+
+import { FormGroup, Checkbox } from '@patternfly/react-core';
+import LabelIcon from 'foremanReact/components/common/LabelIcon';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const IgnoreSubmanErrors = ({ value, onChange, isLoading }) => (
+  <FormGroup fieldId="reg_katello_ignore">
+    <Checkbox
+      label={
+        <span>
+          {__('Ignore errors')}{' '}
+          <LabelIcon text={__('Ignore subscription manager errors')} />
+        </span>
+      }
+      id="reg_katello_ignore"
+      onChange={() => onChange({ ignoreSubmanErrors: !value })}
+      isDisabled={isLoading}
+      isChecked={value}
+    />
+  </FormGroup>
+);
+
+IgnoreSubmanErrors.propTypes = {
+  value: PropTypes.bool,
+  onChange: PropTypes.func,
+  isLoading: PropTypes.bool,
+};
+
+IgnoreSubmanErrors.defaultProps = {
+  value: false,
+  onChange: noop,
+  isLoading: false,
+};
+
+export default IgnoreSubmanErrors;

data/webpack/components/extensions/RegistrationCommands/fields/LifecycleEnvironment.js

@@ -0,0 +1,56 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import {
+  FormGroup,
+  FormSelectOption, FormSelect,
+} from '@patternfly/react-core';
+
+import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import { noop } from 'foremanReact/common/helpers';
+
+const LifecycleEnvironment = ({
+  pluginValues, onChange, isLoading,
+  hostGroupEnvironment, lifecycleEnvironments,
+}) => (
+  <FormGroup
+    label={__('Lifecycle environment')}
+    fieldId="reg_katello_lce"
+    helperText={hostGroupEnvironment && sprintf('From host group: %s', hostGroupEnvironment)}
+  >
+    <FormSelect
+      value={pluginValues?.lifecycleEnvironmentId}
+      onChange={v => onChange({ lifecycleEnvironmentId: v })}
+      className="without_select2"
+      id="reg_katello_lce"
+      isDisabled={isLoading || lifecycleEnvironments.length === 0}
+    >
+      <FormSelectOption
+        value=""
+        label={lifecycleEnvironments.length === 0 ? __('No Lifecycle environment to select') : ''}
+      />
+      {lifecycleEnvironments.map(lce => (
+        <FormSelectOption key={lce.id} value={lce.id} label={lce.name} />
+        ))}
+    </FormSelect>
+  </FormGroup>
+);
+
+LifecycleEnvironment.propTypes = {
+  pluginValues: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  onChange: PropTypes.func,
+  hostGroupEnvironment: PropTypes.string,
+  lifecycleEnvironments: PropTypes.array, // eslint-disable-line react/forbid-prop-types
+  isLoading: PropTypes.bool,
+};
+
+LifecycleEnvironment.defaultProps = {
+  onChange: noop,
+  isLoading: false,
+  hostGroupEnvironment: '',
+  lifecycleEnvironments: [],
+  pluginValues: {},
+
+};
+
+export default LifecycleEnvironment;