foreman_theme_satellite 13.1.0 → 13.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6712b54b9a655b833cd7c67931e8725861a8bc1738eb05b4e39232564106749b
-  data.tar.gz: e4d3e6310a890fe539aa4d4de3f23ded4957e70fad2af4e3c764e2824aabd05a
+  metadata.gz: 2fd91a213bdd2371b7b27083b0d07d67cdc62cf134010105970038bf18c812ad
+  data.tar.gz: a42b790f25bbecca04b24a6227c5babe722d73d42cbfca66c7e00ae84f3161cc
 SHA512:
-  metadata.gz: 39d6169e89fba9e5a99bb663e2168d2173fc785152aeffd9010e9a657c8f1a6c38117d8be0924e151165d240e9287f54d32c74fff97450b92fb2605172a652f4
-  data.tar.gz: 4ad13a0248ddeec1350812e2f9a267df6022ab7a3989afeb295b65b9667c272aff0b676bd5a383544acb6136d7f893f17cf3023ec2eaf71491e2e61e33cf0d4d
+  metadata.gz: e1e1c1d3bb94e37e58ebfa19409615d128f9d15b3d9c8960990be28bcc3bca86c69a67d84a6b856b7ec392285891f65ed9203fa5c7feca8314f547adbb5a05c6
+  data.tar.gz: 5d94cd375d7186c0ea4210e291e51bb44464b8b590d61c51380380d5b4d02d0409c8b94238aca5daa4cdb9b481f846937be39ee0265b55370a4e91b3a360c942

data/app/assets/stylesheets/foreman_theme_satellite/theme.scss

@@ -12,3 +12,21 @@
     margin: -5px 5px 0 0;
   }
 }
+
+#rails-app-content {
+  --header-height: 70px;
+  top: var(--header-height);
+  height: calc(100% - var(--header-height));
+
+  &.eol-banner {
+    --banner-height: calc(
+      2 * var(--pf-global--spacer--xs) +
+        2 * (var(--pf-global--LineHeight--md) * var(--pf-global--FontSize--sm))
+    ); // banner height is line height and a small padding
+    top: calc(
+      var(--header-height) + var(--banner-height)
+    );
+
+    height: calc(100% - var(--header-height) - var(--banner-height));
+  }
+}

data/app/helpers/provisioning_templates_helper_branding.rb

@@ -4,7 +4,7 @@ module ProvisioningTemplatesHelperBranding
     return super unless ProvisioningTemplatesControllerBranding::SUPPORTED_PROVISIONING_TEMPLATES.include?(name.name)
 
     image_tag(
-      'foreman_theme_satellite/Redhat.png',
+      'foreman_theme_satellite/supported_icon.png',
       class: 'prov-brand-img',
       title: _('Supported by Red Hat')
     ).safe_concat(super)

data/app/overrides/layouts/base/eol_banner.html.erb.deface

@@ -0,0 +1,56 @@
+<!-- insert_top 'body' -->
+
+<% if User.current&.admin %>
+<% data = ForemanThemeSatellite.lifecycle_data %>
+
+<% text, icon, date = if data[:end_of_life].nil?
+   [nil, nil, nil]
+elsif data[:end_of_life] < Time.zone.now
+   [_('Satellite %{version} is estimated to have reached its End of Life on %{date}.'), 'danger', data[:end_of_life]]
+elsif data[:end_of_life] < 6.months.after
+   [_('Satellite %{version} is estimated to reach its End of Life by the end of %{month} %{year}.'), 'warning', I18n.l(data[:end_of_life], format: "%B %Y")]
+end %>
+
+<% if text %>
+<div class="pf-c-banner pf-m-<%= icon %>" id="satellite-eol-banner">
+  <div>
+    <% if icon == 'warning' %>
+      <%= text % { month: _(data[:end_of_life].strftime('%B')), year: data[:end_of_life].strftime('%Y'), version: data[:short_version] } %>
+    <% else %>
+      <%= text % { date: data[:end_of_life].to_date, version: data[:short_version] } %>
+    <% end %>
+    <div>
+    <%= _("For up to date information about Satellite's lifecycle see ") %><a href="https://access.redhat.com/support/policy/updates/satellite"><%= _("Red Hat Satellite Product Life Cycle") %></a>.
+    <%= _("Kindly plan to upgrade Satellite to the supported version, for upgrade guidance see ") %><a href="<%= ForemanThemeSatellite.documentation_server %>/labsinfo/satelliteupgradehelper "><%= _("Red Hat Satellite Upgrade Helper") %>.
+    </div>
+  </div>
+  <span id="satellite-oel-banner-dismiss-button" style="position: absolute; font-size: 20px; top: 0px; right: 5px; cursor: pointer;">&times;</span>
+</div>
+
+<script>
+  const level = "<%= icon %>";
+  const shouldHide = localStorage.getItem('satellite-eol-banner-dismissed');
+  const element = document.getElementById('satellite-eol-banner');
+  const hiddenUntil = new Date(localStorage.getItem('satellite-eol-banner-dismissed-until'));
+
+  if (shouldHide == level && hiddenUntil >= (new Date())) {
+      element.style.display = 'none';
+  } else {
+    window.onload = function(e) {
+      // We have to do it from a callback because the element may not exist yet
+      document.getElementById('rails-app-content').classList.add('eol-banner');
+    }
+  }
+
+  const dismissButton = document.getElementById('satellite-oel-banner-dismiss-button');
+  dismissButton.addEventListener('click', () => {
+      element.style.display = 'none';
+      document.getElementById('rails-app-content').classList.remove('eol-banner');
+      localStorage.setItem('satellite-eol-banner-dismissed', level);
+      const now = new Date();
+      const cutoff = new Date(now.getTime() + 30 * 24 * 60 * 60 * 1000);
+      localStorage.setItem('satellite-eol-banner-dismissed-until', cutoff.toISOString());
+  });
+</script>
+<% end %>
+<% end %>

data/app/services/foreman_theme_satellite/lifecycle.rb

@@ -0,0 +1,31 @@
+module ForemanThemeSatellite
+  class Lifecycle
+    class << self
+      # rubocop:disable Metrics/AbcSize
+      def lifecycle_data(version)
+        metadata_path = ::ForemanThemeSatellite::LIFECYCLE_METADATA_PATH
+
+        parsed = Foreman::Version.new(version)
+        lifecycle_data = { current_version: version, short_version: "#{parsed.major}.#{parsed.minor}" }
+
+        return lifecycle_data unless File.exist?(metadata_path)
+
+        yaml = YAML.load_file(metadata_path)
+        raise "Unexpected lifecycle metadata file version '#{yaml['version']}'" unless yaml['version'] == '1'
+
+        eol = yaml['releases'].fetch(lifecycle_data[:short_version], {})['end_of_life']
+        lifecycle_data[:end_of_life] = Time.find_zone('UTC').parse(eol) if eol
+        lifecycle_data[:status] = if lifecycle_data[:end_of_life].nil?
+                                    nil
+                                  elsif lifecycle_data[:end_of_life] < Time.zone.now
+                                    'danger'
+                                  elsif lifecycle_data[:end_of_life] < 6.months.after
+                                    'warning'
+                                  end
+
+        lifecycle_data
+      end
+      # rubocop:enable Metrics/AbcSize
+    end
+  end
+end

data/lib/foreman_theme_satellite/documentation.rb

@@ -50,8 +50,8 @@ module ForemanThemeSatellite
       'RolesandPermissions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/managing_users_and_roles_admin",
       'LDAPAuthentication' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#Using_LDAP_satellite",
       'Bookmarks' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/searching_and_bookmarking_admin",
-      'Policydeploymentoptions' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance#Managing_Compliance_Policies_security-compliance",
-      'CreatingSCAPcontent' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/managing_security_compliance_admin#running-a-security-compliance-scan-on-demand_admin",
+      'Policydeploymentoptions' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/compliance-policy-deployment-options_security-compliance",
+      'CreatingSCAPcontent' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/configuring_scap_contents_security-compliance",
 
       # Planning
       'SmartProxies' => "#{ForemanThemeSatellite.documentation_root}/satellite_overview_concepts_and_deployment_considerations/chap-documentation-architecture_guide-capsule_server_overview",
@@ -62,6 +62,13 @@ module ForemanThemeSatellite
 
       # Misc
       'GettingHelp' => "https://access.redhat.com/products/red-hat-satellite/#support",
+
+      # Managing Security Compliance
+      'Monitoring_Compliance_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/Monitoring_Compliance_security-compliance",
+      'Managing_Compliance_Policies_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/Managing_Compliance_Policies_security-compliance",
+      'Configuring_SCAP_Contents_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/Configuring_SCAP_Contents_security-compliance",
+      'tailoring-xccdf-profiles_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/Configuring_SCAP_Contents_security-compliance#tailoring-xccdf-profiles_security-compliance",
+      'deploying-compliance-policies_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/Configuring_SCAP_Contents_security-compliance#deploying-compliance-policies_security-compliance",
     }.freeze
 
     PLUGINS_DOCUMENTATION = {

data/lib/foreman_theme_satellite/engine.rb

@@ -114,6 +114,7 @@ module ForemanThemeSatellite
   end
 
   METADATA_PATH = '/usr/share/satellite/metadata.yml'.freeze
+  LIFECYCLE_METADATA_PATH = '/usr/share/satellite/lifecycle-metadata.yml'.freeze
 
   def self.metadata_field(key, default)
     value = ENV["SATELLITE_#{key.upcase}"]
@@ -125,8 +126,12 @@ module ForemanThemeSatellite
     @metadata_yaml.fetch(key, default)
   end
 
+  def self.lifecycle_data
+    @lifecycle_data ||= ForemanThemeSatellite::Lifecycle.lifecycle_data(get_satellite_version)
+  end
+
   def self.get_satellite_version
-    metadata_field('version', '6.13.0-development')
+    metadata_field('version', '6.14.0-development')
   end
 
   def self.get_satellite_short_version

data/lib/foreman_theme_satellite/version.rb

@@ -1,3 +1,3 @@
 module ForemanThemeSatellite
-  VERSION = '13.1.0'.freeze
+  VERSION = '13.2.0'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_theme_satellite",
-  "version": "13.1.0",
+  "version": "13.2.0",
   "description": "Satellite theme =============",
   "main": "index.js",
   "scripts": {
@@ -14,14 +14,14 @@
     "url": "http://bugzilla.redhat.com/"
   },
   "peerDependencies": {
-    "@theforeman/vendor": "^4.12.0"
+    "@theforeman/vendor": ">= 4.12.0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^4.12.0",
-    "@theforeman/eslint-plugin-foreman": "^4.12.0",
-    "@theforeman/test": "^4.12.0",
-    "@theforeman/vendor-dev": "^4.12.0",
+    "@theforeman/builder": ">= 4.12.0",
+    "@theforeman/eslint-plugin-foreman": ">= 4.12.0",
+    "@theforeman/test": ">= 4.12.0",
+    "@theforeman/vendor-dev": ">= 4.12.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.7.2",
     "prettier": "^2.0.5",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_theme_satellite
 version: !ruby/object:Gem::Version
-  version: 13.1.0
+  version: 13.2.0
 platform: ruby
 authors:
 - Shimon Stein
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,6 +124,7 @@ files:
 - app/assets/images/foreman_theme_satellite/header_logo.svg
 - app/assets/images/foreman_theme_satellite/login_bg.svg
 - app/assets/images/foreman_theme_satellite/login_logo.svg
+- app/assets/images/foreman_theme_satellite/supported_icon.png
 - app/assets/javascripts/foreman_theme_satellite/locale/en/foreman_theme_satellite.js
 - app/assets/javascripts/foreman_theme_satellite/theme_dashboard.js
 - app/assets/javascripts/foreman_theme_satellite/theme_ng_page_title.js
@@ -159,12 +160,14 @@ files:
 - app/models/concerns/setting_branding.rb
 - app/models/concerns/upstream_only_settings.rb
 - app/overrides/bootdisk_help_page.rb
+- app/overrides/layouts/base/eol_banner.html.erb.deface
 - app/overrides/layouts/base/theme_react_root.html.erb.deface
 - app/overrides/layouts/base/theme_resources.html.erb.deface
 - app/overrides/layouts/base/theme_style_resources.html.erb.deface
 - app/overrides/rhev.rb
 - app/overrides/satellite_name_override.rb
 - app/services/concerns/setting_registry_branding.rb
+- app/services/foreman_theme_satellite/lifecycle.rb
 - app/services/foreman_theme_satellite/renderer_methods.rb
 - app/views/api/v2/home/status_extensions.json.rabl
 - app/views/foreman_theme_satellite/_theme_client_side_branding.js.erb
@@ -192,9 +195,7 @@ files:
 - lib/generators/foreman_theme_satellite/lib/css_compare.rb
 - lib/tasks/foreman_theme_satellite_tasks.rake
 - locale/Makefile
-- locale/en/foreman_theme_satellite.edit.po
 - locale/en/foreman_theme_satellite.po
-- locale/en/foreman_theme_satellite.po.time_stamp
 - locale/foreman_theme_satellite.pot
 - locale/gemspec.rb
 - package.json

data/locale/en/foreman_theme_satellite.edit.po

@@ -1,152 +0,0 @@
-# foreman_theme_satellite
-#
-# This file is distributed under the same license as foreman_theme_satellite.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: version 0.0.1\n"
-"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-08-20 08:54+0100\n"
-"Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
-"Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../app/helpers/provisioning_templates_helper_branding.rb:9
-msgid "Supported by Red Hat"
-msgstr ""
-
-#: ../app/helpers/rhev_helper.rb:3
-msgid "RHEV integration is deprecated."
-msgstr ""
-
-#: ../app/helpers/rhev_helper.rb:4
-msgid "On August 31, 2022, Red Hat Virtualization entered the Maintenance Support Phase. The Maintenance Support Phase runs until August 31, 2024, followed by the Extended Life Phase, which runs until August 31, 2026."
-msgstr ""
-
-#: ../app/helpers/rhev_helper.rb:5
-msgid "More information"
-msgstr ""
-
-#: ../app/helpers/theme_application_helper.rb:7
-msgid "When editing a Template, you must assign a list of Operating Systems with which this Template can be used. Optionally, you can restrict a template to a list of Hostgroups or Environments."
-msgstr ""
-
-#: ../app/helpers/theme_application_helper.rb:8
-msgid "When a Host requests a template (e.g. during provisioning), Foreman selects the optimal match from the available templates of that type, in the following order:"
-msgstr ""
-
-#: ../app/helpers/theme_application_helper.rb:10
-msgid "Host group and Environment"
-msgstr ""
-
-#: ../app/helpers/theme_application_helper.rb:11
-msgid "Host group only"
-msgstr ""
-
-#: ../app/helpers/theme_application_helper.rb:12
-msgid "Environment only"
-msgstr ""
-
-#: ../app/helpers/theme_application_helper.rb:13
-msgid "Operating system default"
-msgstr ""
-
-#: ../app/helpers/theme_application_helper.rb:15
-msgid "The final entry, Operating System default, can be set by editing the %s page."
-msgstr ""
-
-#: ../app/helpers/theme_application_helper.rb:15
-msgid "Operating System"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:2
-msgid "Version %{version}"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:3
-msgid "Support"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:4
-msgid "Customer portal"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:5
-msgid "Documentation"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:6
-msgid "Administering Red Hat Satellite"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:7
-msgid "Transitioning from Red Hat Satellite 5 to Red Hat Satellite 6"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:8
-msgid "API Guide"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:9
-msgid "Blog"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:10
-msgid "Red Hat Satellite Blog"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:11
-msgid "IRC"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:12
-msgid "You can find us on %{liberachat} (irc.libera.chat) in #redhat-satellite."
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:13
-msgid "Version %{version} © %{year} Red Hat Inc."
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:14
-msgid "Includes %{system} © 2009-%{year} Paul Kelly and Ohad Levy"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:15
-msgid "If you feel this is an error with Satellite 6 itself, please open a new issue with"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:16
-msgid "Satellite ticketing system"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:17
-msgid "You would probably need to attach the"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:18
-msgid "Full trace"
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:19
-msgid "and relevant log entries."
-msgstr ""
-
-#: ../app/overrides/satellite_name_override.rb:20
-msgid "(build: %{version})"
-msgstr ""
-
-#: ../lib/foreman_theme_satellite/engine.rb:45
-msgid "Show unsupported provisioning templates. When enabled, all the avaiable templates will be shown. When disabled, Red Hat supported templates will be shown only"
-msgstr ""
-
-#: ../lib/foreman_theme_satellite/engine.rb:48
-msgid "Show unsupported provisioning templates"
-msgstr ""
-
-#: gemspec.rb:2
-msgid "Theme changes for Satellite 6."
-msgstr ""