foreman_rh_cloud 3.0.14 → 3.0.15

data/config/routes.rb

@@ -11,17 +11,26 @@ Rails.application.routes.draw do
     post 'installed_packages_inclusion', to: 'uploads#installed_packages_inclusion'
     post 'ips_obfuscation', to: 'uploads#ips_obfuscation'
 
+    get 'cloud_connector', to: 'uploads#cloud_connector_status'
+    post 'cloud_connector', to: 'uploads#enable_cloud_connector'
+
     resources :tasks, only: [:create]
   end
 
   namespace :insights_cloud do
     resources :tasks, only: [:create]
     resource :settings, only: [:show, :update]
-    get 'hits/:host_id', to: 'hits#index'
+    resources :hits, except: %i[show] do
+      collection do
+        get 'auto_complete_search'
+      end
+    end
+    match 'hits/:host_id', to: 'hits#show', via: :get
+    post 'save_token_and_sync', to: 'settings#save_token_and_sync'
   end
 
   namespace :foreman_rh_cloud do
-    get 'inventory_upload', to: 'react#inventory_upload'
-    get 'insights_cloud', to: 'react#insights_cloud'
+    get 'inventory_upload', to: '/react#index'
+    get 'insights_cloud', to: '/react#index' # Uses foreman's react controller
   end
 end

data/lib/foreman_inventory_upload.rb

@@ -48,7 +48,7 @@ module ForemanInventoryUpload
   end
 
   def self.facts_archive_name(organization)
-    "report_for_#{organization}.tar.gz"
+    "report_for_#{organization}.tar.xz"
   end
 
   def self.upload_url

data/lib/foreman_inventory_upload/generators/archived_report.rb

@@ -28,7 +28,7 @@ module ForemanInventoryUpload
 
           @logger.info 'Archiving generated report'
           # success = system('tar', '-zcvf', @target, '-C', tmpdir, '.')
-          Open3.popen2e('tar', '-zcvf', @target, '-C', tmpdir, '.') do |_in, out, wait_thr|
+          Open3.popen2e('tar', '-Jcvf', @target, '-C', tmpdir, '.') do |_in, out, wait_thr|
             @logger.info("tar: #{out.read}")
 
             if wait_thr.value.success?

data/lib/foreman_rh_cloud/engine.rb

@@ -1,5 +1,6 @@
 require 'katello'
 require 'redhat_access'
+require 'foreman_ansible'
 
 module ForemanRhCloud
   class Engine < ::Rails::Engine
@@ -40,11 +41,21 @@ module ForemanRhCloud
             'foreman_inventory_upload/accounts': [:index],
             'foreman_inventory_upload/reports': [:last],
             'foreman_inventory_upload/uploads': [:auto_upload, :show_auto_upload, :download_file, :last],
-            'foreman_rh_cloud/react': [:inventory_upload]
+            'react': [:index]
+          )
+          permission(
+            :view_insights_hits,
+            {
+              '/foreman_rh_cloud/insights_cloud': [:index], # for bookmarks and later for showing the page
+              'insights_cloud/hits': [:index, :show, :auto_complete_search],
+              'insights_cloud/settings': [:index, :show],
+              'react': [:index],
+            },
+            :resource_type => ::InsightsHit.name
           )
         end
 
-        plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud]
+        plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud, :view_insights_hits]
 
         role 'ForemanRhCloud', plugin_permissions, 'Role granting permissions to view the hosts inventory,
                                                     generate a report, upload it to the cloud and download it locally'
@@ -55,8 +66,8 @@ module ForemanRhCloud
 
         # Adding a sub menu after hosts menu
         divider :top_menu, caption: N_('RH Cloud'), parent: :configure_menu
-        menu :top_menu, :inventory_upload, caption: N_('Inventory Upload'), url_hash: { controller: :'foreman_rh_cloud/react', action: :inventory_upload }, parent: :configure_menu
-        menu :top_menu, :insights_hits_import, caption: N_('Insights'), url_hash: { controller: :'foreman_rh_cloud/react', action: :insights_cloud }, parent: :configure_menu
+        menu :top_menu, :inventory_upload, caption: N_('Inventory Upload'), url: '/foreman_rh_cloud/inventory_upload', url_hash: { controller: :react, action: :index }, parent: :configure_menu
+        menu :top_menu, :insights_hits, caption: N_('Insights'), url: '/foreman_rh_cloud/insights_cloud', url_hash: { controller: :react, action: :index }, parent: :configure_menu
 
         register_facet InsightsFacet, :insights do
           configure_host do
@@ -80,7 +91,6 @@ module ForemanRhCloud
       ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
 
       ::Host::Managed.include RhCloudHost
-      ::Host::Base.include RhCloudHost
     end
 
     initializer "foreman_rh_cloud.set_dynflow.config.on_init", :before => :finisher_hook do |_app|

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '3.0.14'.freeze
+  VERSION = '3.0.15'.freeze
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -2,6 +2,21 @@ require 'tempfile'
 
 namespace :rh_cloud_inventory do
   namespace :report do
+    desc 'Generate inventory report and send it to Red Hat cloud'
+    task generate_upload: [:environment, 'dynflow:client'] do
+      unless ENV['organization_id'].nil?
+        organizations = [ Organization.where(:id => ENV['organization_id']).first ]
+      else
+        organizations = Organization.unscoped.all
+      end
+
+      User.as_anonymous_admin do
+        organizations.each do |organization|
+          ForemanInventoryUpload::Async::GenerateReportJob.perform_now(ForemanInventoryUpload.generated_reports_folder, organization.id)
+          puts "Generated and uploaded inventory report for organization '#{organization.name}'"
+        end
+      end
+    end
     desc 'Generate inventory report to be sent to Red Hat cloud'
     task generate: :environment do
       portal_user = ENV['portal_user']
@@ -27,6 +42,14 @@ namespace :rh_cloud_inventory do
         end
       end
     end
+    desc 'Upload generated inventory report to Red Hat cloud'
+    task upload: [:environment, 'dynflow:client'] do
+      base_folder = ENV['target'] || ForemanInventoryUpload.generated_reports_folder
+      organization_id = ENV['organization_id']
+      report_file = ForemanInventoryUpload.facts_archive_name(organization_id)
+      ForemanInventoryUpload::Async::QueueForUploadJob.perform_now(base_folder, report_file, organization_id)
+      puts "Uploaded #{report_file}"
+    end
   end
 
   desc "Synchronize Insights hosts hits"

data/package.json

@@ -22,26 +22,27 @@
     "url": "http://projects.theforeman.org/projects/foreman_rh_cloud/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 4.0.2"
+    "@theforeman/vendor": "~4.14.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^4.0.2",
-    "@theforeman/stories": "^4.0.2",
-    "@theforeman/test": "^4.0.2",
-    "@theforeman/vendor-dev": "^4.0.2",
-    "@theforeman/eslint-plugin-foreman": "^4.0.2",
-    "babel-eslint": "^10.0.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-spellcheck": "^0.0.17",
-    "prettier": "^1.13.5",
-    "raf": "^3.4.0",
-    "stylelint": "^9.3.0",
-    "stylelint-config-standard": "^18.0.0",
-    "surge": "^0.20.3"
+    "@babel/core": "~7.7.0",
+    "@redhat-cloud-services/frontend-components": "^2.5.0",
+    "@theforeman/builder": "~4.14.0",
+    "@theforeman/stories": "~4.14.0",
+    "@theforeman/test": "~4.14.0",
+    "@theforeman/vendor-dev": "~4.14.0",
+    "@theforeman/eslint-plugin-foreman": "~4.14.0",
+    "babel-eslint": "~10.0.0",
+    "eslint": "~6.7.2",
+    "eslint-plugin-spellcheck": "~0.0.17",
+    "prettier": "~1.19.1",
+    "stylelint": "~9.3.0",
+    "stylelint-config-standard": "~18.0.0",
+    "surge": "~0.20.3",
+    "redux-mock-store": "~1.2.2"
   },
   "dependencies": {
-    "jed": "^1.1.1",
-    "react-intl": "^2.8.0"
+    "jed": "~1.1.1",
+    "react-intl": "~2.8.0"
   }
 }

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

@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
-import { ListView, noop } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
+import { Accordion } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 import ListItem from './Components/ListItem';
 import EmptyState from './Components/EmptyState';
@@ -42,7 +43,7 @@ class AccountList extends Component {
       const account = accounts[accountID];
       return <ListItem key={index} accountID={accountID} account={account} />;
     });
-    return <ListView className="account_list">{items}</ListView>;
+    return <Accordion className="account-list">{items}</Accordion>;
   }
 }
 

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

@@ -1,4 +1,4 @@
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { addToast } from 'foremanReact/redux/actions/toasts';
 import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {

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

@@ -1,22 +1,40 @@
-import React from 'react';
-import { ListView } from 'patternfly-react';
+import React, { useState } from 'react';
+import {
+  AccordionItem,
+  AccordionToggle,
+  AccordionContent,
+  Label,
+} from '@patternfly/react-core';
+import { UserIcon } from '@patternfly/react-icons';
 import PropTypes from 'prop-types';
 import ListItemStatus from '../ListItemStatus';
 import Dashboard from '../../../Dashboard';
 
-const ListItem = ({ accountID, account }) => (
-  <ListView.Item
-    leftContent={<ListView.Icon name="user" />}
-    heading={account.label}
-    additionalInfo={[
-      <ListItemStatus key={`${accountID}_status`} account={account} />,
-    ]}
-    stacked
-    hideCloseIcon
-  >
-    <Dashboard accountID={accountID} account={account} />
-  </ListView.Item>
-);
+const ListItem = ({ accountID, account }) => {
+  const [isExpanded, setIsExpanded] = useState(false);
+  return (
+    <AccordionItem>
+      <AccordionToggle
+        onClick={() => setIsExpanded(currentValue => !currentValue)}
+        isExpanded={isExpanded}
+      >
+        <span>
+          <Label
+            className="account-icon"
+            variant="outline"
+            color="blue"
+            icon={<UserIcon />}
+          />
+          {account.label}
+        </span>
+        <ListItemStatus key={`${accountID}_status`} account={account} />
+      </AccordionToggle>
+      <AccordionContent isHidden={!isExpanded}>
+        <Dashboard accountID={accountID} account={account} />
+      </AccordionContent>
+    </AccordionItem>
+  );
+};
 
 ListItem.propTypes = {
   accountID: PropTypes.string.isRequired,

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

@@ -1,50 +1,50 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ListItem rendering render with Props 1`] = `
-<ListViewItem
-  actions={null}
-  additionalInfo={
-    Array [
-      <ListItemStatus
-        account={
-          Object {
-            "generate_report_status": "unknown",
-            "label": "default_org_name",
-            "upload_report_status": "unknown",
-          }
+<AccordionItem>
+  <AccordionToggle
+    isExpanded={false}
+    onClick={[Function]}
+  >
+    <span>
+      <Label
+        className="account-icon"
+        color="blue"
+        icon={
+          <UserIcon
+            color="currentColor"
+            noVerticalAlign={false}
+            size="sm"
+          />
         }
-      />,
-    ]
-  }
-  checkboxInput={null}
-  compoundExpand={false}
-  compoundExpanded={false}
-  description={null}
-  heading="default_org_name"
-  hideCloseIcon={true}
-  initExpanded={false}
-  leftContent={
-    <ListViewIcon
-      className=""
-      name="user"
-      size="sm"
-      type="fa"
+        variant="outline"
+      />
+      default_org_name
+    </span>
+    <ListItemStatus
+      account={
+        Object {
+          "generate_report_status": "unknown",
+          "label": "default_org_name",
+          "upload_report_status": "unknown",
+        }
+      }
+      key="1_status"
     />
-  }
-  onCloseCompoundExpand={[Function]}
-  onExpand={[Function]}
-  onExpandClose={[Function]}
-  stacked={true}
->
-  <Connect(Dashboard)
-    account={
-      Object {
-        "generate_report_status": "unknown",
-        "label": "default_org_name",
-        "upload_report_status": "unknown",
+  </AccordionToggle>
+  <AccordionContent
+    isHidden={true}
+  >
+    <Connect(Dashboard)
+      account={
+        Object {
+          "generate_report_status": "unknown",
+          "label": "default_org_name",
+          "upload_report_status": "unknown",
+        }
       }
-    }
-    accountID="1"
-  />
-</ListViewItem>
+      accountID="1"
+    />
+  </AccordionContent>
+</AccordionItem>
 `;

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

@@ -1,8 +1,7 @@
 import React from 'react';
-import { Grid } from 'patternfly-react';
+import { Grid, GridItem } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import './listItemStatus.scss';
 import { getStatusIconByRegex } from './ListItemStatusHelper';
 
 const ListItemStatus = ({ account }) => {
@@ -13,15 +12,15 @@ const ListItemStatus = ({ account }) => {
     account.upload_report_status
   );
   return (
-    <Grid className="status">
-      <Grid.Col sm={6} className="item">
+    <Grid hasGutter className="status">
+      <GridItem span={6} className="item">
         <p>{__('Generating')}</p>
         {generatingStatusIcon}
-      </Grid.Col>
-      <Grid.Col sm={6} className="item">
+      </GridItem>
+      <GridItem span={6} className="item">
         <p>{__('Uploading')}</p>
         {uploadingStatusIcon}
-      </Grid.Col>
+      </GridItem>
     </Grid>
   );
 };

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

@@ -1,10 +1,11 @@
 import React from 'react';
-import { Icon, Spinner } from 'patternfly-react';
+import { Spinner } from '@patternfly/react-core';
+import { CheckIcon, TimesIcon } from '@patternfly/react-icons';
 
 const STATUS_ICONS = {
-  success: <Icon name="check" />,
-  failure: <Icon name="times" />,
-  running: <Spinner loading inline size="xs" />,
+  success: <CheckIcon />,
+  failure: <TimesIcon />,
+  running: <Spinner size="sm" />,
   unknown: <span>--</span>,
 };
 

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

@@ -2,57 +2,44 @@
 
 exports[`ListItemStatus rendering render with Props 1`] = `
 <Grid
-  bsClass="container"
   className="status"
-  componentClass="div"
-  fluid={false}
+  hasGutter={true}
 >
-  <Col
-    bsClass="col"
+  <GridItem
     className="item"
-    componentClass="div"
-    sm={6}
+    span={6}
   >
     <p>
       Generating
     </p>
-    <Icon
-      name="check"
-      type="fa"
+    <CheckIcon
+      color="currentColor"
+      noVerticalAlign={false}
+      size="sm"
     />
-  </Col>
-  <Col
-    bsClass="col"
+  </GridItem>
+  <GridItem
     className="item"
-    componentClass="div"
-    sm={6}
+    span={6}
   >
     <p>
       Uploading
     </p>
     <Spinner
-      className=""
-      inline={true}
-      inverse={false}
-      loading={true}
-      size="xs"
+      size="sm"
     />
-  </Col>
+  </GridItem>
 </Grid>
 `;
 
 exports[`ListItemStatus rendering render without Props 1`] = `
 <Grid
-  bsClass="container"
   className="status"
-  componentClass="div"
-  fluid={false}
+  hasGutter={true}
 >
-  <Col
-    bsClass="col"
+  <GridItem
     className="item"
-    componentClass="div"
-    sm={6}
+    span={6}
   >
     <p>
       Generating
@@ -60,12 +47,10 @@ exports[`ListItemStatus rendering render without Props 1`] = `
     <span>
       --
     </span>
-  </Col>
-  <Col
-    bsClass="col"
+  </GridItem>
+  <GridItem
     className="item"
-    componentClass="div"
-    sm={6}
+    span={6}
   >
     <p>
       Uploading
@@ -73,6 +58,6 @@ exports[`ListItemStatus rendering render without Props 1`] = `
     <span>
       --
     </span>
-  </Col>
+  </GridItem>
 </Grid>
 `;