foreman_rh_cloud 6.0.42.2 → 6.0.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 286d62e3c864ee4b0728bfc1c5d1d224e46ee0917d7a2ea517e096ea6dab0c5c
4
- data.tar.gz: 1ce1d58a07bdc5d57acb5dab27e4441594605608a79fdfa82f029c6e6018211e
3
+ metadata.gz: f9180080890adb316306a32a93c88fd86153d3ddf3acc9d5182831a325b35ca4
4
+ data.tar.gz: 6a6d744fda10894d04f630e48b1c27a9bc87d4d6ac6af6324e3c2644b69e6948
5
5
  SHA512:
6
- metadata.gz: 5375be3e72da24347196c842946f663464bdf8d367b592b682c604eb7373221addc0f43f49735941cc3cfc279ebffb87888284e21752ca4c2b9ba863e99e88c0
7
- data.tar.gz: cc5d701cff558eaf96ea554a7d293fc5fe14e6d8c04daf05d537363dac759b7e611f8af66e780cb30e8856e2a696364a6b9b1efe58806b357f25d8c0f58b6954
6
+ metadata.gz: 39ced1494bc063a49bc6db9917dc067abf9491e5c2f0b1eb5083134dc8cb74ef83cbe4fddabe26cfc2e44204594e3eb48ef23bb5d6c6b987838c3adaacfbc18e
7
+ data.tar.gz: a84b6d061179e2d9c5a4ab3ba8031c0d3f949bdfd09fe8701435eb3328f87cd1c252602659fe963bfaf22e20feccd9b7242e9dae381a8ccf3ef4b9833c2f42b9
@@ -18,6 +18,9 @@ module ForemanInventoryUpload
18
18
  end
19
19
 
20
20
  def enable_cloud_connector
21
+ # Set the autoupload to true, since it's required by the feature.
22
+ Setting[:allow_auto_inventory_upload] = true
23
+
21
24
  cloud_connector = ForemanRhCloud::CloudConnector.new
22
25
  render json: cloud_connector.install.to_json
23
26
  end
@@ -1,3 +1,3 @@
1
1
  module ForemanRhCloud
2
- VERSION = '6.0.42.2'.freeze
2
+ VERSION = '6.0.43'.freeze
3
3
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "foreman_rh_cloud",
3
- "version": "6.0.42.2",
3
+ "version": "6.0.43",
4
4
  "description": "Inventory Upload =============",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -1,5 +1,7 @@
1
1
  import React from 'react';
2
2
  import { useSelector, useDispatch } from 'react-redux';
3
+ import { openConfirmModal } from 'foremanReact/components/ConfirmModal';
4
+ import { translate as __ } from 'foremanReact/common/I18n';
3
5
  import { CloudConnectorButton } from './CloudConnectorButton';
4
6
  import { configureCloudConnector } from './CloudConnectorActions';
5
7
  import { selectStatus, selectJobLink } from './CloudConnectorSelectors';
@@ -12,7 +14,18 @@ const ConnectedCloudConnectorButton = () => {
12
14
  return (
13
15
  <CloudConnectorButton
14
16
  status={status}
15
- onClick={() => dispatch(configureCloudConnector())}
17
+ onClick={() =>
18
+ dispatch(
19
+ openConfirmModal({
20
+ title: __('Notice'),
21
+ message: __(
22
+ 'This action will also enable automatic reports upload'
23
+ ),
24
+ isWarning: true,
25
+ onConfirm: () => dispatch(configureCloudConnector()),
26
+ })
27
+ )
28
+ }
16
29
  jobLink={jobLink}
17
30
  />
18
31
  );
@@ -1,5 +1,3 @@
1
- @import '~@redhat-cloud-services/frontend-components/index.css';
2
-
3
1
  .rh-cloud-recommendations-table {
4
2
  .pf-c-table__check {
5
3
  input:disabled {
@@ -0,0 +1,3 @@
1
+ export const openConfirmModal = options => options;
2
+
3
+ export default openConfirmModal;
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_rh_cloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.42.2
4
+ version: 6.0.43
5
5
  platform: ruby
6
6
  authors:
7
7
  - Foreman Red Hat Cloud team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-11-02 00:00:00.000000000 Z
11
+ date: 2022-09-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: katello
@@ -197,7 +197,6 @@ files:
197
197
  - db/migrate/20210720000001_remove_old_insights_statuses.foreman_rh_cloud.rb
198
198
  - db/migrate/20211027000001_create_task_output.foreman_rh_cloud.rb
199
199
  - db/migrate/20220321000001_add_unique_to_insights_rules.foreman_rh_cloud.rb
200
- - db/migrate/20221102110254_fix_rh_cloud_settings_category_to_dsl.rb
201
200
  - db/seeds.d/179_ui_notifications.rb
202
201
  - db/seeds.d/50_job_templates.rb
203
202
  - lib/foreman_inventory_upload.rb
@@ -625,6 +624,7 @@ files:
625
624
  - webpack/__mocks__/foremanReact/common/I18n.js
626
625
  - webpack/__mocks__/foremanReact/common/MountingService.js
627
626
  - webpack/__mocks__/foremanReact/common/helpers.js
627
+ - webpack/__mocks__/foremanReact/components/ConfirmModal/index.js
628
628
  - webpack/__mocks__/foremanReact/components/Head.js
629
629
  - webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js
630
630
  - webpack/__mocks__/foremanReact/components/ToastsList/index.js
@@ -1,7 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- class FixRhCloudSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
4
- def up
5
- Setting.where(category: 'Setting::RhCloud').update_all(category: 'Setting')
6
- end
7
- end