katello 4.4.1 → 4.5.0

data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js

@@ -54,9 +54,9 @@ test('Can enable and disable add repositories button', async (done) => {
   );
 
   await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeInTheDocument());
-  expect(getByLabelText('Select all rows')).toBeInTheDocument();
+  expect(getByLabelText('Select all')).toBeInTheDocument();
   expect(getByLabelText('add_repositories')).toHaveAttribute('aria-disabled', 'true');
-  getByLabelText('Select all rows').click();
+  getByLabelText('Select all').click();
   await patientlyWaitFor(() => {
     expect(getByLabelText('add_repositories')).toHaveAttribute('aria-disabled', 'false');
   });
@@ -66,7 +66,7 @@ test('Can enable and disable add repositories button', async (done) => {
 
 test('Can add repositories', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const cvAddparams = { include_permissions: true, repository_ids: [58, 62, 64, 106] };
+  const cvAddparams = { include_permissions: true, repository_ids: [58, 62, 64, 106, 107] };
 
   const repoAddscope = nockInstance
     .put(cvDetailsPath, cvAddparams)
@@ -88,9 +88,9 @@ test('Can add repositories', async (done) => {
   );
 
   await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeInTheDocument());
-  expect(getByLabelText('Select all rows')).toBeInTheDocument();
+  expect(getByLabelText('Select all')).toBeInTheDocument();
   expect(getByLabelText('add_repositories')).toHaveAttribute('aria-disabled', 'true');
-  getByLabelText('Select all rows').click();
+  getByLabelText('Select all').click();
   getByLabelText('add_repositories').click();
   await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeInTheDocument());
 
@@ -123,8 +123,8 @@ test('Can remove repositories', async (done) => {
   );
 
   await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeInTheDocument());
-  expect(getByLabelText('Select all rows')).toBeInTheDocument();
-  getByLabelText('Select all rows').click();
+  expect(getByLabelText('Select all')).toBeInTheDocument();
+  getByLabelText('Select all').click();
   await patientlyWaitFor(() => {
     expect(getByLabelText('bulk_actions')).toHaveAttribute('aria-expanded', 'false');
   });

data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewRepoAdd.fixture.json

@@ -8,6 +8,7 @@
   "auto_publish": false,
   "solve_dependencies": false,
   "import_only": false,
+  "generated_for": "none",
   "repository_ids": [
     1,
     2

data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/ActionSummary.js

@@ -0,0 +1,58 @@
+import React from 'react';
+import { PropTypes } from 'prop-types';
+import {
+  Flex,
+  FlexItem,
+  Label,
+  Text,
+} from '@patternfly/react-core';
+import { ExclamationTriangleIcon } from '@patternfly/react-icons';
+import {
+  global_warning_color_100 as warningColor,
+} from '@patternfly/react-tokens';
+
+const ActionSummary = ({ title, text, selectedEnv: { name, id } }) => (
+  <div>
+    {title &&
+      <h3 style={{ margin: '8px 0' }}><b>{title}</b></h3>
+    }
+    {text &&
+      <Flex>
+        <FlexItem style={{ marginRight: '8px' }}>
+          <ExclamationTriangleIcon color={warningColor.value} />
+        </FlexItem>
+        <FlexItem style={{ marginRight: '8px' }}>
+          <Text>{text}</Text>
+        </FlexItem>
+        {name && id &&
+          <FlexItem>
+            <Label isTruncated color="purple" href={`/lifecycle_environments/${id}`}>{name}</Label>
+          </FlexItem>
+        }
+      </Flex>
+    }
+  </div>);
+
+
+ActionSummary.propTypes = {
+  title: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.object, // React component
+  ]),
+  text: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.object, // React component
+  ]),
+  selectedEnv: PropTypes.shape({
+    id: PropTypes.number,
+    name: PropTypes.string,
+  }),
+};
+
+ActionSummary.defaultProps = {
+  title: undefined,
+  text: undefined,
+  selectedEnv: {},
+};
+
+export default ActionSummary;

data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/BulkDeleteContextWrapper.js

@@ -0,0 +1,45 @@
+import React, {
+  createContext,
+  useState,
+} from 'react';
+
+import { PropTypes } from 'prop-types';
+
+export const BulkDeleteContext = createContext({});
+
+const BulkDeleteContextWrapper = ({
+  children, versions, onClose,
+}) => {
+  const [selectedEnvForAK, setSelectedEnvForAK] = useState([]);
+  const [selectedCVForAK, setSelectedCVForAK] = useState(null);
+  const [selectedEnvForHosts, setSelectedEnvForHosts] = useState([]);
+  const [selectedCVForHosts, setSelectedCVForHosts] = useState(null);
+  const [currentStep, setCurrentStep] = useState(1);
+
+  return (
+    <BulkDeleteContext.Provider value={{
+      onClose,
+      versions,
+      selectedEnvForAK,
+      setSelectedEnvForAK,
+      selectedCVForAK,
+      setSelectedCVForAK,
+      selectedEnvForHosts,
+      setSelectedEnvForHosts,
+      selectedCVForHosts,
+      setSelectedCVForHosts,
+      currentStep,
+      setCurrentStep,
+    }}
+    >
+      {children}
+    </BulkDeleteContext.Provider>);
+};
+
+BulkDeleteContextWrapper.propTypes = {
+  versions: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
+  onClose: PropTypes.func.isRequired,
+  children: PropTypes.element.isRequired,
+};
+
+export default BulkDeleteContextWrapper;

data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/BulkDeleteHelpers.js

@@ -0,0 +1,30 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+import { sum } from 'lodash';
+
+export const getNumberOfActivationKeys = versions =>
+  sum(versions.map(({ environments }) =>
+    sum(environments.map(({ activation_key_count: akCount }) => akCount))));
+
+export const getNumberOfHosts = versions =>
+  sum(versions.map(({ environments }) =>
+    sum(environments.map(({ host_count: hostCount }) => hostCount))));
+
+// Gets a non-duplicated list of environments from within a given set of versions
+export const getEnvironmentList = (versions) => {
+  const envIds = [];
+  const environmentList = [];
+  versions.forEach(({ environments }) => environments.forEach((env) => {
+    if (!envIds.includes(env.id)) {
+      environmentList.push(env);
+      envIds.push(env.id);
+    }
+  }));
+  return environmentList;
+};
+
+export const getNumberOfEnvironments = versions => getEnvironmentList(versions).length;
+
+// Creates a string from a list of versions: '3.0' or '3.0 and 2.0' or '3.0, 2.0 and 1.0' etc.
+export const getVersionListString = versions => versions.map(({ version }, index) =>
+  `${index > 0 && index === (versions.length - 1) ?
+    __(' and') : ''} ${version}${versions.length - index > 2 ? ',' : ''}`).join('');

data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/BulkDeleteModal.js

@@ -0,0 +1,56 @@
+import React, { useContext } from 'react';
+
+import { translate as __ } from 'foremanReact/common/I18n';
+import { PropTypes } from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+
+import { Wizard } from '@patternfly/react-core';
+
+import BulkDeleteContextWrapper, {
+  BulkDeleteContext,
+} from './BulkDeleteContextWrapper';
+import {
+  getVersionListString,
+} from './BulkDeleteHelpers';
+import bulkDeleteSteps from './bulkDeleteSteps';
+
+const BulkDeleteModal = ({ versions, onClose }) => {
+  const WizardWithContext = () => {
+    const context = useContext(BulkDeleteContext);
+    const versionList = getVersionListString(versions);
+    const description =
+      (<FormattedMessage
+        id="bulk-delete-modal-title"
+        values={{ versionList }}
+        defaultMessage={versions.length === 1 ?
+          __('Deleting version {versionList}') :
+          __('Deleting versions: {versionList}')}
+      />);
+
+    return (
+      <Wizard
+        title={versions.length === 1 ?
+          __('Delete version') :
+          __('Delete versions')}
+        description={description}
+        steps={bulkDeleteSteps(context)}
+        onGoToStep={({ id }) => context.setCurrentStep(id)}
+        onNext={({ id }) => context.setCurrentStep(id)}
+        onBack={({ id }) => context.setCurrentStep(id)}
+        onClose={onClose}
+        isOpen
+      />);
+  };
+
+  return (
+    <BulkDeleteContextWrapper {...{ versions, onClose }}>
+      <WizardWithContext />
+    </BulkDeleteContextWrapper>
+  );
+};
+
+BulkDeleteModal.propTypes = {
+  versions: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
+  onClose: PropTypes.func.isRequired,
+};
+export default BulkDeleteModal;

data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ConfirmBulkDelete.js

@@ -0,0 +1,126 @@
+import React, { useContext } from 'react';
+
+import { translate as __ } from 'foremanReact/common/I18n';
+import { first } from 'lodash';
+import { FormattedMessage } from 'react-intl';
+import { useSelector } from 'react-redux';
+
+import {
+  Flex,
+  FlexItem,
+  Label,
+} from '@patternfly/react-core';
+
+import WizardHeader from '../../../../components/WizardHeader';
+import { selectContentViews } from '../../../../ContentViewSelectors';
+import ActionSummary from '../ActionSummary';
+import { BulkDeleteContext } from '../BulkDeleteContextWrapper';
+import {
+  getEnvironmentList,
+  getNumberOfActivationKeys,
+  getNumberOfHosts,
+  getVersionListString,
+} from '../BulkDeleteHelpers';
+
+export default () => {
+  const {
+    versions, selectedCVForHosts, selectedEnvForHosts, selectedCVForAK, selectedEnvForAK,
+  } = useContext(BulkDeleteContext);
+  const { results: contentViewResults = [] } = useSelector(selectContentViews);
+  const versionList = getVersionListString(versions);
+  const numberOfActivationKeys = getNumberOfActivationKeys(versions);
+  const numberOfHosts = getNumberOfHosts(versions);
+  const affectedVersions = versions.filter(({ environments }) => !!environments.length);
+  const affectedVersionsListString = getVersionListString(affectedVersions);
+  const environments = getEnvironmentList(versions);
+  const pluralEnvironments = environments.length > 1;
+
+  return (
+    <>
+      <WizardHeader
+        title={__('Review details')}
+      />
+      <ActionSummary
+        title={__('Versions')}
+        text={<FormattedMessage
+          id="bulk-delete-summary-versions"
+          values={{
+            versionList,
+            versionOrVersions: versions.length > 1 ?
+              __('Versions') : __('Version'),
+          }}
+          defaultMessage={__('{versionOrVersions} {versionList} will be deleted and will no longer be available for promotion.')}
+        />}
+      />
+      {!!affectedVersions.length &&
+        <div>
+          <ActionSummary
+            title={__('Environments')}
+            text={
+              <FormattedMessage
+                id="bulk-delete-summary-environments"
+                values={{
+                  versionList: affectedVersionsListString,
+                  versionOrVersions: affectedVersions.length > 1 ? __('Versions ') : __('Version '),
+                  envLabel: (() => {
+                    const { id, name } = first(environments);
+                    return <Label isTruncated color="purple" href={`/lifecycle_environments/${id}`}>{name}</Label>;
+                  })(),
+                }}
+                defaultMessage={pluralEnvironments ?
+                  __('{versionOrVersions} {versionList} will be removed from the following environments:') :
+                  __('{versionOrVersions} {versionList} will be removed from the {envLabel} environment.')}
+              />
+            }
+          />
+          {pluralEnvironments &&
+            <Flex>
+              {environments.map(({ name, id }) => (
+                <FlexItem key={id}>
+                  <Label isTruncated color="purple" href={`/lifecycle_environments/${id}`}>{name}</Label>
+                </FlexItem>))
+              }
+            </Flex>}
+        </div>
+      }
+      {!!numberOfHosts &&
+        <ActionSummary
+          title={__('Hosts')}
+          text={
+            <FormattedMessage
+              id="bulk-delete-summary-hosts"
+              values={{
+                numberOfHosts,
+                cvName: contentViewResults
+                  .find(({ id }) => id === selectedCVForHosts)?.name || '',
+              }}
+              defaultMessage={numberOfHosts > 1 ?
+                __('{numberOfHosts} hosts will be assigned to content view {cvName} in') :
+                __('{numberOfHosts} host will be assigned to content view {cvName} in')}
+            />
+          }
+          selectedEnv={first(selectedEnvForHosts)}
+        />}
+      {!!numberOfActivationKeys &&
+        <ActionSummary
+          title={__('Activation keys')}
+          text={
+            <FormattedMessage
+              id="bulk-delete-summary-activation-keys"
+              values={{
+                numberOfActivationKeys,
+                cvName: contentViewResults
+                  .find(({ id }) => id === selectedCVForAK)?.name || '',
+              }}
+              defaultMessage={numberOfActivationKeys > 1 ?
+                __('{numberOfActivationKeys} activation keys will be assigned to content view {cvName} in') :
+                __('{numberOfActivationKeys} activation key will be assigned to content view {cvName} in')}
+            />
+          }
+          selectedEnv={first(selectedEnvForAK)}
+        />
+      }
+    </>
+  );
+};
+

data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/FinishBulkDelete.js

@@ -0,0 +1,61 @@
+import React, { useContext } from 'react';
+
+import { translate as __ } from 'foremanReact/common/I18n';
+import { first } from 'lodash';
+import {
+  useDispatch,
+} from 'react-redux';
+import useDeepCompareEffect from 'use-deep-compare-effect';
+
+import Loading from '../../../../../../components/Loading';
+import getContentViewDetails, {
+  bulkDeleteContentViewVersion,
+} from '../../../ContentViewDetailActions';
+
+import { BulkDeleteContext } from '../BulkDeleteContextWrapper';
+
+export default () => {
+  const {
+    onClose,
+    versions,
+    selectedEnvForAK,
+    selectedCVForAK,
+    selectedEnvForHosts,
+    selectedCVForHosts,
+  } = useContext(BulkDeleteContext);
+  const { content_view: { id: cvId } } = first(versions);
+
+  const dispatch = useDispatch();
+
+  // Call the remove api on load
+  useDeepCompareEffect(() => {
+    dispatch(bulkDeleteContentViewVersion(
+      cvId,
+      {
+        bulk_content_view_version_ids: {
+          included: {
+            ids: versions.map(({ id }) => id),
+          },
+          excluded: {},
+        },
+        id: cvId,
+        system_content_view_id: selectedCVForHosts ?? undefined,
+        system_environment_id: first(selectedEnvForHosts)?.id ?? undefined,
+        key_content_view_id: selectedCVForAK ?? undefined,
+        key_environment_id: first(selectedEnvForAK)?.id ?? undefined,
+      },
+      // Callback to update on success
+      () => {
+        onClose(true);
+        dispatch(getContentViewDetails(cvId));
+      },
+      // onError
+      () => { onClose(true); },
+    ));
+  }, [dispatch, cvId, versions,
+    selectedCVForHosts, selectedEnvForHosts, selectedCVForAK, selectedEnvForAK, onClose]);
+
+
+  return <Loading loadingText={__('Please wait while the task starts..')} />;
+};
+

data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ReassignActivationKeys.js

@@ -0,0 +1,196 @@
+import React, {
+  useContext,
+  useState,
+} from 'react';
+
+import { translate as __ } from 'foremanReact/common/I18n';
+import { STATUS } from 'foremanReact/constants';
+import { first } from 'lodash';
+import { FormattedMessage } from 'react-intl';
+import {
+  useDispatch,
+  useSelector,
+} from 'react-redux';
+import useDeepCompareEffect from 'use-deep-compare-effect';
+
+import {
+  Button,
+  ExpandableSection,
+  Popover,
+  PopoverPosition,
+  Select,
+  SelectDirection,
+  SelectOption,
+  TextContent,
+} from '@patternfly/react-core';
+import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
+
+import EnvironmentPaths
+  from '../../../../components/EnvironmentPaths/EnvironmentPaths';
+import WizardHeader from '../../../../components/WizardHeader';
+import getContentViews from '../../../../ContentViewsActions';
+import {
+  selectContentViews,
+  selectContentViewStatus,
+} from '../../../../ContentViewSelectors';
+import AffectedActivationKeys from '../../Delete/affectedActivationKeys';
+import { BulkDeleteContext } from '../BulkDeleteContextWrapper';
+import {
+  getEnvironmentList,
+  getNumberOfActivationKeys,
+} from '../BulkDeleteHelpers';
+
+export default () => {
+  const dispatch = useDispatch();
+  const {
+    selectedEnvForAK,
+    setSelectedEnvForAK,
+    versions,
+    selectedCVForAK,
+    setSelectedCVForAK,
+  } = useContext(BulkDeleteContext);
+
+  const { results = [] } = useSelector(selectContentViews);
+  const { content_view: { id: cvId } } = first(versions);
+  const contentViewsInEnvStatus = useSelector(selectContentViewStatus);
+  const cvInEnvLoading = contentViewsInEnvStatus === STATUS.PENDING;
+  const [toggleCVSelect, setToggleCVSelect] = useState(false);
+
+  const numberOfActivationKeys = getNumberOfActivationKeys(versions);
+  const versionEnvironments = getEnvironmentList(versions);
+
+  useDeepCompareEffect(
+    () => {
+      if (selectedEnvForAK.length) {
+        dispatch(getContentViews({
+          environment_id: first(selectedEnvForAK).id,
+          include_default: true,
+          full_result: true,
+        }));
+      }
+    },
+    [selectedEnvForAK, dispatch],
+  );
+
+  const contentViewEligible = (id) => {
+    if (id === cvId) {
+      return (versionEnvironments.filter(env =>
+        env.id === first(selectedEnvForAK)?.id).length === 0);
+    }
+    return true;
+  };
+
+  const selectOptions = results.filter(({ id }) => contentViewEligible(id))
+    .map(({ id, name }) => (
+      <SelectOption
+        key={id}
+        value={id}
+      >
+        {name}
+      </SelectOption>));
+
+  const placeHolder = (() => {
+    switch (true) {
+    case cvInEnvLoading && !!selectedEnvForAK.length:
+      return __('Loading...');
+    case selectedEnvForAK.length === 0:
+      return __('Select an environment above');
+    case selectOptions.length > 0:
+      return __('Select a content view');
+    default:
+      return __('No content views available');
+    }
+  })();
+
+  const setUserCheckedItems = (value) => {
+    setSelectedCVForAK(null);
+    setSelectedEnvForAK(value);
+  };
+
+  const onSelect = (_event, selection) => {
+    setSelectedCVForAK(selection);
+    setToggleCVSelect(false);
+  };
+
+  return (
+    <>
+      <WizardHeader
+        title={numberOfActivationKeys > 1 ?
+          __('Reassign affected activation keys') :
+          __('Reassign affected activation key')}
+        description={
+          <>
+            <FormattedMessage
+              id="there-are-x-activation-keys"
+              values={{
+                numberOfActivationKeys,
+              }}
+              defaultMessage={numberOfActivationKeys > 1 ?
+                __('There are {numberOfActivationKeys} activation keys that need to be reassigned.') :
+                __('There is {numberOfActivationKeys} activation key that needs to be reassigned.')
+              }
+            />
+            <br />
+            <>
+              {numberOfActivationKeys > 1 ?
+                __('Please select a lifecycle environment and a content view to move these activation keys.') :
+                __('Please select a lifecycle environment and a content view to move this activation key.')}
+              <Popover
+                appendTo={() => document.body}
+                aria-label="activationKeys-popover"
+                position={PopoverPosition.top}
+                bodyContent={
+                  __('Before removing versions you must move activation keys to an environment where the associated version is not in use.')
+                }
+              >
+                <Button ouiaId="reassign-activation-keys-info" style={{ padding: '8px' }} variant="plain" aria-label="popoverButton">
+                  <OutlinedQuestionCircleIcon />
+                </Button>
+              </Popover>
+            </>
+          </>
+        }
+      />
+      <ExpandableSection
+        toggleTextCollapsed={__('Show affected activation keys')}
+        toggleTextExpanded={__('Hide affected activation keys')}
+      >
+        <AffectedActivationKeys
+          {...{
+            cvId,
+          }}
+          versionEnvironments={versionEnvironments}
+          deleteCV
+        />
+      </ExpandableSection >
+      <EnvironmentPaths
+        userCheckedItems={selectedEnvForAK}
+        setUserCheckedItems={setUserCheckedItems}
+        publishing={false}
+        headerText={__('Select an environment')}
+        multiSelect={false}
+      />
+      <TextContent>
+        {__('Select a content view')}
+      </TextContent>
+      <Select
+        selections={selectedCVForAK}
+        onSelect={onSelect}
+        isDisabled={cvInEnvLoading || !selectOptions?.length || !selectedEnvForAK?.length}
+        id="selectCV"
+        name="selectCV"
+        aria-label="selectCV"
+        placeholderText={placeHolder}
+        isOpen={toggleCVSelect}
+        onToggle={setToggleCVSelect}
+        menuAppendTo={() => document.body}
+        direction={SelectDirection.up}
+        maxHeight={300}
+        width={350}
+      >
+        {selectOptions}
+      </Select>
+    </>
+  );
+};
+