foreman_rh_cloud 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f6361a25739c19a67518378257d51f67fc443839d76d7d07f5bd597f09ef15d
-  data.tar.gz: b558ad39920b634ee4c9be77ec20f65235eb3193de374879dc85bc284a15bfa5
+  metadata.gz: aa962e3bc67676bb6d21b2196824ddef35ece66d0b24dad52658605446c39dfb
+  data.tar.gz: 8ee5a01dda9593c05b2babe5f65ee31a8a88dded967b159972351b5ee07e518a
 SHA512:
-  metadata.gz: 83b2169b736d8c57d544b8ce53bda7e91e4741efdd384953fd32a22ac96e531282e97ef740112a7be5310ef44fc0569fe8995972304844302d0b2eb3db6215f8
-  data.tar.gz: 3b7bbd7d76a68b5b41874472961eabd2360de0ad871705430d7549d8c44b48e5811ba9d566d74a3c0a8774b7c3b4c0c5a0f75ae57f2f38519ef528e12239c4f3
+  metadata.gz: 6d766ae3c9edec7b7041c73058a80c1e268e5dd2323a049fe66963ab7f313e9ce54e4e6f677b022f2c630944b9b8278bac30207fe4b1cf278cd8db3bdaa393cf
+  data.tar.gz: 4e4b112121137835a8a54dd3831ff293e7ba172458a1de2adb310a73afcbb605fc48bfe80456fc7e640218a051d419a98d5e0537f5fa4455ed619de110632fa8

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -25,6 +25,7 @@ module ForemanInventoryUpload
       ]
 
       render json: {
+        autoUploadEnabled: Setting[:allow_auto_inventory_upload],
         accounts: accounts,
       }, status: :ok
     end

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -11,14 +11,10 @@ module ForemanInventoryUpload
 
     def download_file
       filename = ForemanInventoryUpload.facts_archive_name(params[:organization_id])
-      path = Rails.root.join(ForemanInventoryUpload.uploads_folder, filename)
-      unless File.exist? path
-        return throw_flash_error(
-          "Path doesn't exist: #{path}"
-        )
-      end
+      files = Dir["{#{ForemanInventoryUpload.uploads_file_path(filename)},#{ForemanInventoryUpload.done_file_path(filename)}}"]
 
-      send_file path, disposition: 'attachment', filename: 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)
@@ -27,5 +23,16 @@ module ForemanInventoryUpload
         :error_msg => message
       )
     end
+
+    def auto_upload
+      Setting[:allow_auto_inventory_upload] = auto_upload_params
+      render json: {
+        autoUploadEnabled: Setting[:allow_auto_inventory_upload],
+      }
+    end
+
+    def auto_upload_params
+      ActiveModel::Type::Boolean.new.cast(params.require(:value))
+    end
   end
 end

data/app/models/setting/rh_cloud.rb

@@ -0,0 +1,13 @@
+class Setting::RhCloud < Setting
+  def self.default_settings
+    return unless ActiveRecord::Base.connection.table_exists?('settings')
+    return unless super
+    [
+      set('allow_auto_inventory_upload', N_('Allow automatic upload of the host inventory to the Red Hat cloud'), true),
+    ]
+  end
+
+  def self.humanized_category
+    N_('RH Cloud')
+  end
+end

data/config/routes.rb

@@ -6,5 +6,6 @@ Rails.application.routes.draw do
     get ':organization_id/uploads/last', to: 'uploads#last', constraints: { organization_id: %r{[^\/]+} }
     get ':organization_id/uploads/file', to: 'uploads#download_file', constraints: { organization_id: %r{[^\/]+} }
     get 'accounts', to: 'accounts#index'
+    post 'auto_upload', to: 'uploads#auto_upload'
   end
 end

data/lib/foreman_inventory_upload.rb

@@ -18,6 +18,18 @@ module ForemanInventoryUpload
     )
   end
 
+  def self.uploads_file_path(filename)
+    File.join(ForemanInventoryUpload.uploads_folder, filename)
+  end
+
+  def self.done_folder
+    File.join(ForemanInventoryUpload.uploads_folder, 'done/')
+  end
+
+  def self.done_file_path(filename)
+    File.join(ForemanInventoryUpload.done_folder, filename)
+  end
+
   def self.generated_reports_folder
     @generated_reports_folder ||= ensure_folder(
       File.join(

data/lib/foreman_inventory_upload/async/generate_all_reports_job.rb

@@ -2,6 +2,14 @@ module ForemanInventoryUpload
   module Async
     class GenerateAllReportsJob < ::ApplicationJob
       def perform
+        unless Setting[:allow_auto_inventory_upload]
+          logger.debug(
+            'The scheduled process is disabled due to the "allow_auto_inventory_upload"
+            setting being set to false.'
+          )
+          return
+        end
+
         organizations = Organization.unscoped.all
 
         organizations.map do |organization|

data/lib/foreman_inventory_upload/generators/archived_report.rb

@@ -16,9 +16,9 @@ module ForemanInventoryUpload
               first = true
               host_batches.each do |hosts_batch|
                 slice_id = Foreman.uuid
-                hosts_count = hosts_batch.count
-                @logger.info "Adding slice #{slice_id} with #{hosts_count} hosts"
-                generate_slice(tmpdir, slice_id, hosts_batch)
+                @logger.info "Adding slice #{slice_id}"
+                hosts_count = generate_slice(tmpdir, slice_id, hosts_batch)
+                @logger.info "slice #{slice_id} was created with #{hosts_count} hosts"
                 inner_generator.add_slice(slice_id, hosts_count, first)
                 first = false
               end
@@ -43,10 +43,13 @@ module ForemanInventoryUpload
       private
 
       def generate_slice(tmpdir, slice_id, hosts_batch)
+        hosts_count = 0
         File.open(File.join(tmpdir, "#{slice_id}.json"), 'w') do |slice_out|
           slice_generator = ForemanInventoryUpload::Generators::Slice.new(hosts_batch, slice_out, slice_id)
           slice_generator.render
+          hosts_count = slice_generator.hosts_count
         end
+        hosts_count
       end
     end
   end

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -18,6 +18,7 @@ module ForemanInventoryUpload
               'uname::release',
               'lscpu::flags',
               'distribution::version',
+              'distribution::id',
             ]).pluck(:name, :id)
           ]
       end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -4,11 +4,13 @@ module ForemanInventoryUpload
       include FactHelpers
 
       attr_accessor :slice_id
+      attr_reader :hosts_count
 
       def initialize(hosts, output = [], slice_id = Foreman.uuid)
         @stream = JsonStream.new(output)
         @hosts = hosts
         @slice_id = slice_id
+        @hosts_count = 0
       end
 
       def render
@@ -26,7 +28,10 @@ module ForemanInventoryUpload
             hosts_batch.each do |host|
               next unless host&.subscription_facet&.pools&.first
               @stream.comma unless first
-              first = false if report_host(host)
+              if report_host(host)
+                first = false
+                @hosts_count += 1
+              end
             end
           end
         end
@@ -36,7 +41,7 @@ module ForemanInventoryUpload
         @stream.object do
           @stream.simple_field('display_name', host.name)
           @stream.simple_field('fqdn', host.fqdn)
-          @stream.simple_field('account', host.subscription_facet.pools.first.account_number.to_s)
+          @stream.simple_field('account', host.subscription_facet.pools.where.not(account_number: nil).first&.account_number&.to_s)
           @stream.simple_field('subscription_manager_id', host.subscription_facet.uuid)
           @stream.simple_field('satellite_id', host.subscription_facet.uuid)
           @stream.simple_field('bios_uuid', fact_value(host, 'dmi::system::uuid'))
@@ -65,7 +70,7 @@ module ForemanInventoryUpload
 
           @stream.array_field('tags', :last) do
             report_tag('satellite', 'satellite_instance_id', Foreman.instance_id) if Foreman.respond_to?(:instance_id)
-            report_tag('satellite', 'organization_id', host.organization_id, :last)
+            report_tag('satellite', 'organization_id', host.organization_id.to_s, :last)
           end
         end
       end
@@ -105,7 +110,14 @@ module ForemanInventoryUpload
             end.join(', '))
           end
         end
-        @stream.simple_field('os_release', fact_value(host, 'distribution::name'))
+        @stream.simple_field(
+          'os_release',
+          os_release_value(
+            name: fact_value(host, 'distribution::name'),
+            version: fact_value(host, 'distribution::version'),
+            codename: fact_value(host, 'distribution::id')
+          )
+        )
         @stream.simple_field('os_kernel_version', fact_value(host, 'uname::release'))
         @stream.simple_field('arch', host.architecture&.name)
         @stream.simple_field('subscription_status', host.subscription_status_label)
@@ -142,6 +154,10 @@ module ForemanInventoryUpload
         @stream.simple_field('satellite_instance_id', Foreman.respond_to?(:instance_id) ? Foreman.instance_id : nil)
         @stream.simple_field('organization_id', host.organization_id, :last)
       end
+
+      def os_release_value(name:, version:, codename:)
+        "#{name} #{version} (#{codename})"
+      end
     end
   end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -5,6 +5,10 @@ module ForemanRhCloud
   class Engine < ::Rails::Engine
     engine_name 'foreman_rh_cloud'
 
+    initializer 'foreman_rh_cloud.load_default_settings', :before => :load_config_initializers do
+      require_dependency File.expand_path('../../app/models/setting/rh_cloud.rb', __dir__)
+    end
+
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '2.0.4'.freeze
+  VERSION = '2.0.5'.freeze
 end

data/test/controllers/accounts_controller_test.rb

@@ -14,12 +14,17 @@ class AccountsControllerTest < ActionController::TestCase
     upload_label = ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id)
     upload_output = ForemanInventoryUpload::Async::ProgressOutput.register(upload_label)
     upload_output.status = 'upload_status_test'
+    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :value => true)
+    assert_equal true, Setting[:allow_auto_inventory_upload]
 
     get :index, session: set_session_user
 
     assert_response :success
-    actual = JSON.parse(response.body)['accounts'][test_org.id.to_s]
-    assert_equal 'generate_status_test', actual['generate_report_status']
-    assert_equal 'upload_status_test', actual['upload_report_status']
+    actual = JSON.parse(response.body)
+    actual_account_statuses = actual['accounts'][test_org.id.to_s]
+    assert_equal 'generate_status_test', actual_account_statuses['generate_report_status']
+    assert_equal 'upload_status_test', actual_account_statuses['upload_report_status']
+
+    assert_equal true, actual['autoUploadEnabled']
   end
 end

data/test/controllers/uploads_controller_test.rb

@@ -18,4 +18,17 @@ class UploadsControllerTest < ActionController::TestCase
     actual = JSON.parse(response.body)
     assert_equal 'test output', actual['output']
   end
+
+  test 'should update allow_auto_inventory_upload setting' do
+    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+
+    assert_equal false, Setting[:allow_auto_inventory_upload]
+
+    post :auto_upload, params: { value: true }, session: set_session_user
+
+    assert_response :success
+    actual = JSON.parse(response.body)
+    assert_equal true, actual['autoUploadEnabled']
+    assert_equal true, Setting[:allow_auto_inventory_upload]
+  end
 end

data/test/factories/inventory_upload_factories.rb

@@ -1,16 +1,16 @@
 # redefine katello factories, as long as katello is not compatible with dynamic properties
 FactoryBot.define do
   factory :katello_organization, :class => "Organization" do
-    type {"Organization"}
+    type { "Organization" }
     sequence(:name) { |n| "Organization#{n}" }
     sequence(:label) { |n| "org#{n}" }
     sequence(:id) { |n| n }
 
     trait :acme_corporation do
-      name {"ACME_Corporation"}
-      type {"Organization"}
-      description {"This is the first Organization."}
-      label {"acme_corporation_label"}
+      name { "ACME_Corporation" }
+      type { "Organization" }
+      description { "This is the first Organization." }
+      label { "acme_corporation_label" }
     end
 
     trait :with_library do
@@ -24,11 +24,11 @@ end
 FactoryBot.define do
   factory :katello_content_view, :class => Katello::ContentView do
     sequence(:name) { |n| "Database#{n}" }
-    description {"This content view is for database content"}
+    description { "This content view is for database content" }
     association :organization, :factory => :katello_organization
 
     trait :composite do
-      composite {true}
+      composite { true }
     end
   end
 end
@@ -50,23 +50,23 @@ end
 FactoryBot.define do
   factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
     sequence(:uuid) { |n| "uuid-#{n}-#{rand(500)}" }
-    facts { {'memory.memtotal' => "12 GB"} }
+    facts { { 'memory.memtotal' => "12 GB" } }
   end
 end
 
 FactoryBot.define do
   factory :katello_pool, :class => Katello::Pool do
-    active {true}
-    end_date {Date.today + 1.year}
+    active { true }
+    end_date { Date.today + 1.year }
   end
 end
 
 FactoryBot.modify do
   factory :host do
     transient do
-      content_view {nil}
-      lifecycle_environment {nil}
-      content_source {nil}
+      content_view { nil }
+      lifecycle_environment { nil }
+      content_source { nil }
     end
 
     trait :with_content do

data/test/unit/slice_generator_test.rb

@@ -17,6 +17,8 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     )
 
     @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+
+    ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
   end
 
   def interesting_facts
@@ -30,9 +32,11 @@ class ReportGeneratorTest < ActiveSupport::TestCase
       'dmi::bios::vendor',
       'dmi::bios::version',
       'dmi::bios::relase_date',
-      'distribution::name',
       'uname::release',
       'lscpu::flags',
+      'distribution::name',
+      'distribution::version',
+      'distribution::id',
     ]
   end
 
@@ -56,6 +60,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal @host.name, actual_host['display_name']
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
   end
 
   test 'generates a report with satellite facts' do
@@ -72,13 +77,13 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 'satellite-id', satellite_facts['satellite_instance_id']
     assert_equal @host.organization_id, satellite_facts['organization_id']
 
-    instance_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'satellite_instance_id'}
+    instance_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'satellite_instance_id' }
     assert_not_nil instance_id_tag
     assert_equal 'satellite-id', instance_id_tag['value']
 
-    org_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'organization_id'}
+    org_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'organization_id' }
     assert_not_nil org_id_tag
-    assert_equal @host.organization_id, org_id_tag['value']
+    assert_equal @host.organization_id.to_s, org_id_tag['value']
 
     version = satellite_facts['satellite_version']
     if defined?(ForemanThemeSatellite)
@@ -158,6 +163,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal @host.name, actual_host['display_name']
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
   end
 
   test 'shows system_memory_bytes in bytes' do
@@ -174,4 +180,41 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 1024, actual_profile['system_memory_bytes']
   end
+
+  test 'reports an account for hosts with multiple pools' do
+    first_pool = @host.subscription_facet.pools.first
+    second_pool = FactoryBot.create(:katello_pool, account_number: nil, cp_id: 2)
+    @host.subscription_facet.pools = []
+    @host.subscription_facet.save!
+    @host.subscription_facet.pools << first_pool
+    @host.subscription_facet.pools << second_pool
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_host['account'])
+    assert_not_empty(actual_host['account'])
+  end
+
+  test 'Generates os_release with version and id' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['distribution::name'], value: 'Red Hat Test Linux', host: @host)
+    FactoryBot.create(:fact_value, fact_name: fact_names['distribution::version'], value: '7.1', host: @host)
+    FactoryBot.create(:fact_value, fact_name: fact_names['distribution::id'], value: 'TestId', host: @host)
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_profile = actual_host['system_profile'])
+    assert_equal 'Red Hat Test Linux 7.1 (TestId)', actual_profile['os_release']
+  end
 end

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

@@ -28,6 +28,8 @@ export const accountID = 'user@redhat.com';
 
 export const processStatusName = 'upload_report_status';
 
+export const autoUploadEnabled = true;
+
 export const props = {
   accounts,
   fetchAccountsStatus: noop,

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

@@ -10,12 +10,13 @@ import {
 export const fetchAccountsStatus = () => async dispatch => {
   try {
     const {
-      data: { accounts },
+      data: { accounts, autoUploadEnabled },
     } = await API.get('accounts');
     dispatch({
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
         accounts,
+        autoUploadEnabled,
       },
     });
   } catch (error) {

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

@@ -5,6 +5,7 @@ import {
   INVENTORY_ACCOUNT_STATUS_POLLING_START,
   INVENTORY_PROCESS_RESTART,
 } from './AccountListConstants';
+import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
 
 const initialState = Immutable({
   accounts: {},
@@ -20,6 +21,7 @@ export default (state = initialState, action) => {
       accounts,
       accountID,
       processStatusName,
+      autoUploadEnabled,
     } = {},
   } = action;
 
@@ -28,6 +30,7 @@ export default (state = initialState, action) => {
       return state.merge({
         ...state,
         accounts,
+        autoUploadEnabled,
         error: null,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:
@@ -49,6 +52,11 @@ export default (state = initialState, action) => {
           [processStatusName]: 'Restarting...',
         },
       });
+    case AUTO_UPLOAD_TOGGLE:
+      return state.merge({
+        ...state,
+        autoUploadEnabled,
+      });
     default:
       return state;
   }

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

@@ -6,3 +6,5 @@ export const selectAccounts = state => selectAccountsList(state).accounts;
 export const selectPollingProcessID = state =>
   selectAccountsList(state).pollingProcessID;
 export const selectError = state => selectAccountsList(state).error;
+export const selectAutoUploadEnabled = state =>
+  selectAccountsList(state).autoUploadEnabled;

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

@@ -14,7 +14,9 @@ import {
   pollingProcessID,
   accountID,
   processStatusName,
+  autoUploadEnabled,
 } from '../AccountList.fixtures';
+import { AUTO_UPLOAD_TOGGLE } from '../../AutoUploadSwitcher/AutoUploadSwitcherConstants';
 
 const fixtures = {
   'should return the initial state': {},
@@ -23,6 +25,7 @@ const fixtures = {
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
         accounts,
+        autoUploadEnabled,
       },
     },
   },
@@ -54,6 +57,14 @@ const fixtures = {
       },
     },
   },
+  'should handle AUTO_UPLOAD_TOGGLE': {
+    action: {
+      type: AUTO_UPLOAD_TOGGLE,
+      payload: {
+        autoUploadEnabled,
+      },
+    },
+  },
 };
 
 describe('AccountList reducer', () =>

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

@@ -3,14 +3,20 @@ import {
   selectAccountsList,
   selectAccounts,
   selectPollingProcessID,
+  selectAutoUploadEnabled,
 } from '../AccountListSelectors';
-import { pollingProcessID, accounts } from '../AccountList.fixtures';
+import {
+  pollingProcessID,
+  accounts,
+  autoUploadEnabled,
+} from '../AccountList.fixtures';
 
 const state = {
   ForemanInventoryUpload: {
     accountsList: {
       accounts,
       pollingProcessID,
+      autoUploadEnabled,
     },
   },
 };
@@ -20,6 +26,8 @@ const fixtures = {
   'should return AccountList accounts': () => selectAccounts(state),
   'should return AccountList pollingProcessID': () =>
     selectPollingProcessID(state),
+  'should return AccountList autoUploadEnabled': () =>
+    selectAutoUploadEnabled(state),
 };
 
 describe('AccountList selectors', () =>

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

@@ -1,5 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`AccountList reducer should handle AUTO_UPLOAD_TOGGLE 1`] = `
+Object {
+  "accounts": Object {},
+  "autoUploadEnabled": true,
+  "error": null,
+  "pollingProcessID": 0,
+}
+`;
+
 exports[`AccountList reducer should handle INVENTORY_ACCOUNT_STATUS_POLLING 1`] = `
 Object {
   "accounts": Object {
@@ -19,6 +28,7 @@ Object {
       "upload_report_status": "success",
     },
   },
+  "autoUploadEnabled": true,
   "error": null,
   "pollingProcessID": 0,
 }

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

@@ -1,7 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AccountList selectors should return AccountList pollingProcessID 1`] = `0`;
-
 exports[`AccountList selectors should return AccountList accounts 1`] = `
 Object {
   "Account1": Object {
@@ -22,6 +20,10 @@ Object {
 }
 `;
 
+exports[`AccountList selectors should return AccountList autoUploadEnabled 1`] = `true`;
+
+exports[`AccountList selectors should return AccountList pollingProcessID 1`] = `0`;
+
 exports[`AccountList selectors should return AccountsList 1`] = `
 Object {
   "accounts": Object {
@@ -41,6 +43,7 @@ Object {
       "upload_report_status": "success",
     },
   },
+  "autoUploadEnabled": true,
   "pollingProcessID": 0,
 }
 `;

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

@@ -0,0 +1 @@
+export const handleToggleResponse = { data: { autoUploadEnabled: true } };

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcher.js

@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Switch, FieldLevelHelp } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import './autoUploadSwitcher.scss';
+
+const AutoUploadSwitcher = ({ autoUploadEnabled, handleToggle }) => (
+  <div className="auto_upload_switcher">
+    <Switch
+      size="mini"
+      value={autoUploadEnabled}
+      onChange={() => handleToggle(autoUploadEnabled)}
+    />
+    <FieldLevelHelp
+      content={__(
+        'Enable automatic upload of your host inventory to the Red Hat cloud'
+      )}
+    />
+    <span>Allow Auto Upload</span>
+  </div>
+);
+
+AutoUploadSwitcher.propTypes = {
+  autoUploadEnabled: PropTypes.bool,
+  handleToggle: PropTypes.func.isRequired,
+};
+
+AutoUploadSwitcher.defaultProps = {
+  autoUploadEnabled: true,
+};
+
+export default AutoUploadSwitcher;

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcherActions.js

@@ -0,0 +1,27 @@
+import API from 'foremanReact/API';
+import {
+  AUTO_UPLOAD_TOGGLE,
+  AUTO_UPLOAD_TOGGLE_ERROR,
+} from './AutoUploadSwitcherConstants';
+
+export const handleToggle = currentAutoUploadEnabled => async dispatch => {
+  const toggledAutoUploadEnabled = !currentAutoUploadEnabled;
+  try {
+    const {
+      data: { autoUploadEnabled },
+    } = await API.post('auto_upload', { value: toggledAutoUploadEnabled });
+    dispatch({
+      type: AUTO_UPLOAD_TOGGLE,
+      payload: {
+        autoUploadEnabled,
+      },
+    });
+  } catch (error) {
+    dispatch({
+      type: AUTO_UPLOAD_TOGGLE_ERROR,
+      payload: {
+        error: error.message,
+      },
+    });
+  }
+};

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcherConstants.js

@@ -0,0 +1,2 @@
+export const AUTO_UPLOAD_TOGGLE = 'AUTO_UPLOAD_TOGGLE';
+export const AUTO_UPLOAD_TOGGLE_ERROR = 'AUTO_UPLOAD_TOGGLE_ERROR';

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

@@ -0,0 +1,14 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { noop } from 'patternfly-react';
+
+import AutoUploadSwitcher from '../AutoUploadSwitcher';
+
+const fixtures = {
+  'render with props': { autoUploadEnabled: true, handleToggle: noop },
+  /** fixtures, props for the component */
+};
+
+describe('AutoUploadSwitcher', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(AutoUploadSwitcher, fixtures));
+});

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/AutoUploadSwitcherActions.test.js

@@ -0,0 +1,14 @@
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
+import API from 'foremanReact/API';
+import { handleToggle } from '../AutoUploadSwitcherActions';
+import { handleToggleResponse } from '../AutoUploadSwitcher.fixtures';
+
+jest.mock('foremanReact/API');
+API.post.mockImplementation(async () => handleToggleResponse);
+
+const fixtures = {
+  'should handleToggle': () => handleToggle(),
+};
+
+describe('AutoUploadSwitcher actions', () =>
+  testActionSnapshotWithFixtures(fixtures));

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

@@ -0,0 +1,38 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AutoUploadSwitcher rendering render with props 1`] = `
+<div
+  className="auto_upload_switcher"
+>
+  <Switch
+    animate={true}
+    baseClass="bootstrap-switch"
+    bsSize={null}
+    defaultValue={true}
+    disabled={false}
+    handleWidth="auto"
+    inverse={false}
+    labelText=" "
+    labelWidth="auto"
+    offColor="default"
+    offText="OFF"
+    onChange={[Function]}
+    onColor="primary"
+    onText="ON"
+    readonly={false}
+    size="mini"
+    tristate={false}
+    value={true}
+    wrapperClass="wrapper"
+  />
+  <FieldLevelHelp
+    buttonClass=""
+    content="Enable automatic upload of your host inventory to the Red Hat cloud"
+    placement="top"
+    rootClose={true}
+  />
+  <span>
+    Allow Auto Upload
+  </span>
+</div>
+`;

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/__snapshots__/AutoUploadSwitcherActions.test.js.snap

@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AutoUploadSwitcher actions should handleToggle 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "autoUploadEnabled": true,
+      },
+      "type": "AUTO_UPLOAD_TOGGLE",
+    },
+  ],
+]
+`;

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/autoUploadSwitcher.scss

@@ -0,0 +1,3 @@
+.auto_upload_switcher {
+  float: right;
+}

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

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

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

@@ -1,7 +1,8 @@
 import React from 'react';
 import { IntegrationTestHelper } from '@theforeman/test';
 
-import Dashboard, { reducers } from '../index';
+import Dashboard from '../Dashboard';
+import reducers from '../../../ForemanInventoryUploadReducers';
 import { accountID } from '../Dashboard.fixtures';
 
 describe('Dashboard integration test', () => {

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.js

@@ -0,0 +1,21 @@
+import React from 'react';
+import { Grid } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import AutoUploadSwitcher from '../AutoUploadSwitcher';
+
+const PageHeader = () => (
+  <React.Fragment>
+    <Grid.Row>
+      <Grid.Col xs={12}>
+        <h1>{__('Red Hat Inventory Uploads')}</h1>
+      </Grid.Col>
+    </Grid.Row>
+    <Grid.Row>
+      <Grid.Col xs={4} xsOffset={8}>
+        <AutoUploadSwitcher />
+      </Grid.Col>
+    </Grid.Row>
+  </React.Fragment>
+);
+
+export default PageHeader;

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

@@ -0,0 +1,13 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+
+import PageHeader from '../PageHeader';
+
+const fixtures = {
+  'render without Props': {},
+  /** fixtures, props for the component */
+};
+
+describe('PageHeader', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(PageHeader, fixtures));
+});

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

@@ -0,0 +1,33 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PageHeader rendering render without Props 1`] = `
+<Fragment>
+  <Row
+    bsClass="row"
+    componentClass="div"
+  >
+    <Col
+      bsClass="col"
+      componentClass="div"
+      xs={12}
+    >
+      <h1>
+        Red Hat Inventory Uploads
+      </h1>
+    </Col>
+  </Row>
+  <Row
+    bsClass="row"
+    componentClass="div"
+  >
+    <Col
+      bsClass="col"
+      componentClass="div"
+      xs={4}
+      xsOffset={8}
+    >
+      <Connect(AutoUploadSwitcher) />
+    </Col>
+  </Row>
+</Fragment>
+`;

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

@@ -0,0 +1 @@
+export { default } from './PageHeader';

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

@@ -1,3 +1,4 @@
 export const props = {
   date: '2019-08-21T16:14:16.520+03:00',
+  autoUploadEnabled: true,
 };

data/webpack/ForemanInventoryUpload/Components/ScheduledRun/ScheduledRun.js

@@ -5,8 +5,8 @@ import { FormattedRelative } from 'react-intl';
 import { translate as __ } from 'foremanReact/common/I18n';
 import './scheduledRun.scss';
 
-const ScheduledRun = ({ date }) =>
-  date ? (
+const ScheduledRun = ({ date, autoUploadEnabled }) =>
+  autoUploadEnabled && date ? (
     <Grid.Col sm={12} className="scheduled_run">
       <p>
         <Icon name="calendar" />
@@ -18,10 +18,12 @@ const ScheduledRun = ({ date }) =>
 
 ScheduledRun.propTypes = {
   date: PropTypes.string,
+  autoUploadEnabled: PropTypes.bool,
 };
 
 ScheduledRun.defaultProps = {
   date: null,
+  autoUploadEnabled: true,
 };
 
 export default ScheduledRun;

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

@@ -4,7 +4,6 @@ import ScheduledRun from '../ScheduledRun';
 import { props } from '../ScheduledRun.fixtures';
 
 const fixtures = {
-  'render without Props': {},
   'render with Props': props,
 };
 

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

@@ -21,5 +21,3 @@ exports[`ScheduledRun rendering render with Props 1`] = `
   </p>
 </Col>
 `;
-
-exports[`ScheduledRun rendering render without Props 1`] = `""`;

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

@@ -1 +1,12 @@
-export { default } from './ScheduledRun';
+import { connect } from 'react-redux';
+
+import ScheduledRun from './ScheduledRun';
+import { selectAutoUploadEnabled } from '../AccountList/AccountListSelectors';
+
+// map state to props
+const mapStateToProps = state => ({
+  autoUploadEnabled: selectAutoUploadEnabled(state),
+});
+
+// export connected component
+export default connect(mapStateToProps)(ScheduledRun);

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

@@ -12,7 +12,7 @@ exports[`TabBody rendering render without Props 1`] = `
     exitCode=""
     logs={null}
   />
-  <ScheduledRun
+  <Connect(ScheduledRun)
     date={null}
   />
 </Row>

data/webpack/ForemanInventoryUpload/ForemanInventoryUpload.js

@@ -1,14 +1,15 @@
 import React from 'react';
 import { IntlProvider } from 'react-intl';
-import { translate as __ } from 'foremanReact/common/I18n';
+import { Grid } from 'patternfly-react';
 import AccountList from './Components/AccountList';
+import PageHeader from './Components/PageHeader';
 
 const ForemanInventoryUpload = () => (
   <IntlProvider locale={navigator.language}>
-    <div className="inventory-upload">
-      <h1>{__('Red Hat Inventory Uploads')}</h1>
+    <Grid fluid className="inventory-upload">
+      <PageHeader />
       <AccountList />
-    </div>
+    </Grid>
   </IntlProvider>
 );
 

data/webpack/ForemanInventoryUpload/__snapshots__/ForemanInventoryUpload.test.js.snap

@@ -4,13 +4,14 @@ exports[`ForemanInventoryUpload render without Props 1`] = `
 <IntlProvider
   locale="en-US"
 >
-  <div
+  <Grid
+    bsClass="container"
     className="inventory-upload"
+    componentClass="div"
+    fluid={true}
   >
-    <h1>
-      Red Hat Inventory Uploads
-    </h1>
+    <PageHeader />
     <Connect(AccountList) />
-  </div>
+  </Grid>
 </IntlProvider>
 `;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -109,6 +109,7 @@ files:
 - app/controllers/foreman_inventory_upload/reports_controller.rb
 - app/controllers/foreman_inventory_upload/uploads_controller.rb
 - app/helpers/foreman_inventory_upload_helper.rb
+- app/models/setting/rh_cloud.rb
 - app/views/foreman_inventory_upload/layouts/react.html.erb
 - config/routes.rb
 - lib/foreman_inventory_upload.rb
@@ -191,6 +192,16 @@ files:
 - webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListSelectors.test.js.snap
 - webpack/ForemanInventoryUpload/Components/AccountList/accountList.scss
 - webpack/ForemanInventoryUpload/Components/AccountList/index.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcher.fixtures.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcher.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcherActions.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcherConstants.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/AutoUploadSwitcher.test.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/AutoUploadSwitcherActions.test.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/__snapshots__/AutoUploadSwitcher.test.js.snap
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/__snapshots__/AutoUploadSwitcherActions.test.js.snap
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/autoUploadSwitcher.scss
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/index.js
 - webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.fixtures.js
 - webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.js
 - webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.stories.js
@@ -231,6 +242,10 @@ files:
 - webpack/ForemanInventoryUpload/Components/NavContainer/__tests__/__snapshots__/NavContainer.test.js.snap
 - webpack/ForemanInventoryUpload/Components/NavContainer/index.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/navContainer.scss
+- webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.js
+- webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/PageHeader.test.js
+- webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageHeader.test.js.snap
+- webpack/ForemanInventoryUpload/Components/PageHeader/index.js
 - webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.fixtures.js
 - webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.js
 - webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerateHelper.js