katello 4.18.1 → 4.19.0.rc2

data/webpack/scenes/ContentViews/Create/__tests__/createContentView.test.js

@@ -7,7 +7,7 @@ import CreateContentViewForm from '../CreateContentViewForm';
 import cvCreateData from './contentViewCreateResult.fixtures.json';
 
 const cvCreatePath = api.getApiUrl('/content_views');
-
+const envPath = api.getApiUrl('/organizations/1/environments/paths?permission_type=promotable');
 const mockFn = jest.fn();
 
 delete window.location;
@@ -27,6 +27,17 @@ const createDetails = {
   auto_publish: false,
 };
 
+const createRollingDetails = {
+  name: '1232123',
+  label: '1232123',
+  description: '',
+  composite: false,
+  rolling: true,
+  solve_dependencies: false,
+  auto_publish: false,
+  environment_ids: [],
+};
+
 const createdCVDetails = { ...cvCreateData };
 
 const form = <CreateContentViewForm setModalOpen={mockFn} />;
@@ -48,6 +59,30 @@ test('Can save content view from form', async (done) => {
   done();
 });
 
+test('Can save rolling content view from form with environment_ids param passed', async (done) => {
+  const createscope = nockInstance
+    .post(cvCreatePath, createRollingDetails)
+    .reply(201, createdCVDetails);
+  const envscope = nockInstance
+    .get(envPath)
+    .reply(200, []);
+
+  const { queryByText, getByLabelText } = renderWithRedux(form);
+  expect(queryByText('Description')).toBeInTheDocument();
+  fireEvent.change(getByLabelText('input_name'), { target: { value: '1232123' } });
+
+  await patientlyWaitFor(() => { expect(getByLabelText('input_label')).toHaveAttribute('value', '1232123'); });
+
+  fireEvent.click(getByLabelText('rolling_tile'));
+  await patientlyWaitFor(() => { expect(getByLabelText('rolling_tile')).toHaveAttribute('aria-selected', 'true'); });
+
+  getByLabelText('create_content_view').click();
+
+  assertNockRequest(createscope);
+  assertNockRequest(envscope);
+  done();
+});
+
 test('Form closes itself upon save', async (done) => {
   const createscope = nockInstance
     .post(cvCreatePath, createDetails)
@@ -81,6 +116,7 @@ test('Displays dependent fields correctly', () => {
   expect(getByText('Rolling content view')).toBeInTheDocument();
   expect(getByText('Solve dependencies')).toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
+  expect(queryByText('Lifecycle Environments')).not.toBeInTheDocument();
 
   // label auto_set
   fireEvent.change(getByLabelText('input_name'), { target: { value: '123 2123' } });
@@ -90,11 +126,19 @@ test('Displays dependent fields correctly', () => {
   fireEvent.click(getByLabelText('composite_tile'));
   expect(queryByText('Solve dependencies')).not.toBeInTheDocument();
   expect(getByText('Auto publish')).toBeInTheDocument();
+  expect(queryByText('Lifecycle Environments')).not.toBeInTheDocument();
 
   // display Solve Dependencies when Component CV
   fireEvent.click(getByLabelText('component_tile'));
   expect(getByText('Solve dependencies')).toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
+  expect(queryByText('Lifecycle Environments')).not.toBeInTheDocument();
+
+  // display Lifecycle Environments when Rolling CV
+  fireEvent.click(getByLabelText('rolling_tile'));
+  expect(queryByText('Solve dependencies')).not.toBeInTheDocument();
+  expect(queryByText('Auto publish')).not.toBeInTheDocument();
+  expect(getByText('Lifecycle Environments')).toBeInTheDocument();
 });
 
 test('Validates label field', () => {

data/webpack/scenes/ContentViews/Delete/__tests__/affectedHosts.fixtures.json

@@ -129,7 +129,6 @@
         "last_checkin": "2021-10-01 14:23:38 -0400",
         "service_level": "",
         "release_version": null,
-        "autoheal": true,
         "registered_at": "2021-09-21 19:40:43 -0400",
         "registered_through": "centos7-devel4.samir.example.com",
         "purpose_role": "",

data/webpack/scenes/ContentViews/Details/ContentViewInfo.js

@@ -1,6 +1,7 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import {
+  Button,
   Flex,
   FlexItem,
   TextContent,
@@ -20,6 +21,8 @@ import ActionableDetail from '../../../components/ActionableDetail';
 import './contentViewInfo.scss';
 import { dependenciesHelpText, autoPublishHelpText, hasPermission } from '../helpers';
 import { LabelImportOnly, LabelGenerated } from '../Create/ContentViewFormComponents';
+import getEnvironmentPaths from '../components/EnvironmentPaths/EnvironmentPathActions';
+import EnvironmentPaths from '../components/EnvironmentPaths/EnvironmentPaths';
 
 const ContentViewInfo = ({ cvId, details }) => {
   const dispatch = useDispatch();
@@ -35,8 +38,11 @@ const ContentViewInfo = ({ cvId, details }) => {
     auto_publish: autoPublish,
     import_only: importOnly,
     generated_for: generatedFor,
+    environments,
     permissions,
   } = details;
+  const [selectedEnvs, setSelectedEnvs] = useState([]);
+  const [buttonLoading, setButtonLoading] = useState(false);
   const generatedContentView = generatedFor !== 'none';
   const onEdit = (val, attribute) => {
     if (val === details[attribute]) return;
@@ -44,7 +50,30 @@ const ContentViewInfo = ({ cvId, details }) => {
   };
   let iconText = __('Content view');
   if (composite) { iconText = __('Composite content view'); } else if (rolling) { iconText = __('Rolling content view'); }
+  useEffect(
+    () => {
+      if (rolling) {
+        dispatch(getEnvironmentPaths());
+      }
+    },
+    [rolling, dispatch],
+  );
+  // Fetch environment paths only if rolling content view
+  useEffect(() => {
+    if (environments?.length) {
+      setSelectedEnvs(environments);
+    }
+  }, [environments, setSelectedEnvs]);
+
 
+  const updateEnvs = (optedEnvs) => {
+    setButtonLoading(true);
+    const checkedEnvIds = optedEnvs?.map(env => env.id) ?? [];
+    dispatch(updateContentView(cvId, { environment_ids: checkedEnvIds }, () => {
+    // This callback runs only on success
+      setButtonLoading(false);
+    }));
+  };
   return (
     <TextContent className="margin-0-24">
       <TextList component={TextListVariants.dl}>
@@ -146,6 +175,34 @@ const ContentViewInfo = ({ cvId, details }) => {
               />
             </TextListItem>
           </>}
+        {rolling &&
+          <>
+            <TextListItem component={TextListItemVariants.dt}>
+              {__('Lifecycle Environments')}
+            </TextListItem>
+            <TextListItem component={TextListItemVariants.dd} className="foreman-spaced-list">
+              <EnvironmentPaths
+                headerText=""
+                publishing={false}
+                userCheckedItems={selectedEnvs}
+                setUserCheckedItems={setSelectedEnvs}
+              />
+              <Flex>
+                <FlexItem spacer={{ default: 'spacerXs' }}>
+                  <Button
+                    ouiaId="save-button"
+                    isLoading={buttonLoading}
+                    isDisabled={buttonLoading}
+                    onClick={() => updateEnvs(selectedEnvs)}
+                    style={{ marginTop: '1rem' }}
+                  >
+                    {__('Save Environments')}
+                  </Button>
+                </FlexItem>
+              </Flex>
+            </TextListItem>
+          </>
+         }
       </TextList>
     </TextContent>
   );
@@ -163,6 +220,7 @@ ContentViewInfo.propTypes = {
     auto_publish: PropTypes.bool,
     import_only: PropTypes.bool,
     generated_for: PropTypes.string,
+    environments: PropTypes.arrayOf(PropTypes.shape({})),
     permissions: PropTypes.shape({}),
   }).isRequired,
 };

data/webpack/scenes/ContentViews/Details/Filters/CVDebFilterContent.js

@@ -235,6 +235,7 @@ const CVDebFilterContent = ({
                     filterId={filterId}
                     onClose={onClose}
                     selectedFilterRuleData={selectedFilterRuleData}
+                    repositoryIds={details.repository_ids}
                   />}
               </>}
           />

data/webpack/scenes/ContentViews/Details/Filters/Rules/DebPackage/AddEditDebPackageRuleModal.js

@@ -4,30 +4,91 @@ import { useDispatch, useSelector } from 'react-redux';
 import { STATUS } from 'foremanReact/constants';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { Modal, ModalVariant, Form, FormGroup, TextInput, ActionGroup, Button } from '@patternfly/react-core';
+import {
+  Modal, ModalVariant, Form, FormGroup, TextInput,
+  ActionGroup, Button, FormSelect, FormSelectOption, Popover,
+} from '@patternfly/react-core';
+import {
+  HelpIcon,
+} from '@patternfly/react-icons';
 import { addCVFilterRule, editCVFilterRule, getCVFilterRules } from '../../../ContentViewDetailActions';
 import {
   selectCreateFilterRuleStatus,
 } from '../../../ContentViewDetailSelectors';
+import { orgId } from '../../../../../../services/api';
+import SearchText from '../../../../../../components/Search/SearchText';
+import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../../../ContentViewsConstants';
 
-const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData }) => {
+const AddEditDebPackageRuleModal = ({
+  filterId, onClose, selectedFilterRuleData, repositoryIds,
+}) => {
   const {
     id: editingId,
     name: editingName,
     arch: editingArchitecture,
+    version: editingVersion,
+    min_version: editingMinVersion,
+    max_version: editingMaxVersion,
   } = selectedFilterRuleData || {};
 
   const isEditing = !!selectedFilterRuleData;
 
+  const VersionModifiers = {
+    'All versions': __('All versions'),
+    'Equal to': __('Equal to'),
+    'Greater than': __('Greater than'),
+    'Less than': __('Less than'),
+    /* eslint-disable quote-props */
+    'Range': __('Range'),
+  };
+
+  const versionText = () => {
+    switch (true) {
+    case !!editingVersion: return VersionModifiers['Equal to'];
+    case !!editingMinVersion && !editingMaxVersion: return VersionModifiers['Greater than'];
+    case !editingMinVersion && !!editingMaxVersion: return VersionModifiers['Less than'];
+    case !!editingMinVersion && !!editingMaxVersion: return VersionModifiers.Range;
+    default: return VersionModifiers['All versions'];
+    }
+  };
 
   const [name, setName] = useState(editingName || '');
   const [architecture, setArchitecture] = useState(editingArchitecture || '');
+  const [version, setVersion] = useState(editingVersion || '');
+  const [minVersion, setMinVersion] = useState(editingMinVersion || '');
+  const [maxVersion, setMaxVersion] = useState(editingMaxVersion || '');
+  const [versionComparator, setVersionComparator] = useState(versionText(selectedFilterRuleData));
   const [saving, setSaving] = useState(false);
   const dispatch = useDispatch();
   const status = useSelector(state => selectCreateFilterRuleStatus(state));
 
   const submitDisabled = !name || name.length === 0;
 
+  const showVersion = versionComparator === VersionModifiers['Equal to'];
+  const showMinVersion =
+    versionComparator === VersionModifiers['Greater than'] ||
+    versionComparator === VersionModifiers.Range;
+  const showMaxVersion =
+    versionComparator === VersionModifiers['Less than'] ||
+    versionComparator === VersionModifiers.Range;
+
+  const formVersionParams = () => {
+    switch (versionComparator) {
+    case 'All versions':
+      return {};
+    case 'Equal to':
+      return { version };
+    case 'Greater than':
+      return { min_version: minVersion };
+    case 'Less than':
+      return { max_version: maxVersion };
+    case 'Range':
+      return { min_version: minVersion, max_version: maxVersion };
+    default:
+      return {};
+    }
+  };
+
   const onSubmit = () => {
     setSaving(true);
     dispatch(isEditing ?
@@ -37,6 +98,7 @@ const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData
           id: editingId,
           name,
           architecture,
+          ...formVersionParams(),
         },
         () => {
           dispatch(getCVFilterRules(filterId));
@@ -45,11 +107,12 @@ const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData
       ) :
       addCVFilterRule(
         filterId,
-        { name, architecture }, () => {
+        { name, architecture, ...formVersionParams() }, () => {
           dispatch(getCVFilterRules(filterId));
           onClose();
         },
       ));
+    dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
   };
 
   useDeepCompareEffect(() => {
@@ -58,14 +121,35 @@ const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData
     }
   }, [status, setSaving]);
 
+  const nameAutoCompleteEndpoint = '/katello/api/v2/debs/auto_complete_name';
+  const archAutoCompleteEndpoint = '/katello/api/v2/debs/auto_complete_arch';
+  const searchDataProp = term => ({
+    organization_id: orgId(),
+    term,
+    repoids: repositoryIds,
+  });
+
   return (
     <Modal
       ouiaId="add-edit-deb-filter-rule-modal"
-      title={selectedFilterRuleData ? __('Edit package filter rule') : __('Create package filter rule')}
+      title={selectedFilterRuleData ? __('Edit DEB rule') : __('Add DEB rule')}
       variant={ModalVariant.small}
       isOpen
       onClose={onClose}
       appendTo={document.body}
+      help={
+        <Popover
+          headerContent={__('Help')}
+          bodyContent={__('Filter rules may include or exclude specific Debian packages ' +
+        'by name, architecture, and version. Version comparisons follow Debian policy ' +
+        '(epoch:upstream-revision; "~" sorts before empty). Leave all version fields ' +
+        'blank to match all versions.')}
+        >
+          <Button variant="plain" aria-label="Help" ouiaId="deb-filter-rule-modal-help">
+            <HelpIcon />
+          </Button>
+        </Popover>
+      }
     >
       <Form onSubmit={(e) => {
         e.preventDefault();
@@ -73,37 +157,88 @@ const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData
       }}
       >
         <FormGroup label={__('DEB name')} isRequired fieldId="name">
-          <TextInput
-            ouiaId="input-name"
-            isRequired
-            type="text"
-            id="name"
-            aria-label="input_name"
-            name="name"
-            value={name}
-            onChange={(_event, value) => setName(value)}
+          <SearchText
+            data={{
+              autocomplete: {
+                url: nameAutoCompleteEndpoint,
+                apiParams: input => searchDataProp(input),
+              },
+            }}
+            onSearchChange={setName}
+            initialQuery={name}
           />
         </FormGroup>
         <FormGroup label={__('Architecture')} fieldId="architecture">
-          <TextInput
-            ouiaId="input-architecture"
-            type="text"
-            id="architecture"
-            aria-label="input_architecture"
-            name="architecture"
-            value={architecture}
-            onChange={(_event, value) => setArchitecture(value)}
+          <SearchText
+            data={{
+              autocomplete: {
+                url: archAutoCompleteEndpoint,
+                apiParams: arch => searchDataProp(arch),
+              },
+            }}
+            onSearchChange={setArchitecture}
+            initialQuery={architecture}
           />
         </FormGroup>
+        <FormGroup label={__('Version')} fieldId="version_comparator">
+          <FormSelect
+            ouiaId="deb-version-comparator"
+            value={versionComparator}
+            onChange={(_event, val) => setVersionComparator(val)}
+            id="version_comparator"
+            name="version_comparator"
+            aria-label="version_comparator"
+          >
+            {Object.entries(VersionModifiers).map(([key, label]) => (
+              <FormSelectOption key={key} value={key} label={label} />
+            ))}
+          </FormSelect>
+        </FormGroup>
+        {showVersion &&
+          <FormGroup label={__('Version')} fieldId="version">
+            <TextInput
+              ouiaId="deb-input-version"
+              type="text"
+              id="version"
+              aria-label="input_version"
+              name="version"
+              value={version}
+              onChange={(_event, val) => setVersion(val)}
+            />
+          </FormGroup>}
+        {showMinVersion &&
+          <FormGroup label={__('Minimum version')} fieldId="min_version">
+            <TextInput
+              ouiaId="deb-input-min-version"
+              type="text"
+              id="min_version"
+              aria-label="input_min_version"
+              name="min_version"
+              value={minVersion}
+              onChange={(_event, val) => setMinVersion(val)}
+            />
+          </FormGroup>}
+        {showMaxVersion &&
+          <FormGroup label={__('Maximum version')} fieldId="max_version">
+            <TextInput
+              ouiaId="deb-input-max-version"
+              type="text"
+              id="max_version"
+              aria-label="input_max_version"
+              name="max_version"
+              value={maxVersion}
+              onChange={(_event, val) => setMaxVersion(val)}
+            />
+          </FormGroup>}
         <ActionGroup>
           <Button
-            ouiaId="create-deb-package-filter-rule"
-            aria-label="create_deb_package_filter_rule"
+            ouiaId="add-edit-deb-package-modal-submit"
+            aria-label="add_deb_package_filter_rule"
             variant="primary"
             isDisabled={saving || submitDisabled}
             type="submit"
           >
-            {selectedFilterRuleData ? __('Edit rule') : __('Create rule')}
+            {selectedFilterRuleData ? __('Save') : __('Add rule')}
           </Button>
           <Button ouiaId="cancel-button" variant="link" onClick={onClose}>
             {__('Cancel')}
@@ -121,12 +256,17 @@ AddEditDebPackageRuleModal.propTypes = {
     id: PropTypes.number,
     name: PropTypes.string,
     arch: PropTypes.string,
+    version: PropTypes.string,
+    min_version: PropTypes.string,
+    max_version: PropTypes.string,
   }),
+  repositoryIds: PropTypes.arrayOf(PropTypes.number),
 };
 
 AddEditDebPackageRuleModal.defaultProps = {
   onClose: null,
   selectedFilterRuleData: undefined,
+  repositoryIds: [],
 };
 
 export default AddEditDebPackageRuleModal;