foreman_rh_cloud 6.0.42.2 → 6.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 286d62e3c864ee4b0728bfc1c5d1d224e46ee0917d7a2ea517e096ea6dab0c5c
-  data.tar.gz: 1ce1d58a07bdc5d57acb5dab27e4441594605608a79fdfa82f029c6e6018211e
+  metadata.gz: f9180080890adb316306a32a93c88fd86153d3ddf3acc9d5182831a325b35ca4
+  data.tar.gz: 6a6d744fda10894d04f630e48b1c27a9bc87d4d6ac6af6324e3c2644b69e6948
 SHA512:
-  metadata.gz: 5375be3e72da24347196c842946f663464bdf8d367b592b682c604eb7373221addc0f43f49735941cc3cfc279ebffb87888284e21752ca4c2b9ba863e99e88c0
-  data.tar.gz: cc5d701cff558eaf96ea554a7d293fc5fe14e6d8c04daf05d537363dac759b7e611f8af66e780cb30e8856e2a696364a6b9b1efe58806b357f25d8c0f58b6954
+  metadata.gz: 39ced1494bc063a49bc6db9917dc067abf9491e5c2f0b1eb5083134dc8cb74ef83cbe4fddabe26cfc2e44204594e3eb48ef23bb5d6c6b987838c3adaacfbc18e
+  data.tar.gz: a84b6d061179e2d9c5a4ab3ba8031c0d3f949bdfd09fe8701435eb3328f87cd1c252602659fe963bfaf22e20feccd9b7242e9dae381a8ccf3ef4b9833c2f42b9

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -18,6 +18,9 @@ module ForemanInventoryUpload
     end
 
     def enable_cloud_connector
+      # Set the autoupload to true, since it's required by the feature.
+      Setting[:allow_auto_inventory_upload] = true
+
       cloud_connector = ForemanRhCloud::CloudConnector.new
       render json: cloud_connector.install.to_json
     end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '6.0.42.2'.freeze
+  VERSION = '6.0.43'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "6.0.42.2",
+  "version": "6.0.43",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/index.js

@@ -1,5 +1,7 @@
 import React from 'react';
 import { useSelector, useDispatch } from 'react-redux';
+import { openConfirmModal } from 'foremanReact/components/ConfirmModal';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { CloudConnectorButton } from './CloudConnectorButton';
 import { configureCloudConnector } from './CloudConnectorActions';
 import { selectStatus, selectJobLink } from './CloudConnectorSelectors';
@@ -12,7 +14,18 @@ const ConnectedCloudConnectorButton = () => {
   return (
     <CloudConnectorButton
       status={status}
-      onClick={() => dispatch(configureCloudConnector())}
+      onClick={() =>
+        dispatch(
+          openConfirmModal({
+            title: __('Notice'),
+            message: __(
+              'This action will also enable automatic reports upload'
+            ),
+            isWarning: true,
+            onConfirm: () => dispatch(configureCloudConnector()),
+          })
+        )
+      }
       jobLink={jobLink}
     />
   );

data/webpack/InsightsCloudSync/Components/InsightsTable/table.scss

@@ -1,5 +1,3 @@
-@import '~@redhat-cloud-services/frontend-components/index.css';
-
 .rh-cloud-recommendations-table {
   .pf-c-table__check {
     input:disabled {

data/webpack/__mocks__/foremanReact/components/ConfirmModal/index.js

@@ -0,0 +1,3 @@
+export const openConfirmModal = options => options;
+
+export default openConfirmModal;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 6.0.42.2
+  version: 6.0.43
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -197,7 +197,6 @@ files:
 - db/migrate/20210720000001_remove_old_insights_statuses.foreman_rh_cloud.rb
 - db/migrate/20211027000001_create_task_output.foreman_rh_cloud.rb
 - db/migrate/20220321000001_add_unique_to_insights_rules.foreman_rh_cloud.rb
-- db/migrate/20221102110254_fix_rh_cloud_settings_category_to_dsl.rb
 - db/seeds.d/179_ui_notifications.rb
 - db/seeds.d/50_job_templates.rb
 - lib/foreman_inventory_upload.rb
@@ -625,6 +624,7 @@ files:
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/MountingService.js
 - webpack/__mocks__/foremanReact/common/helpers.js
+- webpack/__mocks__/foremanReact/components/ConfirmModal/index.js
 - webpack/__mocks__/foremanReact/components/Head.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js
 - webpack/__mocks__/foremanReact/components/ToastsList/index.js

data/db/migrate/20221102110254_fix_rh_cloud_settings_category_to_dsl.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class FixRhCloudSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
-  def up
-    Setting.where(category: 'Setting::RhCloud').update_all(category: 'Setting')
-  end
-end