foreman_rh_cloud 2.0.8 → 2.0.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +27 -2
- data/app/controllers/foreman_inventory_upload/accounts_controller.rb +3 -0
- data/app/controllers/foreman_inventory_upload/tasks_controller.rb +25 -0
- data/app/controllers/foreman_inventory_upload/uploads_controller.rb +18 -0
- data/app/controllers/insights_cloud/hits_controller.rb +17 -0
- data/app/controllers/insights_cloud/settings_controller.rb +24 -0
- data/app/controllers/insights_cloud/tasks_controller.rb +1 -2
- data/app/helpers/foreman_inventory_upload_host_helper.rb +10 -2
- data/app/models/concerns/rh_cloud_host.rb +15 -0
- data/app/models/insights_facet.rb +5 -1
- data/app/models/insights_hit.rb +1 -1
- data/app/models/inventory_sync/inventory_status.rb +30 -0
- data/app/models/setting/rh_cloud.rb +4 -1
- data/app/overrides/hosts_list.rb +1 -1
- data/app/services/foreman_rh_cloud/cloud_auth.rb +28 -0
- data/app/views/foreman_rh_cloud/react/insights_cloud.html.erb +1 -1
- data/app/views/foreman_rh_cloud/react/inventory_upload.html.erb +1 -1
- data/app/views/hosts/_insights_tab.html.erb +9 -0
- data/app/views/layouts/foreman_rh_cloud/application.html.erb +0 -1
- data/config/routes.rb +6 -0
- data/db/migrate/20200727111529_add_uuid_column_to_insights_facets.foreman_rh_cloud.rb +5 -0
- data/db/migrate/20201007115752_add_hits_count_to_insights_facets_table.foreman_rh_cloud.rb +5 -0
- data/db/migrate/20201007121540_setup_hits_count_cache.foreman_rh_cloud.rb +10 -0
- data/lib/foreman_inventory_upload.rb +4 -0
- data/lib/foreman_inventory_upload/async/generate_report_job.rb +1 -1
- data/lib/foreman_inventory_upload/async/shell_process.rb +21 -9
- data/lib/foreman_inventory_upload/async/upload_report_job.rb +22 -6
- data/lib/foreman_inventory_upload/generators/fact_helpers.rb +36 -1
- data/lib/foreman_inventory_upload/generators/json_stream.rb +17 -2
- data/lib/foreman_inventory_upload/generators/metadata.rb +3 -0
- data/lib/foreman_inventory_upload/generators/queries.rb +4 -4
- data/lib/foreman_inventory_upload/generators/slice.rb +62 -34
- data/lib/foreman_inventory_upload/scripts/uploader.sh.erb +1 -1
- data/lib/foreman_rh_cloud.rb +68 -0
- data/lib/foreman_rh_cloud/engine.rb +19 -3
- data/lib/foreman_rh_cloud/version.rb +1 -1
- data/lib/insights_cloud.rb +8 -8
- data/lib/insights_cloud/async/insights_full_sync.rb +24 -32
- data/lib/insights_cloud/async/insights_scheduled_sync.rb +23 -0
- data/lib/inventory_sync/async/host_result.rb +50 -0
- data/lib/inventory_sync/async/inventory_full_sync.rb +80 -0
- data/lib/tasks/insights.rake +15 -0
- data/lib/tasks/rh_cloud_inventory.rake +37 -0
- data/package.json +3 -1
- data/test/controllers/insights_sync/settings_controller_test.rb +30 -0
- data/test/factories/insights_factories.rb +31 -0
- data/test/jobs/insights_full_sync_test.rb +33 -1
- data/test/jobs/inventory_full_sync_test.rb +91 -0
- data/test/jobs/upload_report_job_test.rb +34 -0
- data/test/unit/fact_helpers_test.rb +22 -0
- data/test/unit/insights_facet_test.rb +23 -0
- data/test/unit/metadata_generator_test.rb +2 -0
- data/test/unit/rh_cloud_http_proxy_test.rb +65 -0
- data/test/unit/slice_generator_test.rb +172 -11
- data/webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js +16 -1
- data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListActions.js +22 -17
- data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListReducer.js +18 -0
- data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListSelectors.js +8 -0
- data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListActions.test.js +7 -0
- data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListReducer.test.js +12 -6
- data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListSelectors.test.js +9 -0
- data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListActions.test.js.snap +20 -0
- data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListReducer.test.js.snap +12 -0
- data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListSelectors.test.js.snap +6 -0
- data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcher.fixtures.js +2 -0
- data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcherActions.js +10 -11
- data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcherConstants.js +0 -1
- data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/AutoUploadSwitcherActions.test.js +12 -2
- data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/__snapshots__/AutoUploadSwitcherActions.test.js.snap +17 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/ExcludePackagesSwitcher.fixtures.js +1 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/ExcludePackagesSwitcher.js +30 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/ExcludePackagesSwitcherActions.js +29 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/ExcludePackagesSwitcherConstants.js +1 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/ExcludePackagesSwitcher.test.js +13 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/ExcludePackagesSwitcherActions.test.js +21 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/__snapshots__/ExcludePackagesSwitcher.test.js.snap +38 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/__snapshots__/ExcludePackagesSwitcherActions.test.js.snap +31 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/__snapshots__/integration.test.js.snap +41 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/integration.test.js +36 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/excludePackagesSwitcher.scss +3 -0
- data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/index.js +20 -0
- data/webpack/ForemanInventoryUpload/Components/FullScreenModal/FullScreenModal.js +5 -1
- data/webpack/ForemanInventoryUpload/Components/FullScreenModal/__tests__/__snapshots__/FullScreenModal.test.js.snap +1 -0
- data/webpack/ForemanInventoryUpload/Components/FullScreenModal/fullScreenModal.scss +15 -13
- data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcher.fixtures.js +2 -1
- data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcher.js +1 -0
- data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcher.scss +3 -0
- data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcherActions.js +10 -11
- data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcherConstants.js +0 -2
- data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/__tests__/HostObfuscationSwitcherActions.test.js +12 -2
- data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/__tests__/__snapshots__/HostObfuscationSwitcherActions.test.js.snap +18 -1
- data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilterReducer.js +13 -2
- data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/InventoryFilterReducer.test.js +10 -1
- data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/InventoryFilterReducer.test.js.snap +6 -0
- data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/integration.test.js.snap +9 -0
- data/webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettings.js +4 -0
- data/webpack/ForemanInventoryUpload/Components/InventorySettings/__tests__/__snapshots__/InventorySettings.test.js.snap +2 -0
- data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcher.fixtures.js +1 -0
- data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcher.js +29 -0
- data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcherActions.js +29 -0
- data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcherConstants.js +1 -0
- data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/__tests__/IpsObfuscationSwitcher.test.js +13 -0
- data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/__tests__/IpsObfuscationSwitcherActions.test.js +21 -0
- data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/__tests__/__snapshots__/IpsObfuscationSwitcher.test.js.snap +38 -0
- data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/__tests__/__snapshots__/IpsObfuscationSwitcherActions.test.js.snap +31 -0
- data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/index.js +20 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.js +1 -1
- data/webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageHeader.test.js.snap +3 -3
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/DocsButton/DocsButton.js +1 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/DocsButton/__tests__/__snapshots__/DocsButton.test.js.snap +1 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/HistoryButton/HistoryButton.js +1 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/HistoryButton/__tests__/__snapshots__/HistoryButton.test.js.snap +1 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js +2 -2
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/__snapshots__/PageDescription.test.js.snap +2 -2
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButton.js +58 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonActions.js +57 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonConstants.js +3 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonReducer.js +36 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonSelectors.js +13 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButton.test.js +13 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonActions.test.js +31 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonFixtures.js +9 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonReducer.test.js +26 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonSelectors.test.js +36 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButton.test.js.snap +26 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButtonActions.test.js.snap +98 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButtonReducer.test.js.snap +18 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButtonSelectors.test.js.snap +18 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/Modal.js +63 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/Toast.js +41 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/modal.scss +20 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/index.js +22 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/ToolbarButtons.js +2 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/__tests__/__snapshots__/ToolbarButtons.test.js.snap +1 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/toolbarButtons.scss +6 -1
- data/webpack/ForemanInventoryUpload/Components/StatusChart/StatusChart.js +1 -1
- data/webpack/ForemanInventoryUpload/Components/StatusChart/__tests__/__snapshots__/StatusChart.test.js.snap +1 -1
- data/webpack/ForemanInventoryUpload/Components/TabContainer/tabContainer.scss +1 -1
- data/webpack/ForemanInventoryUpload/Components/TabHeader/TabHeader.js +6 -1
- data/webpack/ForemanInventoryUpload/Components/Terminal/Terminal.js +2 -4
- data/webpack/ForemanInventoryUpload/ForemanInventoryConstants.js +3 -1
- data/webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js +8 -0
- data/webpack/ForemanInventoryUpload/ForemanInventoryUploadReducers.js +2 -0
- data/webpack/ForemanRhCloudPages.js +9 -0
- data/webpack/ForemanRhCloudReducers.js +2 -0
- data/webpack/ForemanRhCloudSelectors.js +5 -0
- data/webpack/ForemanRhCloudTestHelpers.js +17 -3
- data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettings.js +33 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettingsActions.js +57 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettingsConstants.js +4 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettingsReducer.js +24 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettingsSelectors.js +6 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/InsightsSettings.test.js +18 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/InsightsSettingsActions.test.js +62 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/InsightsSettingsReducer.test.js +33 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/InsightsSettingsSelectors.test.js +21 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/__snapshots__/InsightsSettings.test.js.snap +15 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/__snapshots__/InsightsSettingsActions.test.js.snap +65 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/__snapshots__/InsightsSettingsReducer.test.js.snap +19 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/__snapshots__/InsightsSettingsSelectors.test.js.snap +9 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/index.js +21 -0
- data/webpack/InsightsCloudSync/Components/InsightsSettings/insightsSettings.scss +16 -0
- data/webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/InsightsSyncSwitcher.fixtures.js +1 -0
- data/webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/InsightsSyncSwitcher.js +45 -0
- data/webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/__tests__/InsightsSyncSwitcher.test.js +17 -0
- data/webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/__tests__/__snapshots__/InsightsSyncSwitcher.test.js.snap +38 -0
- data/webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/index.js +1 -0
- data/webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/insightsSyncSwitcher.scss +3 -0
- data/webpack/InsightsCloudSync/InsightsCloudSync.js +36 -5
- data/webpack/InsightsCloudSync/InsightsCloudSync.test.js +1 -0
- data/webpack/InsightsCloudSync/InsightsCloudSyncActions.js +10 -11
- data/webpack/InsightsCloudSync/InsightsCloudSyncConstants.js +0 -2
- data/webpack/InsightsCloudSync/InsightsCloudSyncReducers.js +7 -2
- data/webpack/InsightsCloudSync/__snapshots__/InsightsCloudSync.test.js.snap +51 -9
- data/webpack/InsightsCloudSync/index.js +2 -1
- data/webpack/InsightsHostDetailsTab/InsightsTab.js +66 -0
- data/webpack/InsightsHostDetailsTab/InsightsTab.scss +86 -0
- data/webpack/InsightsHostDetailsTab/InsightsTabActions.js +31 -0
- data/webpack/InsightsHostDetailsTab/InsightsTabConstants.js +2 -0
- data/webpack/InsightsHostDetailsTab/InsightsTabReducer.js +19 -0
- data/webpack/InsightsHostDetailsTab/InsightsTabSelectors.js +3 -0
- data/webpack/InsightsHostDetailsTab/__tests__/InsightsTab.fixtures.js +25 -0
- data/webpack/InsightsHostDetailsTab/__tests__/InsightsTab.test.js +13 -0
- data/webpack/InsightsHostDetailsTab/__tests__/InsightsTabActions.test.js +19 -0
- data/webpack/InsightsHostDetailsTab/__tests__/InsightsTabIntegration.test.js +17 -0
- data/webpack/InsightsHostDetailsTab/__tests__/InsightsTabReducer.test.js +26 -0
- data/webpack/InsightsHostDetailsTab/__tests__/InsightsTabSelectors.test.js +13 -0
- data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTab.test.js.snap +34 -0
- data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabActions.test.js.snap +58 -0
- data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabReducer.test.js.snap +34 -0
- data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabSelectors.test.js.snap +20 -0
- data/webpack/InsightsHostDetailsTab/components/ListItem/ListItem.js +69 -0
- data/webpack/InsightsHostDetailsTab/components/ListItem/index.js +1 -0
- data/webpack/InsightsHostDetailsTab/index.js +20 -0
- data/webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js +1 -0
- data/webpack/__mocks__/foremanReact/constants.js +5 -0
- data/webpack/__mocks__/foremanReact/redux/actions/toasts.js +8 -0
- data/webpack/__tests__/ForemanRhCloudSelectors.test.js +4 -1
- data/webpack/__tests__/ForemanRhCloudTestHelpers.test.js +12 -2
- data/webpack/__tests__/__snapshots__/ForemanRhCloudSelectors.test.js.snap +10 -9
- data/webpack/__tests__/__snapshots__/ForemanRhCloudTestHelpers.test.js.snap +27 -2
- data/webpack/index.js +2 -12
- metadata +120 -12
- data/lib/tasks/generator.rake +0 -29
- data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/hostObfuscationSwitcher.scss +0 -0
@@ -1,5 +1,8 @@
|
|
1
1
|
import { testReducerSnapshotWithFixtures } from '@theforeman/test';
|
2
|
-
import {
|
2
|
+
import {
|
3
|
+
LAYOUT_CHANGE_ORG,
|
4
|
+
LAYOUT_INITIALIZE,
|
5
|
+
} from 'foremanReact/components/Layout/LayoutConstants';
|
3
6
|
import reducer from '../InventoryFilterReducer';
|
4
7
|
import { filterTerm, org } from '../InventoryFilter.fixtures';
|
5
8
|
import {
|
@@ -29,6 +32,12 @@ const fixtures = {
|
|
29
32
|
payload: { org },
|
30
33
|
},
|
31
34
|
},
|
35
|
+
'should handle LAYOUT_INITIALIZE': {
|
36
|
+
action: {
|
37
|
+
type: LAYOUT_INITIALIZE,
|
38
|
+
payload: { organization: org },
|
39
|
+
},
|
40
|
+
},
|
32
41
|
};
|
33
42
|
|
34
43
|
describe('AccountList reducer', () =>
|
@@ -18,6 +18,12 @@ Object {
|
|
18
18
|
}
|
19
19
|
`;
|
20
20
|
|
21
|
+
exports[`AccountList reducer should handle LAYOUT_INITIALIZE 1`] = `
|
22
|
+
Object {
|
23
|
+
"filterTerm": "some_org",
|
24
|
+
}
|
25
|
+
`;
|
26
|
+
|
21
27
|
exports[`AccountList reducer should return the initial state 1`] = `
|
22
28
|
Object {
|
23
29
|
"filterTerm": "",
|
@@ -14,6 +14,14 @@ Object {
|
|
14
14
|
],
|
15
15
|
"state": Object {
|
16
16
|
"ForemanRhCloud": Object {
|
17
|
+
"InsightsCloudSync": Object {
|
18
|
+
"settings": Object {
|
19
|
+
"insightsSyncEnabled": false,
|
20
|
+
},
|
21
|
+
},
|
22
|
+
"hostInsights": Object {
|
23
|
+
"hits": Array [],
|
24
|
+
},
|
17
25
|
"inventoryUpload": Object {
|
18
26
|
"accountsList": Object {
|
19
27
|
"accounts": Object {},
|
@@ -24,6 +32,7 @@ Object {
|
|
24
32
|
"inventoryFilter": Object {
|
25
33
|
"filterTerm": "some_new_filter",
|
26
34
|
},
|
35
|
+
"inventorySync": Object {},
|
27
36
|
},
|
28
37
|
},
|
29
38
|
},
|
@@ -2,13 +2,17 @@ import React from 'react';
|
|
2
2
|
import { translate as __ } from 'foremanReact/common/I18n';
|
3
3
|
import AutoUploadSwitcher from '../AutoUploadSwitcher';
|
4
4
|
import HostObfuscationSwitcher from '../HostObfuscationSwitcher';
|
5
|
+
import ExcludePackagesSwitcher from '../ExcludePackagesSwitcher';
|
6
|
+
import IpsObfuscationSwitcher from '../IpsObfuscationSwitcher';
|
5
7
|
import './inventorySettings.scss';
|
6
8
|
|
7
9
|
const InventorySettings = () => (
|
8
10
|
<div className="inventory_settings">
|
9
11
|
<h3>{__('Settings')}</h3>
|
10
12
|
<AutoUploadSwitcher />
|
13
|
+
<ExcludePackagesSwitcher />
|
11
14
|
<HostObfuscationSwitcher />
|
15
|
+
<IpsObfuscationSwitcher />
|
12
16
|
</div>
|
13
17
|
);
|
14
18
|
|
@@ -0,0 +1 @@
|
|
1
|
+
export const handleToggleResponse = { data: { ipsObfuscationEnabled: true } };
|
data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcher.js
ADDED
@@ -0,0 +1,29 @@
|
|
1
|
+
import React from 'react';
|
2
|
+
import PropTypes from 'prop-types';
|
3
|
+
import { Switch, FieldLevelHelp } from 'patternfly-react';
|
4
|
+
import { translate as __ } from 'foremanReact/common/I18n';
|
5
|
+
|
6
|
+
const IpsObfuscationSwitcher = ({ ipsObfuscationEnabled, handleToggle }) => (
|
7
|
+
<div className="ips_obfuscation_switcher">
|
8
|
+
<span>Obfuscate host ipv4 addresses</span>
|
9
|
+
<FieldLevelHelp
|
10
|
+
content={__('Obfuscate ipv4 addresses sent to the Red Hat cloud')}
|
11
|
+
/>
|
12
|
+
<Switch
|
13
|
+
size="mini"
|
14
|
+
value={ipsObfuscationEnabled}
|
15
|
+
onChange={() => handleToggle(ipsObfuscationEnabled)}
|
16
|
+
/>
|
17
|
+
</div>
|
18
|
+
);
|
19
|
+
|
20
|
+
IpsObfuscationSwitcher.propTypes = {
|
21
|
+
ipsObfuscationEnabled: PropTypes.bool,
|
22
|
+
handleToggle: PropTypes.func.isRequired,
|
23
|
+
};
|
24
|
+
|
25
|
+
IpsObfuscationSwitcher.defaultProps = {
|
26
|
+
ipsObfuscationEnabled: false,
|
27
|
+
};
|
28
|
+
|
29
|
+
export default IpsObfuscationSwitcher;
|
@@ -0,0 +1,29 @@
|
|
1
|
+
import API from 'foremanReact/API';
|
2
|
+
import { addToast } from 'foremanReact/redux/actions/toasts';
|
3
|
+
import { inventoryUrl } from '../../ForemanInventoryHelpers';
|
4
|
+
import { IPS_OBFUSCATION_TOGGLE } from './IpsObfuscationSwitcherConstants';
|
5
|
+
|
6
|
+
export const handleToggle = currentIpsObfuscationEnabled => async dispatch => {
|
7
|
+
const toggledIpsObfuscationEnabled = !currentIpsObfuscationEnabled;
|
8
|
+
try {
|
9
|
+
const {
|
10
|
+
data: { ipsObfuscationEnabled },
|
11
|
+
} = await API.post(inventoryUrl('ips_obfuscation'), {
|
12
|
+
value: toggledIpsObfuscationEnabled,
|
13
|
+
});
|
14
|
+
dispatch({
|
15
|
+
type: IPS_OBFUSCATION_TOGGLE,
|
16
|
+
payload: {
|
17
|
+
ipsObfuscationEnabled,
|
18
|
+
},
|
19
|
+
});
|
20
|
+
} catch (error) {
|
21
|
+
dispatch(
|
22
|
+
addToast({
|
23
|
+
sticky: true,
|
24
|
+
type: 'error',
|
25
|
+
message: error.message,
|
26
|
+
})
|
27
|
+
);
|
28
|
+
}
|
29
|
+
};
|
@@ -0,0 +1 @@
|
|
1
|
+
export const IPS_OBFUSCATION_TOGGLE = 'IPS_OBFUSCATION_TOGGLE';
|
@@ -0,0 +1,13 @@
|
|
1
|
+
import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
|
2
|
+
import { noop } from 'patternfly-react';
|
3
|
+
|
4
|
+
import IpsObfuscationSwitcher from '../IpsObfuscationSwitcher';
|
5
|
+
|
6
|
+
const fixtures = {
|
7
|
+
'render with props': { ipsObfuscationEnabled: true, handleToggle: noop },
|
8
|
+
};
|
9
|
+
|
10
|
+
describe('IpsObfuscationSwitcher', () => {
|
11
|
+
describe('rendering', () =>
|
12
|
+
testComponentSnapshotsWithFixtures(IpsObfuscationSwitcher, fixtures));
|
13
|
+
});
|
@@ -0,0 +1,21 @@
|
|
1
|
+
import { testActionSnapshotWithFixtures } from '@theforeman/test';
|
2
|
+
import API from 'foremanReact/API';
|
3
|
+
import { handleToggle } from '../IpsObfuscationSwitcherActions';
|
4
|
+
import { handleToggleResponse } from '../IpsObfuscationSwitcher.fixtures';
|
5
|
+
|
6
|
+
jest.mock('foremanReact/API');
|
7
|
+
API.post.mockImplementation(async () => handleToggleResponse);
|
8
|
+
|
9
|
+
const fixtures = {
|
10
|
+
'should handleToggle': () => handleToggle(false),
|
11
|
+
'should handleError': () => {
|
12
|
+
API.post.mockImplementationOnce(() =>
|
13
|
+
Promise.reject(new Error('test error'))
|
14
|
+
);
|
15
|
+
|
16
|
+
return handleToggle(false);
|
17
|
+
},
|
18
|
+
};
|
19
|
+
|
20
|
+
describe('IpsObfuscationSwitcher actions', () =>
|
21
|
+
testActionSnapshotWithFixtures(fixtures));
|
@@ -0,0 +1,38 @@
|
|
1
|
+
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
2
|
+
|
3
|
+
exports[`IpsObfuscationSwitcher rendering render with props 1`] = `
|
4
|
+
<div
|
5
|
+
className="ips_obfuscation_switcher"
|
6
|
+
>
|
7
|
+
<span>
|
8
|
+
Obfuscate host ipv4 addresses
|
9
|
+
</span>
|
10
|
+
<FieldLevelHelp
|
11
|
+
buttonClass=""
|
12
|
+
content="Obfuscate ipv4 addresses sent to the Red Hat cloud"
|
13
|
+
placement="top"
|
14
|
+
rootClose={true}
|
15
|
+
/>
|
16
|
+
<Switch
|
17
|
+
animate={true}
|
18
|
+
baseClass="bootstrap-switch"
|
19
|
+
bsSize={null}
|
20
|
+
defaultValue={true}
|
21
|
+
disabled={false}
|
22
|
+
handleWidth="auto"
|
23
|
+
inverse={false}
|
24
|
+
labelText=" "
|
25
|
+
labelWidth="auto"
|
26
|
+
offColor="default"
|
27
|
+
offText="OFF"
|
28
|
+
onChange={[Function]}
|
29
|
+
onColor="primary"
|
30
|
+
onText="ON"
|
31
|
+
readonly={false}
|
32
|
+
size="mini"
|
33
|
+
tristate={false}
|
34
|
+
value={true}
|
35
|
+
wrapperClass="wrapper"
|
36
|
+
/>
|
37
|
+
</div>
|
38
|
+
`;
|
@@ -0,0 +1,31 @@
|
|
1
|
+
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
2
|
+
|
3
|
+
exports[`IpsObfuscationSwitcher actions should handleError 1`] = `
|
4
|
+
Array [
|
5
|
+
Array [
|
6
|
+
Object {
|
7
|
+
"payload": Object {
|
8
|
+
"message": Object {
|
9
|
+
"message": "test error",
|
10
|
+
"sticky": true,
|
11
|
+
"type": "error",
|
12
|
+
},
|
13
|
+
},
|
14
|
+
"type": "TOASTS_ADD",
|
15
|
+
},
|
16
|
+
],
|
17
|
+
]
|
18
|
+
`;
|
19
|
+
|
20
|
+
exports[`IpsObfuscationSwitcher actions should handleToggle 1`] = `
|
21
|
+
Array [
|
22
|
+
Array [
|
23
|
+
Object {
|
24
|
+
"payload": Object {
|
25
|
+
"ipsObfuscationEnabled": true,
|
26
|
+
},
|
27
|
+
"type": "IPS_OBFUSCATION_TOGGLE",
|
28
|
+
},
|
29
|
+
],
|
30
|
+
]
|
31
|
+
`;
|
@@ -0,0 +1,20 @@
|
|
1
|
+
import { bindActionCreators } from 'redux';
|
2
|
+
import { connect } from 'react-redux';
|
3
|
+
|
4
|
+
import * as actions from './IpsObfuscationSwitcherActions';
|
5
|
+
import IpsObfuscationSwitcher from './IpsObfuscationSwitcher';
|
6
|
+
import { selectIpsObfuscationEnabled } from '../AccountList/AccountListSelectors';
|
7
|
+
|
8
|
+
// map state to props
|
9
|
+
const mapStateToProps = state => ({
|
10
|
+
ipsObfuscationEnabled: selectIpsObfuscationEnabled(state),
|
11
|
+
});
|
12
|
+
|
13
|
+
// map action dispatchers to props
|
14
|
+
const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
|
15
|
+
|
16
|
+
// export connected component
|
17
|
+
export default connect(
|
18
|
+
mapStateToProps,
|
19
|
+
mapDispatchToProps
|
20
|
+
)(IpsObfuscationSwitcher);
|
@@ -14,7 +14,7 @@ exports[`PageHeader rendering render without Props 1`] = `
|
|
14
14
|
<h1
|
15
15
|
className="inventory_title"
|
16
16
|
>
|
17
|
-
Red Hat Inventory
|
17
|
+
Red Hat Inventory
|
18
18
|
</h1>
|
19
19
|
</Col>
|
20
20
|
</Row>
|
@@ -51,8 +51,8 @@ exports[`PageHeader rendering render without Props 1`] = `
|
|
51
51
|
<Col
|
52
52
|
bsClass="col"
|
53
53
|
componentClass="div"
|
54
|
-
xs={
|
55
|
-
xsOffset={
|
54
|
+
xs={6}
|
55
|
+
xsOffset={2}
|
56
56
|
>
|
57
57
|
<ToolbarButtons />
|
58
58
|
</Col>
|
@@ -10,12 +10,12 @@ export const PageDescription = () => (
|
|
10
10
|
</p>
|
11
11
|
<p>
|
12
12
|
{__(
|
13
|
-
'In order to utilize these
|
13
|
+
'In order to utilize these services, you can set the auto upload in the settings to "ON".'
|
14
14
|
)}
|
15
15
|
</p>
|
16
16
|
<p>
|
17
17
|
{__(
|
18
|
-
'You can also trigger the upload manually by
|
18
|
+
'You can also trigger the upload manually by opening the relevant organization card, and clicking on the "Restart" button'
|
19
19
|
)}
|
20
20
|
</p>
|
21
21
|
</div>
|
@@ -8,10 +8,10 @@ exports[`PageDescription rendering render without Props 1`] = `
|
|
8
8
|
Red Hat Insights is a set of cloud services which provide unified subscription reporting, predictive analysis and remediation of issues through this Satellite instance.
|
9
9
|
</p>
|
10
10
|
<p>
|
11
|
-
In order to utilize these
|
11
|
+
In order to utilize these services, you can set the auto upload in the settings to "ON".
|
12
12
|
</p>
|
13
13
|
<p>
|
14
|
-
You can also trigger the upload manually by
|
14
|
+
You can also trigger the upload manually by opening the relevant organization card, and clicking on the "Restart" button
|
15
15
|
</p>
|
16
16
|
</div>
|
17
17
|
`;
|
@@ -0,0 +1,58 @@
|
|
1
|
+
import React from 'react';
|
2
|
+
import PropTypes from 'prop-types';
|
3
|
+
import { Button, Icon, Spinner } from 'patternfly-react';
|
4
|
+
import { STATUS } from 'foremanReact/constants';
|
5
|
+
import SyncModal from './components/Modal';
|
6
|
+
import { SYNC_BUTTON_TEXT } from '../../../../ForemanInventoryConstants';
|
7
|
+
|
8
|
+
class SyncButton extends React.Component {
|
9
|
+
state = {
|
10
|
+
showModal: false,
|
11
|
+
};
|
12
|
+
|
13
|
+
toggleModal = () => {
|
14
|
+
this.setState({ showModal: !this.state.showModal });
|
15
|
+
};
|
16
|
+
|
17
|
+
render() {
|
18
|
+
const { cloudToken, handleSync, status } = this.props;
|
19
|
+
|
20
|
+
const handleClick = !cloudToken ? this.toggleModal : handleSync;
|
21
|
+
return (
|
22
|
+
<React.Fragment>
|
23
|
+
<SyncModal show={this.state.showModal} toggleModal={this.toggleModal} />
|
24
|
+
<Button
|
25
|
+
className="sync_button"
|
26
|
+
onClick={handleClick}
|
27
|
+
bsSize="lg"
|
28
|
+
disabled={status === STATUS.PENDING}
|
29
|
+
>
|
30
|
+
{!cloudToken && (
|
31
|
+
<span>
|
32
|
+
<Icon name="warning" />{' '}
|
33
|
+
</span>
|
34
|
+
)}
|
35
|
+
{status === STATUS.PENDING ? (
|
36
|
+
<Spinner loading size="xs" />
|
37
|
+
) : (
|
38
|
+
<Icon name="refresh" />
|
39
|
+
)}
|
40
|
+
{SYNC_BUTTON_TEXT}
|
41
|
+
</Button>
|
42
|
+
</React.Fragment>
|
43
|
+
);
|
44
|
+
}
|
45
|
+
}
|
46
|
+
|
47
|
+
SyncButton.propTypes = {
|
48
|
+
cloudToken: PropTypes.string,
|
49
|
+
handleSync: PropTypes.func.isRequired,
|
50
|
+
status: PropTypes.string,
|
51
|
+
};
|
52
|
+
|
53
|
+
SyncButton.defaultProps = {
|
54
|
+
cloudToken: null,
|
55
|
+
status: null,
|
56
|
+
};
|
57
|
+
|
58
|
+
export default SyncButton;
|
data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonActions.js
ADDED
@@ -0,0 +1,57 @@
|
|
1
|
+
import React from 'react';
|
2
|
+
import API from 'foremanReact/API';
|
3
|
+
import { addToast } from 'foremanReact/redux/actions/toasts';
|
4
|
+
import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
|
5
|
+
import Toast from './components/Toast';
|
6
|
+
import {
|
7
|
+
INVENTORY_SYNC_REQUEST,
|
8
|
+
INVENTORY_SYNC_SUCCESS,
|
9
|
+
INVENTORY_SYNC_ERROR,
|
10
|
+
} from './SyncButtonConstants';
|
11
|
+
|
12
|
+
export const handleSync = () => async dispatch => {
|
13
|
+
dispatch({
|
14
|
+
type: INVENTORY_SYNC_REQUEST,
|
15
|
+
payload: {},
|
16
|
+
});
|
17
|
+
try {
|
18
|
+
const {
|
19
|
+
data: { syncHosts, disconnectHosts },
|
20
|
+
} = await API.post(inventoryUrl('tasks'));
|
21
|
+
dispatch({
|
22
|
+
type: INVENTORY_SYNC_SUCCESS,
|
23
|
+
payload: {
|
24
|
+
syncHosts,
|
25
|
+
disconnectHosts,
|
26
|
+
},
|
27
|
+
});
|
28
|
+
|
29
|
+
dispatch(
|
30
|
+
addToast({
|
31
|
+
sticky: true,
|
32
|
+
type: 'success',
|
33
|
+
message: (
|
34
|
+
<Toast syncHosts={syncHosts} disconnectHosts={disconnectHosts} />
|
35
|
+
),
|
36
|
+
})
|
37
|
+
);
|
38
|
+
} catch ({
|
39
|
+
message,
|
40
|
+
response: { data: { message: toastMessage } = {} } = {},
|
41
|
+
}) {
|
42
|
+
dispatch({
|
43
|
+
type: INVENTORY_SYNC_ERROR,
|
44
|
+
payload: {
|
45
|
+
error: message,
|
46
|
+
},
|
47
|
+
});
|
48
|
+
|
49
|
+
dispatch(
|
50
|
+
addToast({
|
51
|
+
sticky: true,
|
52
|
+
type: 'error',
|
53
|
+
message: toastMessage || message,
|
54
|
+
})
|
55
|
+
);
|
56
|
+
}
|
57
|
+
};
|