diff --git a/app/views/overrides/organizations/_edit_override.html.erb b/app/views/overrides/organizations/_edit_override.html.erb
index 4c83d0e071f..68c1e9dabdf 100644
--- a/app/views/overrides/organizations/_edit_override.html.erb
+++ b/app/views/overrides/organizations/_edit_override.html.erb
@@ -18,4 +18,8 @@
tag1 + tag2
end %>
+
+ <%= _('Simple Content Access will be required for all organizations in Katello 4.12.') %>
+
+
<% end %>
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html
index 631217bd7ea..c40d9c1620c 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html
@@ -5,6 +5,6 @@
-This organization is not using Simple Content Access. Entitlement-based subscription management is deprecated and will be removed in a future version.
+This organization is not using Simple Content Access. Entitlement-based subscription management is deprecated and will be removed in Katello 4.12.
diff --git a/webpack/scenes/Subscriptions/SubscriptionsPage.js b/webpack/scenes/Subscriptions/SubscriptionsPage.js
index e6b4a0af345..8b42d0fe115 100644
--- a/webpack/scenes/Subscriptions/SubscriptionsPage.js
+++ b/webpack/scenes/Subscriptions/SubscriptionsPage.js
@@ -6,6 +6,8 @@ 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 { Popover, Flex, FlexItem } from '@patternfly/react-core';
+import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
import ModalProgressBar from 'foremanReact/components/common/ModalProgressBar';
import PermissionDenied from 'foremanReact/components/PermissionDenied';
import ManageManifestModal from './Manifest/';
@@ -204,7 +206,7 @@ class SubscriptionsPage extends Component {
const emptyStateData = isManifestImported
? {
header: __('There are no Subscriptions to display'),
- description: __('Add Subscriptions using the Add Subscriptions button.'),
+ description: __('Add subscriptions using the Add Subscriptions button.'),
action: {
title: __('Add subscriptions'),
url: 'subscriptions/add',
@@ -212,7 +214,7 @@ class SubscriptionsPage extends Component {
}
: {
header: __('There are no Subscriptions to display'),
- description: __('Import a Manifest to manage your Entitlements.'),
+ description: __('Import a subscription manifest to give hosts access to Red Hat content.'),
action: {
onClick: () => openManageManifestModal(),
title: __('Import a Manifest'),
@@ -220,26 +222,50 @@ class SubscriptionsPage extends Component {
};
const SCAAlert = (
-
+
{__('Subscriptions service')},
- br:
,
scaLink: {__('Simple Content Access')},
}}
- defaultMessage={simpleContentAccess ? __(`This organization has Simple Content Access enabled.
- Hosts are not required to have subscriptions attached to access repositories.
- {br}
- Learn more about your overall subscription usage with the {subscriptionsService}.`) : __('This organization is not using {scaLink}. Entitlement-based subscription management is deprecated and will be removed in a future version.')}
+ defaultMessage={__('This organization is not using {scaLink}. Entitlement-based subscription management is deprecated and will be removed in Katello 4.12.')}
/>
);
+
+ const SCAPopoverContent = (
+ ,
+ subscriptionsService: {__('Subscriptions service')},
+ }}
+ defaultMessage={__(`This page shows the subscriptions available from this organization's subscription manifest.
+ {br}
+ Learn more about your overall subscription usage with the {subscriptionsService}.`)}
+ />
+ );
return (
- {__('Subscriptions')}
+
+
+ {__('Subscriptions')}
+
+ {isManifestImported && (
+
+
+
+ Toggle popover
+
+
+
+ )}
+
- {!this.props.organization?.loading && SCAAlert}
+ {!this.props.organization?.loading && !simpleContentAccess ? SCAAlert : null}
-
- Subscriptions
-
+
+
+
+ Subscriptions
+
+
+
,
"scaLink":
Simple Content Access
,
- "subscriptionsService":
- Subscriptions service
- ,
}
}
/>
@@ -102,7 +104,7 @@ exports[`subscriptions page should render 1`] = `
"onClick": [Function],
"title": "Import a Manifest",
},
- "description": "Import a Manifest to manage your Entitlements.",
+ "description": "Import a subscription manifest to give hosts access to Red Hat content.",
"header": "There are no Subscriptions to display",
}
}