foreman_rh_cloud 14.6.0 → 14.6.1
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 +4 -4
- data/config/routes.rb +0 -2
- data/lib/foreman_rh_cloud/plugin.rb +0 -1
- data/lib/foreman_rh_cloud/version.rb +1 -1
- data/package.json +1 -1
- data/webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettings.js +4 -2
- data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/InventoryAutoUpload.js +4 -1
- data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableConstants.js +0 -6
- metadata +1 -2
- data/app/controllers/api/v2/rh_cloud/advisor_engine_config_controller.rb +0 -16
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b80cb2de0c22cf0c9e0d878a88effd7553dc3c38b9101ecf0a7381f9b217f281
|
|
4
|
+
data.tar.gz: d342a910cb349b96a18519632cb408db1b4f91c6f85833f93646821af6f8cb73
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 32c9dbb72480c907d77a2f211510cea5922350ac5a313bb862f7c567fac87efe41deab149231769f07bf0fc20145f0376573a323435b7363fc7fafe5b7b0af33
|
|
7
|
+
data.tar.gz: 47eb84a4c683107c27f0dc403d8864b3999d691f10c316aea184f32fb89812a4d1476927215bec12ca34b6968198b4e48fa0d7994d00fb6bbd21eb36a002dacb
|
data/config/routes.rb
CHANGED
|
@@ -72,8 +72,6 @@ Rails.application.routes.draw do
|
|
|
72
72
|
namespace 'rh_cloud' do
|
|
73
73
|
post 'announce_to_sources', to: 'inventory#announce_to_sources'
|
|
74
74
|
post 'cloud_request', to: 'cloud_request#update'
|
|
75
|
-
get 'advisor_engine_config', to: 'advisor_engine_config#show'
|
|
76
|
-
|
|
77
75
|
# Inventory upload task endpoints
|
|
78
76
|
get 'inventory_upload/tasks/current', to: 'foreman_inventory_upload/api/tasks#current'
|
|
79
77
|
get 'inventory_upload/tasks/history', to: 'foreman_inventory_upload/api/tasks#history'
|
|
@@ -48,7 +48,6 @@ module ForemanRhCloud
|
|
|
48
48
|
'foreman_inventory_upload/cloud_status': [:index],
|
|
49
49
|
'foreman_inventory_upload/uploads_settings': [:index],
|
|
50
50
|
'foreman_inventory_upload/missing_hosts': [:index],
|
|
51
|
-
'api/v2/rh_cloud/advisor_engine_config': [:show],
|
|
52
51
|
'foreman_rh_cloud/foreman_rh_cloud': [:inventory_upload, :recommendations],
|
|
53
52
|
'react': [:index]
|
|
54
53
|
)
|
data/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useState } from 'react';
|
|
2
2
|
import { useSelector } from 'react-redux';
|
|
3
3
|
import { translate as __ } from 'foremanReact/common/I18n';
|
|
4
|
-
import { Flex, FlexItem } from '@patternfly/react-core';
|
|
4
|
+
import { Flex, FlexItem, Title } from '@patternfly/react-core';
|
|
5
5
|
|
|
6
6
|
import AdvancedSetting from './AdvancedSetting';
|
|
7
7
|
import {
|
|
@@ -32,7 +32,9 @@ const InventorySettings = () => {
|
|
|
32
32
|
|
|
33
33
|
return (
|
|
34
34
|
<div className="inventory-settings">
|
|
35
|
-
<h3>
|
|
35
|
+
<Title headingLevel="h3" size="lg" ouiaId="inventory-settings-title">
|
|
36
|
+
{__('Settings')}
|
|
37
|
+
</Title>
|
|
36
38
|
{[...settingKeys].map(key => {
|
|
37
39
|
const isChildSetting = Object.hasOwnProperty.call(
|
|
38
40
|
childSettingsDict,
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
FormGroup,
|
|
9
9
|
Grid,
|
|
10
10
|
GridItem,
|
|
11
|
+
Title,
|
|
11
12
|
} from '@patternfly/react-core';
|
|
12
13
|
import { InfoAltIcon, CaretRightIcon } from '@patternfly/react-icons';
|
|
13
14
|
import { translate as __ } from 'foremanReact/common/I18n';
|
|
@@ -32,7 +33,9 @@ const InventoryAutoUploadSwitcher = ({
|
|
|
32
33
|
return (
|
|
33
34
|
<FormGroup>
|
|
34
35
|
<Grid>
|
|
35
|
-
<h3
|
|
36
|
+
<Title headingLevel="h3" size="lg" ouiaId="rh-cloud-inventory-title">
|
|
37
|
+
{__('Red Hat Cloud Inventory')}
|
|
38
|
+
</Title>
|
|
36
39
|
<hr />
|
|
37
40
|
<Grid hasGutter>
|
|
38
41
|
<GridItem span={7}>
|
|
@@ -114,10 +114,4 @@ export const INSIGHTS_SET_SELECT_ALL_ALERT = 'INSIGHTS_SET_SELECT_ALL_ALERT';
|
|
|
114
114
|
|
|
115
115
|
export const INSIGHTS_SET_SELECT_ALL = 'INSIGHTS_SET_SELECT_ALL';
|
|
116
116
|
|
|
117
|
-
export const ADVISOR_ENGINE_CONFIG_KEY = 'ADVISOR_ENGINE_CONFIG';
|
|
118
|
-
|
|
119
|
-
export const ADVISOR_ENGINE_CONFIG_PATH = foremanUrl(
|
|
120
|
-
'/api/v2/rh_cloud/advisor_engine_config'
|
|
121
|
-
);
|
|
122
|
-
|
|
123
117
|
export const NEW_HOST_PATH = '/new/hosts/';
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: foreman_rh_cloud
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 14.6.
|
|
4
|
+
version: 14.6.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Foreman Red Hat Cloud team
|
|
@@ -67,7 +67,6 @@ files:
|
|
|
67
67
|
- app/assets/javascripts/foreman_rh_cloud/locale/ko/foreman_rh_cloud.js
|
|
68
68
|
- app/assets/javascripts/foreman_rh_cloud/locale/zh_CN/foreman_rh_cloud.js
|
|
69
69
|
- app/controllers/api/v2/advisor_engine/advisor_engine_controller.rb
|
|
70
|
-
- app/controllers/api/v2/rh_cloud/advisor_engine_config_controller.rb
|
|
71
70
|
- app/controllers/api/v2/rh_cloud/cloud_request_controller.rb
|
|
72
71
|
- app/controllers/api/v2/rh_cloud/inventory_controller.rb
|
|
73
72
|
- app/controllers/concerns/foreman_rh_cloud/iop_smart_proxy_access.rb
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
module Api
|
|
2
|
-
module V2
|
|
3
|
-
module RhCloud
|
|
4
|
-
class AdvisorEngineConfigController < ::Api::V2::BaseController
|
|
5
|
-
include ::Api::Version2
|
|
6
|
-
|
|
7
|
-
api :GET, "/rh_cloud/advisor_engine_config", N_("Show if system is configured to use local iop-advisor-engine.")
|
|
8
|
-
def show
|
|
9
|
-
render json: {
|
|
10
|
-
use_iop_mode: ForemanRhCloud.with_iop_smart_proxy?,
|
|
11
|
-
}, status: :ok
|
|
12
|
-
end
|
|
13
|
-
end
|
|
14
|
-
end
|
|
15
|
-
end
|
|
16
|
-
end
|