foreman_rh_cloud 4.0.29 → 5.0.28

data/test/jobs/upload_report_job_test.rb

@@ -1,6 +1,8 @@
 require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
 
-class UploadReportJobTest < ActiveJob::TestCase
+class UploadReportJobTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include FolderIsolation
 
   test 'returns aborted state when disconnected' do
@@ -12,7 +14,7 @@ class UploadReportJobTest < ActiveJob::TestCase
     )
     FactoryBot.create(:setting, :name => 'content_disconnected', :value => true)
 
-    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
@@ -24,7 +26,7 @@ class UploadReportJobTest < ActiveJob::TestCase
     organization = FactoryBot.create(:organization)
     Organization.any_instance.expects(:owner_details).returns(nil)
 
-    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)

data/test/unit/shell_process_job_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
 
 class ShellProcessJobTest < ActiveSupport::TestCase
   class TestProcessJob < ForemanInventoryUpload::Async::ShellProcess
@@ -13,11 +14,12 @@ class ShellProcessJobTest < ActiveSupport::TestCase
     end
   end
 
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include FolderIsolation
 
   test 'Runs a process with environment vars' do
     label = Foreman.uuid
-    TestProcessJob.perform_now(label)
+    ForemanTasks.sync_task(TestProcessJob, label)
 
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
 

data/test/unit/slice_generator_test.rb

@@ -447,18 +447,6 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
-  test 'excludes hosts with host_registration_insights set to false' do
-    @host.host_parameters << HostParameter.create(
-      name: 'host_registration_insights',
-      value: "false",
-      parameter_type: 'boolean'
-    )
-
-    count = ForemanInventoryUpload::Generators::Queries.for_org(@host.organization_id).count
-
-    assert_equal 0, count
-  end
-
   test 'shows system_memory_bytes in bytes' do
     FactoryBot.create(:fact_value, fact_name: fact_names['memory::memtotal'], value: '1', host: @host)
 

data/webpack/ForemanInventoryUpload/Components/AccountList/accountList.scss

@@ -1,4 +1,12 @@
 .rh-cloud-inventory-page {
+  #main {
+    padding: 0;
+
+    #breadcrumb {
+      display: none;
+    }
+  }
+
   .account-list {
     .pf-c-accordion__toggle {
       margin-top: 10px;

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.scss

@@ -1,5 +1,21 @@
 .rh-cloud-inventory-page {
   .inventory-upload-header {
+    margin-top: 35px;
+
+    h1 {
+      font-family: 'RedHatDisplay';
+      font-weight: 400;
+      margin: 0;
+    }
+
+    p {
+      font-size: 16px;
+    }
+
+    .pf-c-dropdown__toggle {
+      margin-right: -20px;
+    }
+
     .settings-alert {
       margin-bottom: 30px;
       .pf-c-alert {
@@ -18,10 +34,7 @@
 
     .inventory-upload-header-title {
       margin-top: -15px;
-
-      h1 {
-        margin: 0;
-      }
+      margin-bottom: 8px;
     }
 
     .title-dropdown {

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

@@ -4,7 +4,10 @@ import {
   DropdownItem,
   KebabToggle,
   DropdownPosition,
+  Grid,
+  GridItem,
 } from '@patternfly/react-core';
+import Head from 'foremanReact/components/Head';
 import {
   INVENTORY_PAGE_TITLE,
   ACTIONS_HISTORY_BUTTON_TEXT,
@@ -43,23 +46,32 @@ const PageTitle = () => {
     </DropdownItem>,
   ];
   return (
-    <div className="row form-group inventory-upload-header-title">
-      <h1 className="col-md-8">{INVENTORY_PAGE_TITLE}</h1>
-      <Dropdown
-        className="title-dropdown"
-        onSelect={() => setIsDropdownOpen(false)}
-        toggle={<KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />}
-        isOpen={isDropdownOpen}
-        isPlain
-        dropdownItems={dropdownItems}
-        position={DropdownPosition.right}
-      />
-      <CloudPingModal
-        isOpen={showPingModal}
-        toggle={togglePingModal}
-        title={CLOUD_PING_TITLE}
-      />
-    </div>
+    <Grid className="inventory-upload-header-title">
+      <GridItem span={6}>
+        <Head>
+          <title>{INVENTORY_PAGE_TITLE}</title>
+        </Head>
+        <h1>{INVENTORY_PAGE_TITLE}</h1>
+      </GridItem>
+      <GridItem span={6}>
+        <Dropdown
+          className="title-dropdown"
+          onSelect={() => setIsDropdownOpen(false)}
+          toggle={
+            <KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />
+          }
+          isOpen={isDropdownOpen}
+          isPlain
+          dropdownItems={dropdownItems}
+          position={DropdownPosition.right}
+        />
+        <CloudPingModal
+          isOpen={showPingModal}
+          toggle={togglePingModal}
+          title={CLOUD_PING_TITLE}
+        />
+      </GridItem>
+    </Grid>
   );
 };
 export default PageTitle;

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

@@ -1,53 +1,64 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`PageTitle rendering render without Props 1`] = `
-<div
-  className="row form-group inventory-upload-header-title"
+<Grid
+  className="inventory-upload-header-title"
 >
-  <h1
-    className="col-md-8"
+  <GridItem
+    span={6}
   >
-    Red Hat Inventory
-  </h1>
-  <Dropdown
-    className="title-dropdown"
-    dropdownItems={
-      Array [
-        <DropdownItem
-          href="/foreman_tasks/tasks?search=action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Actions history
-        </DropdownItem>,
-        <DropdownItem
-          href="/links/manual/+?root_url=https%3A%2F%2Faccess.redhat.com%2Fproducts%2Fsubscription-central"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Documentation
-        </DropdownItem>,
-        <DropdownItem
-          onClick={[Function]}
-        >
-          Connectivity test
-        </DropdownItem>,
-      ]
-    }
-    isOpen={false}
-    isPlain={true}
-    onSelect={[Function]}
-    position="right"
-    toggle={
-      <KebabToggle
-        onToggle={[Function]}
-      />
-    }
-  />
-  <CloudPingModal
-    isOpen={false}
-    title="Connectivity test"
-    toggle={[Function]}
-  />
-</div>
+    <Head>
+      <title>
+        Red Hat Inventory
+      </title>
+    </Head>
+    <h1>
+      Red Hat Inventory
+    </h1>
+  </GridItem>
+  <GridItem
+    span={6}
+  >
+    <Dropdown
+      className="title-dropdown"
+      dropdownItems={
+        Array [
+          <DropdownItem
+            href="/foreman_tasks/tasks?search=action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Actions history
+          </DropdownItem>,
+          <DropdownItem
+            href="/links/manual/+?root_url=https%3A%2F%2Faccess.redhat.com%2Fproducts%2Fsubscription-central"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Documentation
+          </DropdownItem>,
+          <DropdownItem
+            onClick={[Function]}
+          >
+            Connectivity test
+          </DropdownItem>,
+        ]
+      }
+      isOpen={false}
+      isPlain={true}
+      onSelect={[Function]}
+      position="right"
+      toggle={
+        <KebabToggle
+          onToggle={[Function]}
+        />
+      }
+    />
+    <CloudPingModal
+      isOpen={false}
+      title="Connectivity test"
+      toggle={[Function]}
+    />
+  </GridItem>
+</Grid>
 `;

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

@@ -1,24 +1,26 @@
 import React from 'react';
+import { Text } from '@patternfly/react-core';
+
 import { translate as __ } from 'foremanReact/common/I18n';
 
 export const PageDescription = () => (
   <div id="inventory_page_description">
-    <p>
+    <Text>
       {__(
         'Red Hat Insights is a set of cloud services which provide unified subscription reporting, predictive analysis and remediation of issues through this Satellite instance.'
       )}
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__(
         'You can toggle the Auto upload switch to the ON position to enable Satellite to automatically upload your host inventory once a day.'
       )}
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__(
         'Click Restart to upload your host inventory to Red Hat Insights. Perform this step for each organization from which you want to manually upload a host inventory.'
       )}
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__(
         'Enabling inventory uploads is required by subscription watch. For more information about subscription watch see link:'
       )}
@@ -30,8 +32,8 @@ export const PageDescription = () => (
       >
         {__('About subscription watch')}
       </a>
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__('For more information about Insights and Cloud Connector read')}
       &nbsp;
       <a
@@ -41,7 +43,7 @@ export const PageDescription = () => (
       >
         {__('Red Hat Insights Data and Application Security')}
       </a>
-    </p>
+    </Text>
   </div>
 );
 

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

@@ -4,16 +4,16 @@ exports[`PageDescription rendering render without Props 1`] = `
 <div
   id="inventory_page_description"
 >
-  <p>
+  <Text>
     Red Hat Insights is a set of cloud services which provide unified subscription reporting, predictive analysis and remediation of issues through this Satellite instance.
-  </p>
-  <p>
+  </Text>
+  <Text>
     You can toggle the Auto upload switch to the ON position to enable Satellite to automatically upload your host inventory once a day.
-  </p>
-  <p>
+  </Text>
+  <Text>
     Click Restart to upload your host inventory to Red Hat Insights. Perform this step for each organization from which you want to manually upload a host inventory.
-  </p>
-  <p>
+  </Text>
+  <Text>
     Enabling inventory uploads is required by subscription watch. For more information about subscription watch see link:
      
     <a
@@ -23,8 +23,8 @@ exports[`PageDescription rendering render without Props 1`] = `
     >
       About subscription watch
     </a>
-  </p>
-  <p>
+  </Text>
+  <Text>
     For more information about Insights and Cloud Connector read
      
     <a
@@ -34,6 +34,6 @@ exports[`PageDescription rendering render without Props 1`] = `
     >
       Red Hat Insights Data and Application Security
     </a>
-  </p>
+  </Text>
 </div>
 `;

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/__snapshots__/InventoryAutoUpload.test.js.snap

@@ -33,7 +33,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
       >
         <Popover
           bodyContent={
-            <UNDEFINED
+            <Memo(Connect(AdvancedSettings))
               autoUploadEnabled={true}
               handleToggle={[Function]}
             />

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTable.test.js.snap

@@ -60,7 +60,10 @@ exports[`InsightsTable rendering render with Props 1`] = `
     dropdownPosition="right"
     expandId="expandable-toggle"
     gridBreakPoint="grid-md"
+    isHeaderSelectDisabled={false}
+    isNested={false}
     isStickyHeader={false}
+    isTreeTable={false}
     onSelect={[Function]}
     onSort={[Function]}
     ouiaSafe={true}
@@ -77,7 +80,7 @@ exports[`InsightsTable rendering render with Props 1`] = `
     variant="compact"
   >
     <TableHeader />
-    <Component />
+    <TableBody />
   </Table>
   <TableEmptyState
     error={null}

data/webpack/InsightsCloudSync/Components/__tests__/__snapshots__/NoTokenEmptyState.test.js.snap

@@ -157,6 +157,7 @@ exports[`NoTokenEmptyState render 1`] = `
                                 isReadOnly={false}
                                 isRequired={false}
                                 onChange={[Function]}
+                                ouiaSafe={true}
                                 type="password"
                                 validated="default"
                                 value=""
@@ -165,6 +166,9 @@ exports[`NoTokenEmptyState render 1`] = `
                                   aria-invalid={false}
                                   aria-label="input-cloud-token"
                                   className="pf-c-form-control"
+                                  data-ouia-component-id="OUIA-Generated-TextInputBase-1"
+                                  data-ouia-component-type="PF4/TextInput"
+                                  data-ouia-safe={true}
                                   disabled={false}
                                   onBlur={[Function]}
                                   onChange={[Function]}
@@ -190,21 +194,28 @@ exports[`NoTokenEmptyState render 1`] = `
             onClick={[Function]}
             variant="primary"
           >
-            <button
-              aria-disabled={true}
-              aria-label={null}
-              className="pf-c-button pf-m-primary pf-m-disabled"
-              data-ouia-component-id="OUIA-Generated-Button-primary-1"
-              data-ouia-component-type="PF4/Button"
-              data-ouia-safe={true}
-              disabled={true}
+            <ButtonBase
+              innerRef={null}
+              isDisabled={true}
               onClick={[Function]}
-              role={null}
-              tabIndex={null}
-              type="button"
+              variant="primary"
             >
-              Save setting and sync recommendations
-            </button>
+              <button
+                aria-disabled={true}
+                aria-label={null}
+                className="pf-c-button pf-m-primary pf-m-disabled"
+                data-ouia-component-id="OUIA-Generated-Button-primary-1"
+                data-ouia-component-type="PF4/Button"
+                data-ouia-safe={true}
+                disabled={true}
+                onClick={[Function]}
+                role={null}
+                tabIndex={null}
+                type="button"
+              >
+                Save setting and sync recommendations
+              </button>
+            </ButtonBase>
           </Button>
         </div>
       </div>

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

@@ -32,7 +32,7 @@ exports[`InsightsCloudSync render 1`] = `
         <span
           className="insights-toolbar-buttons"
         >
-          <UNDEFINED />
+          <Memo(Connect(RemediationModal)) />
           <ToolbarDropdown
             onRecommendationSync={[Function]}
           />

data/webpack/__mocks__/foremanReact/components/Head.js

@@ -0,0 +1,11 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { Helmet } from 'react-helmet';
+
+const Head = ({ children }) => <Helmet>{children}</Helmet>;
+
+Head.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+
+export default Head;

data/webpack/common/Switcher/__tests__/__snapshots__/SwitcherPF4.test.js.snap

@@ -7,6 +7,7 @@ exports[`InsightsCloudSync helpers should return insights cloud Url 1`] = `
   id="rh-cloud-switcher-some-id"
   isChecked={true}
   isDisabled={false}
+  isReversed={false}
   label={
     <div>
       some-label

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 4.0.29
+  version: 5.0.28
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -158,6 +158,8 @@ files:
 - app/models/insights_rule.rb
 - app/models/inventory_sync/inventory_status.rb
 - app/models/setting/rh_cloud.rb
+- app/models/task_output_line.rb
+- app/models/task_output_status.rb
 - app/overrides/hosts_list.rb
 - app/overrides/layouts/base/styles.html.erb.deface
 - app/services/foreman_rh_cloud/branch_info.rb
@@ -188,6 +190,7 @@ files:
 - db/migrate/20210307000001_add_unique_to_insights_facet.foreman_rh_cloud.rb
 - db/migrate/20210404000001_change_resolutions.foreman_rh_cloud.rb
 - db/migrate/20210720000001_remove_old_insights_statuses.foreman_rh_cloud.rb
+- db/migrate/20211027000001_create_task_output.foreman_rh_cloud.rb
 - db/seeds.d/179_ui_notifications.rb
 - db/seeds.d/50_job_templates.rb
 - lib/foreman_inventory_upload.rb
@@ -609,6 +612,7 @@ files:
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/MountingService.js
 - webpack/__mocks__/foremanReact/common/helpers.js
+- webpack/__mocks__/foremanReact/components/Head.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutSelectors.js
 - webpack/__mocks__/foremanReact/constants.js