foreman_theme_satellite 13.2.5 → 13.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e429335574eaa060f65234918f4c8ed7bff9468fa70f7a6692056e7fdfee6d4e
-  data.tar.gz: 64e189a7c9b42236e9af00063d018283dd3256859192ab77866b5871f5e9edf6
+  metadata.gz: 4fc8386e72cfe1a8766ca9304a0449cfd93c76d5d8bdd0082014a07991a8d3bf
+  data.tar.gz: 10f45792b87bd24f807f3f6f6b1623f099bf9754110ecd4968d8173b8c9ffd46
 SHA512:
-  metadata.gz: 97d0dbf8203ccac0e3bb4cd7cb3b333659eb886bf9226d110de4974c1f0097cd3c399ce67c52706e85d99c0e5015f066d47fa0095c2f969f4f751df406bdce3a
-  data.tar.gz: 5df13cfec2643815b6e7bb038afdf0b20de4d465d89855189a59bb02073fc55944026375af77767f15d3c068db194e4ad8ebef395a46133e81e83cac9872f658
+  metadata.gz: aa87b9bbef7680664f1c215ac516c619e82ddf928536fa1a6270d1032e5182ef7b114f67ff29404679c45acc23571c40b2cad19a9ac3fc4f6abe71c93acf8b86
+  data.tar.gz: b25163c80960e12eaa33e008f0ba06ae9632c10ba0d050c36c60b524b5d38776b2dd74476cf41c9ff19b166a3887127fbed2d78523019139bf3526895ecaf8f8

data/README.md

@@ -303,7 +303,7 @@ Deface::Override.new(:virtual_path  => "about/index",
                      :text          =>  "    <div class=\"stats-well\"><h4><%= _(\"Support\") %></h4> <p>Visit the <%= link_to _('Customer Portal'), \"https://access.redhat.com/\",
                                        :rel => \"external\" %> to get support, find solutions to common questions, and more.</p><h6><%= _(\"Documentation\") %></h6>
                                         <ul>
-                                        <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"https://access.redhat.com/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
+                                        <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"#{ForemanThemeSatellite.documentation_server}/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
                                         <li><%= link_to _('API Resources'), apipie_apipie_path, :title => _('Automate Satellite via a simple and powerful API') %></li>
                                         </ul>
                                         <h6><%= _(\"Blog\") %></h6>

data/app/controllers/concerns/documentation_controller_branding.rb

@@ -12,13 +12,11 @@ module DocumentationControllerBranding
     end
     if url.empty?
       upstream_url = super(section, options)
-      if (upstream_url =~ /redhat.com/)
-        url = upstream_url
-      else
-        special_links_pair = ForemanThemeSatellite::Documentation::SPECIAL_LINKS.find { |regex, _val| regex.match(upstream_url) }
-        url = special_links_pair[1] if special_links_pair
-        url = "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite" if url.empty?
-      end
+      url = if (upstream_url =~ /redhat.com/)
+              upstream_url
+            else
+              "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite"
+            end
     end
     url
   end

data/app/helpers/theme_application_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 # Overrides for functions used in helpers.
 module ThemeApplicationHelper
   def association_text()

data/app/overrides/satellite_name_override.rb

@@ -37,7 +37,7 @@ Deface::Override.new(:virtual_path  => "about/index",
                      :text          =>  "    <div class=\"stats-well\"><h4><%= _(\"Support\") %></h4> <p>Visit the <%= link_to _('Customer Portal'), \"https://access.redhat.com/\",
                                        :rel => \"external\" %> to get support, find solutions to common questions, and more.</p><h6><%= _(\"Documentation\") %></h6>
                                         <ul>
-                                        <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"https://access.redhat.com/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
+                                        <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"#{ForemanThemeSatellite.documentation_server}/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
                                         <li><%= link_to _('API Resources'), apipie_apipie_path, :title => _('Automate Satellite via a simple and powerful API') %></li>
                                         <li><%= link_to _('Templates DSL'), apipie_dsl_apipie_dsl_path, :title => _('Get DSL reference for templates writing') %></li>
                                         </ul>

data/db/migrate/20180605150932_deprecate_satellite_templates.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Rails/SkipsModelValidations
+
 require_relative '../../lib/foreman_theme_satellite/deprecated_templates'
 
 class DeprecateSatelliteTemplates < ActiveRecord::Migration[5.1]
@@ -50,3 +52,5 @@ class DeprecateSatelliteTemplates < ActiveRecord::Migration[5.1]
     destination.operatingsystem_ids = (destination.operatingsystem_ids + source.operatingsystem_ids).uniq
   end
 end
+
+# rubocop:enable Rails/SkipsModelValidations

data/lib/foreman_theme_satellite/branded_words.rb

@@ -10,6 +10,8 @@ module ForemanThemeSatellite
   FOREMAN_BRAND = {
     /%{proxy}/               => '%{proxy}',
     /%{foreman}/             => '%{foreman}',
+    /\b[Pp]roxy [Hh][Tt][Tt][Pp]\b(?!-)/    => 'Proxy HTTP', # Workaround for French translation
+    /\b[Pp]roxies [Hh][Tt][Tt][Pp]\b(?!-)/ => 'Proxies HTTP', # Workaround for French translation
     /\b[Hh][Tt][Tt][Pp] [Pp]roxy\b(?!-)/    => 'HTTP Proxy',
     /\b[Hh][Tt][Tt][Pp] [Pp]roxies\b(?!-)/ => 'HTTP Proxies',
     /\bHTTP\(S\) proxy\b(?!-)/ => 'HTTP(S) proxy',
@@ -53,6 +55,5 @@ module ForemanThemeSatellite
     /\b[Kk]atello 4.11\b(?!-)/       => 'Satellite 6.15',
     /\b[Kk]atello 4.12\b(?!-)/       => 'Satellite 6.16',
     /\b[Kk]atello 4.13\b(?!-)/       => 'Satellite 6.16',
-    %r{https://theforeman.org/plugins/katello/(?!-)} => "https://access.redhat.com/documentation/en-us/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}/html/managing_hosts/registering_hosts#registering-a-host-to-satellite-using-the-bootstrap-script"
   }.freeze
 end

data/lib/foreman_theme_satellite/documentation.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 module ForemanThemeSatellite
   module Documentation
     USER_GUIDE_DICTIONARY = {
-      # Ansible
-      'ImportingRoles' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Importing_Ansible_Roles_and_Variables_ansible",
-      'Variables' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Overriding_Ansible_Variables_in_satellite_ansible",
-
       # Managing Hosts
       'ForemanRemoteExecution' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/configuring_and_setting_up_remote_jobs_managing-hosts",
       'ExecutingaJob' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/configuring_and_setting_up_remote_jobs_managing-hosts#Configuring_the_Global_capsule_Remote_Execution_Setting_in_satellite_managing-hosts",
@@ -45,7 +41,7 @@ module ForemanThemeSatellite
       'ConfigurationOptions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/",
       'PuppetReports' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/monitoring_resources_admin#Using_the_Project_Content_Dashboard_admin",
       'Mail_Notifications' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/configuring_email_notifications_admin",
-      'Realm' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#External_Authentication_for_Provisioned_Hosts_satellite",
+      'Realm' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm_satellite",
       'Searching' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/searching_and_bookmarking_admin",
       '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",
@@ -74,16 +70,19 @@ module ForemanThemeSatellite
 
     PLUGINS_DOCUMENTATION = {
       'foreman_azure' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/provisioning_cloud_instances_on_microsoft_azure_resource_manager_azure-provisioning",
-      'foreman_discovery' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/configuring_the_discovery_service_provisioning",
+      'foreman_discovery' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/discovering-hosts-on-a-network_provisioning",
     }.freeze
 
-    SPECIAL_LINKS = [
-      [/docs\.theforeman\.org\/.*?\/Managing_Hosts\/.*?registering-a-host.*?managing-hosts/i, "#{ForemanThemeSatellite.documentation_root}/managing_hosts/registering_hosts_to_server_managing-hosts#Registering_Hosts_by_Using_Global_Registration_managing-hosts"],
-    ]
-
     DOCS_GUIDES_LINKS = {
+      'Managing_Content' => {
+        'Products_and_Repositories_content-management' => "#{ForemanThemeSatellite.documentation_root}/managing_content/importing_content_content-management#Products_and_Repositories_content-management",
+      },
       'Managing_Hosts' => {
         'registering-a-host_managing-hosts' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/registering_hosts_to_server_managing-hosts#Registering_Hosts_by_Using_Global_Registration_managing-hosts",
+      },
+      'Managing_Configurations_Ansible' => {
+        'Importing_Ansible_Roles_and_Variables_ansible' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Importing_Ansible_Roles_and_Variables_ansible",
+        'Overriding_Ansible_Variables_in_foreman_ansible' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Overriding_Ansible_Variables_in_satellite_ansible",
       }
     }.freeze
 
@@ -96,11 +95,12 @@ module ForemanThemeSatellite
       source.map do |k, v|
         key = "#{prefix}/#{k}"
         if v.is_a?(Hash)
-          key_values.concat(*nested_to_flat_k_v(key, v))
+          key_values.concat(nested_to_flat_k_v(key, v))
         else
-          key_values.concat([key, v])
+          key_values.concat([[key, v]])
         end
       end
+      key_values
     end
   end
 end

data/lib/foreman_theme_satellite/engine.rb

@@ -139,7 +139,7 @@ module ForemanThemeSatellite
   end
 
   def self.documentation_server
-    @documentation_server ||= metadata_field('documentation_server', 'https://access.redhat.com')
+    @documentation_server ||= metadata_field('documentation_server', 'https://docs.redhat.com')
   end
 
   def self.documentation_version

data/lib/foreman_theme_satellite/version.rb

@@ -1,3 +1,3 @@
 module ForemanThemeSatellite
-  VERSION = '13.2.5'.freeze
+  VERSION = '13.3.0'.freeze
 end

data/lib/tasks/foreman_theme_satellite_tasks.rake

@@ -14,21 +14,6 @@ namespace :test do
 end
 
 namespace :foreman_theme_satellite do
-  task :rubocop do
-    begin
-      require 'rubocop/rake_task'
-      RuboCop::RakeTask.new(:rubocop_foreman_theme_satellite) do |task|
-        task.patterns = ["#{ForemanThemeSatellite::Engine.root}/app/**/*.rb",
-                         "#{ForemanThemeSatellite::Engine.root}/lib/**/*.rb",
-                         "#{ForemanThemeSatellite::Engine.root}/test/**/*.rb"]
-      end
-    rescue
-      puts 'Rubocop not loaded.'
-    end
-
-    Rake::Task['rubocop_foreman_theme_satellite'].invoke
-  end
-
   desc 'Validate documentation links against given TOC file'
   task :validate_docs do
     toc_file = ENV['TOC']
@@ -44,7 +29,6 @@ namespace :foreman_theme_satellite do
 
     all_links = ForemanThemeSatellite::Documentation::USER_GUIDE_DICTIONARY
                 .merge(ForemanThemeSatellite::Documentation::PLUGINS_DOCUMENTATION)
-                .merge(Hash[ForemanThemeSatellite::Documentation::SPECIAL_LINKS])
                 .merge(ForemanThemeSatellite::Documentation.flat_docs_guides_links)
 
     failed = all_links.filter { |_key, doc_address| doc_address.include?('/html/') && !checker.test_link(doc_address) }
@@ -57,8 +41,3 @@ end
 
 Rake::Task[:test].enhance ['test:foreman_theme_satellite']
 Rake::Task['test:foreman_theme_satellite'].enhance ['foreman_theme_satellite:validate_docs']
-
-load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task['jenkins:unit'].enhance ['test:foreman_theme_satellite', 'foreman_theme_satellite:rubocop']
-end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_theme_satellite",
-  "version": "13.2.5",
+  "version": "13.3.0",
   "description": "Satellite theme =============",
   "main": "index.js",
   "scripts": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_theme_satellite
 version: !ruby/object:Gem::Version
-  version: 13.2.5
+  version: 13.3.0
 platform: ruby
 authors:
 - Shimon Stein
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -54,61 +54,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: theforeman-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 description: Theme changes for Satellite 6.
 email:
 - sshtein@redhat.com
@@ -221,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: This is a plugin that enables building a theme for Foreman.