Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #36756 - Add a banner warning about RHEL lifecycle EOS per content host #10747

Merged
merged 1 commit into from
Oct 2, 2023
Merged

Fixes #36756 - Add a banner warning about RHEL lifecycle EOS per content host #10747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engines/bastion/app/assets/javascripts/bastion/components/views/bst-alert.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
5 changes: 5 additions & 0 deletions ...on_katello/app/assets/javascripts/bastion_katello/common/views/rhel-lifecycle-notice.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions .../assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you like this format better or the React way of doing things?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

React is easier to understand to me.

return _.isString(this.rhel_lifecycle_status_label) && (this.rhel_lifecycle_status_label.indexOf("Approaching end of") >= 0);
};

return resource;
}]
);
Loading