katello 4.16.1 → 4.17.0.rc1

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

@@ -4,11 +4,27 @@ import { isEqual, sortBy, capitalize } from 'lodash';
 import { shallowEqual, useSelector, useDispatch } from 'react-redux';
 import { Link, useHistory } from 'react-router-dom';
 import {
-  Tooltip, Form, ActionGroup, Flex, FlexItem, Select,
-  SelectOption, SelectVariant, ChipGroup, Chip,
-  Tabs, Tab, TabTitleText, Button, DatePicker, Bullseye,
-  Divider, Text,
+  Tooltip,
+  Form,
+  ActionGroup,
+  Flex,
+  FlexItem,
+  ChipGroup,
+  Chip,
+  Tabs,
+  Tab,
+  TabTitleText,
+  Button,
+  DatePicker,
+  Bullseye,
+  Divider,
+  Text,
 } from '@patternfly/react-core';
+import {
+  Select,
+  SelectOption,
+  SelectVariant,
+} from '@patternfly/react-core/deprecated';
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { selectCVFilterDetails } from '../ContentViewDetailSelectors';
@@ -159,7 +175,7 @@ const CVErrataDateFilterContent = ({
               <FlexItem span={2}>
                 <Select
                   variant={SelectVariant.checkbox}
-                  onToggle={setTypeSelectOpen}
+                  onToggle={(_event, val) => setTypeSelectOpen(val)}
                   onSelect={(_event, selection) => onTypeSelect(selection)}
                   selections={selectedTypes}
                   isOpen={typeSelectOpen}
@@ -217,7 +233,7 @@ const CVErrataDateFilterContent = ({
                   </Tooltip>
                 }
               </FlexItem>
-              <Divider isVertical />
+              <Divider orientation={{ default: 'vertical' }} />
               <FlexItem span={2} spacer={{ default: 'spacerNone' }}>
                 <Select
                   selections={dateType}
@@ -226,7 +242,7 @@ const CVErrataDateFilterContent = ({
                     setDateTypeSelectOpen(false);
                   }}
                   isOpen={dateTypeSelectOpen}
-                  onToggle={setDateTypeSelectOpen}
+                  onToggle={(_event, val) => setDateTypeSelectOpen(val)}
                   id="date_type_selector"
                   ouiaId="date_type_selector"
                   name="date_type_selector"

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

@@ -5,10 +5,28 @@ import { shallowEqual, useSelector, useDispatch } from 'react-redux';
 import { capitalize, omit, isEqual } from 'lodash';
 import { TableVariant } from '@patternfly/react-table';
 import {
-  Tabs, Tab, TabTitleText, Split, SplitItem, Select, SelectVariant,
-  SelectOption, Button, Dropdown, DropdownItem, KebabToggle, Flex, FlexItem,
-  Bullseye, DatePicker, ChipGroup, Chip, Text,
+  Tabs,
+  Tab,
+  TabTitleText,
+  Split,
+  SplitItem,
+  Button,
+  Flex,
+  FlexItem,
+  Bullseye,
+  DatePicker,
+  ChipGroup,
+  Chip,
+  Text,
 } from '@patternfly/react-core';
+import {
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+  Select,
+  SelectVariant,
+  SelectOption,
+} from '@patternfly/react-core/deprecated';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 
@@ -310,7 +328,7 @@ const CVErrataIDFilterContent = ({
                       aria-label="errata_type_selector"
                       ouiaId="errata_type_selector"
                       variant={SelectVariant.checkbox}
-                      onToggle={setTypeSelectOpen}
+                      onToggle={(_event, val) => setTypeSelectOpen(val)}
                       onSelect={(_event, selection) => onTypeSelect(selection)}
                       selections={selectedTypes}
                       isOpen={typeSelectOpen}
@@ -374,7 +392,7 @@ const CVErrataIDFilterContent = ({
                         setDateTypeSelectOpen(false);
                       }}
                       isOpen={dateTypeSelectOpen}
-                      onToggle={setDateTypeSelectOpen}
+                      onToggle={(_event, val) => setDateTypeSelectOpen(val)}
                       id="date_type_selector"
                       name="date_type_selector"
                       ouiaId="date_type_selector"

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

@@ -5,9 +5,21 @@ import { shallowEqual, useSelector, useDispatch } from 'react-redux';
 import { omit } from 'lodash';
 import { TableVariant } from '@patternfly/react-table';
 import {
-  Tabs, Tab, TabTitleText, Split, SplitItem, Button, Dropdown, DropdownItem,
-  KebabToggle, Select, SelectOption, SelectVariant,
+  Tabs,
+  Tab,
+  TabTitleText,
+  Split,
+  SplitItem,
+  Button,
 } from '@patternfly/react-core';
+import {
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+  Select,
+  SelectOption,
+  SelectVariant,
+} from '@patternfly/react-core/deprecated';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 
@@ -245,7 +257,7 @@ const CVModuleStreamFilterContent = ({
                   <SplitItem data-testid="allAddedNotAdded">
                     <Select
                       variant={SelectVariant.single}
-                      onToggle={setSelectOpen}
+                      onToggle={(_event, val) => setSelectOpen(val)}
                       ouiaId="added-notAdded-selector"
                       onSelect={(_event, selection) => {
                         setSelectedIndex(allAddedNotAdded.indexOf(selection));

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

@@ -4,9 +4,21 @@ import PropTypes from 'prop-types';
 import { shallowEqual, useSelector, useDispatch } from 'react-redux';
 import { TableVariant } from '@patternfly/react-table';
 import {
-  Tabs, Tab, TabTitleText, Split, SplitItem, Button,
-  Select, SelectVariant, SelectOption, Dropdown, DropdownItem, KebabToggle,
+  Tabs,
+  Tab,
+  TabTitleText,
+  Split,
+  SplitItem,
+  Button,
 } from '@patternfly/react-core';
+import {
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+  Select,
+  SelectVariant,
+  SelectOption,
+} from '@patternfly/react-core/deprecated';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 
@@ -235,7 +247,7 @@ const CVPackageGroupFilterContent = ({
                   <SplitItem data-testid="allAddedNotAdded">
                     <Select
                       variant={SelectVariant.single}
-                      onToggle={setSelectOpen}
+                      onToggle={(_event, val) => setSelectOpen(val)}
                       ouiaId="allAddedNotAdded"
                       onSelect={(_event, selection) => {
                         setSelectedIndex(allAddedNotAdded.indexOf(selection));

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

@@ -3,7 +3,19 @@ import useDeepCompareEffect from 'use-deep-compare-effect';
 import PropTypes from 'prop-types';
 import { shallowEqual, useSelector, useDispatch } from 'react-redux';
 import { TableVariant } from '@patternfly/react-table';
-import { Tabs, Tab, TabTitleText, Split, SplitItem, Dropdown, DropdownItem, KebabToggle, Button } from '@patternfly/react-core';
+import {
+  Tabs,
+  Tab,
+  TabTitleText,
+  Split,
+  SplitItem,
+  Button,
+} from '@patternfly/react-core';
+import {
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+} from '@patternfly/react-core/deprecated';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 import onSelect from '../../../../components/Table/helpers';

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

@@ -11,13 +11,15 @@ import {
   Text,
   TextVariants,
   Label,
+  Flex,
+  FlexItem,
+} from '@patternfly/react-core';
+import {
   Dropdown,
   DropdownItem,
   KebabToggle,
   DropdownPosition,
-  Flex,
-  FlexItem,
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { useDispatch } from 'react-redux';
 import getContentViewDetails, {
@@ -134,7 +136,7 @@ const ContentViewFilterDetailsHeader = ({
               ouiaId="cv-filter-actions-kebab"
               position={DropdownPosition.right}
               style={{ marginLeft: 'auto' }}
-              toggle={<KebabToggle onToggle={setDropdownOpen} id="toggle-dropdown" />}
+              toggle={<KebabToggle onToggle={(_event, val) => setDropdownOpen(val)} id="toggle-dropdown" />}
               isOpen={dropDownOpen}
               isPlain
               dropdownItems={dropDownItems}

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

@@ -1,7 +1,17 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 import { shallowEqual, useSelector, useDispatch } from 'react-redux';
-import { Label, Split, SplitItem, Dropdown, DropdownItem, KebabToggle, Button } from '@patternfly/react-core';
+import {
+  Label,
+  Split,
+  SplitItem,
+  Button,
+} from '@patternfly/react-core';
+import {
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+} from '@patternfly/react-core/deprecated';
 import { TableVariant } from '@patternfly/react-table';
 import { STATUS } from 'foremanReact/constants';
 import LongDateTime from 'foremanReact/components/common/dates/LongDateTime';

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentModal.test.js

@@ -35,7 +35,8 @@ test('Can show matching content modal', async (done) => {
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(cvMatchContentscope, done);
+  assertNockRequest(cvMatchContentscope);
+  done();
 });
 
 test('Can search with filter', async (done) => {
@@ -87,5 +88,6 @@ test('Can search with filter', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(getMatchContentscope);
-  assertNockRequest(secondGetMatchContentscope, done);
+  assertNockRequest(secondGetMatchContentscope);
+  done();
 });

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/matchContentModal.scss

@@ -1,3 +1,3 @@
-.pf-c-empty-state {
+.pf-v5-c-empty-state {
   margin-top: 0;
 }

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

@@ -81,7 +81,7 @@ const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData
             aria-label="input_name"
             name="name"
             value={name}
-            onChange={value => setName(value)}
+            onChange={(_event, value) => setName(value)}
           />
         </FormGroup>
         <FormGroup label={__('Architecture')} fieldId="architecture">
@@ -92,7 +92,7 @@ const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData
             aria-label="input_architecture"
             name="architecture"
             value={architecture}
-            onChange={value => setArchitecture(value)}
+            onChange={(_event, value) => setArchitecture(value)}
           />
         </FormGroup>
         <ActionGroup>

data/webpack/scenes/ContentViews/Details/Filters/Rules/Package/AddEditPackageRuleModal.js

@@ -181,7 +181,7 @@ const AddEditPackageRuleModal = ({
           <FormSelect
             ouiaId="version-comparator"
             value={versionComparator}
-            onChange={setVersionComparator}
+            onChange={(_event, val) => setVersionComparator(val)}
             id="version_comparator"
             name="version_comparator"
             aria-label="version_comparator"
@@ -201,7 +201,7 @@ const AddEditPackageRuleModal = ({
               aria-label="input_version"
               name="version"
               value={version}
-              onChange={setVersion}
+              onChange={(_event, val) => setVersion(val)}
             />
           </FormGroup>}
         {showMinVersion &&
@@ -213,7 +213,7 @@ const AddEditPackageRuleModal = ({
               aria-label="input_min_version"
               name="min_version"
               value={minVersion}
-              onChange={setMinVersion}
+              onChange={(_event, val) => setMinVersion(val)}
             />
           </FormGroup>}
         {showMaxVersion &&
@@ -225,7 +225,7 @@ const AddEditPackageRuleModal = ({
               aria-label="input_max_version"
               name="max_version"
               value={maxVersion}
-              onChange={setMaxVersion}
+              onChange={(_event, val) => setMaxVersion(val)}
             />
           </FormGroup>}
         <ActionGroup>

data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVContainerImageFilterContent.test.js

@@ -75,7 +75,8 @@ test('Can view container image filter rules', async (done) => {
 
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(cvFiltersScope, done);
+  assertNockRequest(cvFiltersScope);
+  done();
 });
 
 // Remove
@@ -107,13 +108,13 @@ test('Can remove filter rules', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(queryByText(firstResultName)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'false');
   });
 
-  fireEvent.click(getAllByLabelText('Actions')[0]);
+  fireEvent.click(getAllByLabelText('Kebab toggle')[0]);
 
   await patientlyWaitFor(() => {
-    expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
+    expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'true');
     expect(queryByText('Remove')).toBeInTheDocument();
     fireEvent.click(queryByText('Remove'));
   });
@@ -126,7 +127,8 @@ test('Can remove filter rules', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterDeleteScope);
-  assertNockRequest(cvFiltersCallbackScope, done);
+  assertNockRequest(cvFiltersCallbackScope);
+  done();
 });
 
 // Add
@@ -187,7 +189,8 @@ test('Can add filter rules', async (done) => {
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterAddScope);
   assertNockRequest(autocompleteNameScope);
-  assertNockRequest(cvFiltersCallbackScope, done);
+  assertNockRequest(cvFiltersCallbackScope);
+  done();
   act(done);
 });
 
@@ -239,13 +242,13 @@ test('Can edit filter rules', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(queryByText(firstResultName)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'false');
   });
 
-  fireEvent.click(getAllByLabelText('Actions')[0]);
+  fireEvent.click(getAllByLabelText('Kebab toggle')[0]);
 
   await patientlyWaitFor(() => {
-    expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
+    expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'true');
     expect(queryByText('Edit')).toBeInTheDocument();
     fireEvent.click(queryByText('Edit'));
   });
@@ -268,7 +271,8 @@ test('Can edit filter rules', async (done) => {
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterAddScope);
   assertNockRequest(autocompleteNameScope);
-  assertNockRequest(cvFiltersCallbackScope, done);
+  assertNockRequest(cvFiltersCallbackScope);
+  done();
   act(done);
 });
 
@@ -302,7 +306,8 @@ test('Shows call-to-action when there are no filter rules', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(autocompleteNameScope);
-  assertNockRequest(cvFiltersScope, done);
+  assertNockRequest(cvFiltersScope);
+  done();
   act(done);
 });
 
@@ -325,6 +330,7 @@ test('Hides bulk_remove dropdownItem when there are no filter rules', async (don
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(cvFiltersScope, done);
+  assertNockRequest(cvFiltersScope);
+  done();
   act(done);
 });

data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js

@@ -270,11 +270,9 @@ test('Remove rpm filter rule in a self-closing modal', async (done) => {
   expect(queryByText(cvFilterName)).toBeNull();
   await patientlyWaitFor(() => {
     expect(getByText(cvFilterName)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toBeInTheDocument();
+    expect(getAllByLabelText('Kebab toggle')[0]).toBeInTheDocument();
   });
-
-  getAllByLabelText('Actions')[1].click();
-
+  getAllByLabelText('Kebab toggle')[0].click();
   await patientlyWaitFor(() => {
     expect(getByText('Remove')).toBeInTheDocument();
   });
@@ -282,7 +280,7 @@ test('Remove rpm filter rule in a self-closing modal', async (done) => {
   getByText('Remove').click();
   await patientlyWaitFor(() => {
     expect(getByText(cvFilterName)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toBeInTheDocument();
+    expect(getAllByLabelText('Kebab toggle')[1]).toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
@@ -338,16 +336,14 @@ test('Edit rpm filter rule in a self-closing modal', async (done) => {
   expect(queryByText(cvFilterName)).toBeNull();
   await patientlyWaitFor(() => {
     expect(getByText(cvFilterName)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toBeInTheDocument();
+    expect(getAllByLabelText('Kebab toggle')[0]).toBeInTheDocument();
   });
-
-  getAllByLabelText('Actions')[1].click();
-
+  fireEvent.click(getAllByLabelText('Kebab toggle')[0]);
   await patientlyWaitFor(() => {
     expect(getByText('Edit')).toBeInTheDocument();
   });
 
-  getByText('Edit').click();
+  fireEvent.click(getByText('Edit'));
 
   await patientlyWaitFor(() => {
     expect(getByText('Edit RPM rule')).toBeInTheDocument();
@@ -409,6 +405,6 @@ test('Shows call-to-action when there are no RPM filters', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterDetailScope);
-  assertNockRequest(cvPackageFilterRulesScope);
+  assertNockRequest(cvPackageFilterRulesScope, done);
   act(done);
 });