katello 4.7.2 → 4.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caf8ccd185806f397ab47aff3a18c1419e93ae534a597bdf08467f865690c2d4
-  data.tar.gz: c19cceba74ca69d6b839f9c0b6f1de58853c8d3b36103f0c002a17873c9d8da3
+  metadata.gz: 58b5925ff8555ac324b96a6ef2586d6f38e09400e6139a8b18d7e4301b1c6595
+  data.tar.gz: c4d40153fc8d19270c842352ce292d9c67f2c829e72791b0903a5d6caf61da7a
 SHA512:
-  metadata.gz: f1df0d7b2063005b81247f8a0038893753927855909583f19a10510c50c8c68cd22aba87d1b2629d74875b764fef70322b4d978c0b8fe4d4299d55601217e86b
-  data.tar.gz: bd9f1f8a869ef9a1307dcaf306b649a128f1833b03f8af9f722b40c4c82c59a2165669c06d534fe34077af8b684297a6891c46d62cab8ebf8b836a7534c7b514
+  metadata.gz: 213cea9b546d83bd1bd7fe0e8a912f765bbf110321f7388c29480baf52fbf0c39d7cb8185d453c2adf542bb1748e009952c74cf900ad2cba5a8b1adefd4dd9c5
+  data.tar.gz: 572177ab7ccdf854b3ffe7df6714d6fc920491c5c7c0e424dd03eb0ecf8338aa09e327474ce68a4b10cb37d21b4f65d0577bbaa29c6cfaf2b110a35ac99687d6

data/app/lib/actions/candlepin/environment/set_content.rb

@@ -52,7 +52,13 @@ module Actions
         def existing_ids
           ::Katello::Resources::Candlepin::Environment.
               find(input[:cp_environment_id])[:environmentContent].map do |content|
-            content[:content][:id]
+            if content.key?('contentId')
+              # Supports Candlepin 4.2.11 and up
+              content['contentId']
+            else
+              # Supports Candlepin versions below 4.2.11
+              content[:content][:id]
+            end
           end
         end
       end

data/db/migrate/20230119003859_ensure_repo_username_password_nil_not_blank.rb

@@ -2,7 +2,7 @@ class EnsureRepoUsernamePasswordNilNotBlank < ActiveRecord::Migration[6.1]
   def change
     ::Katello::Repository.library.each do |repo|
       if repo.upstream_username == '' && repo.upstream_password == ''
-        repo.update(upstream_username: nil, upstream_password: nil)
+        repo.root.update(upstream_username: nil, upstream_password: nil)
       end
     end
   end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.7.2".freeze
+  VERSION = "4.7.4".freeze
 end

data/webpack/components/RoutedTabs/index.js

@@ -22,17 +22,13 @@ const RoutedTabs = ({
         className="margin-0-24"
       >
         {tabs.map(({ key, title }) => (
-          <a
-            key={key}
+          <Tab
             href={`#/${key}`}
-            style={{ textDecoration: 'none' }}
-          >
-            <Tab
-              eventKey={key}
-              aria-label={title}
-              title={<TabTitleText>{title}</TabTitleText>}
-            />
-          </a>
+            key={key}
+            eventKey={key}
+            aria-label={title}
+            title={<TabTitleText>{title}</TabTitleText>}
+          />
         ))}
       </Tabs>
       <div className="margin-16-0">
@@ -64,4 +60,3 @@ RoutedTabs.defaultProps = {
 };
 
 export default withRouter(RoutedTabs);
-

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packagesTab.test.js

@@ -405,7 +405,7 @@ test('Remove is disabled when in select all mode', async (done) => {
   fireEvent.click(selectAllCheckbox);
   getByRole('button', { name: 'bulk_actions' }).click();
 
-  const removeButton = getByRole('button', { name: 'bulk_remove' });
+  const removeButton = getByRole('menuitem', { name: 'bulk_remove' });
   await patientlyWaitFor(() => expect(removeButton).toBeInTheDocument());
   expect(removeButton).toHaveAttribute('aria-disabled', 'true');
 

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

@@ -35,8 +35,10 @@ exports[`ActivationKeys renders 1`] = `
     inputAutoComplete="off"
     inputIdPrefix=""
     isCreatable={false}
+    isCreateOptionOnTop={false}
     isCreateSelectOptionObject={false}
     isDisabled={true}
+    isFlipEnabled={true}
     isGrouped={false}
     isInputFilterPersisted={false}
     isInputValuePersisted={false}
@@ -53,15 +55,20 @@ exports[`ActivationKeys renders 1`] = `
     ouiaSafe={true}
     placeholderText="No Activation keys to select"
     position="left"
+    removeFindDomNode={false}
     removeSelectionAriaLabel="Remove"
     selections={Array []}
+    shouldResetOnSelect={true}
     toggleAriaLabel="Options menu"
     toggleIcon={null}
     toggleId={null}
+    toggleIndicator={null}
+    typeAheadAriaDescribedby=""
     typeAheadAriaLabel=""
     validated="default"
     variant="typeaheadmulti"
     width=""
+    zIndex={9999}
   />
 </FormGroup>
 `;

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

@@ -6,9 +6,11 @@ exports[`Force renders 1`] = `
 >
   <Checkbox
     className=""
+    component="div"
     id="reg_katello_force"
     isChecked={false}
     isDisabled={false}
+    isRequired={false}
     isValid={true}
     label={
       <span>

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

@@ -6,9 +6,11 @@ exports[`IgnoreSubmanErrors renders 1`] = `
 >
   <Checkbox
     className=""
+    component="div"
     id="reg_katello_ignore"
     isChecked={false}
     isDisabled={false}
+    isRequired={false}
     isValid={true}
     label={
       <span>

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

@@ -10,6 +10,7 @@ exports[`LifecycleEnvironment renders 1`] = `
     className="without_select2"
     id="reg_katello_lce"
     isDisabled={true}
+    isIconSprite={false}
     isRequired={false}
     onBlur={[Function]}
     onChange={[Function]}

data/webpack/scenes/AlternateContentSources/Create/ACSCreateWizard.js

@@ -40,7 +40,6 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
   const [caCertName, setCACertName] = useState('');
   const [productIds, setProductIds] = useState([]);
   const [productNames, setProductNames] = useState([]);
-  const [currentStep, setCurrentStep] = useState(1);
   const dispatch = useDispatch();
 
   useEffect(
@@ -139,8 +138,6 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     <ACSCreateContext.Provider value={{
       show,
       setIsOpen,
-      currentStep,
-      setCurrentStep,
       acsType,
       setAcsType,
       contentType,
@@ -186,10 +183,6 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
       <Wizard
         title={__('Add an alternate content source')}
         steps={steps}
-        startAtStep={currentStep}
-        onGoToStep={({ id }) => setCurrentStep(id)}
-        onNext={({ id }) => setCurrentStep(id)}
-        onBack={({ id }) => setCurrentStep(id)}
         onClose={() => {
           setIsOpen(false);
         }}

data/webpack/scenes/AlternateContentSources/Create/Steps/ACSCreateFinish.js

@@ -1,7 +1,9 @@
 import React, { useCallback, useContext, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
+import PropTypes from 'prop-types';
 import useDeepCompareEffect from 'use-deep-compare-effect';
+import { WizardContextConsumer } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import ACSCreateContext from '../ACSCreateContext';
@@ -9,10 +11,16 @@ import { selectCreateACS, selectCreateACSError, selectCreateACSStatus } from '..
 import getAlternateContentSources, { createACS } from '../../ACSActions';
 import Loading from '../../../../components/Loading';
 
-const ACSCreateFinish = () => {
+const ACSCreateFinishWrapper = () => (
+  <WizardContextConsumer>
+    {({ activeStep }) => <ACSCreateFinish activeStep={activeStep} />}
+  </WizardContextConsumer>
+);
+
+const ACSCreateFinish = ({ activeStep }) => {
   const { push } = useHistory();
+  const currentStep = activeStep.id;
   const {
-    currentStep,
     setIsOpen,
     acsType,
     contentType,
@@ -94,4 +102,10 @@ const ACSCreateFinish = () => {
   return <Loading loadingText={__('Saving alternate content source...')} />;
 };
 
-export default ACSCreateFinish;
+ACSCreateFinish.propTypes = {
+  activeStep: PropTypes.shape({
+    id: PropTypes.number.isRequired,
+  }).isRequired,
+};
+
+export default ACSCreateFinishWrapper;

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

@@ -205,7 +205,7 @@ const CVErrataDateFilterContent = ({
                     value={startDate}
                     invalidFormatText={invalidDateFormat}
                     dateFormat={dateFormat}
-                    onChange={setStartDate}
+                    onChange={(e, val) => setStartDate(val)}
                     dateParse={dateParse}
                     placeholder={startEntry ? 'MM/DD/YYYY' : __('Start date')}
                     isDisabled={!hasPermission(permissions, 'edit_content_views')}
@@ -227,7 +227,7 @@ const CVErrataDateFilterContent = ({
                     value={endDate}
                     invalidFormatText={invalidDateFormat}
                     dateFormat={dateFormat}
-                    onChange={setEndDate}
+                    onChange={(e, val) => setEndDate(val)}
                     dateParse={dateParse}
                     placeholder={endEntry ? 'MM/DD/YYYY' : __('End date')}
                     isDisabled={!hasPermission(permissions, 'edit_content_views')}

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

@@ -206,12 +206,12 @@ const CVErrataIDFilterContent = ({
     } else setSelectedTypes([...selectedTypes, selection]);
   };
 
-  const setValidStartDate = (value) => {
+  const setValidStartDate = (e, value) => {
     setStartDate(value);
     if (validAPIDate(value)) setApiStartDate(value);
   };
 
-  const setValidEndDate = (value) => {
+  const setValidEndDate = (e, value) => {
     setEndDate(value);
     if (validAPIDate(value)) setApiEndDate(value);
   };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.7.2
+  version: 4.7.4
 platform: ruby
 authors:
 - N/A
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -5427,7 +5427,7 @@ homepage: http://www.katello.org
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -5442,8 +5442,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman
 test_files: []