foreman_rh_cloud 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0724cdfa4e0563ba9b2cbab222198ab8dd921527f8c31d1136795a158b659038
-  data.tar.gz: 7bc88ae8db51b586e7e4d6d8e05baf16dc782f86626e059aecacece43adbd4d8
+  metadata.gz: 222e7f5392e6276d4c38fdeb9bdbbf1078bcbbbc10bbf4aa3eb841ed1395bff9
+  data.tar.gz: 746a4388499f65ad2691188ccb36e0936486222ed7a278bb90e35ce27adff85f
 SHA512:
-  metadata.gz: 0e7e3dd16635ecbac89f7ad2cb2f62a59c29b71108e323dee2c050a9aedf62b7c1a304a977fe589322ae18044f5f2ffdbb1e22eb07ad9ee3e9e67045fa3d4614
-  data.tar.gz: 46f916e376facb3b487eb125e65916efca85b51c40c7ff4f090758e677ac37638cf81f07dec0e3279a61c67455d4c966948a6343eb4a26ed20ef3e76e0a3fafa
+  metadata.gz: 19504446398f9dca2bee75c9a89265fc9b67b24e43b018c516a0fbc8351f7e4f888f3c4295606049ea15390b8291599401913cfc8d974ca0d86be9029ff2a5f8
+  data.tar.gz: ce53ae2e0a0b1eba451d8e7b498fbd7c50257416c5604ae57df4cfbab6e5815e2cf91ddfd1f3ffa0b89933201dd01f68904fe7e50514a042a4685ddffdbc35f7

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -10,11 +10,11 @@ module ForemanInventoryUpload
           upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportJob)
 
           [
-            id,
+            label,
             {
               generate_report_status: generate_report_status,
               upload_report_status: upload_report_status,
-              label: label,
+              id: id,
             },
           ]
         end

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -14,14 +14,7 @@ module ForemanInventoryUpload
       files = Dir["{#{ForemanInventoryUpload.uploads_file_path(filename)},#{ForemanInventoryUpload.done_file_path(filename)}}"]
 
       return send_file files.first, disposition: 'attachment', filename: filename unless files.empty?
-      throw_flash_error "File doesn't exist"
-    end
-
-    def throw_flash_error(message)
-      process_error(
-        :redirect => foreman_inventory_upload_index_path,
-        :error_msg => message
-      )
+      raise ::Foreman::Exception.new("The report file doesn't exist")
     end
 
     def auto_upload

data/lib/foreman_inventory_upload.rb

@@ -62,6 +62,7 @@ module ForemanInventoryUpload
   end
 
   def self.inventory_export_url
-    ForemanRhCloud.base_url + '/api/inventory/v1/hosts'
+    tags = URI.encode("satellite/satellite_instance_id=#{Foreman.instance_id}")
+    ForemanRhCloud.base_url + "/api/inventory/v1/hosts?tags=#{tags}"
   end
 end

data/lib/foreman_inventory_upload/generators/json_stream.rb

@@ -63,7 +63,7 @@ module ForemanInventoryUpload
         return value if value.is_a?(FalseClass)
         return value.to_json if value.is_a?(Hash)
 
-        "\"#{value}\""
+        ActiveSupport::JSON.encode(value)
       end
     end
   end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '1.0.17'.freeze
+  VERSION = '1.0.18'.freeze
 end

data/package.json

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

data/test/controllers/accounts_controller_test.rb

@@ -21,7 +21,7 @@ class AccountsControllerTest < ActionController::TestCase
 
     assert_response :success
     actual = JSON.parse(response.body)
-    actual_account_statuses = actual['accounts'][test_org.id.to_s]
+    actual_account_statuses = actual['accounts'][test_org.label]
     assert_equal 'generate_status_test', actual_account_statuses['generate_report_status']
     assert_equal 'upload_status_test', actual_account_statuses['upload_report_status']
 

data/test/unit/slice_generator_test.rb

@@ -290,7 +290,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'generates a report with satellite facts' do
-    hostgroup = FactoryBot.create(:hostgroup)
+    hostgroup = FactoryBot.create(:hostgroup, name: 'Special"name')
     @host.hostgroup = hostgroup
     @host.save!
 

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

@@ -2,17 +2,17 @@ import { noop } from 'patternfly-react';
 
 export const accounts = {
   Account1: {
-    label: 'test_org1',
+    id: 1,
     upload_report_status: 'running',
     generate_report_status: 'running',
   },
   Account2: {
-    label: 'test_org2',
+    id: 2,
     upload_report_status: 'unknown',
     generate_report_status: 'failure',
   },
   Account3: {
-    label: 'test_org3',
+    id: 3,
     upload_report_status: 'success',
     generate_report_status: 'running',
   },

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountList.js

@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import { ListView, noop } from 'patternfly-react';
+import { isEmpty } from 'lodash';
 import PropTypes from 'prop-types';
 import ListItem from './Components/ListItem';
 import EmptyState from './Components/EmptyState';
@@ -23,24 +24,23 @@ class AccountList extends Component {
 
   render() {
     const { accounts, error, filterTerm } = this.props;
-    const accountIds = Object.keys(accounts);
-    const filteredAccountIds = filterAccounts(accounts, accountIds, filterTerm);
+    const filteredAccount = filterAccounts(accounts, filterTerm);
 
     if (error) {
       return <ErrorState error={error} />;
     }
 
-    if (accountIds.length === 0) {
+    if (isEmpty(accounts)) {
       return <EmptyState />;
     }
 
-    if (filteredAccountIds.length === 0) {
+    if (isEmpty(filteredAccount)) {
       return <EmptyResults />;
     }
 
-    const items = filteredAccountIds.map((accountID, index) => {
-      const account = accounts[accountID];
-      return <ListItem key={index} accountID={accountID} account={account} />;
+    const items = Object.keys(filteredAccount).map((label, index) => {
+      const account = accounts[label];
+      return <ListItem key={index} label={label} account={account} />;
     });
     return <ListView className="account_list">{items}</ListView>;
   }

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListHelper.js

@@ -1,10 +1,10 @@
-export const filterAccounts = (accounts, accountIds, filterTerm) => {
-  if (!filterTerm || !accountIds.length) {
-    return accountIds;
-  }
+import { pickBy } from 'lodash';
+
+export const filterAccounts = (accounts, filterTerm) => {
+  if (!filterTerm) return accounts;
 
   const filterTermLowerCased = filterTerm.toLowerCase();
-  return accountIds.filter(id =>
-    accounts[id].label.toLowerCase().includes(filterTermLowerCased)
+  return pickBy(accounts, (value, key) =>
+    key.toLowerCase().includes(filterTermLowerCased)
   );
 };

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItem/ListItem.fixtures.js

@@ -1 +1,10 @@
-export const props = { accountID: '1' };
+export const props = {
+  label: 'test',
+  account: {
+    test: {
+      generate_report_status: 'unknown',
+      upload_report_status: 'unknown',
+      id: 1,
+    },
+  },
+};

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItem/ListItem.js

@@ -4,26 +4,26 @@ import PropTypes from 'prop-types';
 import ListItemStatus from '../ListItemStatus';
 import Dashboard from '../../../Dashboard';
 
-const ListItem = ({ accountID, account }) => (
+const ListItem = ({ label, account }) => (
   <ListView.Item
     leftContent={<ListView.Icon name="user" />}
-    heading={account.label}
+    heading={label}
     additionalInfo={[
-      <ListItemStatus key={`${accountID}_status`} account={account} />,
+      <ListItemStatus key={`${label}_status`} account={account} />,
     ]}
     stacked
     hideCloseIcon
   >
-    <Dashboard accountID={accountID} account={account} />
+    <Dashboard accountID={account.id} account={account} />
   </ListView.Item>
 );
 
 ListItem.propTypes = {
-  accountID: PropTypes.string.isRequired,
+  label: PropTypes.string.isRequired,
   account: PropTypes.shape({
     generate_report_status: PropTypes.string,
     upload_report_status: PropTypes.string,
-    label: PropTypes.string,
+    id: PropTypes.number,
   }),
 };
 
@@ -31,7 +31,7 @@ ListItem.defaultProps = {
   account: {
     generate_report_status: 'unknown',
     upload_report_status: 'unknown',
-    label: 'default_org_name',
+    id: 0,
   },
 };
 

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItem/__tests__/__snapshots__/ListItem.test.js.snap

@@ -8,9 +8,11 @@ exports[`ListItem rendering render with Props 1`] = `
       <ListItemStatus
         account={
           Object {
-            "generate_report_status": "unknown",
-            "label": "default_org_name",
-            "upload_report_status": "unknown",
+            "test": Object {
+              "generate_report_status": "unknown",
+              "id": 1,
+              "upload_report_status": "unknown",
+            },
           }
         }
       />,
@@ -20,7 +22,7 @@ exports[`ListItem rendering render with Props 1`] = `
   compoundExpand={false}
   compoundExpanded={false}
   description={null}
-  heading="default_org_name"
+  heading="test"
   hideCloseIcon={true}
   initExpanded={false}
   leftContent={
@@ -39,12 +41,13 @@ exports[`ListItem rendering render with Props 1`] = `
   <Connect(Dashboard)
     account={
       Object {
-        "generate_report_status": "unknown",
-        "label": "default_org_name",
-        "upload_report_status": "unknown",
+        "test": Object {
+          "generate_report_status": "unknown",
+          "id": 1,
+          "upload_report_status": "unknown",
+        },
       }
     }
-    accountID="1"
   />
 </ListViewItem>
 `;

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListHelper.test.js

@@ -1,12 +1,12 @@
 import { filterAccounts } from '../AccountListHelper';
-import { accounts, accountIDs } from '../AccountList.fixtures';
+import { accounts } from '../AccountList.fixtures';
 
 describe('AccountList helpers', () => {
   it('account ids filter should return all accounts where label contains "test"', () => {
-    expect(filterAccounts(accounts, accountIDs, 'test')).toEqual(accountIDs);
+    expect(filterAccounts(accounts, 'AcCoUnT')).toEqual(accounts);
   });
 
   it('account ids filter should not match', () => {
-    expect(filterAccounts(accounts, accountIDs, 'no_match')).toEqual([]);
+    expect(filterAccounts(accounts, 'no_match')).toEqual({});
   });
 });

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

@@ -8,34 +8,34 @@ exports[`AccountList rendering render with props 1`] = `
     account={
       Object {
         "generate_report_status": "running",
-        "label": "test_org1",
+        "id": 1,
         "upload_report_status": "running",
       }
     }
-    accountID="Account1"
     key="0"
+    label="Account1"
   />
   <ListItem
     account={
       Object {
         "generate_report_status": "failure",
-        "label": "test_org2",
+        "id": 2,
         "upload_report_status": "unknown",
       }
     }
-    accountID="Account2"
     key="1"
+    label="Account2"
   />
   <ListItem
     account={
       Object {
         "generate_report_status": "running",
-        "label": "test_org3",
+        "id": 3,
         "upload_report_status": "success",
       }
     }
-    accountID="Account3"
     key="2"
+    label="Account3"
   />
 </ListView>
 `;

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListActions.test.js.snap

@@ -8,17 +8,17 @@ Array [
         "accounts": Object {
           "Account1": Object {
             "generate_report_status": "running",
-            "label": "test_org1",
+            "id": 1,
             "upload_report_status": "running",
           },
           "Account2": Object {
             "generate_report_status": "failure",
-            "label": "test_org2",
+            "id": 2,
             "upload_report_status": "unknown",
           },
           "Account3": Object {
             "generate_report_status": "running",
-            "label": "test_org3",
+            "id": 3,
             "upload_report_status": "success",
           },
         },

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListReducer.test.js.snap

@@ -23,17 +23,17 @@ Object {
   "accounts": Object {
     "Account1": Object {
       "generate_report_status": "running",
-      "label": "test_org1",
+      "id": 1,
       "upload_report_status": "running",
     },
     "Account2": Object {
       "generate_report_status": "failure",
-      "label": "test_org2",
+      "id": 2,
       "upload_report_status": "unknown",
     },
     "Account3": Object {
       "generate_report_status": "running",
-      "label": "test_org3",
+      "id": 3,
       "upload_report_status": "success",
     },
   },

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListSelectors.test.js.snap

@@ -4,17 +4,17 @@ exports[`AccountList selectors should return AccountList accounts 1`] = `
 Object {
   "Account1": Object {
     "generate_report_status": "running",
-    "label": "test_org1",
+    "id": 1,
     "upload_report_status": "running",
   },
   "Account2": Object {
     "generate_report_status": "failure",
-    "label": "test_org2",
+    "id": 2,
     "upload_report_status": "unknown",
   },
   "Account3": Object {
     "generate_report_status": "running",
-    "label": "test_org3",
+    "id": 3,
     "upload_report_status": "success",
   },
 }
@@ -35,17 +35,17 @@ Object {
   "accounts": Object {
     "Account1": Object {
       "generate_report_status": "running",
-      "label": "test_org1",
+      "id": 1,
       "upload_report_status": "running",
     },
     "Account2": Object {
       "generate_report_status": "failure",
-      "label": "test_org2",
+      "id": 2,
       "upload_report_status": "unknown",
     },
     "Account3": Object {
       "generate_report_status": "running",
-      "label": "test_org3",
+      "id": 3,
       "upload_report_status": "success",
     },
   },

data/webpack/ForemanInventoryUpload/Components/Dashboard/DashboardActions.js

@@ -67,7 +67,7 @@ export const setActiveTab = (accountID, tabName) => ({
 });
 
 export const downloadReports = accountID => {
-  window.location.href = inventoryUrl(`${accountID}/uploads/file`);
+  window.open(inventoryUrl(`${accountID}/uploads/file`), '_blank');
   return {
     type: INVENTORY_REPORTS_DOWNLOAD,
     payload: {

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardActions.test.js

@@ -35,4 +35,17 @@ const fixtures = {
     runWithGetState({ activeTab: 'reports' }, toggleFullScreen, accountID),
 };
 
-describe('Dashboard actions', () => testActionSnapshotWithFixtures(fixtures));
+describe('Dashboard actions', () => {
+  const { location } = window;
+
+  beforeAll(() => {
+    delete window.location;
+    window.location = { href: jest.fn() };
+  });
+
+  afterAll(() => {
+    window.location = location;
+  });
+
+  return testActionSnapshotWithFixtures(fixtures);
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -535,7 +535,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
@@ -550,25 +550,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.2.3
+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/unit/metadata_generator_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/unit/metadata_generator_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/shell_process_job_test.rb
 - test/unit/slice_generator_test.rb