Fixes #36782 - Update UI in preparation for SCA-only

Katello · Sep 26, 2023 · 467495b · 467495b
1 parent e75f1f1
commit 467495b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...pp/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html b/...pp/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html
@@ -5,6 +5,6 @@
 </div>
 <div id="non-sca-banner" bst-alert="warning" ng-if="!simpleContentAccessEnabled">
   <span translate>
-This organization is not using <a target="_blank" href="https://access.redhat.com/articles/simple-content-access">Simple Content Access.</a> Entitlement-based subscription management is deprecated and will be removed in a future version.
+This organization is not using <a target="_blank" href="https://access.redhat.com/articles/simple-content-access">Simple Content Access.</a> Entitlement-based subscription management is deprecated and will be removed in Katello 4.12.
   </span>
 </div>
diff --git a/webpack/scenes/Subscriptions/SubscriptionsPage.js b/webpack/scenes/Subscriptions/SubscriptionsPage.js
@@ -220,7 +220,7 @@ class SubscriptionsPage extends Component {
       };
 
     const SCAAlert = (
-      <Alert ouiaId="sca-alert" type={simpleContentAccess ? 'info' : 'warning'}>
+      <Alert ouiaId="sca-alert" type="warning">
         <FormattedMessage
           id="sca-alert"
           values={{
@@ -231,7 +231,7 @@ class SubscriptionsPage extends Component {
           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.')}
+          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 Katello 4.12.')}
         />
       </Alert>
     );