foreman_openscap 4.3.1 → 5.1.0

data/test/helpers/arf_report_dashboard_helper_test.rb

@@ -7,14 +7,13 @@ class ArfReportDashboardHelperTest < ActionView::TestCase
     categories = { :passed => 'passed', :failed => 'failed' }
     report = { :passed => 23, :failed => 24 }
     colors = { :passed => '#FFF', :failed => '#000' }
-    res = JSON.parse(breakdown_chart_data(categories, report, colors))
+    res = breakdown_chart_data(categories, report, colors)
     assert_equal ["passed", 23, "#FFF"], res.first
     assert_equal ["failed", 24, "#000"], res.last
   end
 
   test 'should return breakdown chart data for donut as json' do
-    report = { :passed => 4, :failed => 7, :othered => 5 }
-    res = JSON.parse(donut_breakdown_chart_data(report))
+    res = donut_breakdown_chart_data(:passed => 4, :failed => 7, :othered => 5)
     assert_equal 3, res.size
     assert_include res, ["Passed", 4, ArfReportDashboardHelper::COLORS[:passed]]
     assert_include res, ["Failed", 7, ArfReportDashboardHelper::COLORS[:failed]]
@@ -22,12 +21,12 @@ class ArfReportDashboardHelperTest < ActionView::TestCase
   end
 
   test 'should return data for report status chart' do
-    res = JSON.parse(arf_report_status_chart_data(:passed => 6, :failed => 7, :othered => 8))
-    assert_equal "Number of Events", res['yAxisLabel']
-    assert_equal "Rule Results", res['xAxisLabel']
-    assert_equal 3, res['data'].size
-    assert_include res['data'], ["passed", 6]
-    assert_include res['data'], ["failed", 7]
-    assert_include res['data'], ["othered", 8]
+    res = arf_report_status_chart_data(:passed => 6, :failed => 7, :othered => 8)
+    assert_equal "Number of Events", res[:yAxisLabel]
+    assert_equal "Rule Results", res[:xAxisLabel]
+    assert_equal 3, res[:data].size
+    assert_include res[:data], [:passed, 6]
+    assert_include res[:data], [:failed, 7]
+    assert_include res[:data], [:othered, 8]
   end
 end

data/test/helpers/policy_dashboard_helper_test.rb

@@ -11,7 +11,7 @@ class PolicyDashboardHelperTest < ActionView::TestCase
       :inconclusive_hosts => 7,
       :report_missing => 8
     }
-    res = JSON.parse(policy_breakdown_chart_data(report))
+    res = policy_breakdown_chart_data(report)
     assert_equal 4, res.size
     assert_include res, ['Compliant hosts', 5, PolicyDashboardHelper::COLORS[:compliant_hosts]]
     assert_include res, ['Incompliant hosts', 6, PolicyDashboardHelper::COLORS[:incompliant_hosts]]

data/test/test_plugin_helper.rb

@@ -5,19 +5,24 @@ require 'test_helper'
 FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
 # Add factories from foreman_ansible
 FactoryBot.definition_file_paths << File.join(ForemanAnsible::Engine.root, '/test/factories')
+FactoryBot.definition_file_paths << File.join(ForemanPuppet::Engine.root, '/test/factories') if defined?(ForemanPuppet)
 FactoryBot.reload
 
 require "#{ForemanOpenscap::Engine.root}/test/fixtures/cve_fixtures"
 
 module ScapClientPuppetclass
+  def puppet_available?
+    defined?(ForemanPuppet)
+  end
+
   def setup_puppet_class
     puppet_config = ::ForemanOpenscap::ClientConfig::Puppet.new
-    Puppetclass.find_by(:name => puppet_config.puppetclass_name)&.destroy
+    ForemanPuppet::Puppetclass.find_by(:name => puppet_config.puppetclass_name)&.destroy
 
     puppet_class = FactoryBot.create(:puppetclass, :name => puppet_config.puppetclass_name)
-    server_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.server_param, :default_value => nil)
-    port_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.port_param, :default_value => nil)
-    policies_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.policies_param, :default_value => nil)
+    server_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.server_param, :default_value => nil, :override => false)
+    port_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.port_param, :default_value => nil, :override => false)
+    policies_param = FactoryBot.create(:puppetclass_lookup_key, :key => puppet_config.policies_param, :default_value => nil, :override => false)
 
     env = FactoryBot.create :environment
 

data/test/unit/policy_test.rb

@@ -75,7 +75,6 @@ class PolicyTest < ActiveSupport::TestCase
     asset = FactoryBot.create(:asset, :assetable_id => hg.id, :assetable_type => 'Hostgroup')
     policy = FactoryBot.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
     policy.save!
-    hg.hostgroup_classes.destroy_all
     hg.destroy
     assert_equal 0, policy.hostgroups.count
   end
@@ -314,6 +313,7 @@ class PolicyTest < ActiveSupport::TestCase
   end
 
   test "should change deploy type" do
+    skip unless puppet_available?
     policy = FactoryBot.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_profile)
     setup_puppet_class
     policy.change_deploy_type({ :deploy_by => 'puppet' })

data/test/unit/services/config_name_service_test.rb

@@ -24,6 +24,7 @@ class ConfigNameServiceTest < ActiveSupport::TestCase
   end
 
   test 'should find all available except Manual' do
+    skip unless puppet_available?
     ForemanOpenscap::ClientConfig::Ansible.any_instance.stubs(:available?).returns(false)
     configs = @name_service.all_available_except(:manual)
     assert_equal 1, configs.size

data/test/unit/services/hostgroup_overrider_test.rb

@@ -9,11 +9,12 @@ class HostgroupOverriderTest < ActiveSupport::TestCase
   end
 
   test 'should populate puppet overrides' do
+    skip unless puppet_available?
     puppet_class, env, port_param, server_param = setup_puppet_class.values_at :puppet_class, :env, :port_param, :server_param
 
     proxy = FactoryBot.create(:openscap_proxy, :url => 'https://override-keys.example.com:8998')
 
-    hostgroup = FactoryBot.create(:hostgroup, :environment_id => env.id, :openscap_proxy_id => proxy.id)
+    hostgroup = FactoryBot.create(:hostgroup, :environment => env, :openscap_proxy_id => proxy.id, :puppet => FactoryBot.create(:hostgroup_puppet_facet))
     refute hostgroup.puppetclasses.include? puppet_class
     assert LookupValue.where(:match => "hostgroup=#{hostgroup.to_label}",
                              :lookup_key_id => port_param.id,

data/test/unit/services/lookup_key_overrider_test.rb

@@ -8,6 +8,7 @@ class LookupKeyOverriderTest < ActiveSupport::TestCase
   end
 
   test 'should override puppet class parameters' do
+    skip unless puppet_available?
     server_param, port_param, policies_param = setup_puppet_class.values_at :server_param, :port_param, :policies_param
     refute server_param.override
     refute port_param.override
@@ -21,7 +22,8 @@ class LookupKeyOverriderTest < ActiveSupport::TestCase
   end
 
   test 'should add error when no puppet class found' do
-    puppet_class = Puppetclass.find_by :name => ForemanOpenscap::ClientConfig::Puppet.new.puppetclass_name
+    skip unless puppet_available?
+    puppet_class = ::ForemanPuppet::Puppetclass.find_by :name => ForemanOpenscap::ClientConfig::Puppet.new.puppetclass_name
     puppet_class.destroy if puppet_class
     policy = FactoryBot.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_content_profile, :deploy_by => :puppet)
     ForemanOpenscap::LookupKeyOverrider.new(policy).override
@@ -41,6 +43,7 @@ class LookupKeyOverriderTest < ActiveSupport::TestCase
   end
 
   test 'should add error when lookup keys not present' do
+    skip unless puppet_available?
     server_param, port_param, policies_param = setup_puppet_class.values_at :server_param, :port_param, :policies_param
     server_param.destroy
     port_param.destroy

data/test/unit/services/oval/setup_check_test.rb

@@ -0,0 +1,37 @@
+require 'test_plugin_helper'
+
+class ForemanOpenscap::Oval::SetupCheckTest < ActiveSupport::TestCase
+  test 'should show error message with filled in data' do
+    check = ::ForemanOpenscap::Oval::SetupCheck.new(
+      :id => :test_check,
+      :title => _("Will it pass?"),
+      :fail_msg => ->(hash) { "There was an error in #{hash[:name]}, you need to #{hash[:action]}" }
+    )
+
+    check.fail_with!(:name => 'your engine', :action => 'run')
+    assert_equal 'There was an error in your engine, you need to run', check.fail_msg
+  end
+
+  test 'should show error message when it is a string' do
+    msg = "Do not panic"
+    check = ::ForemanOpenscap::Oval::SetupCheck.new(
+      :id => :test_check,
+      :title => _("Will it pass?"),
+      :fail_msg => msg
+    )
+    check.fail!
+    assert_equal msg, check.fail_msg
+  end
+
+  test 'should not show error message when check not failed' do
+    check = ::ForemanOpenscap::Oval::SetupCheck.new(
+      :id => :test_check,
+      :title => _("Will it pass?"),
+      :fail_msg => 'foo'
+    )
+
+    assert_nil check.fail_msg
+    check.fail!
+    assert_not_nil check.fail_msg
+  end
+end

data/webpack/components/ConfirmModal.js

@@ -0,0 +1,63 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Modal, Button, ModalVariant, Spinner } from '@patternfly/react-core';
+
+import { translate as __ } from 'foremanReact/common/I18n';
+
+import './ConfirmModal.scss';
+
+const ConfirmModal = props => {
+  const [callMutation, { loading }] = props.prepareMutation();
+
+  const actions = [
+    <Button
+      key="confirm"
+      variant="primary"
+      onClick={() => props.onConfirm(callMutation, props.record.id)}
+      isDisabled={loading}
+    >
+      {__('Confirm')}
+    </Button>,
+    <Button
+      key="cancel"
+      variant="link"
+      onClick={event => props.onClose()}
+      isDisabled={loading}
+    >
+      {__('Cancel')}
+    </Button>,
+  ];
+
+  if (loading) {
+    actions.push(<Spinner key="spinner" size="lg" />);
+  }
+
+  return (
+    <Modal
+      variant={ModalVariant.medium}
+      title={props.title}
+      isOpen={props.isOpen}
+      className="foreman-modal"
+      showClose={false}
+      actions={actions}
+    >
+      {props.text}
+    </Modal>
+  );
+};
+
+ConfirmModal.propTypes = {
+  prepareMutation: PropTypes.func.isRequired,
+  onConfirm: PropTypes.func.isRequired,
+  record: PropTypes.object,
+  onClose: PropTypes.func.isRequired,
+  title: PropTypes.string.isRequired,
+  isOpen: PropTypes.bool.isRequired,
+  text: PropTypes.string.isRequired,
+};
+
+ConfirmModal.defaultProps = {
+  record: null,
+};
+
+export default ConfirmModal;

data/webpack/components/ConfirmModal.scss

@@ -0,0 +1,3 @@
+.pf-c-backdrop {
+  z-index: 1040;
+}

data/webpack/components/EditableInput.js

@@ -0,0 +1,157 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import {
+  Button,
+  Split,
+  SplitItem,
+  Spinner,
+  FormGroup,
+} from '@patternfly/react-core';
+import {
+  TimesIcon,
+  CheckIcon,
+  PencilAltIcon,
+  ExclamationCircleIcon,
+} from '@patternfly/react-icons';
+
+import './EditableInput.scss';
+
+const EditableInput = props => {
+  const [editing, setEditing] = useState(false);
+  const [submitting, setSubmitting] = useState(false);
+  const [inputValue, setInputValue] = useState(props.value);
+  const [error, setError] = useState('');
+  const [touched, setTouched] = useState(false);
+
+  const stopSubmitting = () => setSubmitting(false);
+
+  const handleSubmit = event => {
+    event.preventDefault();
+    onSubmit();
+  };
+
+  const onFinish = () => {
+    setSubmitting(false);
+    setEditing(false);
+  };
+
+  const onSubmit = () => {
+    setSubmitting(true);
+    props.onConfirm(inputValue, onFinish, stopSubmitting, onError);
+  };
+
+  const onError = err => {
+    setTouched(false);
+    setError(err);
+  };
+
+  const onCancel = () => {
+    setInputValue(props.value);
+    setEditing(false);
+  };
+
+  const onChange = value => {
+    if (!touched) {
+      setTouched(true);
+    }
+    setInputValue(value);
+  };
+
+  if (!editing) {
+    return (
+      <Split>
+        <SplitItem>{props.value || <i>{__('None provided')}</i>}</SplitItem>
+        <SplitItem>
+          <Button
+            className="inline-edit-icon"
+            aria-label={`edit ${props.attrName}`}
+            variant="plain"
+            onClick={() => setEditing(true)}
+          >
+            <PencilAltIcon />
+          </Button>
+        </SplitItem>
+      </Split>
+    );
+  }
+
+  const Component = props.component;
+
+  const shouldValidate = (isTouched, err) => {
+    if (!isTouched) {
+      return err ? 'error' : 'success';
+    }
+    return 'noval';
+  };
+
+  const valid = shouldValidate(touched, error);
+
+  return (
+    <Split>
+      <SplitItem>
+        <form onSubmit={handleSubmit} className="pf-c-form">
+          <FormGroup
+            helperTextInvalid={error}
+            helperTextInvalidIcon={<ExclamationCircleIcon />}
+            validated={valid}
+          >
+            <Component
+              {...props.inputProps}
+              type="text"
+              aria-label={`${props.attrName} text input`}
+              isDisabled={submitting}
+              value={inputValue || ''}
+              onChange={onChange}
+              validated={valid}
+            />
+          </FormGroup>
+        </form>
+      </SplitItem>
+      <SplitItem>
+        <Button
+          aria-label={`submit ${props.attrName}`}
+          variant="plain"
+          onClick={onSubmit}
+          isDisabled={submitting}
+        >
+          <CheckIcon />
+        </Button>
+      </SplitItem>
+      <SplitItem>
+        <Button
+          aria-label={`cancel editing ${props.attrName}`}
+          variant="plain"
+          onClick={onCancel}
+          isDisabled={submitting}
+        >
+          <TimesIcon />
+        </Button>
+      </SplitItem>
+      <SplitItem>
+        {submitting && (
+          <Spinner
+            key="spinner"
+            size="lg"
+            id={`edit-${props.attrName}-spinner`}
+          />
+        )}
+      </SplitItem>
+    </Split>
+  );
+};
+
+EditableInput.propTypes = {
+  value: PropTypes.string,
+  onConfirm: PropTypes.func.isRequired,
+  attrName: PropTypes.string.isRequired,
+  component: PropTypes.object.isRequired,
+  inputProps: PropTypes.object,
+};
+
+EditableInput.defaultProps = {
+  inputProps: {},
+  value: '',
+};
+
+export default EditableInput;

data/webpack/components/EditableInput.scss

@@ -0,0 +1,3 @@
+.inline-edit-icon {
+  padding-top: 2px;
+}

data/webpack/components/EmptyState.js

@@ -12,10 +12,11 @@ import {
   CubeIcon,
   ExclamationCircleIcon,
   SearchIcon,
+  LockIcon,
 } from '@patternfly/react-icons';
 import { global_danger_color_200 as dangerColor } from '@patternfly/react-tokens';
 
-const EmptyStateIcon = ({ error, search }) => {
+const EmptyStateIcon = ({ error, search, lock }) => {
   if (error)
     return (
       <PfEmptyStateIcon
@@ -23,18 +24,20 @@ const EmptyStateIcon = ({ error, search }) => {
         color={dangerColor.value}
       />
     );
+  if (lock) return <PfEmptyStateIcon icon={LockIcon} />;
   if (search) return <PfEmptyStateIcon icon={SearchIcon} />;
   return <PfEmptyStateIcon icon={CubeIcon} />;
 };
 
-const EmptyState = ({ title, body, error, search }) => (
+const EmptyState = ({ title, body, error, search, lock, primaryButton }) => (
   <Bullseye>
     <PfEmptyState variant={EmptyStateVariant.small}>
-      <EmptyStateIcon error={!!error} search={search} />
+      <EmptyStateIcon error={!!error} search={search} lock={lock} />
       <Title headingLevel="h2" size="lg">
         {title}
       </Title>
       <EmptyStateBody>{body}</EmptyStateBody>
+      {primaryButton}
     </PfEmptyState>
   </Bullseye>
 );
@@ -42,11 +45,13 @@ const EmptyState = ({ title, body, error, search }) => (
 EmptyStateIcon.propTypes = {
   error: PropTypes.bool,
   search: PropTypes.bool,
+  lock: PropTypes.bool,
 };
 
 EmptyStateIcon.defaultProps = {
   error: false,
   search: false,
+  lock: false,
 };
 
 EmptyState.propTypes = {
@@ -54,6 +59,8 @@ EmptyState.propTypes = {
   body: PropTypes.string,
   error: PropTypes.oneOfType([PropTypes.shape({}), PropTypes.string]),
   search: PropTypes.bool,
+  lock: PropTypes.bool,
+  primaryButton: PropTypes.node,
 };
 
 EmptyState.defaultProps = {
@@ -62,6 +69,8 @@ EmptyState.defaultProps = {
     'There was an error retrieving data from the server. Check your connection and try again.',
   error: undefined,
   search: false,
+  lock: false,
+  primaryButton: null,
 };
 
 export default EmptyState;

data/webpack/components/IndexLayout.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Helmet } from 'react-helmet';
+import ToastsList from 'foremanReact/components/ToastsList';
 import {
   Grid,
   GridItem,
@@ -11,25 +12,31 @@ import {
 
 import './IndexLayout.scss';
 
-const IndexLayout = ({ pageTitle, children }) => (
+const IndexLayout = ({ pageTitle, children, contentWidthSpan }) => (
   <React.Fragment>
     <Helmet>
       <title>{pageTitle}</title>
     </Helmet>
+    <ToastsList />
     <Grid className="scap-page-grid">
-      <GridItem span={12}>
+      <GridItem span={12} className="pf-u-pb-xl">
         <TextContent>
           <Text component={TextVariants.h1}>{pageTitle}</Text>
         </TextContent>
       </GridItem>
-      <GridItem span={12}>{children}</GridItem>
+      <GridItem span={contentWidthSpan}>{children}</GridItem>
     </Grid>
   </React.Fragment>
 );
 
 IndexLayout.propTypes = {
   pageTitle: PropTypes.string.isRequired,
-  children: PropTypes.object.isRequired,
+  children: PropTypes.oneOfType([PropTypes.node, PropTypes.object]).isRequired,
+  contentWidthSpan: PropTypes.number,
+};
+
+IndexLayout.defaultProps = {
+  contentWidthSpan: 12,
 };
 
 export default IndexLayout;

data/webpack/components/IndexTable/index.js

@@ -2,18 +2,25 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Table, TableHeader, TableBody } from '@patternfly/react-table';
 import { Pagination, Flex, FlexItem } from '@patternfly/react-core';
-import '@patternfly/patternfly/patternfly-addons.scss';
 import { usePaginationOptions } from 'foremanReact/components/Pagination/PaginationHooks';
 
 import { preparePerPageOptions, refreshPage } from './IndexTableHelper';
 
-const IndexTable = props => {
+const IndexTable = ({
+  history,
+  pagination,
+  totalCount,
+  toolbarBtns,
+  ariaTableLabel,
+  columns,
+  ...rest
+}) => {
   const handlePerPageSelected = (event, perPage) => {
-    refreshPage(props.history, { page: 1, perPage });
+    refreshPage(history, { page: 1, perPage });
   };
 
   const handlePageSelected = (event, page) => {
-    refreshPage(props.history, { ...props.pagination, page });
+    refreshPage(history, { ...pagination, page });
   };
 
   const perPageOptions = preparePerPageOptions(usePaginationOptions());
@@ -21,12 +28,12 @@ const IndexTable = props => {
   return (
     <React.Fragment>
       <Flex className="pf-u-pt-md">
-        <FlexItem>{props.toolbarBtns}</FlexItem>
+        <FlexItem>{toolbarBtns}</FlexItem>
         <FlexItem align={{ default: 'alignRight' }}>
           <Pagination
-            itemCount={props.totalCount}
-            page={props.pagination.page}
-            perPage={props.pagination.perPage}
+            itemCount={totalCount}
+            page={pagination.page}
+            perPage={pagination.perPage}
             onSetPage={handlePageSelected}
             onPerPageSelect={handlePerPageSelected}
             perPageOptions={perPageOptions}
@@ -34,12 +41,7 @@ const IndexTable = props => {
           />
         </FlexItem>
       </Flex>
-      <Table
-        aria-label={props.ariaTableLabel}
-        cells={props.columns}
-        rows={props.rows}
-        actions={props.actions}
-      >
+      <Table aria-label={ariaTableLabel} cells={columns} {...rest}>
         <TableHeader />
         <TableBody />
       </Table>
@@ -50,17 +52,14 @@ const IndexTable = props => {
 IndexTable.propTypes = {
   history: PropTypes.object.isRequired,
   pagination: PropTypes.object.isRequired,
-  toolbarBtns: PropTypes.array,
+  toolbarBtns: PropTypes.node,
   totalCount: PropTypes.number.isRequired,
   ariaTableLabel: PropTypes.string.isRequired,
   columns: PropTypes.array.isRequired,
-  rows: PropTypes.array.isRequired,
-  actions: PropTypes.array,
 };
 
 IndexTable.defaultProps = {
   toolbarBtns: [],
-  actions: [],
 };
 
 export default IndexTable;

data/webpack/components/LinkButton.js

@@ -0,0 +1,26 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { Button } from '@patternfly/react-core';
+import PropTypes from 'prop-types';
+
+const LinkButton = ({ path, btnVariant, btnText, isDisabled }) => (
+  <Link to={path}>
+    <Button variant={btnVariant} isDisabled={isDisabled}>
+      {btnText}
+    </Button>
+  </Link>
+);
+
+LinkButton.propTypes = {
+  path: PropTypes.string.isRequired,
+  btnText: PropTypes.string.isRequired,
+  btnVariant: PropTypes.string,
+  isDisabled: PropTypes.bool,
+};
+
+LinkButton.defaultProps = {
+  btnVariant: 'primary',
+  isDisabled: false,
+};
+
+export default LinkButton;

data/webpack/components/withDeleteModal.js

@@ -0,0 +1,51 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
+import ConfirmModal from './ConfirmModal';
+
+const withDelete = Component => {
+  const Subcomponent = ({
+    confirmDeleteTitle,
+    submitDelete,
+    prepareMutation,
+    ...rest
+  }) => {
+    const [toDelete, setToDelete] = useState(null);
+
+    const toggleModal = (item = null) => {
+      setToDelete(item);
+    };
+
+    return (
+      <React.Fragment>
+        <Component {...rest} toggleModal={toggleModal} />
+        <ConfirmModal
+          title={confirmDeleteTitle}
+          text={
+            toDelete
+              ? sprintf(
+                  __('Are you sure you want to delete %s?'),
+                  toDelete.name
+                )
+              : ''
+          }
+          onClose={toggleModal}
+          isOpen={!!toDelete}
+          onConfirm={submitDelete}
+          prepareMutation={() => prepareMutation(toggleModal)}
+          record={toDelete}
+        />
+      </React.Fragment>
+    );
+  };
+
+  Subcomponent.propTypes = {
+    confirmDeleteTitle: PropTypes.string.isRequired,
+    submitDelete: PropTypes.func.isRequired,
+    prepareMutation: PropTypes.func.isRequired,
+  };
+
+  return Subcomponent;
+};
+
+export default withDelete;