foreman_rh_cloud 2.0.16 → 3.0.14

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/components/AdvancedSettings/index.js

@@ -0,0 +1,28 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import { handleToggle as hostObfuscationToggle } from '../../../../Components/HostObfuscationSwitcher/HostObfuscationSwitcherActions';
+import { handleToggle as ipsObfuscationToggle } from '../../../../Components/IpsObfuscationSwitcher/IpsObfuscationSwitcherActions';
+import { handleToggle as excludePackagesToggle } from '../../../../Components/ExcludePackagesSwitcher/ExcludePackagesSwitcherActions';
+import AdvancedSettings from './AdvancedSettings';
+import {
+  selectExcludePackages,
+  selectHostObfuscationEnabled,
+  selectIpsObfuscationEnabled,
+} from '../../../../Components/AccountList/AccountListSelectors';
+
+// map state to props
+const mapStateToProps = state => ({
+  hostObfuscationEnabled: selectHostObfuscationEnabled(state),
+  ipsObfuscationEnabled: selectIpsObfuscationEnabled(state),
+  excludePackagesEnabled: selectExcludePackages(state),
+});
+
+// map action dispatchers to props
+const mapDispatchToProps = dispatch =>
+  bindActionCreators(
+    { hostObfuscationToggle, ipsObfuscationToggle, excludePackagesToggle },
+    dispatch
+  );
+
+// export connected component
+export default connect(mapStateToProps, mapDispatchToProps)(AdvancedSettings);

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/index.js

@@ -0,0 +1,22 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+
+import * as actions from '../../Components/AutoUploadSwitcher/AutoUploadSwitcherActions';
+import InventoryAutoUpload from './InventoryAutoUpload';
+import { selectAutoUploadEnabled } from '../../Components/AccountList/AccountListSelectors';
+import { fetchAccountsStatus as fetchSettings } from '../../Components/AccountList/AccountListActions';
+
+// map state to props
+const mapStateToProps = state => ({
+  autoUploadEnabled: selectAutoUploadEnabled(state),
+});
+
+// map action dispatchers to props
+const mapDispatchToProps = dispatch =>
+  bindActionCreators({ ...actions, fetchSettings }, dispatch);
+
+// export connected component
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(InventoryAutoUpload);

data/webpack/ForemanRhCloudFills.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
+import InventoryAutoUploadSwitcher from './ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload';
+
+const fills = [
+  {
+    slot: 'katello-manage-manifest-form',
+    name: 'InventoryAutoUpload',
+    component: () => <InventoryAutoUploadSwitcher />,
+    weight: 50,
+  },
+];
+
+export const registerFills = () => {
+  fills.forEach(({ slot, name, component: Component, weight }, index) =>
+    addGlobalFill(
+      slot,
+      name,
+      <Component key={`rh-cloud-fill-${index}`} />,
+      weight
+    )
+  );
+};

data/webpack/ForemanRhCloudPages.js

@@ -1,9 +1,14 @@
+import componentRegistry from 'foremanReact/components/componentRegistry';
 import ForemanInventoryUpload from './ForemanInventoryUpload';
 import InsightsCloudSync from './InsightsCloudSync';
 import InsightsHostDetailsTab from './InsightsHostDetailsTab';
 
-export default [
+const pages = [
   { name: 'ForemanInventoryUpload', type: ForemanInventoryUpload },
   { name: 'InsightsCloudSync', type: InsightsCloudSync },
   { name: 'InsightsHostDetailsTab', type: InsightsHostDetailsTab },
 ];
+
+export const registerPages = () => {
+  pages.forEach(page => componentRegistry.register(page));
+};

data/webpack/ForemanRhCloudReducers.js

@@ -1,12 +1,21 @@
 import { combineReducers } from 'redux';
+import { registerReducer } from 'foremanReact/common/MountingService';
 import inventoryUploadReducers from './ForemanInventoryUpload/ForemanInventoryUploadReducers';
 import insightsReducers from './InsightsCloudSync/InsightsCloudSyncReducers';
 import { hostInsightsReducers } from './InsightsHostDetailsTab';
 
-export default {
+const reducers = {
   ForemanRhCloud: combineReducers({
     ...inventoryUploadReducers,
     ...insightsReducers,
     ...hostInsightsReducers,
   }),
 };
+
+export default reducers;
+
+export const registerReducers = () => {
+  Object.entries(reducers).forEach(([key, reducer]) =>
+    registerReducer(key, reducer)
+  );
+};

data/webpack/InsightsHostDetailsTab/InsightsTab.js

@@ -17,16 +17,14 @@ class InsightsHostDetailsTab extends React.Component {
     if (!hits.length) {
       return <h2>No recommendations were found for this host!</h2>;
     }
-    const hitsSorted = orderBy(hits, ['insights_hit.total_risk'], ['desc']);
+    const hitsSorted = orderBy(hits, ['total_risk'], ['desc']);
     const items = hitsSorted.map(
       (
         {
-          insights_hit: {
-            title,
-            total_risk: totalRisk,
-            results_url: resultsUrl,
-            solution_url: solutionUrl,
-          },
+          title,
+          total_risk: totalRisk,
+          results_url: resultsUrl,
+          solution_url: solutionUrl,
         },
         index
       ) => (

data/webpack/InsightsHostDetailsTab/__tests__/InsightsTab.fixtures.js

@@ -2,20 +2,18 @@ export const hostID = 1234;
 
 export const hits = [
   {
-    insights_hit: {
-      hostname: 'my-host.example.com',
-      rhel_version: '7.8',
-      uuid: '4739b323-a343-4e89-b71b-81991b8dc656',
-      last_seen: '2020-08-19T04:43:09.068706Z',
-      title:
-        'New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled',
-      solution_url: 'https://access.redhat.com/node/3359651',
-      total_risk: 2,
-      likelihood: 2,
-      publish_date: '2018-04-16T10:03:16Z',
-      results_url:
-        'https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/',
-    },
+    hostname: 'my-host.example.com',
+    rhel_version: '7.8',
+    uuid: '4739b323-a343-4e89-b71b-81991b8dc656',
+    last_seen: '2020-08-19T04:43:09.068706Z',
+    title:
+      'New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled',
+    solution_url: 'https://access.redhat.com/node/3359651',
+    total_risk: 2,
+    likelihood: 2,
+    publish_date: '2018-04-16T10:03:16Z',
+    results_url:
+      'https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/',
   },
 ];
 

data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabActions.test.js.snap

@@ -13,18 +13,16 @@ Array [
       "payload": Object {
         "hits": Array [
           Object {
-            "insights_hit": Object {
-              "hostname": "my-host.example.com",
-              "last_seen": "2020-08-19T04:43:09.068706Z",
-              "likelihood": 2,
-              "publish_date": "2018-04-16T10:03:16Z",
-              "results_url": "https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/",
-              "rhel_version": "7.8",
-              "solution_url": "https://access.redhat.com/node/3359651",
-              "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
-              "total_risk": 2,
-              "uuid": "4739b323-a343-4e89-b71b-81991b8dc656",
-            },
+            "hostname": "my-host.example.com",
+            "last_seen": "2020-08-19T04:43:09.068706Z",
+            "likelihood": 2,
+            "publish_date": "2018-04-16T10:03:16Z",
+            "results_url": "https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/",
+            "rhel_version": "7.8",
+            "solution_url": "https://access.redhat.com/node/3359651",
+            "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
+            "total_risk": 2,
+            "uuid": "4739b323-a343-4e89-b71b-81991b8dc656",
           },
         ],
       },

data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabReducer.test.js.snap

@@ -10,18 +10,16 @@ exports[`AccountList reducer should handle INSIGHTS_HITS_SUCCESS 1`] = `
 Object {
   "hits": Array [
     Object {
-      "insights_hit": Object {
-        "hostname": "my-host.example.com",
-        "last_seen": "2020-08-19T04:43:09.068706Z",
-        "likelihood": 2,
-        "publish_date": "2018-04-16T10:03:16Z",
-        "results_url": "https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/",
-        "rhel_version": "7.8",
-        "solution_url": "https://access.redhat.com/node/3359651",
-        "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
-        "total_risk": 2,
-        "uuid": "4739b323-a343-4e89-b71b-81991b8dc656",
-      },
+      "hostname": "my-host.example.com",
+      "last_seen": "2020-08-19T04:43:09.068706Z",
+      "likelihood": 2,
+      "publish_date": "2018-04-16T10:03:16Z",
+      "results_url": "https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/",
+      "rhel_version": "7.8",
+      "solution_url": "https://access.redhat.com/node/3359651",
+      "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
+      "total_risk": 2,
+      "uuid": "4739b323-a343-4e89-b71b-81991b8dc656",
     },
   ],
 }

data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabSelectors.test.js.snap

@@ -3,18 +3,16 @@
 exports[`InsightsTab selectors should return hits 1`] = `
 Array [
   Object {
-    "insights_hit": Object {
-      "hostname": "my-host.example.com",
-      "last_seen": "2020-08-19T04:43:09.068706Z",
-      "likelihood": 2,
-      "publish_date": "2018-04-16T10:03:16Z",
-      "results_url": "https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/",
-      "rhel_version": "7.8",
-      "solution_url": "https://access.redhat.com/node/3359651",
-      "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
-      "total_risk": 2,
-      "uuid": "4739b323-a343-4e89-b71b-81991b8dc656",
-    },
+    "hostname": "my-host.example.com",
+    "last_seen": "2020-08-19T04:43:09.068706Z",
+    "likelihood": 2,
+    "publish_date": "2018-04-16T10:03:16Z",
+    "results_url": "https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/",
+    "rhel_version": "7.8",
+    "solution_url": "https://access.redhat.com/node/3359651",
+    "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
+    "total_risk": 2,
+    "uuid": "4739b323-a343-4e89-b71b-81991b8dc656",
   },
 ]
 `;

data/webpack/__mocks__/foremanReact/common/MountingService.js

@@ -0,0 +1 @@
+export const registerReducer = jest.fn;

data/webpack/common/Switcher/index.js

@@ -0,0 +1,79 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Switch, Level, LevelItem } from '@patternfly/react-core';
+import {
+  OverlayTrigger,
+  Tooltip,
+  Icon,
+  Grid,
+  ControlLabel,
+  noop,
+} from 'patternfly-react';
+
+const Switcher = ({
+  id,
+  label,
+  tooltip,
+  isChecked,
+  onChange,
+  labelCol = 5,
+  SwitchCol = 2,
+}) => (
+  <React.Fragment>
+    <Grid.Col sm={labelCol}>
+      <ControlLabel className="control-label" style={{ paddingTop: '0' }}>
+        <Level>
+          <LevelItem>
+            <span className={`rh-cloud-switcher-${id}-label`}>{label}</span>
+          </LevelItem>
+          <LevelItem>
+            <OverlayTrigger
+              overlay={
+                <Tooltip
+                  id={`rh-cloud-switcher-${id}-tooltip`}
+                  style={{ zIndex: 10000 }}
+                >
+                  {tooltip}
+                </Tooltip>
+              }
+              placement="bottom"
+              trigger={['hover', 'focus']}
+              rootClose={false}
+            >
+              <Icon type="pf" name="info" />
+            </OverlayTrigger>
+          </LevelItem>
+        </Level>
+      </ControlLabel>
+    </Grid.Col>
+    <Grid.Col sm={SwitchCol} style={{ marginBottom: '5px' }}>
+      <Switch
+        id={`rh-cloud-switcher-${id}`}
+        isChecked={isChecked}
+        onChange={onChange}
+        label=" "
+      />
+    </Grid.Col>
+  </React.Fragment>
+);
+
+Switcher.propTypes = {
+  id: PropTypes.string.isRequired,
+  label: PropTypes.string,
+  tooltip: PropTypes.string,
+  isChecked: PropTypes.bool,
+  onChange: PropTypes.func,
+  labelCol: PropTypes.number,
+  SwitchCol: PropTypes.number,
+};
+
+Switcher.defaultProps = {
+  label: null,
+  tooltip: null,
+  isChecked: true,
+  onChange: noop,
+  labelCol: 5,
+  SwitchCol: 2,
+};
+
+export default Switcher;

data/webpack/global_index.js

@@ -0,0 +1,5 @@
+import { registerReducers } from './ForemanRhCloudReducers';
+import { registerFills } from './ForemanRhCloudFills';
+
+registerReducers();
+registerFills();

data/webpack/index.js

@@ -1,15 +1,5 @@
-/* eslint import/no-unresolved: [2, { ignore: [foremanReact/*] }] */
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint-disable import/extensions */
-import componentRegistry from 'foremanReact/components/componentRegistry';
-import { registerReducer } from 'foremanReact/common/MountingService';
-import reducers from './ForemanRhCloudReducers';
-import pages from './ForemanRhCloudPages';
+import { registerReducers } from './ForemanRhCloudReducers';
+import { registerPages } from './ForemanRhCloudPages';
 
-// register reducers
-Object.entries(reducers).forEach(([key, reducer]) =>
-  registerReducer(key, reducer)
-);
-
-// register components
-pages.forEach(page => componentRegistry.register(page));
+registerReducers();
+registerPages();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 3.0.14
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -125,9 +125,6 @@ files:
 - app/views/foreman_rh_cloud/react/inventory_upload.html.erb
 - app/views/hosts/_insights_tab.html.erb
 - app/views/layouts/foreman_rh_cloud/application.html.erb
-- config/Gemfile.lock.gh_test
-- config/database.yml.example
-- config/package-lock.json.gh_test
 - config/routes.rb
 - db/migrate/20191215104806_create_insights_hits.foreman_inventory_upload.rb
 - db/migrate/20191216062008_create_insights_facets.foreman_inventory_upload.rb
@@ -449,12 +446,18 @@ files:
 - webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js
 - webpack/ForemanInventoryUpload/ForemanInventoryUpload.js
 - webpack/ForemanInventoryUpload/ForemanInventoryUploadReducers.js
-- webpack/ForemanInventoryUpload/SubscriptionsPageExtension/SubscriptionsPageExtensionActions.js
+- webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/InventoryAutoUpload.js
+- webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/InventoryAutoUpload.test.js
+- webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/__snapshots__/InventoryAutoUpload.test.js.snap
+- webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/components/AdvancedSettings/AdvancedSettings.js
+- webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/components/AdvancedSettings/index.js
+- webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/index.js
 - webpack/ForemanInventoryUpload/__tests__/ForemanInventoryHelpers.test.js
 - webpack/ForemanInventoryUpload/__tests__/ForemanInventoryUpload.test.js
 - webpack/ForemanInventoryUpload/__tests__/__snapshots__/ForemanInventoryHelpers.test.js.snap
 - webpack/ForemanInventoryUpload/__tests__/__snapshots__/ForemanInventoryUpload.test.js.snap
 - webpack/ForemanInventoryUpload/index.js
+- webpack/ForemanRhCloudFills.js
 - webpack/ForemanRhCloudHelpers.js
 - webpack/ForemanRhCloudPages.js
 - webpack/ForemanRhCloudReducers.js
@@ -512,6 +515,7 @@ files:
 - webpack/InsightsHostDetailsTab/index.js
 - webpack/__mocks__/foremanReact/API.js
 - webpack/__mocks__/foremanReact/common/I18n.js
+- webpack/__mocks__/foremanReact/common/MountingService.js
 - webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js
 - webpack/__mocks__/foremanReact/constants.js
@@ -522,13 +526,14 @@ files:
 - webpack/__tests__/__snapshots__/ForemanRhCloudHelpers.test.js.snap
 - webpack/__tests__/__snapshots__/ForemanRhCloudSelectors.test.js.snap
 - webpack/__tests__/__snapshots__/ForemanRhCloudTestHelpers.test.js.snap
+- webpack/common/Switcher/index.js
+- webpack/global_index.js
 - webpack/index.js
-- webpack/subscriptions_extension_index.js
 homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -543,25 +548,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files:
-- test/controllers/uploads_controller_test.rb
-- test/controllers/insights_sync/settings_controller_test.rb
 - test/controllers/accounts_controller_test.rb
+- test/controllers/insights_sync/settings_controller_test.rb
 - test/controllers/reports_controller_test.rb
-- test/test_plugin_helper.rb
-- test/jobs/upload_report_job_test.rb
+- test/controllers/uploads_controller_test.rb
+- test/factories/insights_factories.rb
+- test/factories/inventory_upload_factories.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
-- test/factories/inventory_upload_factories.rb
-- test/factories/insights_factories.rb
-- test/unit/shell_process_job_test.rb
+- test/jobs/upload_report_job_test.rb
+- test/test_plugin_helper.rb
+- test/unit/archived_report_generator_test.rb
 - test/unit/metadata_generator_test.rb
+- test/unit/shell_process_job_test.rb
+- test/unit/fact_helpers_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
-- test/unit/fact_helpers_test.rb
-- test/unit/archived_report_generator_test.rb
 - test/unit/slice_generator_test.rb