foreman_rh_cloud 3.0.18 → 3.0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50f4cac8e85d4aa6a6f5311e0276277ee3de729dfe29954d2fb8e907c2996e65
-  data.tar.gz: 96a40dac10cabdcf362add97a29d841a88a16d96a9cfb2a59c10eab0a64b8b5d
+  metadata.gz: 72303b7bc3f1bc2deb3972acde6131cdbe4d1760381d1eb8cdaa5704e3189481
+  data.tar.gz: 725efab879cee6224007359547068820882319d078089760cac43a8c763df754
 SHA512:
-  metadata.gz: 9dee0e2da14903584e433cf39e5f21c0e6e913ee54a6c579d929dee1db8163d60990502d7404285d7df8fed49f2b2910e923d47adc529dbda0c5f9aada23174b
-  data.tar.gz: 9c468f95609d7d844ae0b0c1b8bbe697c4b43e55529a6dfc5030b74089b05c2d0fae0843e415cb98bec95dacd45c056d25b2130c8df141238059552303a62573
+  metadata.gz: 28d7e810476e8202a62aa7381e8d3ef86cec5f2f6a7bc9580d5a116a543275183201ad573e848f30a65253bee2f20e7b0385f0cc6f0ab90637cfb03398557188
+  data.tar.gz: 52560a0917aecaed1c9897c593769c19b7dde9348c1b0450cd32fb4998d5c63e4232d671a1b767e33e6dcec960b3f4647bc23d56a80f15c1f18930db8b772409

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -27,6 +27,7 @@ module ForemanRhCloud
         headers: {
           params: forward_params,
           user_agent: http_user_agent(original_request),
+          content_type: original_request.media_type,
         },
       }
       base_params.merge(path_params(original_request.path, certs))

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '3.0.18'.freeze
+  VERSION = '3.0.18.1'.freeze
 end

data/package.json

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

data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -23,6 +23,18 @@ module InsightsCloud::Api
         assert_equal @body, @response.body
       end
 
+      test "should respond with the same content type" do
+        net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
+        net_http_resp.add_field 'Set-Cookie', 'Monster'
+        res = RestClient::Response.create(@body, net_http_resp, @http_req)
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.expects(:execute_cloud_request).with do |opts|
+          opts[:headers][:content_type] == 'application/json'
+        end.returns(res)
+
+        post :forward_request, as: :json, params: { "path" => "static/v1/test", "machine_telemetry" => {"foo" => "bar"} }
+        assert_equal @body, @response.body
+      end
+
       test "should add headers to response from cloud" do
         x_resource_count = '101'
         x_rh_insights_request_id = '202'

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilter.fixtures.js

@@ -1,2 +1,3 @@
 export const filterTerm = 'test_filter_term';
-export const organization = { title: 'some_org', id: 1 };
+
+export const organization = 'some-org';

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilter.js

@@ -1,40 +1,53 @@
-import React from 'react';
+/* eslint-disable react-hooks/exhaustive-deps */
+import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { FormGroup, FormControl } from 'patternfly-react';
+import { FormGroup, TextInput } from '@patternfly/react-core';
 import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
 import ClearButton from './Components/ClearButton';
 import './inventoryFilter.scss';
+import { ANY_ORGANIZATION } from './InventoryFilterConstants';
 
 const InventoryFilter = ({
   handleFilterChange,
   handleFilterClear,
   filterTerm,
-}) => (
-  <form id="inventory_filter_form">
-    <FormGroup controlId="inventory_filter_input">
-      <FormControl
-        value={filterTerm}
-        type="text"
-        placeholder={__('Filter..')}
-        bsSize="lg"
-        onChange={e => handleFilterChange(e.target.value)}
-      />
-      <ClearButton onClear={handleFilterClear} />
-    </FormGroup>
-  </form>
-);
+  organization,
+}) => {
+  useEffect(() => {
+    const initialTerm =
+      organization === __(ANY_ORGANIZATION) ? '' : organization;
+    handleFilterChange(initialTerm);
+  }, [organization]);
+
+  return (
+    <form id="inventory_filter_form">
+      <FormGroup>
+        <TextInput
+          id="inventory_filter_input"
+          value={filterTerm}
+          type="text"
+          placeholder={__('Filter..')}
+          onChange={handleFilterChange}
+        />
+        <ClearButton onClear={handleFilterClear} />
+      </FormGroup>
+    </form>
+  );
+};
 
 InventoryFilter.propTypes = {
   handleFilterChange: PropTypes.func,
   handleFilterClear: PropTypes.func,
   filterTerm: PropTypes.string,
+  organization: PropTypes.string,
 };
 
 InventoryFilter.defaultProps = {
   handleFilterChange: noop,
   handleFilterClear: noop,
   filterTerm: '',
+  organization: '',
 };
 
 export default InventoryFilter;

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilterReducer.js

@@ -1,13 +1,7 @@
 import Immutable from 'seamless-immutable';
-import {
-  LAYOUT_CHANGE_ORG,
-  LAYOUT_INITIALIZE,
-} from 'foremanReact/components/Layout/LayoutConstants';
-import { translate as __ } from 'foremanReact/common/I18n';
 import {
   INVENTORY_FILTER_UPDATE,
   INVENTORY_FILTER_CLEAR,
-  ANY_ORGANIZATION,
 } from './InventoryFilterConstants';
 
 const initialState = Immutable({
@@ -16,7 +10,7 @@ const initialState = Immutable({
 
 export default (
   state = initialState,
-  { type, payload: { filterTerm, organization } = {} }
+  { type, payload: { filterTerm } = {} }
 ) => {
   switch (type) {
     case INVENTORY_FILTER_UPDATE:
@@ -27,15 +21,6 @@ export default (
       return state.merge({
         filterTerm: '',
       });
-    case LAYOUT_CHANGE_ORG:
-    case LAYOUT_INITIALIZE: {
-      const { title } = organization || {};
-      // Any org is used only in it's translated form in the redux
-      const term = title === __(ANY_ORGANIZATION) ? '' : title;
-      return state.merge({
-        filterTerm: term,
-      });
-    }
     default:
       return state;
   }

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/InventoryFilter.test.js

@@ -2,9 +2,15 @@ import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import { noop } from 'foremanReact/common/helpers';
 
 import InventoryFilter from '../InventoryFilter';
+import { filterTerm, organization } from '../InventoryFilter.fixtures';
 
 const fixtures = {
-  'render with props': { handleFilterChange: noop },
+  'render with props': {
+    handleFilterChange: noop,
+    handleFilterClear: noop,
+    filterTerm,
+    organization,
+  },
   /** fixtures, props for the component */
 };
 

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/InventoryFilterReducer.test.js

@@ -1,10 +1,6 @@
 import { testReducerSnapshotWithFixtures } from '@theforeman/test';
-import {
-  LAYOUT_CHANGE_ORG,
-  LAYOUT_INITIALIZE,
-} from 'foremanReact/components/Layout/LayoutConstants';
 import reducer from '../InventoryFilterReducer';
-import { filterTerm, organization } from '../InventoryFilter.fixtures';
+import { filterTerm } from '../InventoryFilter.fixtures';
 import {
   INVENTORY_FILTER_UPDATE,
   INVENTORY_FILTER_CLEAR,
@@ -26,18 +22,6 @@ const fixtures = {
       payload: {},
     },
   },
-  'should handle LAYOUT_CHANGE_ORG': {
-    action: {
-      type: LAYOUT_CHANGE_ORG,
-      payload: { organization },
-    },
-  },
-  'should handle LAYOUT_INITIALIZE': {
-    action: {
-      type: LAYOUT_INITIALIZE,
-      payload: { organization },
-    },
-  },
 };
 
 describe('AccountList reducer', () =>

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/InventoryFilter.test.js.snap

@@ -4,18 +4,13 @@ exports[`InventoryFilter rendering render with props 1`] = `
 <form
   id="inventory_filter_form"
 >
-  <FormGroup
-    bsClass="form-group"
-    controlId="inventory_filter_input"
-  >
-    <FormControl
-      bsClass="form-control"
-      bsSize="lg"
-      componentClass="input"
+  <FormGroup>
+    <TextInput
+      id="inventory_filter_input"
       onChange={[Function]}
       placeholder="Filter.."
       type="text"
-      value=""
+      value="test_filter_term"
     />
     <ClearButton
       onClear={[Function]}

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/InventoryFilterReducer.test.js.snap

@@ -12,18 +12,6 @@ Object {
 }
 `;
 
-exports[`AccountList reducer should handle LAYOUT_CHANGE_ORG 1`] = `
-Object {
-  "filterTerm": "some_org",
-}
-`;
-
-exports[`AccountList reducer should handle LAYOUT_INITIALIZE 1`] = `
-Object {
-  "filterTerm": "some_org",
-}
-`;
-
 exports[`AccountList reducer should return the initial state 1`] = `
 Object {
   "filterTerm": "",

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/integration.test.js.snap

@@ -6,7 +6,7 @@ Object {
     Array [
       Object {
         "payload": Object {
-          "filterTerm": "some_new_filter",
+          "filterTerm": "some-org",
         },
         "type": "INVENTORY_FILTER_UPDATE",
       },
@@ -35,7 +35,7 @@ Object {
         },
         "dashboard": Object {},
         "inventoryFilter": Object {
-          "filterTerm": "some_new_filter",
+          "filterTerm": "some-org",
         },
         "inventorySync": Object {},
       },

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/integration.test.js

@@ -7,7 +7,7 @@ describe('InventoryFilter integration test', () => {
   it('should flow', async () => {
     const integrationTestHelper = new IntegrationTestHelper(reducers);
     const wrapper = integrationTestHelper.mount(<InventoryFilter />);
-    const input = wrapper.find('#inventory_filter_input');
+    const input = wrapper.find('input[id="inventory_filter_input"]');
     input.simulate('change', { target: { value: 'some_new_filter' } });
     await IntegrationTestHelper.flushAllPromises();
     wrapper.update();

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/index.js

@@ -1,5 +1,6 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
+import { selectCurrentOrganization } from 'foremanReact/components/Layout/LayoutSelectors';
 import reducer from './InventoryFilterReducer';
 import * as actions from './InventoryFilterActions';
 import InventoryFilter from './InventoryFilter';
@@ -9,6 +10,7 @@ export const reducers = { inventoryFilter: reducer };
 
 const mapStateToProps = state => ({
   filterTerm: selectFilterTerm(state),
+  organization: selectCurrentOrganization(state),
 });
 // map action dispatchers to props
 const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/inventoryFilter.scss

@@ -1,5 +1,5 @@
 #inventory_filter_form {
-  .form-group {
+  .pf-c-form__group-control {
     display: -ms-flexbox;
     display: -webkit-flex;
     display: flex;

data/webpack/__mocks__/foremanReact/components/Layout/LayoutSelectors.js

@@ -0,0 +1 @@
+export const selectCurrentOrganization = state => 'some-org';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.18
+  version: 3.0.18.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -58,20 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman_ansible_core
   requirement: !ruby/object:Gem::Requirement
@@ -589,6 +583,7 @@ files:
 - webpack/__mocks__/foremanReact/common/MountingService.js
 - webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js
+- webpack/__mocks__/foremanReact/components/Layout/LayoutSelectors.js
 - webpack/__mocks__/foremanReact/constants.js
 - webpack/__mocks__/foremanReact/redux/API/APISelectors.js
 - webpack/__mocks__/foremanReact/redux/API/index.js
@@ -615,7 +610,7 @@ homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -630,31 +625,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.0.6
+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/uploads_settings_controller_test.rb
 - test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb
-- test/controllers/insights_sync/settings_controller_test.rb
 - test/controllers/reports_controller_test.rb
-- test/controllers/uploads_controller_test.rb
-- test/controllers/uploads_settings_controller_test.rb
-- test/factories/insights_factories.rb
-- test/factories/inventory_upload_factories.rb
+- test/test_plugin_helper.rb
+- test/jobs/upload_report_job_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_rules_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
-- test/jobs/upload_report_job_test.rb
-- test/test_plugin_helper.rb
-- test/unit/archived_report_generator_test.rb
-- test/unit/fact_helpers_test.rb
-- test/unit/insights_facet_test.rb
+- test/factories/inventory_upload_factories.rb
+- test/factories/insights_factories.rb
+- test/unit/tags_generator_test.rb
+- test/unit/shell_process_job_test.rb
 - test/unit/metadata_generator_test.rb
-- test/unit/rh_cloud_http_proxy_test.rb
-- test/unit/services/foreman_rh_cloud/branch_info_test.rb
+- test/unit/insights_facet_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
-- test/unit/shell_process_job_test.rb
+- test/unit/services/foreman_rh_cloud/branch_info_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
-- test/unit/tags_generator_test.rb