foreman_rh_cloud 6.0.45 → 7.0.45

data/lib/foreman_rh_cloud/engine.rb

@@ -42,7 +42,7 @@ module ForemanRhCloud
 
     initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_rh_cloud do
-        requires_foreman '>= 3.3'
+        requires_foreman '>= 3.4'
 
         apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
 
@@ -125,6 +125,13 @@ module ForemanRhCloud
             onlyif: proc { |host| host.insights }
         end
 
+        extend_page 'hosts/_list' do |context|
+          context.with_profile :cloud, _('RH Cloud'), default: true do
+            add_pagelet :hosts_table_column_header, key: :insights_recommendations_count, label: _('Recommendations'), sortable: true, width: '12%', class: 'hidden-xs ellipsis', priority: 100
+            add_pagelet :hosts_table_column_content, key: :insights_recommendations_count, callback: ->(host) { hits_counts_cell(host) }, class: 'hidden-xs ellipsis text-center', priority: 100
+          end
+        end
+
         extend_template_helpers ForemanRhCloud::TemplateRendererHelper
         allowed_template_helpers :remediations_playbook, :download_rh_playbook
       end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '6.0.45'.freeze
+  VERSION = '7.0.45'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "6.0.45",
+  "version": "7.0.45",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -22,14 +22,14 @@
     "url": "http://projects.theforeman.org/projects/foreman_rh_cloud/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 8.16.0"
+    "@theforeman/vendor": ">= 10.1.1"
   },
   "devDependencies": {
     "@babel/core": "~7.7.0",
-    "@theforeman/builder": ">= 8.16.0",
-    "@theforeman/stories": ">= 8.16.0",
-    "@theforeman/test": ">= 8.16.0",
-    "@theforeman/eslint-plugin-foreman": ">= 8.16.0",
+    "@theforeman/builder": ">= 10.1.1",
+    "@theforeman/stories": ">= 10.1.1",
+    "@theforeman/test": ">= 10.1.1",
+    "@theforeman/eslint-plugin-foreman": ">= 10.1.1",
     "babel-eslint": "~10.0.0",
     "eslint": "~6.7.2",
     "eslint-plugin-spellcheck": "~0.0.17",

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButton.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Spinner, Button } from '@patternfly/react-core';
-import { RedoIcon } from '@patternfly/react-icons';
 import { STATUS } from 'foremanReact/constants';
 import { SYNC_BUTTON_TEXT } from '../../../../ForemanInventoryConstants';
 
@@ -27,7 +26,7 @@ class SyncButton extends React.Component {
           isDisabled={status === STATUS.PENDING}
           variant="secondary"
         >
-          {status === STATUS.PENDING ? <Spinner size="sm" /> : <RedoIcon />}
+          {status === STATUS.PENDING && <Spinner size="sm" />}
           {SYNC_BUTTON_TEXT}
         </Button>
       </React.Fragment>

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButton.test.js.snap

@@ -9,11 +9,6 @@ exports[`SyncButton rendering render with Props 1`] = `
     size="lg"
     variant="secondary"
   >
-    <RedoIcon
-      color="currentColor"
-      noVerticalAlign={false}
-      size="sm"
-    />
      Sync inventory status
   </Button>
 </Fragment>

data/webpack/ForemanRhCloudFills.js

@@ -21,7 +21,7 @@ const fills = [
     slot: 'host-overview-cards',
     name: 'insights-total-risk-chart',
     component: props => <InsightsTotalRiskCard {...props} />,
-    weight: 1100,
+    weight: 2800,
   },
 ];
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 6.0.45
+  version: 7.0.45
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -160,7 +160,6 @@ files:
 - app/models/inventory_sync/inventory_status.rb
 - app/models/task_output_line.rb
 - app/models/task_output_status.rb
-- app/overrides/hosts_list.rb
 - app/overrides/layouts/base/styles.html.erb.deface
 - app/services/foreman_rh_cloud/branch_info.rb
 - app/services/foreman_rh_cloud/cert_auth.rb
@@ -241,7 +240,6 @@ files:
 - lib/inventory_sync/async/inventory_self_host_sync.rb
 - lib/inventory_sync/async/query_inventory_job.rb
 - lib/tasks/foreman_rh_cloud_tasks.rake
-- lib/tasks/hybrid_cloud.rake
 - lib/tasks/insights.rake
 - lib/tasks/rh_cloud_inventory.rake
 - locale/Makefile
@@ -680,7 +678,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.

data/app/overrides/hosts_list.rb

@@ -1,13 +0,0 @@
-Deface::Override.new(
-  virtual_path: 'hosts/_list',
-  name: 'insights_hits_header',
-  insert_before: 'thead tr th.hidden-xs:first-of-type',
-  text: '<th class="hidden-xs ellipsis" width="12%"><%= sort :insights_recommendations_count, :as => _("Recommendations")%></th>'
-)
-
-Deface::Override.new(
-  virtual_path: 'hosts/_list',
-  name: 'insights_hits_cells',
-  insert_before: 'tbody tr td.hidden-xs:first-of-type',
-  text: '<%= hits_counts_cell(host) %>'
-)

data/lib/tasks/hybrid_cloud.rake

@@ -1,64 +0,0 @@
-require 'io/console'
-
-namespace :rh_cloud do |args|
-  desc 'Register Satellite Organization with Hybrid Cloud API. \
-        Specify org_id=x replace your organization ID with x. \
-        Specify SATELLITE_RH_CLOUD_URL=https://x with the Hybrid Cloud endpoint you are connecting to.'
-  task hybridcloud_register: [:environment] do
-    include ::ForemanRhCloud::CertAuth
-    include ::InsightsCloud::CandlepinCache
-    
-    def logger
-      @logger ||= Logger.new(STDOUT)
-    end
-
-    def registrations_url
-      logger.warn("Custom url is not set, using the default one: #{ForemanRhCloud.base_url}") if ENV['SATELLITE_RH_CLOUD_URL'].empty?
-      ForemanRhCloud.base_url + '/api/identity/certificate/registrations'
-    end
-
-    if ENV['org_id'].nil?
-      logger.error('ERROR: org_id needs to be specified.')
-      exit(1)
-    end
-    
-    @organization = Organization.find_by(id: ENV['org_id'].to_i) # saw this coming in as a string, so making sure it gets passed as an integer.
-    @uid = cp_owner_id(@organization)
-    @hostname = ForemanRhCloud.foreman_host_name
-    logger.error('Organization provided does not have a manifest imported.') + exit(1) if @uid.nil?
-
-    puts 'Paste your token, output will be hidden.'
-    @token = STDIN.noecho(&:gets).chomp
-    logger.error('Token was not entered.') + exit(1) if @token.empty?
-
-    def headers
-      {
-        Authorization: "Bearer #{@token}"
-      }
-    end
-
-    def payload
-      {
-        "uid": @uid,
-        "display_name": "#{@hostname}+#{@organization.label}"
-      }
-    end
-
-    def method
-      :post
-    end
-
-    begin
-      response = execute_cloud_request(
-        organization: @organization,
-        method: method,
-        url: registrations_url,
-        headers: headers,
-        payload: payload.to_json
-      )
-      logger.debug(response)
-    rescue Exception => ex
-      logger.error(ex)
-    end
-  end
-end