From 046e287eff35e2a50b37594daa5d66b92af71fe2 Mon Sep 17 00:00:00 2001
From: Lucy Fu <lufu@redhat.com>
Date: Tue, 19 Sep 2023 16:22:14 +0000
Subject: [PATCH] Fixes #36756 - Add a banner warning about RHEL lifecycle EOS
 per content host

---
 .../javascripts/bastion/components/views/bst-alert.html      | 2 +-
 .../bastion_katello/common/views/rhel-lifecycle-notice.html  | 5 +++++
 .../content-hosts/details/views/content-host-details.html    | 1 +
 .../assets/javascripts/bastion_katello/hosts/host.factory.js | 4 ++++
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/rhel-lifecycle-notice.html

diff --git a/engines/bastion/app/assets/javascripts/bastion/components/views/bst-alert.html b/engines/bastion/app/assets/javascripts/bastion/components/views/bst-alert.html
index 6db4df04ca0..f6634aaca8e 100644
--- a/engines/bastion/app/assets/javascripts/bastion/components/views/bst-alert.html
+++ b/engines/bastion/app/assets/javascripts/bastion/components/views/bst-alert.html
@@ -1,5 +1,5 @@
 <div uib-alert ng-class='"alert-" + (type || "warning")' ng-mouseover="cancelFade()">
-  <button ng-show="closeable" type="button" class="close" aria-hidden="true" ng-click="close()">
+  <button ng-show="closeable" type="button" class="close" aria-hidden="true" data-dismiss="alert">
     <span class="pficon pficon-close"></span>
   </button>
 
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/rhel-lifecycle-notice.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/rhel-lifecycle-notice.html
new file mode 100644
index 00000000000..fc28377c342
--- /dev/null
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/rhel-lifecycle-notice.html
@@ -0,0 +1,5 @@
+<div id="lifecycle-expire-soon-banner" bst-alert="warning" ng-if="host.rhelLifecycleExpireSoon()" close>
+  <span translate>
+    {{ host.rhel_lifecycle_status_label }}
+  </span>
+</div>
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
index 22d97a07f38..f8fc5ac35a7 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
@@ -54,6 +54,7 @@
 
   <nav data-block="navigation">
     <div content-access-mode-banner></div>
+    <div data-extend-template="common/views/rhel-lifecycle-notice.html"></div>
     <ul class="nav nav-tabs">
       <li ng-class="{active: isState('content-host.info')}">
         <a translate
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js
index 8cbab769910..b3cc348e1e4 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js
@@ -30,6 +30,10 @@ angular.module('Bastion.hosts').factory('Host',
             return _.isString(this.operatingsystem_name) && (this.operatingsystem_name.indexOf("Debian") >= 0 || this.operatingsystem_name.indexOf("Ubuntu") >= 0);
         };
 
+        resource.prototype.rhelLifecycleExpireSoon = function() {
+            return _.isString(this.rhel_lifecycle_status_label) && (this.rhel_lifecycle_status_label.indexOf("Approaching end of") >= 0);
+        };
+
         return resource;
     }]
 );