katello 4.11.1 → 4.12.0.rc2

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

@@ -77,18 +77,6 @@
       "build_status_label": "Installed",
       "errata_status": 0,
       "errata_status_label": "All errata applied",
-      "subscription_status": 5,
-      "subscription_status_label": "Simple Content Access",
-      "purpose_sla_status": 0,
-      "purpose_sla_status_label": "Unknown",
-      "purpose_role_status": 0,
-      "purpose_role_status_label": "Unknown",
-      "purpose_usage_status": 0,
-      "purpose_usage_status_label": "Unknown",
-      "purpose_addons_status": 0,
-      "purpose_addons_status_label": "Unknown",
-      "purpose_status": 0,
-      "purpose_status_label": "Unknown",
       "name": "affectedHost.example.com",
       "id": 1,
       "puppet_proxy_id": null,
@@ -134,7 +122,6 @@
         "content_source": null,
         "kickstart_repository": null
       },
-      "subscription_global_status": 0,
       "subscription_facet_attributes": {
         "id": 2,
         "uuid": "457997e1-ac07-40e4-85b7-e382a3563e4a",

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

@@ -47,6 +47,7 @@ import {
   MODULE_STREAMS_CONTENT,
   DEB_PACKAGES_CONTENT,
   DOCKER_TAGS_CONTENT,
+  CONTAINER_MANIFEST_LIST_CONTENT,
   generatedContentKey,
   STATUS_TRANSLATIONS_ENUM,
   bulkRemoveVersionKey,
@@ -58,7 +59,7 @@ import {
   cvDebPackagesCompareKey,
   filesCompareKey,
   genericContentCompareKey,
-  cvRepositoriesCompareKey,
+  cvRepositoriesCompareKey, cvContainerManifestListsCompareKey,
 } from '../ContentViewsConstants';
 import api, { foremanApi, orgId } from '../../../services/api';
 import { getResponseErrorMsgs } from '../../../utils/helpers';
@@ -179,6 +180,19 @@ export const getDockerTagsComparison = (versionOne, versionTwo, viewBy, params)
   });
 };
 
+export const getContainerManifestListsComparison = (versionOne, versionTwo, viewBy, params) => {
+  const versions = { content_view_version_ids: [versionOne, versionTwo] };
+  const restrictComparison = { restrict_comparison: viewBy };
+  const apiParams = { ...versions, ...restrictComparison, ...params };
+  const apiUrl = '/docker_manifest_lists/compare';
+  return get({
+    key: cvContainerManifestListsCompareKey(versionOne, versionTwo, viewBy),
+    params: apiParams,
+    errorToast: error => __(`Something went wrong while retrieving the container tags! ${getResponseErrorMsgs(error.response)}`),
+    url: api.getApiUrl(apiUrl),
+  });
+};
+
 export const getFilesComparison = (versionOne, versionTwo, viewBy, params) => {
   const versions = { content_view_version_ids: [versionOne, versionTwo] };
   const restrictComparison = { restrict_comparison: viewBy };
@@ -268,6 +282,14 @@ export const getDockerTags = params => get({
   errorToast: error => __(`Something went wrong while getting container tags! ${getResponseErrorMsgs(error.response)}`),
 });
 
+export const getContainerManifestLists = params => get({
+  type: API_OPERATIONS.GET,
+  key: CONTAINER_MANIFEST_LIST_CONTENT,
+  url: api.getApiUrl('/docker_manifest_lists'),
+  params,
+  errorToast: error => __(`Something went wrong while getting container manifest lists! ${getResponseErrorMsgs(error.response)}`),
+});
+
 export const getErrata = params => get({
   type: API_OPERATIONS.GET,
   key: ERRATA_CONTENT,

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

@@ -44,7 +44,10 @@ import {
   cvDockerTagsCompareKey,
   cvDebPackagesCompareKey,
   filesCompareKey,
-  genericContentCompareKey, cvRepositoriesCompareKey,
+  genericContentCompareKey,
+  cvRepositoriesCompareKey,
+  CONTAINER_MANIFEST_LIST_CONTENT,
+  cvContainerManifestListsCompareKey,
 } from '../ContentViewsConstants';
 
 export const selectCVDetails = (state, cvId) =>
@@ -191,6 +194,15 @@ export const selectDockerTagsComparisonStatus = (state, versionOne, versionTwo,
 export const selectDockerTagsComparisonError = (state, versionOne, versionTwo, viewBy) =>
   selectAPIError(state, cvDockerTagsCompareKey(versionOne, versionTwo, viewBy));
 
+export const selectContainerManifestListsComparison = (state, versionOne, versionTwo, viewBy) =>
+  selectAPIResponse(state, cvContainerManifestListsCompareKey(versionOne, versionTwo, viewBy))
+    || {};
+
+export const selectContainerManifestListsComparisonStatus =
+    (state, versionOne, versionTwo, viewBy) =>
+      selectAPIStatus(state, cvContainerManifestListsCompareKey(versionOne, versionTwo, viewBy))
+    || STATUS.PENDING;
+
 export const selectDebPackagesComparison = (state, versionOne, versionTwo, viewBy) =>
   selectAPIResponse(state, cvDebPackagesCompareKey(versionOne, versionTwo, viewBy)) || {};
 
@@ -243,6 +255,12 @@ export const selectDockerTags = state =>
 export const selectDockerTagsStatus = state =>
   selectAPIStatus(state, DOCKER_TAGS_CONTENT) || STATUS.PENDING;
 
+export const selectContainerManifestLists = state =>
+  selectAPIResponse(state, CONTAINER_MANIFEST_LIST_CONTENT);
+
+export const selectContainerManifestListsStatus = state =>
+  selectAPIStatus(state, CONTAINER_MANIFEST_LIST_CONTENT) || STATUS.PENDING;
+
 export const selectRepositories = state =>
   selectAPIResponse(state, REPOSITORY_CONTENT);
 

data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/hosts.fixtures.json

@@ -77,18 +77,6 @@
       "build_status_label": "Installed",
       "errata_status": 3,
       "errata_status_label": "Security errata applicable",
-      "subscription_status": 0,
-      "subscription_status_label": "Fully entitled",
-      "purpose_sla_status": 3,
-      "purpose_sla_status_label": "Not Specified",
-      "purpose_role_status": 3,
-      "purpose_role_status_label": "Not Specified",
-      "purpose_usage_status": 3,
-      "purpose_usage_status_label": "Not Specified",
-      "purpose_addons_status": 3,
-      "purpose_addons_status_label": "Not Specified",
-      "purpose_status": 3,
-      "purpose_status_label": "Not Specified",
       "name": "steve8.satellite.lab.eng.rdu2.redhat.com",
       "id": 1,
       "puppet_proxy_id": null,
@@ -138,7 +126,6 @@
         },
         "kickstart_repository": null
       },
-      "subscription_global_status": 0,
       "subscription_facet_attributes": {
         "id": 1,
         "uuid": "435a8c86-0df4-4333-9d9f-82149c20612e",

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

@@ -21,6 +21,8 @@ import {
   selectDebPackagesComparisonStatus,
   selectDockerTagsComparison,
   selectDockerTagsComparisonStatus,
+  selectContainerManifestListsComparison,
+  selectContainerManifestListsComparisonStatus,
   selectGenericContentComparison,
   selectGenericContentComparisonStatus,
   selectRepositoriesComparison,
@@ -34,6 +36,7 @@ import {
   getModuleStreamsComparison,
   getDebPackagesComparison,
   getDockerTagsComparison,
+  getContainerManifestListsComparison,
   getGenericContentComparison,
   getRepositoriesComparison,
 } from '../../ContentViewDetailActions';
@@ -361,10 +364,10 @@ export default ({
             </a>),
         },
         {
-          title: __('Available Schema Versions'),
+          title: __('Available schema versions'),
           getProperty: (item) => {
-            if (item?.manifest_schema1) return __('Schema Version 1');
-            return __('Schema Version 2');
+            if (item?.manifest_schema1) return __('Schema version 1');
+            return __('Schema version 2');
           },
         },
         {
@@ -382,6 +385,37 @@ export default ({
         [__('Name')]: 'name',
       },
     },
+    {
+      name: __('Container manifest lists'),
+      getCountKey: (itemVersionOne, itemVersionTwo) =>
+          itemVersionOne?.docker_manifest_list_count || itemVersionTwo?.docker_manifest_list_count,
+      responseSelector: state =>
+        selectContainerManifestListsComparison(state, versionOneId, versionTwoId, viewBy),
+      statusSelector: state =>
+        selectContainerManifestListsComparisonStatus(state, versionOneId, versionTwoId, viewBy),
+      autocompleteEndpoint: '/katello/api/v2/docker_manifest_lists',
+      bookmarkController: 'katello_content_view_components',
+      fetchItems: params =>
+        getContainerManifestListsComparison(versionOneId, versionTwoId, viewBy, params),
+      columnHeaders: [
+        {
+          title: __('Digest'),
+          getProperty: item => item?.digest,
+        },
+        {
+          title: __('Available schema versions'),
+          getProperty: (item) => {
+            if (item?.manifest_schema1) return __('Schema version 1');
+            return __('Schema version 2');
+          },
+        },
+        { title: __(`Version ${versionOne}`), getProperty: item => compareContent(item, versionOneId) },
+        { title: __(`Version ${versionTwo}`), getProperty: item => compareContent(item, versionTwoId) },
+      ],
+      sortConfig: {
+        [__('Digest')]: 'digest',
+      },
+    },
     ...ContentConfig.filter(config => !(config.names.pluralLabel === 'ostree_refs')).map(({
       names: { pluralLowercase, pluralLabel, singularLabel },
       columnHeaders,

data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionContent.js

@@ -11,13 +11,13 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
   const {
     deb_count: debCount = 0,
     docker_manifest_count: dockerManifestCount = 0,
+    docker_manifest_list_count: dockerManifestListCount = 0,
     docker_tag_count: dockerTagCount = 0,
     file_count: fileCount = 0,
     module_stream_count: moduleStreamCount = 0,
     ansible_collection_count: ansibleCollectionCount = 0,
   } = cvVersion;
 
-
   const contentConfigTypes = ContentConfig.filter(({ names: { singularLabel } }) =>
     !!cvVersion[`${singularLabel}_count`])
     .map(({
@@ -37,7 +37,7 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
   const noCounts =
     !Number(debCount) && !Number(dockerManifestCount) && !Number(dockerTagCount) &&
     !Number(fileCount) && !Number(moduleStreamCount) && !Number(ansibleCollectionCount) &&
-    !contentConfigTypes?.length;
+    !Number(dockerManifestListCount) && !contentConfigTypes?.length;
 
   if (noCounts) {
     return <InactiveText text={__('No content')} />;
@@ -67,6 +67,13 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
           <a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/dockerTags`, '')}>{`${dockerManifestCount} Container manifests`}</a><br />
         </>
       }
+      {dockerManifestListCount > 0 &&
+      <>
+        <Link to={`/versions/${versionId}/dockerManifestList`}>
+          {`${dockerManifestListCount} Container manifest lists`}
+        </Link><br />
+      </>
+      }
       {fileCount > 0 &&
         <>
           <a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/files`, '')}>{`${fileCount} Files`}</a><br />
@@ -90,6 +97,7 @@ ContentViewVersionContent.propTypes = {
   cvVersion: PropTypes.shape({
     deb_count: PropTypes.number,
     docker_manifest_count: PropTypes.number,
+    docker_manifest_list_count: PropTypes.number,
     docker_tag_count: PropTypes.number,
     file_count: PropTypes.number,
     module_stream_count: PropTypes.number,

data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvAffectedHosts.fixture.json

@@ -77,18 +77,6 @@
       "build_status_label": "Installed",
       "errata_status": 1,
       "errata_status_label": "No installed packages and/or enabled repositories have been reported by subscription-manager.",
-      "subscription_status": 0,
-      "subscription_status_label": "Fully entitled",
-      "purpose_sla_status": 3,
-      "purpose_sla_status_label": "Not Specified",
-      "purpose_role_status": 3,
-      "purpose_role_status_label": "Not Specified",
-      "purpose_usage_status": 3,
-      "purpose_usage_status_label": "Not Specified",
-      "purpose_addons_status": 3,
-      "purpose_addons_status_label": "Not Specified",
-      "purpose_status": 3,
-      "purpose_status_label": "Not Specified",
       "name": "affectedHost.example.com",
       "id": 1,
       "puppet_proxy_id": null,
@@ -132,7 +120,6 @@
         "content_source": null,
         "kickstart_repository": null
       },
-      "subscription_global_status": 0,
       "subscription_facet_attributes": {
         "id": 2,
         "uuid": "de7dd78f-8eee-4308-90ce-c0e951da83f7",

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js

@@ -20,7 +20,7 @@ import {
   getPackageGroups,
   getRepositories,
   getRPMPackages,
-  getContent,
+  getContent, getContainerManifestLists,
 } from '../../ContentViewDetailActions';
 import {
   selectCVVersions,
@@ -42,7 +42,7 @@ import {
   selectRPMPackages,
   selectRPMPackagesStatus,
   selectContent,
-  selectContentStatus,
+  selectContentStatus, selectContainerManifestLists, selectContainerManifestListsStatus,
 } from '../../ContentViewDetailSelectors';
 import ContentViewVersionRepositoryCell from './ContentViewVersionRepositoryCell';
 import ContentConfig from '../../../../Content/ContentConfig';
@@ -324,10 +324,10 @@ export default ({ cvId, versionId }) => [
           </a>),
       },
       {
-        title: __('Available Schema Versions'),
+        title: __('Available schema versions'),
         getProperty: (item) => {
-          if (item?.manifest_schema1) return __('Schema Version 1');
-          return __('Schema Version 2');
+          if (item?.manifest_schema1) return __('Schema version 1');
+          return __('Schema version 2');
         },
       },
       {
@@ -340,6 +340,32 @@ export default ({ cvId, versionId }) => [
       { title: __('Image'), getProperty: item => item?.upstream_name },
     ],
   },
+  {
+    name: __('Container manifest lists'),
+    route: 'dockerManifestList',
+    repoType: 'docker',
+    getCountKey: item => item?.docker_manifest_list_count,
+    responseSelector: state => selectContainerManifestLists(state),
+    statusSelector: state => selectContainerManifestListsStatus(state),
+    autocompleteEndpoint: '/katello/api/v2/docker_manifest_lists',
+    autocompleteQueryParams: { content_view_version_id: versionId },
+    bookmarkController: 'katello_content_view_components',
+    fetchItems: params =>
+      getContainerManifestLists({ content_view_version_id: versionId, ...params }),
+    columnHeaders: [
+      {
+        title: __('Digest'),
+        getProperty: item => item?.digest,
+      },
+      {
+        title: __('Available schema versions'),
+        getProperty: (item) => {
+          if (item?.manifest_schema1) return __('Schema version 1');
+          return __('Schema version 2');
+        },
+      },
+    ],
+  },
   ...ContentConfig.map(({
     names: { pluralTitle, pluralLabel, singularLabel },
     columnHeaders,

data/webpack/scenes/Organizations/OrganizationSelectors.js

@@ -25,9 +25,6 @@ export const selectManifestHref = state =>
 export const selectIsManifestImported = state =>
   !!selectOrganizationState(state).owner_details?.upstreamConsumer?.webUrl;
 
-export const selectSimpleContentAccessEnabled = state =>
-  selectOrganizationState(state).simple_content_access;
-
 export const selectCdnConfigurationUpdateStatus = state =>
   selectAPIStatus(state, UPDATE_CDN_CONFIGURATION_KEY);
 

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

@@ -8,11 +8,10 @@ import * as contentCredentialActions from '../../ContentCredentials/ContentCrede
 import * as tasksActions from '../../Tasks/TaskActions';
 import history from './ManifestHistoryReducer';
 import {
-  selectSimpleContentAccessEnabled,
   selectIsManifestImported,
   selectUpdatingCdnConfiguration,
 } from '../../Organizations/OrganizationSelectors';
-import { selectManifestActionStarted, selectSimpleContentAccessEligible } from '../SubscriptionsSelectors';
+import { selectManifestActionStarted } from '../SubscriptionsSelectors';
 import { selectContentCredentials } from '../../ContentCredentials/ContentCredentialSelectors';
 
 import ManifestModal from './ManageManifestModal';
@@ -21,11 +20,9 @@ import ManifestModal from './ManageManifestModal';
 const mapStateToProps = state => ({
   organization: state.katello.organization,
   manifestHistory: state.katello.manifestHistory,
-  simpleContentAccess: selectSimpleContentAccessEnabled(state),
   isManifestImported: selectIsManifestImported(state),
   deleteManifestModalExists: !!state.foremanModals.deleteManifestModal,
   manifestActionStarted: selectManifestActionStarted(state),
-  simpleContentAccessEligible: selectSimpleContentAccessEligible(state),
   updatingCdnConfiguration: selectUpdatingCdnConfiguration(state),
   contentCredentials: selectContentCredentials(state),
 });

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -5,7 +5,7 @@ import Immutable from 'seamless-immutable';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { propsToCamelCase } from 'foremanReact/common/helpers';
 import { isEmpty } from 'lodash';
-import { Grid, Row, Col, Alert } from 'patternfly-react';
+import { Grid, Row, Col } from 'patternfly-react';
 import { Popover, Flex, FlexItem } from '@patternfly/react-core';
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import ModalProgressBar from 'foremanReact/components/common/ModalProgressBar';
@@ -18,7 +18,7 @@ import { filterRHSubscriptions } from './SubscriptionHelpers';
 import api, { orgId } from '../../services/api';
 
 import { createSubscriptionParams } from './SubscriptionActions.js';
-import { SUBSCRIPTION_TABLE_NAME, SUBSCRIPTIONS_SERVICE_DOC_URL, SCA_URL } from './SubscriptionConstants';
+import { SUBSCRIPTION_TABLE_NAME, SUBSCRIPTIONS_SERVICE_DOC_URL } from './SubscriptionConstants';
 import './SubscriptionsPage.scss';
 
 class SubscriptionsPage extends Component {
@@ -52,7 +52,6 @@ class SubscriptionsPage extends Component {
       pingUpstreamSubscriptions,
       subscriptions,
       task,
-      checkSimpleContentAccessEligible,
     } = this.props;
 
     if (task) {
@@ -76,10 +75,6 @@ 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);
@@ -140,7 +135,7 @@ class SubscriptionsPage extends Component {
     const {
       deleteModalOpened, openDeleteModal, closeDeleteModal,
       deleteButtonDisabled, disableDeleteButton, enableDeleteButton,
-      searchQuery, updateSearchQuery, simpleContentAccess, hasUpstreamConnection,
+      searchQuery, updateSearchQuery, hasUpstreamConnection,
       task, activePermissions, subscriptions, subscriptionTableSettings, isManifestImported,
     } = this.props;
     // Basic permissions - should we even show this page?
@@ -221,18 +216,6 @@ class SubscriptionsPage extends Component {
         },
       };
 
-    const SCAAlert = (
-      <Alert type="warning">
-        <FormattedMessage
-          id="sca-alert"
-          values={{
-            scaLink: <a href={SCA_URL} target="_blank" rel="noreferrer">{__('Simple Content Access')}</a>,
-          }}
-          defaultMessage={__('This organization is not using {scaLink}. Entitlement-based subscription management is deprecated and will be removed in Katello 4.12.')}
-        />
-      </Alert>
-    );
-
     const SCAPopoverContent = (
       <FormattedMessage
         id="sca-popover-content"
@@ -290,7 +273,6 @@ class SubscriptionsPage extends Component {
               canImportManifest={canImportManifest}
               canDeleteManifest={canDeleteManifest}
               canEditOrganizations={canEditOrganizations}
-              simpleContentAccess={simpleContentAccess}
               taskInProgress={!!task}
               disableManifestActions={disableManifestActions}
               disabledReason={this.getDisabledReason()}
@@ -300,7 +282,6 @@ class SubscriptionsPage extends Component {
             />
 
             <div id="subscriptions-table" className="modal-container">
-              {!this.props.organization?.loading && !simpleContentAccess ? SCAAlert : null}
               <SubscriptionsTable
                 canManageSubscriptionAllocations={canManageSubscriptionAllocations}
                 loadSubscriptions={this.props.loadSubscriptions}
@@ -333,7 +314,6 @@ 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,
@@ -341,7 +321,6 @@ SubscriptionsPage.propTypes = {
   resetTasks: PropTypes.func.isRequired,
   updateQuantity: PropTypes.func.isRequired,
   loadTableColumns: PropTypes.func.isRequired,
-  simpleContentAccess: PropTypes.bool,
   isManifestImported: PropTypes.bool,
   subscriptions: PropTypes.shape({
     // Disabling rule as existing code failed due to an eslint-plugin-react update
@@ -408,7 +387,6 @@ SubscriptionsPage.defaultProps = {
   deleteModalOpened: false,
   deleteButtonDisabled: true,
   subscriptionTableSettings: {},
-  simpleContentAccess: false,
   isManifestImported: false,
   hasUpstreamConnection: false,
   activePermissions: {

data/webpack/scenes/Subscriptions/SubscriptionsSelectors.js

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

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

@@ -6,7 +6,6 @@ import {
   selectDeleteButtonDisabled,
   selectSubscriptionsTask,
   selectHasUpstreamConnection,
-  selectSimpleContentAccessEligible,
 } from '../SubscriptionsSelectors';
 
 const state = {
@@ -17,7 +16,6 @@ const state = {
       taskModalOpened: false,
       deleteButtonDisabled: true,
       hasUpstreamConnection: false,
-      simpleContentAccessEligible: false,
       task: {},
     },
   },
@@ -30,7 +28,6 @@ const fixtures = {
   '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__/SubscriptionsPage.test.js.snap

@@ -67,7 +67,6 @@ exports[`subscriptions page should render 1`] = `
         disableManifestActions={true}
         disabledReason="This is disabled because no connection could be made to the upstream Manifest."
         refresh={[Function]}
-        simpleContentAccess={false}
         taskInProgress={false}
         upload={[Function]}
       />
@@ -75,27 +74,6 @@ exports[`subscriptions page should render 1`] = `
         className="modal-container"
         id="subscriptions-table"
       >
-        <Alert
-          className=""
-          onDismiss={null}
-          type="warning"
-        >
-          <FormattedMessage
-            defaultMessage="This organization is not using {scaLink}. Entitlement-based subscription management is deprecated and will be removed in Katello 4.12."
-            id="sca-alert"
-            values={
-              Object {
-                "scaLink": <a
-                  href="https://access.redhat.com/articles/simple-content-access"
-                  rel="noreferrer"
-                  target="_blank"
-                >
-                  Simple Content Access
-                </a>,
-              }
-            }
-          />
-        </Alert>
         <SubscriptionsTable
           canManageSubscriptionAllocations={false}
           emptyState={

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

@@ -14,12 +14,9 @@ Object {
   "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/index.js

@@ -19,7 +19,7 @@ import {
 } from './SubscriptionsSelectors';
 import { selectTableSettings } from '../../scenes/Settings/SettingsSelectors';
 import { selectIsPollingTask } from '../Tasks/TaskSelectors';
-import { selectOrganizationState, selectSimpleContentAccessEnabled, selectIsManifestImported } from '../Organizations/OrganizationSelectors';
+import { selectOrganizationState, selectIsManifestImported } from '../Organizations/OrganizationSelectors';
 import { pingUpstreamSubscriptions } from './UpstreamSubscriptions/UpstreamSubscriptionsActions';
 import reducer from './SubscriptionReducer';
 import { SUBSCRIPTION_TABLE_NAME, SUBSCRIPTIONS } from './SubscriptionConstants';
@@ -34,7 +34,6 @@ const mapStateToProps = (state) => {
     subscriptions,
     subscriptionTableSettings,
     activePermissions: selectActivePermissions(state),
-    simpleContentAccess: selectSimpleContentAccessEnabled(state),
     isManifestImported: selectIsManifestImported(state),
     hasUpstreamConnection: selectHasUpstreamConnection(state),
     task: selectSubscriptionsTask(state),