foreman_rh_cloud 4.0.25.1 → 4.0.30

data/test/unit/tags_generator_test.rb

@@ -65,14 +65,14 @@ class TagsGeneratorTest < ActiveSupport::TestCase
   test 'generates parameter tags' do
     FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
 
-    @host.stubs(:host_inherited_params_objects).returns(
-      [
-        OpenStruct.new(name: 'bool_param', value: true),
-        OpenStruct.new(name: 'false_param', value: false),
-        OpenStruct.new(name: 'int_param', value: 1),
-        OpenStruct.new(name: 'empty_param', value: nil),
-        OpenStruct.new(name: 'empty_str_param', value: ''),
-      ]
+    @host.stubs(:host_params).returns(
+      {
+        'bool_param' => true,
+        'false_param' => false,
+        'int_param' => 1,
+        'empty_param' => nil,
+        'empty_str_param' => '',
+      }
     )
 
     generator = create_generator
@@ -87,14 +87,14 @@ class TagsGeneratorTest < ActiveSupport::TestCase
   test 'skips parameter tags if include_parameter_tags setting is off' do
     FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
 
-    @host.stubs(:host_inherited_params_objects).returns(
-      [
-        OpenStruct.new(name: 'bool_param', value: true),
-        OpenStruct.new(name: 'false_param', value: false),
-        OpenStruct.new(name: 'int_param', value: 1),
-        OpenStruct.new(name: 'empty_param', value: nil),
-        OpenStruct.new(name: 'empty_str_param', value: ''),
-      ]
+    @host.stubs(:host_params).returns(
+      {
+        'bool_param' => true,
+        'false_param' => false,
+        'int_param' => 1,
+        'empty_param' => nil,
+        'empty_str_param' => '',
+      }
     )
 
     generator = create_generator
@@ -103,6 +103,21 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     assert_equal 0, actual.count
   end
 
+  test 'truncates parameter tags' do
+    Setting[:include_parameter_tags] = true
+
+    @host.stubs(:host_params).returns(
+      {
+        'str_param' => 'a' * 251,
+      }
+    )
+
+    generator = create_generator
+    actual = Hash[generator.generate_parameters]
+
+    assert_equal 'Original value exceeds 250 characters', actual['str_param']
+  end
+
   private
 
   def create_generator

data/webpack/InsightsCloudSync/Components/InsightsHeader/index.js

@@ -1,12 +1,10 @@
 import React from 'react';
 import { Text, TextVariants } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
-import InsightsSettings from '../InsightsSettings';
 import './InsightsHeader.scss';
 
 const InsightsHeader = () => (
   <div className="insights-header">
-    <InsightsSettings />
     <Text component={TextVariants.p}>
       {__(
         'Insights synchronization process is used to provide Insights recommendations output for hosts managed here.'

data/webpack/InsightsCloudSync/Components/InsightsSettings/insightsSettings.scss

@@ -1,3 +1,4 @@
 .insights_settings {
   float: right;
+  margin-top: 22px;
 }

data/webpack/InsightsCloudSync/Components/__tests__/__snapshots__/InsightsHeader.test.js.snap

@@ -4,7 +4,6 @@ exports[`InsightsHeader render 1`] = `
 <div
   className="insights-header"
 >
-  <Connect(InsightsSettings) />
   <Text
     component="p"
   >

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -12,6 +12,7 @@ import {
 import './InsightsCloudSync.scss';
 import Pagination from './Components/InsightsTable/Pagination';
 import ToolbarDropdown from './Components/ToolbarDropdown';
+import InsightsSettings from './Components/InsightsSettings';
 
 const InsightsCloudSync = ({
   syncInsights,
@@ -42,6 +43,7 @@ const InsightsCloudSync = ({
 
   return (
     <div className="rh-cloud-insights">
+      <InsightsSettings />
       <PageLayout
         searchable
         searchProps={INSIGHTS_SEARCH_PROPS}

data/webpack/InsightsCloudSync/__snapshots__/InsightsCloudSync.test.js.snap

@@ -4,6 +4,7 @@ exports[`InsightsCloudSync render 1`] = `
 <div
   className="rh-cloud-insights"
 >
+  <Connect(InsightsSettings) />
   <PageLayout
     beforeToolbarComponent={<InsightsHeader />}
     header="Red Hat Insights"

data/webpack/common/Switcher/HelpLabel.js

@@ -11,7 +11,7 @@ export const HelpLabel = ({ text, id, className }) => {
         onClick={e => e.preventDefault()}
         className={`pf-c-form__group-label-help ${className}`}
       >
-        <HelpIcon noVerticalAlign />
+        <HelpIcon />
       </button>
     </Popover>
   );

data/webpack/common/Switcher/__tests__/__snapshots__/HelpLabel.test.js.snap

@@ -12,7 +12,7 @@ exports[`InsightsCloudSync helpers should return insights cloud Url 1`] = `
   >
     <HelpIcon
       color="currentColor"
-      noVerticalAlign={true}
+      noVerticalAlign={false}
       size="sm"
     />
   </button>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 4.0.25.1
+  version: 4.0.30
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -174,6 +174,7 @@ files:
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/Gemfile.lock.gh_test
 - config/database.yml.example
+- config/package-lock.json
 - config/package-lock.json.gh_test
 - config/package-lock.json.plugin
 - config/rh_cert-api_chain.pem
@@ -255,6 +256,7 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
+- test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
@@ -657,7 +659,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
@@ -685,6 +687,7 @@ test_files:
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
+- test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb