katello 4.7.0.rc1 → 4.7.0.rc2

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

@@ -118,10 +118,10 @@ test('Can remove a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(name)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[1]);
-  expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[2]);
+  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
   fireEvent.click(getByText('Remove'));
 
@@ -175,10 +175,10 @@ test('Can add a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(name)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[2]);
-  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[3]);
+  expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Add')).toBeInTheDocument());
   fireEvent.click(getByText('Add'));
 

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

@@ -132,10 +132,10 @@ test('Can add a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(errataId)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[2]);
-  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[3]);
+  expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Add')).toBeInTheDocument());
   fireEvent.click(getByText('Add'));
 
@@ -190,10 +190,10 @@ test('Can remove a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(errataId)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[1]);
-  expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[2]);
+  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
   fireEvent.click(getByText('Remove'));
 

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

@@ -132,20 +132,18 @@ test('Can add a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(name)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[2]);
-  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[3]);
+  expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Add')).toBeInTheDocument());
   fireEvent.click(getByText('Add'));
 
-
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleScope);
   assertNockRequest(cvRequestCallbackScope);
-
   assertNockRequest(moduleStreamsScope, done);
 });
 
@@ -190,10 +188,10 @@ test('Can remove a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(name)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[1]);
-  expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[2]);
+  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
   fireEvent.click(getByText('Remove'));
 

data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompare.scss

@@ -49,3 +49,34 @@
     width: 100%;
   }
 }
+
+.cvv-spaced-tooltip {
+  margin-left: 8px;
+  display: flex;
+  align-items: center;
+}
+
+.cvv-compare-bordered-table-header {
+  th:nth-last-child(-n+2) {
+    padding-left: 2rem;
+  }
+
+  th:nth-last-child(3) {
+    margin-left: 2rem;
+    border-right:  var(--pf-global--BorderWidth--sm);
+    border-right-color: var(--pf-c-table--BorderColor);
+    border-right-style: inset;
+  }
+}
+
+.cvv-compare-bordered-table-rows {
+  td:nth-last-child(3) {
+    border-right:  var(--pf-global--BorderWidth--sm);
+    border-right-color: var(--pf-c-table--BorderColor);
+    border-right-style: inset;
+  }
+
+  td:nth-last-child(-n+2) {
+    padding-left: 4rem;
+  }
+}

data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareHeader.js

@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { useSelector } from 'react-redux';
 import {
-  Grid, GridItem, TextContent, Text, TextVariants, Tooltip,
+  Grid, GridItem, TextContent, Text, TextVariants,
   Select, SelectOption, SelectVariant, Flex, FlexItem,
 } from '@patternfly/react-core';
-import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import { selectCVDetails } from '../../ContentViewDetailSelectors';
+import { HelpToolTip } from '../../../Create/ContentViewFormComponents';
 
 const CVVersionCompareHeader = ({
   versionOne, versionTwo, cvId, setVersionOne, setVersionTwo, selectedViewBy, setSelectedViewBy,
@@ -81,13 +81,11 @@ const CVVersionCompareHeader = ({
         <TextContent>
           <Text ouiaId="cv-version-compare-button" component={TextVariants.h2}>{__('Compare')}</Text>
         </TextContent>
-        <Tooltip aria="none" aria-live="polite" content={toolTipContent} style={{ marginLeft: 'auto' }}>
-          <OutlinedQuestionCircleIcon />
-        </Tooltip>
+        <HelpToolTip className="cvv-spaced-tooltip" tooltip={toolTipContent} />
       </GridItem>
       <GridItem span={12}>
         <Flex>
-          <FlexItem>
+          <FlexItem style={{ marginRight: '60px' }}>
             <Flex direction={{ default: 'column' }}>
               <h3><b>{__('Versions to compare')}</b></h3>
               <FlexItem>
@@ -146,7 +144,7 @@ const CVVersionCompareHeader = ({
               </FlexItem>
             </Flex>
           </FlexItem >
-          <FlexItem style={{ marginLeft: '60px' }}>
+          <FlexItem className="border-left" style={{ paddingLeft: '60px' }}>
             <Flex direction={{ default: 'column' }}>
               <h3><b>{__('View by')}</b></h3>
               <FlexItem>

data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareTable.js

@@ -8,6 +8,7 @@ import { TableVariant, Tr, Th, Tbody, Td, Thead } from '@patternfly/react-table'
 import { TableType } from './CVVersionCompareConfig';
 import TableWrapper from '../../../../../components/Table/TableWrapper';
 import { useTableSort } from '../../../../../components/Table/TableHooks';
+import './CVVersionCompare.scss';
 
 const CVVersionCompareTable = ({
   tableConfig: {
@@ -59,6 +60,7 @@ const CVVersionCompareTable = ({
       emptyContentTitle={__(`No matching ${name} found.`)}
       emptyContentBody=""
       variant={TableVariant.compact}
+      className="cvv-compare-bordered-table-rows cvv-compare-bordered-table-header"
     >
       <Thead>
         <Tr ouiaId="column-headers">
@@ -78,8 +80,13 @@ const CVVersionCompareTable = ({
           (
             <Tr key={`column-${result.id}`} ouiaId={`column-${result.id}`}>
               {columnHeaders.map(({ getProperty }, colIndex) =>
-                // eslint-disable-next-line react/no-array-index-key
-                <Td key={`cell-${colIndex}`}>{getProperty(result)} </Td>)}
+                (
+                  <Td
+                  // eslint-disable-next-line react/no-array-index-key
+                    key={`cell-${colIndex}`}
+                  >
+                    {getProperty(result)}
+                  </Td>))}
             </Tr>
           ))}
       </Tbody>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.7.0.rc1
+  version: 4.7.0.rc2
 platform: ruby
 authors:
 - N/A
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -837,7 +837,8 @@ files:
 - app/lib/actions/candlepin/owner/destroy_imports.rb
 - app/lib/actions/candlepin/owner/import.rb
 - app/lib/actions/candlepin/owner/import_products.rb
-- app/lib/actions/candlepin/owner/upstream_export.rb
+- app/lib/actions/candlepin/owner/retrieve_upstream_export.rb
+- app/lib/actions/candlepin/owner/start_upstream_export.rb
 - app/lib/actions/candlepin/owner/upstream_update.rb
 - app/lib/actions/candlepin/product/content_add.rb
 - app/lib/actions/candlepin/product/content_create.rb
@@ -850,6 +851,7 @@ files:
 - app/lib/actions/candlepin/product/delete_subscriptions.rb
 - app/lib/actions/candlepin/product/destroy.rb
 - app/lib/actions/candlepin/product/update.rb
+- app/lib/actions/candlepin/upstream_abstract_async_task.rb
 - app/lib/actions/helpers/notifications.rb
 - app/lib/actions/helpers/output_propagator.rb
 - app/lib/actions/helpers/presenter.rb
@@ -1110,6 +1112,7 @@ files:
 - app/lib/actions/pulp3/orchestration/repository/trigger_update_repo_cert_guard.rb
 - app/lib/actions/pulp3/orchestration/repository/update.rb
 - app/lib/actions/pulp3/orchestration/repository/upload_content.rb
+- app/lib/actions/pulp3/orphan_cleanup/delete_orphan_alternate_content_sources.rb
 - app/lib/actions/pulp3/orphan_cleanup/delete_orphan_distributions.rb
 - app/lib/actions/pulp3/orphan_cleanup/delete_orphan_remotes.rb
 - app/lib/actions/pulp3/orphan_cleanup/delete_orphan_repository_versions.rb
@@ -1197,6 +1200,7 @@ files:
 - app/lib/katello/resources/candlepin/subscription.rb
 - app/lib/katello/resources/candlepin/upstream_consumer.rb
 - app/lib/katello/resources/candlepin/upstream_entitlement.rb
+- app/lib/katello/resources/candlepin/upstream_job.rb
 - app/lib/katello/resources/candlepin/upstream_owner.rb
 - app/lib/katello/resources/candlepin/upstream_pool.rb
 - app/lib/katello/resources/cdn.rb
@@ -4493,6 +4497,7 @@ files:
 - locale/hi/katello.po
 - locale/it/katello.po
 - locale/ja/katello.po
+- locale/ka/katello.po
 - locale/katello.pot
 - locale/kn/katello.po
 - locale/ko/katello.po
@@ -5419,7 +5424,7 @@ homepage: http://www.katello.org
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -5434,8 +5439,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman
 test_files: []