foreman_rh_cloud 5.0.29 → 5.0.30

data/config/routes.rb

@@ -18,7 +18,7 @@ Rails.application.routes.draw do
   namespace :insights_cloud do
     resources :tasks, only: [:create]
     resource :settings, only: [:show, :update]
-    resources :hits, except: %i[show] do
+    resources :hits, only: [:index] do
       collection do
         get 'auto_complete_search'
         get 'resolutions', to: 'hits#resolutions'

data/lib/foreman_inventory_upload/generators/tags.rb

@@ -13,7 +13,7 @@ module ForemanInventoryUpload
           organizations +
           content_data +
           satellite_server_data
-        ).reject { |key, value| value.empty? }
+        ).reject { |key, value| value.empty? }.map { |key, value| [key, truncated_value(value)] }
       end
 
       def generate_parameters
@@ -21,6 +21,7 @@ module ForemanInventoryUpload
 
         (@host.host_params || {})
           .select { |_name, value| value.present? || value.is_a?(FalseClass) }
+          .map { |key, value| [key, truncated_value(value)] }
       end
 
       private
@@ -57,6 +58,12 @@ module ForemanInventoryUpload
           ['organization_id', @host.organization_id.to_s],
         ]
       end
+
+      def truncated_value(value)
+        return 'Original value exceeds 250 characters' if value.to_s.length > 250
+
+        value
+      end
     end
   end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -48,13 +48,22 @@ module ForemanRhCloud
         security_block :foreman_rh_cloud do
           permission(
             :generate_foreman_rh_cloud,
-            'foreman_inventory_upload/reports': [:generate]
+            'foreman_inventory_upload/reports': [:generate],
+            'foreman_inventory_upload/tasks': [:create],
+            'api/v2/rh_cloud/inventory': [:sync_inventory_status, :download_file, :generate_report, :enable_cloud_connector],
+            'foreman_inventory_upload/uploads': [:enable_cloud_connector],
+            'foreman_inventory_upload/uploads_settings': [:set_advanced_setting],
+            'insights_cloud/settings': [:save_token_and_sync, :update],
+            'insights_cloud/tasks': [:create]
           )
           permission(
             :view_foreman_rh_cloud,
             'foreman_inventory_upload/accounts': [:index],
             'foreman_inventory_upload/reports': [:last],
             'foreman_inventory_upload/uploads': [:auto_upload, :show_auto_upload, :download_file, :last],
+            'foreman_inventory_upload/tasks': [:show],
+            'foreman_inventory_upload/cloud_status': [:index],
+            'foreman_inventory_upload/uploads_settings': [:index],
             'react': [:index]
           )
           permission(

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '5.0.29'.freeze
+  VERSION = '5.0.30'.freeze
 end

data/package.json

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

data/test/unit/rh_cloud_permissions_test.rb

@@ -0,0 +1,14 @@
+require 'test_plugin_helper'
+require 'unit/shared/access_permissions_test_base'
+
+class RhCloudPermissionsTest < ActiveSupport::TestCase
+  include AccessPermissionsTestBase
+
+  check_routes(
+    Rails.application.routes,
+    [
+      'insights_cloud/api/machine_telemetries/forward_request',
+      'insights_cloud/api/machine_telemetries/branch_info',
+    ],
+    skip_patterns: [/^(?!foreman_inventory_upload|insights_cloud|.*rh_cloud).*/]) # include only plugin paths
+end

data/test/unit/tags_generator_test.rb

@@ -103,6 +103,21 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     assert_equal 0, actual.count
   end
 
+  test 'truncates parameter tags' do
+    Setting[:include_parameter_tags] = true
+
+    @host.stubs(:host_params).returns(
+      {
+        'str_param' => 'a' * 251,
+      }
+    )
+
+    generator = create_generator
+    actual = Hash[generator.generate_parameters]
+
+    assert_equal 'Original value exceeds 250 characters', actual['str_param']
+  end
+
   private
 
   def create_generator

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

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

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

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import { FormGroup, TextInput } from '@patternfly/react-core';
 import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { useForemanOrganization } from 'foremanReact/Root/Context/ForemanContext';
 import ClearButton from './Components/ClearButton';
 import './inventoryFilter.scss';
 import { ANY_ORGANIZATION } from './InventoryFilterConstants';
@@ -12,13 +13,14 @@ const InventoryFilter = ({
   handleFilterChange,
   handleFilterClear,
   filterTerm,
-  organization,
 }) => {
   useEffect(() => {
     const initialTerm = organization === ANY_ORGANIZATION ? '' : organization;
     handleFilterChange(initialTerm);
   }, []);
 
+  const organization = useForemanOrganization()?.title;
+
   return (
     <form id="inventory_filter_form">
       <FormGroup>
@@ -39,14 +41,12 @@ 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/index.js

@@ -1,6 +1,5 @@
 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';
@@ -10,7 +9,6 @@ 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/PageHeader/components/SyncButton/SyncButtonActions.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { post } from 'foremanReact/redux/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
 import Toast from './components/Toast';

data/webpack/ForemanRhCloudFills.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
 import InventoryAutoUploadSwitcher from './ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload';
 import NewHostDetailsTab from './InsightsHostDetailsTab/NewHostDetailsTab';
+import InsightsTotalRiskCard from './InsightsHostDetailsTab/InsightsTotalRiskChart';
 
 const fills = [
   {
@@ -14,7 +15,13 @@ const fills = [
     slot: 'host-details-page-tabs',
     name: 'Insights',
     component: props => <NewHostDetailsTab {...props} />,
-    weight: 700,
+    weight: 400,
+  },
+  {
+    slot: 'details-cards',
+    name: 'insights-total-risk-chart',
+    component: props => <InsightsTotalRiskCard {...props} />,
+    weight: 1100,
   },
 ];
 

data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettingsActions.js

@@ -1,5 +1,5 @@
 import { API } from 'foremanReact/redux/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import { insightsCloudUrl } from '../../InsightsCloudSyncHelpers';
 import {
   INSIGHTS_SYNC_SETTING_SET,

data/webpack/InsightsHostDetailsTab/InsightsTabActions.js

@@ -1,5 +1,5 @@
 import { API } from 'foremanReact/redux/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import { insightsCloudUrl } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
 import {
   INSIGHTS_HITS_REQUEST,

data/webpack/InsightsHostDetailsTab/InsightsTabConstants.js

@@ -1,2 +1,77 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
 export const INSIGHTS_HITS_REQUEST = 'INSIGHTS_HITS_REQUEST';
 export const INSIGHTS_HITS_SUCCESS = 'INSIGHTS_HITS_SUCCESS';
+
+export const getInitialRisks = () => ({
+  1: {
+    value: 0,
+    title: __('Low'),
+    hoverFill: '#2b9af3',
+  },
+  2: {
+    value: 0,
+    title: __('Moderate'),
+    hoverFill: '#d5a632',
+  },
+  3: {
+    value: 0,
+    title: __('Important'),
+    hoverFill: '#ec7a08',
+  },
+  4: {
+    value: 0,
+    title: __('Critical'),
+    hoverFill: '#7d1007',
+  },
+  total: 0,
+});
+
+const colorScale = ['#bee1f4', '#f4c145', '#f4b678', '#c9190b'];
+
+export const theme = {
+  legend: {
+    gutter: 20,
+    orientation: 'horizontal',
+    titleOrientation: 'top',
+    style: {
+      data: {
+        type: 'square',
+      },
+      labels: {
+        fontFamily: 'RedHatText',
+        fontSize: 14,
+        letterSpacing: 'normal',
+        padding: 10,
+        stroke: 'transparent',
+        fill: '#06c',
+        textDecorationColor: '#06c',
+      },
+      title: {
+        fontFamily: 'RedHatText',
+        fontSize: 14,
+        letterSpacing: 'normal',
+        padding: 2,
+        stroke: 'transparent',
+      },
+    },
+    colorScale,
+  },
+  pie: {
+    colorScale,
+    height: 230,
+    padAngle: 1,
+    padding: 20,
+    style: {
+      data: { padding: 8, stroke: 'transparent', strokeWidth: 1 },
+      labels: {
+        fontFamily: 'RedHatText',
+        fontSize: 14,
+        letterSpacing: 'normal',
+        padding: 8,
+        stroke: 'transparent',
+      },
+    },
+    width: 230,
+  },
+};

data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js

@@ -0,0 +1,147 @@
+import React, { useEffect, useState, useMemo } from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch } from 'react-redux';
+import { push } from 'connected-react-router';
+import { useHistory } from 'react-router-dom';
+import { DropdownItem, Bullseye, Title } from '@patternfly/react-core';
+import { ChartDonut, ChartLegend, ChartLabel } from '@patternfly/react-charts';
+import { STATUS } from 'foremanReact/constants';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
+import { translate as __ } from 'foremanReact/common/I18n';
+import SkeletonLoader from 'foremanReact/components/common/SkeletonLoader';
+import { insightsCloudUrl } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
+import { getInitialRisks, theme } from './InsightsTabConstants';
+
+const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
+  const [totalRisks, setTotalRisks] = useState(getInitialRisks());
+  const hashHistory = useHistory();
+  const dispatch = useDispatch();
+  const API_KEY = `HOST_${id}_RECOMMENDATIONS`;
+  const API_OPTIONS = useMemo(() => ({ key: API_KEY }), [API_KEY]);
+  const {
+    status = STATUS.PENDING,
+    response: { hits = [] },
+  } = useAPI('get', insightsCloudUrl(`hits/${id}`), API_OPTIONS);
+
+  useEffect(() => {
+    if (status !== STATUS.PENDING) {
+      const risks = getInitialRisks();
+      hits.forEach(({ total_risk: risk }) => {
+        risks[risk].value += 1;
+      });
+      risks.total = hits.length;
+      setTotalRisks(risks);
+    }
+  }, [hits, status]);
+
+  const onChartClick = (evt, { index }) => {
+    hashHistory.push(`/Insights`);
+    dispatch(
+      push({
+        search: `search=total_risk+%3D+${index + 1}`,
+      })
+    );
+  };
+
+  const onChartHover = (evt, { index }) => [
+    {
+      mutation: ({ style }) => ({
+        style: { ...style, fill: totalRisks[index + 1]?.hoverFill },
+      }),
+    },
+  ];
+
+  const { 1: low, 2: moderate, 3: important, 4: critical, total } = totalRisks;
+
+  // eslint-disable-next-line react/prop-types
+  const LegendLabel = ({ index, ...rest }) => (
+    <a key={index} onClick={() => onChartClick(null, { index })}>
+      <ChartLabel {...rest} />
+    </a>
+  );
+
+  const legend = (
+    <ChartLegend
+      height={400}
+      width={200}
+      fontSize={14}
+      rowGutter={{ top: -5, bottom: -5 }}
+      orientation="vertical"
+      labelComponent={<LegendLabel />}
+      data={[
+        { name: `${low.title}: ${low.value}` },
+        { name: `${moderate.title}: ${moderate.value}` },
+        { name: `${important.title}: ${important.value}` },
+        { name: `${critical.title}: ${critical.value}` },
+      ]}
+    />
+  );
+
+  const cardBody = (
+    <ChartDonut
+      ariaDesc="Number of recommendations total-risks"
+      constrainToVisibleArea
+      data={[
+        { x: low.title, y: low.value },
+        { x: moderate.title, y: moderate.value },
+        { x: important.title, y: important.value },
+        { x: critical.title, y: critical.value },
+      ]}
+      labels={({ datum: { x, y } }) => `${x}: ${y}`}
+      legendComponent={legend}
+      legendPosition="right"
+      subTitle="Recommendations"
+      title={`${total}`}
+      padding={{
+        bottom: 20,
+        left: 20,
+        right: 140,
+        top: 20,
+      }}
+      width={350}
+      theme={theme}
+      events={[
+        {
+          target: 'data',
+          eventHandlers: {
+            onClick: onChartClick,
+            onMouseOver: onChartHover,
+            onMouseOut: () => [{ mutation: () => null }],
+          },
+        },
+      ]}
+    />
+  );
+
+  return (
+    <CardTemplate
+      header={__('Total Risks')}
+      dropdownItems={[
+        <DropdownItem
+          key="insights-tab"
+          onClick={() => hashHistory.push(`/Insights`)}
+        >
+          {__('View all recommendations')}
+        </DropdownItem>,
+      ]}
+    >
+      <SkeletonLoader
+        status={status}
+        emptyState={
+          <Bullseye>
+            <Title headingLevel="h4"> {__('No results found')} </Title>
+          </Bullseye>
+        }
+      >
+        <div id="rh-cloud-total-risk-card">{cardBody}</div>
+      </SkeletonLoader>
+    </CardTemplate>
+  );
+};
+
+InsightsTotalRiskCard.propTypes = {
+  hostDetails: PropTypes.object.isRequired,
+};
+
+export default InsightsTotalRiskCard;

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -20,7 +20,6 @@ import {
   selectSearch,
   selectHits,
 } from '../InsightsCloudSync/Components/InsightsTable/InsightsTableSelectors';
-import './InsightsTab.scss';
 import { redHatAdvisorSystems } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
 
 const NewHostDetailsTab = ({ hostName, router }) => {

data/webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js

@@ -1 +1,2 @@
 export const useForemanSettings = () => ({ perPage: 20 });
+export const useForemanOrganization = () => ({ title: 'some-org' });

data/webpack/common/ForemanTasks/ForemanTasksActions.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { get } from 'foremanReact/redux/API';
 import { withInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanTaskDetailsUrl } from './ForemanTasksHelpers';
 import { foremanUrl } from '../../ForemanRhCloudHelpers';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 5.0.29
+  version: 5.0.30
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -176,6 +176,7 @@ files:
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/Gemfile.lock.gh_test
 - config/database.yml.example
+- config/package-lock.json
 - config/package-lock.json.gh_test
 - config/package-lock.json.plugin
 - config/rh_cert-api_chain.pem
@@ -262,6 +263,7 @@ files:
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
+- test/unit/rh_cloud_permissions_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb
@@ -595,6 +597,7 @@ files:
 - webpack/InsightsHostDetailsTab/InsightsTabConstants.js
 - webpack/InsightsHostDetailsTab/InsightsTabReducer.js
 - webpack/InsightsHostDetailsTab/InsightsTabSelectors.js
+- webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js
 - webpack/InsightsHostDetailsTab/NewHostDetailsTab.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTab.fixtures.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTab.test.js
@@ -615,11 +618,10 @@ files:
 - 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/components/ToastsList/index.js
 - webpack/__mocks__/foremanReact/constants.js
 - webpack/__mocks__/foremanReact/redux/API/APISelectors.js
 - webpack/__mocks__/foremanReact/redux/API/index.js
-- webpack/__mocks__/foremanReact/redux/actions/toasts.js
 - webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware.js
 - webpack/__mocks__/foremanReact/routes/RouterSelector.js
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
@@ -696,6 +698,7 @@ test_files:
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
+- test/unit/rh_cloud_permissions_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb

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

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