katello 3.17.0 → 3.18.0

data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js

@@ -3,7 +3,6 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
 
 import CONTENT_VIEWS_KEY from '../ContentViewsConstants';
-import { createContentViewsParams } from '../ContentViewsActions';
 import ContentViewsPage from '../../ContentViews';
 import api from '../../../services/api';
 import nock, {
@@ -136,7 +135,8 @@ test('Can handle pagination', async (done) => {
   // Match first page API request
   const firstPageScope = nockInstance
     .get(cvIndexPath)
-    .query(createContentViewsParams())
+    // Using a custom query params matcher because parameters can be strings
+    .query(actualQueryObject => parseInt(actualQueryObject.page, 10) === 1)
     .reply(200, cvIndexFirstPage);
 
   // Match second page API request

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { Grid, Col, Row, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel } from 'react-bootstrap';
 import { Button, Spinner } from 'patternfly-react';
 import ForemanModal from 'foremanReact/components/ForemanModal';
+import Slot from 'foremanReact/components/common/Slot';
 import { translate as __ } from 'foremanReact/common/I18n';
 import TooltipButton from '../../../components/TooltipButton';
 import { LoadingState } from '../../../components/LoadingState';
@@ -93,6 +94,7 @@ class ManageManifestModal extends Component {
       isManifestImported,
       canEditOrganizations,
       simpleContentAccess,
+      simpleContentAccessEligible,
       enableSimpleContentAccess,
       disableSimpleContentAccess,
       taskInProgress,
@@ -104,6 +106,8 @@ class ManageManifestModal extends Component {
     const showSubscriptionManifest = (canImportManifest || canDeleteManifest);
     const showManifestTab = (showRedHatProviderDetails || showSubscriptionManifest);
     const disableSCASwitch = (
+      // allow users to turn SCA off even if they are not eligible to turn it back on
+      (!simpleContentAccessEligible && !simpleContentAccess) ||
       disableManifestActions ||
       !isManifestImported ||
       actionInProgress ||
@@ -194,14 +198,17 @@ class ManageManifestModal extends Component {
                       <Grid>
                         <h3>{__('Subscription Manifest')}</h3>
                         <hr />
-                        <Row>
-                          <SimpleContentAccess
-                            enableSimpleContentAccess={enableSimpleContentAccess}
-                            disableSimpleContentAccess={disableSimpleContentAccess}
-                            isSimpleContentAccessEnabled={simpleContentAccess}
-                            canToggleSimpleContentAccess={!disableSCASwitch}
-                          />
-                        </Row>
+                        { isManifestImported &&
+                          <Row>
+                            <SimpleContentAccess
+                              enableSimpleContentAccess={enableSimpleContentAccess}
+                              disableSimpleContentAccess={disableSimpleContentAccess}
+                              isSimpleContentAccessEnabled={simpleContentAccess}
+                              canToggleSimpleContentAccess={!disableSCASwitch}
+                              simpleContentAccessEligible={simpleContentAccessEligible}
+                            />
+                          </Row>
+                        }
                         <Row>
                           <Col sm={5}>
                             <strong>{__('Subscription Allocation')}</strong>
@@ -244,17 +251,17 @@ class ManageManifestModal extends Component {
                                 />
                               }
                               {canDeleteManifest &&
-                              <React.Fragment>
-                                <TooltipButton
-                                  disabled={!isManifestImported || actionInProgress}
-                                  bsStyle="danger"
-                                  onClick={this.showDeleteManifestModal}
-                                  title={__('Delete')}
-                                  tooltipId="delete-manifest-button-tooltip"
-                                  tooltipText={this.disabledTooltipText()}
-                                  tooltipPlacement="top"
-                                />
-                              </React.Fragment>
+                                <React.Fragment>
+                                  <TooltipButton
+                                    disabled={!isManifestImported || actionInProgress}
+                                    bsStyle="danger"
+                                    onClick={this.showDeleteManifestModal}
+                                    title={__('Delete')}
+                                    tooltipId="delete-manifest-button-tooltip"
+                                    tooltipText={this.disabledTooltipText()}
+                                    tooltipPlacement="top"
+                                  />
+                                </React.Fragment>
                               }
                             </div>
                             <ForemanModal title={__('Confirm delete manifest')} id={DELETE_MANIFEST_MODAL_ID}>
@@ -274,6 +281,7 @@ class ManageManifestModal extends Component {
                     </FormGroup>
                   </React.Fragment>
                 }
+                <Slot id="katello-manage-manifest-form" multi />
               </Form>
             </Tab>
           }
@@ -325,6 +333,7 @@ ManageManifestModal.propTypes = {
   saveOrganization: PropTypes.func.isRequired,
   taskInProgress: PropTypes.bool.isRequired,
   simpleContentAccess: PropTypes.bool,
+  simpleContentAccessEligible: PropTypes.bool,
   manifestHistory: PropTypes.shape({
     loading: PropTypes.bool,
     // Disabling rule as existing code failed due to an eslint-plugin-react update
@@ -344,6 +353,7 @@ ManageManifestModal.defaultProps = {
   isManifestImported: false,
   canEditOrganizations: false,
   simpleContentAccess: false,
+  simpleContentAccessEligible: undefined,
   manifestActionStarted: false,
 };
 

data/webpack/scenes/Subscriptions/Manifest/ManifestActions.js

@@ -22,6 +22,9 @@ import {
   DISABLE_SIMPLE_CONTENT_ACCESS_REQUEST,
   DISABLE_SIMPLE_CONTENT_ACCESS_SUCCESS,
   DISABLE_SIMPLE_CONTENT_ACCESS_FAILURE,
+  SIMPLE_CONTENT_ACCESS_ELIGIBLE_REQUEST,
+  SIMPLE_CONTENT_ACCESS_ELIGIBLE_SUCCESS,
+  SIMPLE_CONTENT_ACCESS_ELIGIBLE_FAILURE,
 } from './ManifestConstants';
 
 export const uploadManifest = file => async (dispatch) => {
@@ -81,6 +84,20 @@ export const deleteManifest = (extendedParams = {}) => async (dispatch) => {
   }
 };
 
+export const checkSimpleContentAccessEligible = () => async (dispatch) => {
+  dispatch({ type: SIMPLE_CONTENT_ACCESS_ELIGIBLE_REQUEST });
+
+  try {
+    const { data } = await api.get(`/organizations/${orgId()}/upstream_subscriptions/simple_content_access/eligible`, {});
+    return dispatch({
+      type: SIMPLE_CONTENT_ACCESS_ELIGIBLE_SUCCESS,
+      response: data,
+    });
+  } catch (error) {
+    return dispatch(apiError(SIMPLE_CONTENT_ACCESS_ELIGIBLE_FAILURE, error));
+  }
+};
+
 export const enableSimpleContentAccess = (extendedParams = {}) => async (dispatch) => {
   dispatch({ type: ENABLE_SIMPLE_CONTENT_ACCESS_REQUEST });
 

data/webpack/scenes/Subscriptions/Manifest/ManifestConstants.js

@@ -22,6 +22,10 @@ export const DISABLE_SIMPLE_CONTENT_ACCESS_REQUEST = 'DISABLE_SIMPLE_CONTENT_ACC
 export const DISABLE_SIMPLE_CONTENT_ACCESS_SUCCESS = 'DISABLE_SIMPLE_CONTENT_ACCESS_SUCCESS';
 export const DISABLE_SIMPLE_CONTENT_ACCESS_FAILURE = 'DISABLE_SIMPLE_CONTENT_ACCESS_FAILURE';
 
+export const SIMPLE_CONTENT_ACCESS_ELIGIBLE_REQUEST = 'SIMPLE_CONTENT_ACCESS_ELIGIBLE_REQUEST';
+export const SIMPLE_CONTENT_ACCESS_ELIGIBLE_SUCCESS = 'SIMPLE_CONTENT_ACCESS_ELIGIBLE_SUCCESS';
+export const SIMPLE_CONTENT_ACCESS_ELIGIBLE_FAILURE = 'SIMPLE_CONTENT_ACCESS_ELIGIBLE_FAILURE';
+
 // Modal IDs
 export const MANAGE_MANIFEST_MODAL_ID = 'manageManifestModal';
 export const DELETE_MANIFEST_MODAL_ID = 'deleteManifestModal';

data/webpack/scenes/Subscriptions/Manifest/SimpleContentAccess.js

@@ -11,6 +11,7 @@ const SimpleContentAccess = (props) => {
     isSimpleContentAccessEnabled,
     enableSimpleContentAccess,
     disableSimpleContentAccess,
+    simpleContentAccessEligible,
   } = props;
 
   const toggleSimpleContentAccess = () => {
@@ -21,6 +22,17 @@ const SimpleContentAccess = (props) => {
     }
   };
 
+  const simpleContentAccessText = () => {
+    // don't show this text unless explicitly told to
+    if (simpleContentAccessEligible !== undefined) {
+      if (!simpleContentAccessEligible && !isSimpleContentAccessEnabled) {
+        return __('Simple Content Access has been disabled by the upstream organization administrator.');
+      }
+    }
+
+    return __('Toggling Simple Content Access will refresh your manifest.');
+  };
+
   return (
     <div id="simple-content-access">
       <Col sm={5}>
@@ -36,7 +48,7 @@ const SimpleContentAccess = (props) => {
               <OverlayTrigger
                 overlay={
                   <Tooltip id="sca-refresh-tooltip">
-                    {__('When Simple Content Access is enabled, hosts can consume from all repositories in their Content View regardless of subscription status.')}
+                    {__('When Simple Content Access is enabled, hosts are not required to have subscriptions attached to access repositories.')}
                   </Tooltip>
                 }
                 placement="bottom"
@@ -61,7 +73,7 @@ const SimpleContentAccess = (props) => {
           />
         </div>
         <div>
-          <i>{__('Toggling Simple Content Access will refresh your manifest.')}</i>
+          <i>{simpleContentAccessText()}</i>
         </div>
       </Col>
     </div>
@@ -73,6 +85,11 @@ SimpleContentAccess.propTypes = {
   disableSimpleContentAccess: PropTypes.func.isRequired,
   isSimpleContentAccessEnabled: PropTypes.bool.isRequired,
   canToggleSimpleContentAccess: PropTypes.bool.isRequired,
+  simpleContentAccessEligible: PropTypes.bool,
+};
+
+SimpleContentAccess.defaultProps = {
+  simpleContentAccessEligible: undefined,
 };
 
 export default SimpleContentAccess;

data/webpack/scenes/Subscriptions/Manifest/__tests__/SimpleContentAccess.test.js

@@ -9,7 +9,15 @@ import api from '../../../../services/api';
 afterEach(cleanup);
 
 const noop = jest.fn();
-const organization = { id: 1, redhat_repository_url: 'https://redhat.com' };
+const organization = {
+  id: 1,
+  redhat_repository_url: 'https://redhat.com',
+  owner_details: {
+    upstreamConsumer: {
+      webUrl: 'https://example.com/',
+    },
+  },
+};
 
 const defaultProps = {
   disableManifestActions: false,

data/webpack/scenes/Subscriptions/Manifest/index.js

@@ -7,7 +7,7 @@ import * as organizationActions from '../../Organizations/OrganizationActions';
 import * as tasksActions from '../../Tasks/TaskActions';
 import history from './ManifestHistoryReducer';
 import { selectSimpleContentAccessEnabled, selectIsManifestImported } from '../../Organizations/OrganizationSelectors';
-import { selectManifestActionStarted } from '../SubscriptionsSelectors';
+import { selectManifestActionStarted, selectSimpleContentAccessEligible } from '../SubscriptionsSelectors';
 
 import ManifestModal from './ManageManifestModal';
 
@@ -21,6 +21,7 @@ const mapStateToProps = state => ({
   isManifestImported: selectIsManifestImported(state),
   modalOpenState: state.foremanModals.ManageManifestModal,
   manifestActionStarted: selectManifestActionStarted(state),
+  simpleContentAccessEligible: selectSimpleContentAccessEligible(state),
 });
 
 // map action dispatchers to props

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -37,7 +37,7 @@ export const SUBSCRIPTIONS_CLOSE_DELETE_MODAL = 'SUBSCRIPTIONS_CLOSE_DELETE_MODA
 export const SUBSCRIPTIONS_DISABLE_DELETE_BUTTON = 'SUBSCRIPTIONS_DISABLE_DELETE_BUTTON';
 export const SUBSCRIPTIONS_ENABLE_DELETE_BUTTON = 'SUBSCRIPTIONS_ENABLE_DELETE_BUTTON';
 
-export const SUBSCRIPTION_WATCH_URL = 'https://cloud.redhat.com/subscriptions/rhel-sw/all';
+export const SUBSCRIPTION_WATCH_URL = 'https://access.redhat.com/articles/subscription-watch';
 
 export const MANIFEST_DELETE_TASK_LABEL = 'Actions::Katello::Organization::ManifestDelete';
 

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -41,6 +41,7 @@ import {
   ENABLE_SIMPLE_CONTENT_ACCESS_REQUEST,
   ENABLE_SIMPLE_CONTENT_ACCESS_SUCCESS,
   DISABLE_SIMPLE_CONTENT_ACCESS_SUCCESS,
+  SIMPLE_CONTENT_ACCESS_ELIGIBLE_SUCCESS,
   UPLOAD_MANIFEST_FAILURE,
   UPLOAD_MANIFEST_REQUEST,
   DELETE_MANIFEST_FAILURE,
@@ -68,6 +69,8 @@ const initialState = Immutable({
 
 export default (state = initialState, action) => {
   switch (action.type) {
+    case SIMPLE_CONTENT_ACCESS_ELIGIBLE_SUCCESS:
+      return state.set('simpleContentAccessEligible', action.response.simple_content_access_eligible);
     case PING_UPSTREAM_SUBSCRIPTIONS_SUCCESS:
       return state.set('hasUpstreamConnection', true);
     case PING_UPSTREAM_SUBSCRIPTIONS_FAILURE:

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -51,6 +51,7 @@ class SubscriptionsPage extends Component {
       settings,
       subscriptions,
       task,
+      checkSimpleContentAccessEligible,
     } = this.props;
 
     const { disconnected } = settings;
@@ -79,6 +80,10 @@ class SubscriptionsPage extends Component {
     }
 
     if (hasUpstreamConnection) {
+      if (hasUpstreamConnection !== prevProps.hasUpstreamConnection) {
+        checkSimpleContentAccessEligible();
+      }
+
       const subscriptionsChanged = subscriptions.results !== prevProps.subscriptions.results;
       if (subscriptionsChanged || !this.state.availableQuantitiesLoaded) {
         const poolIds = filterRHSubscriptions(subscriptions.results).map(subs => subs.id);
@@ -267,8 +272,8 @@ class SubscriptionsPage extends Component {
               {simpleContentAccess && (
                 <Alert type="info">
                   This organization has Simple Content Access enabled.
-                  Hosts can consume from all repositories in their Content View regardless of
-                  subscription status.  <br />
+                  Hosts are not required to have subscriptions attached to access repositories.
+                  <br />
                   Learn more about your overall subscription usage at
                   {' '}<a href={SUBSCRIPTION_WATCH_URL} target="_blank" rel="noreferrer">Subscription Watch</a>.
                 </Alert>
@@ -305,6 +310,7 @@ class SubscriptionsPage extends Component {
 
 SubscriptionsPage.propTypes = {
   pingUpstreamSubscriptions: PropTypes.func.isRequired,
+  checkSimpleContentAccessEligible: PropTypes.func.isRequired,
   loadSubscriptions: PropTypes.func.isRequired,
   loadAvailableQuantities: PropTypes.func.isRequired,
   uploadManifest: PropTypes.func.isRequired,

data/webpack/scenes/Subscriptions/SubscriptionsSelectors.js

@@ -29,3 +29,6 @@ export const selectManifestActionStarted = state =>
 
 export const selectHasUpstreamConnection = state =>
   selectSubscriptionsState(state).hasUpstreamConnection;
+
+export const selectSimpleContentAccessEligible = state =>
+  selectSubscriptionsState(state).simpleContentAccessEligible;

data/webpack/scenes/Subscriptions/__tests__/SubscriptionsPage.test.js

@@ -6,6 +6,7 @@ import SubscriptionsPage from '../SubscriptionsPage';
 import { successState, settingsSuccessState, permissionDeniedState } from './subscriptions.fixtures';
 import { loadAvailableQuantities, loadSubscriptions, updateQuantity, loadTableColumns } from '../SubscriptionActions';
 import { pingUpstreamSubscriptions } from '../UpstreamSubscriptions/UpstreamSubscriptionsActions';
+import { checkSimpleContentAccessEligible } from '../Manifest/ManifestActions';
 import { createColumns, updateColumns } from '../../../scenes/Settings/Tables/TableActions';
 
 jest.mock('foremanReact/components/PermissionDenied');
@@ -43,6 +44,7 @@ describe('subscriptions page', () => {
     loadSubscriptions={loadSubscriptions}
     loadAvailableQuantities={loadAvailableQuantities}
     pingUpstreamSubscriptions={pingUpstreamSubscriptions}
+    checkSimpleContentAccessEligible={checkSimpleContentAccessEligible}
     updateQuantity={updateQuantity}
     handleStartTask={handleStartTask}
     handleFinishedTask={handleFinishedTask}
@@ -78,6 +80,7 @@ describe('subscriptions page', () => {
     loadSubscriptions={loadSubscriptions}
     loadAvailableQuantities={loadAvailableQuantities}
     pingUpstreamSubscriptions={pingUpstreamSubscriptions}
+    checkSimpleContentAccessEligible={checkSimpleContentAccessEligible}
     updateQuantity={updateQuantity}
     handleStartTask={handleStartTask}
     handleFinishedTask={handleFinishedTask}

data/webpack/scenes/Subscriptions/__tests__/SubscriptionsSelectors.test.js

@@ -5,6 +5,8 @@ import {
   selectDeleteModalOpened,
   selectDeleteButtonDisabled,
   selectSubscriptionsTask,
+  selectHasUpstreamConnection,
+  selectSimpleContentAccessEligible,
 } from '../SubscriptionsSelectors';
 
 const state = {
@@ -14,6 +16,8 @@ const state = {
       deleteModalOpened: false,
       taskModalOpened: false,
       deleteButtonDisabled: true,
+      hasUpstreamConnection: false,
+      simpleContentAccessEligible: false,
       task: {},
     },
   },
@@ -25,6 +29,8 @@ const fixtures = {
   'should select delete-modal-opened': () => selectDeleteModalOpened(state),
   'should select delete-button-disabled': () => selectDeleteButtonDisabled(state),
   'should select subscriptions task': () => selectSubscriptionsTask(state),
+  'should select whether we have an upstream connection': () => selectHasUpstreamConnection(state),
+  'should select whether we are simple content access eligible': () => selectSimpleContentAccessEligible(state),
 };
 
 describe('Subscriptions selectors', () => testSelectorsSnapshotWithFixtures(fixtures));

data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsSelectors.test.js.snap

@@ -12,8 +12,14 @@ exports[`Subscriptions selectors should select the subscriptions state 1`] = `
 Object {
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "hasUpstreamConnection": false,
   "searchQuery": "some-query",
+  "simpleContentAccessEligible": false,
   "task": Object {},
   "taskModalOpened": false,
 }
 `;
+
+exports[`Subscriptions selectors should select whether we are simple content access eligible 1`] = `false`;
+
+exports[`Subscriptions selectors should select whether we have an upstream connection 1`] = `false`;

data/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Row, Col, Form, FormGroup, Button, OverlayTrigger, Tooltip, Icon } from 'patternfly-react';
+import { Row, Col, Form, FormGroup, Button } from 'patternfly-react';
 import { LinkContainer } from 'react-router-bootstrap';
 import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -67,18 +67,6 @@ const SubscriptionsToolbar = ({
                 rel="noreferrer"
               >
                 {__('Subscription Watch')}
-                <OverlayTrigger
-                  overlay={
-                    <Tooltip id="sub-watch-tooltip">
-                      {__('Learn more about your overall subscription usage (opens in a new tab)')}
-                    </Tooltip>
-                  }
-                  placement="bottom"
-                  trigger={['hover', 'focus']}
-                  rootClose={false}
-                >
-                  <Icon type="pf" name="info" />
-                </OverlayTrigger>
               </a>
             }
 

data/webpack/test-utils/react-testing-lib-wrapper.js

@@ -5,6 +5,7 @@ import React from 'react';
 import thunk from 'redux-thunk';
 import Immutable from 'seamless-immutable';
 import { APIMiddleware, reducers as apiReducer } from 'foremanReact/redux/API';
+import { reducers as fillReducers } from 'foremanReact/components/common/Fill';
 import { reducers as foremanModalReducer } from 'foremanReact/components/ForemanModal';
 import { STATUS } from 'foremanReact/constants';
 import { render, waitFor } from '@testing-library/react';
@@ -33,6 +34,7 @@ function renderWithRedux(
     katello: allKatelloReducers,
     ...apiReducer,
     ...foremanModalReducer,
+    ...fillReducers,
   });
 
   // Namespacing the initial state as well
@@ -45,6 +47,7 @@ function renderWithRedux(
         settings: initialSettingsState,
       },
     },
+    extendable: {},
     ...initialState,
   });
   const middlewares = applyMiddleware(thunk, APIMiddleware);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.18.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -263,7 +263,7 @@ dependencies:
         version: 3.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -273,7 +273,7 @@ dependencies:
         version: 3.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: pulp_file_client
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +283,7 @@ dependencies:
         version: 1.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -293,7 +293,7 @@ dependencies:
         version: 1.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: pulp_ansible_client
   requirement: !ruby/object:Gem::Requirement
@@ -303,7 +303,7 @@ dependencies:
         version: '0.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -313,7 +313,7 @@ dependencies:
         version: '0.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pulp_container_client
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +323,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -333,7 +333,27 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: pulp_deb_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: pulp_rpm_client
   requirement: !ruby/object:Gem::Requirement
@@ -343,7 +363,7 @@ dependencies:
         version: 3.6.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -353,7 +373,7 @@ dependencies:
         version: 3.6.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: pulp_2to3_migration_client
   requirement: !ruby/object:Gem::Requirement
@@ -700,6 +720,9 @@ files:
 - app/controllers/katello/api/v2/capsule_content_controller.rb
 - app/controllers/katello/api/v2/capsules_controller.rb
 - app/controllers/katello/api/v2/content_credentials_controller.rb
+- app/controllers/katello/api/v2/content_export_incrementals_controller.rb
+- app/controllers/katello/api/v2/content_exports_controller.rb
+- app/controllers/katello/api/v2/content_imports_controller.rb
 - app/controllers/katello/api/v2/content_uploads_controller.rb
 - app/controllers/katello/api/v2/content_view_components_controller.rb
 - app/controllers/katello/api/v2/content_view_filter_rules_controller.rb
@@ -753,12 +776,14 @@ files:
 - app/controllers/katello/concerns/api/v2/content_overrides_controller.rb
 - app/controllers/katello/concerns/api/v2/hostgroups_controller_extensions.rb
 - app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb
+- app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb
 - app/controllers/katello/concerns/api/v2/repository_content_controller.rb
 - app/controllers/katello/concerns/api/v2/smart_proxies_controller_extensions.rb
 - app/controllers/katello/concerns/authorization/api/v2/content_views_controller.rb
 - app/controllers/katello/concerns/filtered_auto_complete_search.rb
 - app/controllers/katello/concerns/hosts_controller_extensions.rb
 - app/controllers/katello/concerns/organizations_controller_extensions.rb
+- app/controllers/katello/concerns/registration_controller_extensions.rb
 - app/controllers/katello/concerns/smart_proxies_controller_extensions.rb
 - app/controllers/katello/errata_controller.rb
 - app/controllers/katello/http_errors.rb
@@ -821,6 +846,7 @@ files:
 - app/lib/actions/helpers/notifications.rb
 - app/lib/actions/helpers/output_propagator.rb
 - app/lib/actions/helpers/presenter.rb
+- app/lib/actions/helpers/smart_proxy_sync_history_helper.rb
 - app/lib/actions/katello/activation_key/create.rb
 - app/lib/actions/katello/activation_key/destroy.rb
 - app/lib/actions/katello/activation_key/reassign.rb
@@ -861,6 +887,7 @@ files:
 - app/lib/actions/katello/content_view_version/destroy.rb
 - app/lib/actions/katello/content_view_version/export.rb
 - app/lib/actions/katello/content_view_version/import.rb
+- app/lib/actions/katello/content_view_version/import_library.rb
 - app/lib/actions/katello/content_view_version/incremental_update.rb
 - app/lib/actions/katello/content_view_version/republish_repositories.rb
 - app/lib/actions/katello/environment/destroy.rb
@@ -888,6 +915,7 @@ files:
 - app/lib/actions/katello/host/update_content_overrides.rb
 - app/lib/actions/katello/host/update_content_view.rb
 - app/lib/actions/katello/host/update_release_version.rb
+- app/lib/actions/katello/host/update_system_purpose.rb
 - app/lib/actions/katello/host/upload_package_profile.rb
 - app/lib/actions/katello/host/upload_profiles.rb
 - app/lib/actions/katello/organization/create.rb
@@ -973,6 +1001,7 @@ files:
 - app/lib/actions/middleware/pulp3_services_check.rb
 - app/lib/actions/middleware/pulp_services_check.rb
 - app/lib/actions/middleware/record_fixtures.rb
+- app/lib/actions/middleware/record_smart_proxy_sync_history.rb
 - app/lib/actions/middleware/remote_action.rb
 - app/lib/actions/middleware/skip_if_matching_content.rb
 - app/lib/actions/pulp/abstract.rb
@@ -1042,6 +1071,7 @@ files:
 - app/lib/actions/pulp3/content_guard/refresh.rb
 - app/lib/actions/pulp3/content_guard/refresh_all_distributions.rb
 - app/lib/actions/pulp3/content_migration.rb
+- app/lib/actions/pulp3/content_migration_presenter.rb
 - app/lib/actions/pulp3/content_view/delete_repository_references.rb
 - app/lib/actions/pulp3/content_view_version/create_exporter.rb
 - app/lib/actions/pulp3/content_view_version/create_importer.rb
@@ -1052,6 +1082,7 @@ files:
 - app/lib/actions/pulp3/import_migration.rb
 - app/lib/actions/pulp3/orchestration/content_view_version/copy_version_units_to_library.rb
 - app/lib/actions/pulp3/orchestration/content_view_version/export.rb
+- app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb
 - app/lib/actions/pulp3/orchestration/content_view_version/import.rb
 - app/lib/actions/pulp3/orchestration/orphan_cleanup/remove_orphans.rb
 - app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb
@@ -1103,6 +1134,7 @@ files:
 - app/lib/actions/pulp3/repository/update_remote.rb
 - app/lib/actions/pulp3/repository/update_repository.rb
 - app/lib/actions/pulp3/repository/upload_file.rb
+- app/lib/actions/pulp3/repository/upload_tag.rb
 - app/lib/katello/README
 - app/lib/katello/api/constraints/activation_key_constraint.rb
 - app/lib/katello/api/mapper_extensions.rb
@@ -1197,7 +1229,9 @@ files:
 - app/models/katello/ansible_tag.rb
 - app/models/katello/authorization/activation_key.rb
 - app/models/katello/authorization/content_view.rb
+- app/models/katello/authorization/content_view_component.rb
 - app/models/katello/authorization/content_view_environment.rb
+- app/models/katello/authorization/content_view_filter.rb
 - app/models/katello/authorization/content_view_history.rb
 - app/models/katello/authorization/content_view_version.rb
 - app/models/katello/authorization/content_view_version_export_history.rb
@@ -1239,6 +1273,7 @@ files:
 - app/models/katello/content_facet_applicable_rpm.rb
 - app/models/katello/content_facet_erratum.rb
 - app/models/katello/content_facet_repository.rb
+- app/models/katello/content_migration_progress.rb
 - app/models/katello/content_override.rb
 - app/models/katello/content_view.rb
 - app/models/katello/content_view_component.rb
@@ -1368,6 +1403,7 @@ files:
 - app/models/katello/rhsm_fact_parser.rb
 - app/models/katello/root_repository.rb
 - app/models/katello/rpm.rb
+- app/models/katello/smart_proxy_sync_history.rb
 - app/models/katello/srpm.rb
 - app/models/katello/subscription.rb
 - app/models/katello/subscription_facet_activation_key.rb
@@ -1407,6 +1443,7 @@ files:
 - app/services/katello/candlepin/message_handler.rb
 - app/services/katello/candlepin/pool_service.rb
 - app/services/katello/candlepin/system_purpose.rb
+- app/services/katello/candlepin/upstream_consumer.rb
 - app/services/katello/candlepin_event_listener.rb
 - app/services/katello/event_daemon.rb
 - app/services/katello/event_monitor/poller_thread.rb
@@ -1452,6 +1489,7 @@ files:
 - app/services/katello/pulp/yum_metadata_file.rb
 - app/services/katello/pulp3/ansible_collection.rb
 - app/services/katello/pulp3/api/ansible_collection.rb
+- app/services/katello/pulp3/api/apt.rb
 - app/services/katello/pulp3/api/content_guard.rb
 - app/services/katello/pulp3/api/core.rb
 - app/services/katello/pulp3/api/docker.rb
@@ -1461,6 +1499,8 @@ files:
 - app/services/katello/pulp3/content_view_version/export.rb
 - app/services/katello/pulp3/content_view_version/import.rb
 - app/services/katello/pulp3/content_view_version/import_export_common.rb
+- app/services/katello/pulp3/content_view_version/import_validator.rb
+- app/services/katello/pulp3/deb.rb
 - app/services/katello/pulp3/distribution.rb
 - app/services/katello/pulp3/docker_blob.rb
 - app/services/katello/pulp3/docker_manifest.rb
@@ -1476,6 +1516,7 @@ files:
 - app/services/katello/pulp3/pulp_content_unit.rb
 - app/services/katello/pulp3/repository.rb
 - app/services/katello/pulp3/repository/ansible_collection.rb
+- app/services/katello/pulp3/repository/apt.rb
 - app/services/katello/pulp3/repository/docker.rb
 - app/services/katello/pulp3/repository/file.rb
 - app/services/katello/pulp3/repository/yum.rb
@@ -1517,6 +1558,7 @@ files:
 - app/views/dashboard/_subscription_status_widget.html.erb
 - app/views/dashboard/_subscription_widget.html.erb
 - app/views/dashboard/_sync_widget.html.erb
+- app/views/foreman/hosts/_registration.html.erb
 - app/views/foreman/job_templates/install_errata.erb
 - app/views/foreman/job_templates/install_errata_-_katello_ansible_default.erb
 - app/views/foreman/job_templates/install_group.erb
@@ -2092,6 +2134,12 @@ files:
 - db/migrate/20200820145217_add_download_concurrency_to_katello_root_repositories.rb
 - db/migrate/20200910140340_remove_distribution_uuid.rb
 - db/migrate/20200914200906_remove_auto_enabled.rb
+- db/migrate/20200929200357_create_katello_smart_proxy_sync_history.rb
+- db/migrate/20201008204114_add_os_versions_to_katello_root_repositories.rb
+- db/migrate/20201012172713_remove_gpg_key_perms.rb
+- db/migrate/20201012192035_add_metadata_to_katello_content_view_version_export_history.rb
+- db/migrate/20201021150008_add_import_only_to_katello_content_view.rb
+- db/migrate/20201119211133_pulp3_migration_progress.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -3927,6 +3975,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-release-version-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-repository-sets-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-subscriptions-modal.controller.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-system-purpose-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-traces-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-host-bulk-module-streams-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-destroy-modal.html
@@ -3937,6 +3986,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-release-version-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-repository-sets-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-traces-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-modal-helper.service.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register-client.directive.js
@@ -4309,6 +4359,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/http-proxy-service.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/os-versions.service.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/ostree-upstream-sync-policy.service.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.routes.js
@@ -4442,6 +4493,8 @@ files:
 - lib/katello/tasks/job_templates.rake
 - lib/katello/tasks/pulp3_content_switchover.rake
 - lib/katello/tasks/pulp3_migration.rake
+- lib/katello/tasks/pulp3_migration_abort.rake
+- lib/katello/tasks/pulp3_migration_stats.rake
 - lib/katello/tasks/pulp3_post_migration_check.rake
 - lib/katello/tasks/receptor/extract_orgs.rake
 - lib/katello/tasks/regenerate_ueber_certs.rake
@@ -4464,6 +4517,7 @@ files:
 - lib/katello/tasks/upgrades/3.15/reindex_rpm_modular.rake
 - lib/katello/tasks/upgrades/3.15/set_sub_facet_dmi_uuid.rake
 - lib/katello/tasks/upgrades/3.16/update_applicable_el8_hosts.rake
+- lib/katello/tasks/upgrades/3.18/add_cvv_export_history_metadata.rb
 - lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb
@@ -4563,7 +4617,6 @@ files:
 - webpack/__mocks__/foremanReact/components/BreadcrumbBar/index.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/common/EmptyState.js
-- webpack/__mocks__/foremanReact/components/common/Fill/GlobalFill.js
 - webpack/__mocks__/foremanReact/redux.js
 - webpack/__mocks__/foremanReact/redux/actions/toasts.js
 - webpack/__mocks__/react-intl/index.js
@@ -4765,6 +4818,14 @@ files:
 - webpack/scenes/ContentViews/Details/ContentViewDetails.js
 - webpack/scenes/ContentViews/Details/ContentViewInfo.js
 - webpack/scenes/ContentViews/Details/DetailsContainer.js
+- webpack/scenes/ContentViews/Details/Repositories/ContentCounts.js
+- webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js
+- webpack/scenes/ContentViews/Details/Repositories/LastSync.js
+- webpack/scenes/ContentViews/Details/Repositories/RepoAddedStatus.js
+- webpack/scenes/ContentViews/Details/Repositories/RepoIcon.js
+- webpack/scenes/ContentViews/Details/Repositories/SelectableDropdown.js
+- webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.fixtures.json
+- webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.test.js
 - webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js
 - webpack/scenes/ContentViews/Details/__tests__/contentViewDetails.fixtures.json
 - webpack/scenes/ContentViews/Details/contentViewInfo.scss