katello 3.17.3 → 3.18.0.rc1

data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.fixtures.json

@@ -0,0 +1,154 @@
+{
+  "total": 14,
+  "subtotal": 14,
+  "page": 1,
+  "per_page": 20,
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": null,
+    "order": null
+  },
+  "results": [
+    {
+      "backend_identifier": "dbe0d30c-e77b-47aa-8bb7-c0e1a2697eb5",
+      "relative_path": "Orion/Library/custom/Lagoon_Nebula/Butterfly",
+      "container_repository_name": null,
+      "full_path": "http://centos7-katello-devel-stable.example.com/pulp/repos/Orion/Library/custom/Lagoon_Nebula/Butterfly/",
+      "library_instance_id": null,
+      "version_href": "/pulp/api/v3/repositories/rpm/rpm/ce16107a-b912-4d78-a5d1-9f90066acf8e/versions/1/",
+      "remote_href": "/pulp/api/v3/remotes/rpm/rpm/b491c3fb-d9e6-4b7e-a95a-312a8856bf1c/",
+      "publication_href": "/pulp/api/v3/publications/rpm/rpm/65b57edc-2e21-4742-be99-28ae6eeb588e/",
+      "id": 107,
+      "name": "Butterfly",
+      "label": "Butterfly",
+      "description": null,
+      "last_sync": {
+        "id": "0ea3e395-4be0-4b75-96be-9b2abf4bba78",
+        "username": "admin",
+        "started_at": "2020-08-17 13:33:27 -0400",
+        "ended_at": "2020-08-17 13:33:33 -0400",
+        "state": "stopped",
+        "result": "success",
+        "progress": 1
+      },
+      "content_view": {
+        "id": 9,
+        "name": "Default Organization View"
+      },
+      "content_view_version": {
+        "id": 19,
+        "name": "Default Organization View 1.0",
+        "content_view_id": 9
+      },
+      "kt_environment": {
+        "id": 15,
+        "name": "Library"
+      },
+      "content_type": "yum",
+      "url": "https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/",
+      "arch": "noarch",
+      "content_id": "1597685535659",
+      "auto_enabled": true,
+      "major": null,
+      "minor": null,
+      "product": {
+        "id": 3,
+        "cp_id": "370238709909",
+        "name": "Lagoon Nebula",
+        "orphaned": false,
+        "redhat": false,
+        "sync_plan": null
+      },
+      "content_label": "Orion_Lagoon_Nebula_Butterfly",
+      "content_counts": {
+        "ostree_branch": 0,
+        "docker_manifest": 0,
+        "docker_manifest_list": 0,
+        "docker_tag": 0,
+        "rpm": 32,
+        "srpm": 0,
+        "package": 32,
+        "package_group": 0,
+        "erratum": 4,
+        "puppet_module": 0,
+        "file": 0,
+        "deb": 0,
+        "module_stream": 0,
+        "ansible_collection": 0
+      },
+      "last_sync_words": "30 days",
+      "added_to_content_view": true
+    },
+    {
+      "backend_identifier": "e0aff6e3-f187-452a-9d7b-f624adf7684d",
+      "relative_path": "Orion/Library/custom/Lagoon_Nebula/Coma",
+      "container_repository_name": null,
+      "full_path": "http://centos7-katello-devel-stable.example.com/pulp/repos/Orion/Library/custom/Lagoon_Nebula/Coma/",
+      "library_instance_id": null,
+      "version_href": "/pulp/api/v3/repositories/rpm/rpm/a6b32606-0e72-43e5-8470-adc33a7b23d4/versions/1/",
+      "remote_href": "/pulp/api/v3/remotes/rpm/rpm/8f194340-7bfa-4af5-8a61-95f3e9a13fb3/",
+      "publication_href": "/pulp/api/v3/publications/rpm/rpm/1666923a-3269-46bd-a948-0f4f21474327/",
+      "id": 106,
+      "name": "Coma",
+      "label": "Coma",
+      "description": null,
+      "last_sync": {
+        "id": "8fd554ff-e795-4662-ab16-97466618fd2e",
+        "username": "admin",
+        "started_at": "2020-08-17 13:33:17 -0400",
+        "ended_at": "2020-08-17 13:33:23 -0400",
+        "state": "stopped",
+        "result": "success",
+        "progress": 1
+      },
+      "content_view": {
+        "id": 9,
+        "name": "Default Organization View"
+      },
+      "content_view_version": {
+        "id": 19,
+        "name": "Default Organization View 1.0",
+        "content_view_id": 9
+      },
+      "kt_environment": {
+        "id": 15,
+        "name": "Library"
+      },
+      "content_type": "yum",
+      "url": "https://inecas.fedorapeople.org/fakerepos/zoo3/",
+      "arch": "noarch",
+      "content_id": "1597685531082",
+      "auto_enabled": true,
+      "major": null,
+      "minor": null,
+      "product": {
+        "id": 3,
+        "cp_id": "370238709909",
+        "name": "Lagoon Nebula",
+        "orphaned": false,
+        "redhat": false,
+        "sync_plan": null
+      },
+      "content_label": "Orion_Lagoon_Nebula_Coma",
+      "content_counts": {
+        "ostree_branch": 1,
+        "docker_manifest": 2,
+        "docker_manifest_list": 2,
+        "docker_tag": 0,
+        "rpm": 32,
+        "srpm": 2,
+        "package": 32,
+        "package_group": 2,
+        "erratum": 4,
+        "puppet_module": 2,
+        "file": 2,
+        "deb": 2,
+        "module_stream": 2,
+        "ansible_collection": 2
+      },
+      "last_sync_words": "30 days",
+      "added_to_content_view": true
+    }
+  ]
+}

data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.test.js

@@ -0,0 +1,131 @@
+import React from 'react';
+import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+
+import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import api from '../../../../../services/api';
+import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
+import ContentViewRepositories from '../ContentViewRepositories';
+
+const repoData = require('./contentViewDetailRepos.fixtures.json');
+
+const autocompleteUrl = '/repositories/auto_complete_search';
+const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` };
+const cvAllRepos = api.getApiUrl('/content_views/1/repositories/show_all');
+const cvRepos = api.getApiUrl('/content_views/1/repositories');
+
+let firstRepo;
+let searchDelayScope;
+let autoSearchScope;
+beforeEach(() => {
+  const { results } = repoData;
+  [firstRepo] = results;
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', true);
+});
+
+afterEach(() => {
+  nock.cleanAll();
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+});
+
+test('Can call API and show repositories on page load', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const scope = nockInstance
+    .get(cvAllRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  const { getByText, queryByText } = renderWithRedux(
+    <ContentViewRepositories cvId={1} />,
+    renderOptions,
+  );
+
+  // Nothing will show at first, page is loading
+  expect(queryByText(firstRepo.name)).toBeNull();
+  // Assert that the repo name is now showing on the screen, but wait for it to appear.
+  await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeTruthy());
+
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});
+
+test('Can filter by repository type', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const allTypesScope = nockInstance
+    .get(cvAllRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  // With the yum checkbox unchecked, we can expect the query params to not include 'yum'
+  const noYumScope = nockInstance
+    .get(cvAllRepos)
+    .query(queryObj => queryObj.content_type === 'yum')
+    .reply(200, repoData);
+
+  const { getByLabelText } = renderWithRedux(<ContentViewRepositories cvId={1} />, renderOptions);
+
+  // Patternfly's Select component makes it hard to attach a label, the existing options aren't
+  // working as expected, so querying by container label and getting first button to open dropdown
+  const toggleContainer = getByLabelText('select Type container');
+  const toggleButton = toggleContainer.querySelector('button');
+  fireEvent.click(toggleButton); // Open type dropdown
+  fireEvent.click(getByLabelText('select Yum repositories')); // select yum repos
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(allTypesScope);
+  assertNockRequest(noYumScope, done);
+});
+
+test('Can filter by Not added status', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const allStatusScope = nockInstance
+    .get(cvAllRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  const notAddedScope = nockInstance
+    .get(cvRepos)
+    .query(params => params.available_for === 'content_view')
+    .reply(200, repoData);
+
+  const { getByLabelText } = renderWithRedux(<ContentViewRepositories cvId={1} />, renderOptions);
+
+  const toggleContainer = getByLabelText('select Status container');
+  const toggleButton = toggleContainer.querySelector('button');
+  fireEvent.click(toggleButton);
+  fireEvent.click(getByLabelText('select Not added'));
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(allStatusScope);
+  assertNockRequest(notAddedScope, done);
+});
+
+test('Can filter by Added status', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const allStatusScope = nockInstance
+    .get(cvAllRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  const addedScope = nockInstance
+    .get(cvRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  const { getByLabelText } = renderWithRedux(<ContentViewRepositories cvId={1} />, renderOptions);
+
+  const toggleContainer = getByLabelText('select Status container');
+  const toggleButton = toggleContainer.querySelector('button');
+  fireEvent.click(toggleButton);
+  fireEvent.click(getByLabelText('select Added'));
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(allStatusScope);
+  assertNockRequest(addedScope, done);
+});

data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js

@@ -11,6 +11,9 @@ const cvDetailData = require('./contentViewDetails.fixtures.json');
 const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` };
 const cvDetailsPath = api.getApiUrl('/content_views/1');
 
+// The Repositories tab will load in the background, prevent this by mocking
+jest.mock('../Repositories/ContentViewRepositories.js', () => () => 'mocked!');
+
 test('Can call API and show details on page load', async (done) => {
   const { label, name, description } = cvDetailData;
   const scope = nockInstance

data/webpack/scenes/ContentViews/Table/ContentViewsTable.js

@@ -11,6 +11,7 @@ import getContentViews from '../ContentViewsActions';
 const ContentViewTable = ({ response, status, error }) => {
   const [table, setTable] = useState({ rows: [], columns: [] });
   const [rowMapping, setRowMapping] = useState({});
+  const [searchQuery, updateSearchQuery] = useState('');
   const { results, ...metadata } = response;
   const loadingResponse = status === STATUS.PENDING;
 
@@ -28,7 +29,7 @@ const ContentViewTable = ({ response, status, error }) => {
     [results, JSON.stringify(rowMapping)], // use JSON to check obj values eq not reference eq
   );
 
-  const onSelect = (event, isSelected, rowId) => {
+  const onSelect = (_event, isSelected, rowId) => {
     let rows;
     if (rowId === -1) {
       rows = table.rows.map(row => ({ ...row, selected: isSelected }));
@@ -90,6 +91,8 @@ const ContentViewTable = ({ response, status, error }) => {
         onSelect,
         onExpand,
         actionResolver,
+        searchQuery,
+        updateSearchQuery,
       }}
       status={tableStatus()}
       fetchItems={getContentViews}

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

@@ -93,6 +93,7 @@ class ManageManifestModal extends Component {
       isManifestImported,
       canEditOrganizations,
       simpleContentAccess,
+      simpleContentAccessEligible,
       enableSimpleContentAccess,
       disableSimpleContentAccess,
       taskInProgress,
@@ -104,6 +105,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 +197,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>
@@ -325,6 +331,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 +351,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));