foreman_openscap 9.0.1 → 9.0.3

data/webpack/components/EditableInput.js

@@ -62,6 +62,7 @@ const EditableInput = props => {
   const editBtn = (
     <SplitItem>
       <Button
+        ouiaId={`oscap-edit-${props.attrName}-edit-button`}
         className="inline-edit-icon"
         aria-label={`edit ${props.attrName}`}
         variant="plain"
@@ -115,6 +116,7 @@ const EditableInput = props => {
       </SplitItem>
       <SplitItem>
         <Button
+          ouiaId={`oscap-edit-${props.attrName}-submit-button`}
           aria-label={`submit ${props.attrName}`}
           variant="plain"
           onClick={onSubmit}
@@ -125,6 +127,7 @@ const EditableInput = props => {
       </SplitItem>
       <SplitItem>
         <Button
+          ouiaId={`oscap-edit-${props.attrName}-cancel-button`}
           aria-label={`cancel editing ${props.attrName}`}
           variant="plain"
           onClick={onCancel}

data/webpack/components/EmptyState.js

@@ -29,11 +29,19 @@ const EmptyStateIcon = ({ error, search, lock }) => {
   return <PfEmptyStateIcon icon={CubeIcon} />;
 };
 
-const EmptyState = ({ title, body, error, search, lock, primaryButton }) => (
+const EmptyState = ({
+  title,
+  body,
+  error,
+  search,
+  lock,
+  primaryButton,
+  ouiaEmptyStateTitleId,
+}) => (
   <Bullseye>
     <PfEmptyState variant={EmptyStateVariant.small}>
       <EmptyStateIcon error={!!error} search={search} lock={lock} />
-      <Title headingLevel="h2" size="lg">
+      <Title ouiaId={ouiaEmptyStateTitleId} headingLevel="h2" size="lg">
         {title}
       </Title>
       <EmptyStateBody>{body}</EmptyStateBody>
@@ -65,6 +73,7 @@ EmptyState.propTypes = {
   search: PropTypes.bool,
   lock: PropTypes.bool,
   primaryButton: PropTypes.node,
+  ouiaEmptyStateTitleId: PropTypes.string,
 };
 
 EmptyState.defaultProps = {
@@ -75,6 +84,7 @@ EmptyState.defaultProps = {
   search: false,
   lock: false,
   primaryButton: null,
+  ouiaEmptyStateTitleId: 'oscap-empty-state-title',
 };
 
 export default EmptyState;

data/webpack/components/IndexLayout.js

@@ -21,7 +21,9 @@ const IndexLayout = ({ pageTitle, children, contentWidthSpan }) => (
     <Grid className="scap-page-grid">
       <GridItem span={12} className="pf-u-pb-xl">
         <TextContent>
-          <Text component={TextVariants.h1}>{pageTitle}</Text>
+          <Text ouiaId="oscap-index-title" component={TextVariants.h1}>
+            {pageTitle}
+          </Text>
         </TextContent>
       </GridItem>
       <GridItem span={contentWidthSpan}>{children}</GridItem>

data/webpack/components/IndexTable/index.js

@@ -11,6 +11,7 @@ const IndexTable = ({
   totalCount,
   toolbarBtns,
   ariaTableLabel,
+  ouiaTableId,
   columns,
   ...rest
 }) => {
@@ -38,6 +39,7 @@ const IndexTable = ({
         </FlexItem>
       </Flex>
       <Table
+        ouiaId={ouiaTableId}
         aria-label={ariaTableLabel}
         cells={columns}
         {...rest}
@@ -56,6 +58,7 @@ IndexTable.propTypes = {
   toolbarBtns: PropTypes.node,
   totalCount: PropTypes.number.isRequired,
   ariaTableLabel: PropTypes.string.isRequired,
+  ouiaTableId: PropTypes.string.isRequired,
   columns: PropTypes.array.isRequired,
 };
 

data/webpack/components/LinkButton.js

@@ -9,9 +9,11 @@ const LinkButton = ({
   btnText,
   isDisabled,
   btnAriaLabel,
+  ouiaId,
 }) => (
   <Link to={path}>
     <Button
+      ouiaId={ouiaId}
       variant={btnVariant}
       isDisabled={isDisabled}
       aria-label={btnAriaLabel}
@@ -27,12 +29,14 @@ LinkButton.propTypes = {
   btnVariant: PropTypes.string,
   isDisabled: PropTypes.bool,
   btnAriaLabel: PropTypes.string,
+  ouiaId: PropTypes.string,
 };
 
 LinkButton.defaultProps = {
   btnVariant: 'primary',
   isDisabled: false,
   btnAriaLabel: null,
+  ouiaId: 'oscap-link-button',
 };
 
 export default LinkButton;

data/webpack/components/OpenscapRemediationWizard/ViewSelectedHostsLink.js

@@ -17,6 +17,7 @@ const ViewSelectedHostsLink = ({
   const url = foremanUrl(`${useForemanHostsPageUrl()}?search=${search}`);
   return (
     <Button
+      ouiaId="oscap-rem-wiz-ext-link-to-hosts"
       component="a"
       variant="link"
       icon={<ExternalLinkSquareAltIcon />}

data/webpack/components/OpenscapRemediationWizard/index.js

@@ -132,6 +132,7 @@ const OpenscapRemediationWizard = ({
         </OpenscapRemediationWizardContext.Provider>
       )}
       <Button
+        ouiaId="oscap-rem-wiz-open-wiz-button"
         id="openscapRemediationWizardButton"
         variant="link"
         isInline

data/webpack/components/OpenscapRemediationWizard/steps/Finish.js

@@ -74,6 +74,7 @@ const Finish = ({ onClose }) => {
 
   const linkToJob = (
     <Button
+      ouiaId="oscap-rem-wiz-job-details-link"
       variant="link"
       icon={<ExternalLinkSquareAltIcon />}
       iconPosition="right"
@@ -84,7 +85,11 @@ const Finish = ({ onClose }) => {
       {__('Job details')}
     </Button>
   );
-  const closeBtn = <Button onClick={onClose}>{__('Close')}</Button>;
+  const closeBtn = (
+    <Button ouiaId="oscap-rem-wiz-close-button-fin-step" onClick={onClose}>
+      {__('Close')}
+    </Button>
+  );
   const errorComponent =
     statusCode === 403 ? (
       <PermissionDenied
@@ -93,6 +98,7 @@ const Finish = ({ onClose }) => {
       />
     ) : (
       <EmptyState
+        ouiaEmptyStateTitleId="oscap-rem-wiz-empty-state-title"
         error
         title={__('Error!')}
         body={errorMsg(data)}
@@ -102,6 +108,7 @@ const Finish = ({ onClose }) => {
   const body =
     status === STATUS.RESOLVED ? (
       <EmptyState
+        ouiaEmptyStateTitleId="oscap-rem-wiz-empty-state-title"
         title={__(
           'The job has started on selected host(s), you can check the status on the job details page.'
         )}

data/webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js

@@ -166,6 +166,7 @@ const ReviewHosts = () => {
       title: __('Name'),
       wrapper: ({ name, display_name: displayName }) => (
         <Button
+          ouiaId={`oscap-rem-wiz-ext-link-to-host-${name}-revhst-step`}
           component="a"
           variant="link"
           target="_blank"

data/webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js

@@ -118,6 +118,7 @@ const ReviewRemediation = () => {
         </GridItem>
         <GridItem md={12} span={4} rowSpan={1}>
           <Button
+            ouiaId={`oscap-wiz-host-details-button-${hostName}-revrem-step`}
             variant="link"
             icon={<ExternalLinkSquareAltIcon />}
             iconPosition="right"
@@ -130,6 +131,7 @@ const ReviewRemediation = () => {
         </GridItem>
         <GridItem md={12} span={8} rowSpan={1}>
           <Button
+            ouiaId={`oscap-wiz-ext-link-to-hosts-${source}-revrem-step`}
             variant="link"
             icon={<ExternalLinkSquareAltIcon />}
             iconPosition="right"
@@ -154,6 +156,7 @@ const ReviewRemediation = () => {
             {method === 'manual' ? null : (
               <GridItem span={4} rowSpan={1}>
                 <Checkbox
+                  ouiaId="oscap-wiz-reboot-checkbox-revrem-step"
                   id="reboot-checkbox"
                   label={__('Reboot the system(s)')}
                   name="reboot-checkbox"

data/webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js

@@ -141,7 +141,12 @@ const SnippetSelect = () => {
         )}
       </Form>
     ) : (
-      <EmptyState error title={__('Error!')} body={errorMsg(logError)} />
+      <EmptyState
+        ouiaEmptyStateTitleId="oscap-rem-wiz-empty-state-title"
+        error
+        title={__('Error!')}
+        body={errorMsg(logError)}
+      />
     );
 
   return (

data/webpack/helpers/formFieldsHelper.js

@@ -25,6 +25,7 @@ export const SelectField = props => {
       validated={valid}
     >
       <FormSelect
+        ouiaId={`oscap-form-sel-${field.name}`}
         {...fieldProps}
         className="without_select2"
         aria-label={fieldProps.name}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.0.3
 platform: ruby
 authors:
 - slukasik@redhat.com
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,7 +91,6 @@ files:
 - app/helpers/foreman_openscap_helper.rb
 - app/helpers/policies_helper.rb
 - app/helpers/policy_dashboard_helper.rb
-- app/helpers/tailoring_files_helper.rb
 - app/lib/proxy_api/migration.rb
 - app/lib/proxy_api/openscap.rb
 - app/mailers/foreman_openscap/policy_mailer.rb
@@ -127,8 +126,6 @@ files:
 - app/services/foreman_openscap/hostgroup_overrider_common.rb
 - app/services/foreman_openscap/lookup_key_overrider.rb
 - app/services/foreman_openscap/lookup_key_overrides_common.rb
-- app/services/foreman_openscap/openscap_proxy_assigned_version_check.rb
-- app/services/foreman_openscap/openscap_proxy_version_check.rb
 - app/services/foreman_openscap/policy_dashboard/data.rb
 - app/services/foreman_openscap/report_dashboard/data.rb
 - app/services/proxy_status/openscap_spool.rb
@@ -299,39 +296,71 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/cs_CZ/LC_MESSAGES/foreman_openscap.mo
+- locale/cs_CZ/foreman_openscap.edit.po
 - locale/cs_CZ/foreman_openscap.po
+- locale/cs_CZ/foreman_openscap.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_openscap.mo
+- locale/de/foreman_openscap.edit.po
 - locale/de/foreman_openscap.po
+- locale/de/foreman_openscap.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_openscap.mo
+- locale/en/foreman_openscap.edit.po
 - locale/en/foreman_openscap.po
+- locale/en/foreman_openscap.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_openscap.mo
+- locale/en_GB/foreman_openscap.edit.po
 - locale/en_GB/foreman_openscap.po
+- locale/en_GB/foreman_openscap.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_openscap.mo
+- locale/es/foreman_openscap.edit.po
 - locale/es/foreman_openscap.po
+- locale/es/foreman_openscap.po.time_stamp
 - locale/foreman_openscap.pot
 - locale/fr/LC_MESSAGES/foreman_openscap.mo
+- locale/fr/foreman_openscap.edit.po
 - locale/fr/foreman_openscap.po
+- locale/fr/foreman_openscap.po.time_stamp
 - locale/gl/LC_MESSAGES/foreman_openscap.mo
+- locale/gl/foreman_openscap.edit.po
 - locale/gl/foreman_openscap.po
+- locale/gl/foreman_openscap.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_openscap.mo
+- locale/it/foreman_openscap.edit.po
 - locale/it/foreman_openscap.po
+- locale/it/foreman_openscap.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_openscap.mo
+- locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
+- locale/ja/foreman_openscap.po.time_stamp
 - locale/ka/LC_MESSAGES/foreman_openscap.mo
+- locale/ka/foreman_openscap.edit.po
 - locale/ka/foreman_openscap.po
+- locale/ka/foreman_openscap.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
+- locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
+- locale/ko/foreman_openscap.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_openscap.mo
+- locale/pt_BR/foreman_openscap.edit.po
 - locale/pt_BR/foreman_openscap.po
+- locale/pt_BR/foreman_openscap.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_openscap.mo
+- locale/ru/foreman_openscap.edit.po
 - locale/ru/foreman_openscap.po
+- locale/ru/foreman_openscap.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_openscap.mo
+- locale/sv_SE/foreman_openscap.edit.po
 - locale/sv_SE/foreman_openscap.po
+- locale/sv_SE/foreman_openscap.po.time_stamp
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_openscap.mo
+- locale/zh_CN/foreman_openscap.edit.po
 - locale/zh_CN/foreman_openscap.po
+- locale/zh_CN/foreman_openscap.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_openscap.mo
+- locale/zh_TW/foreman_openscap.edit.po
 - locale/zh_TW/foreman_openscap.po
+- locale/zh_TW/foreman_openscap.po.time_stamp
 - package.json
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
@@ -377,7 +406,6 @@ files:
 - test/unit/services/hostgroup_overrider_test.rb
 - test/unit/services/lookup_key_overrider_test.rb
 - test/unit/services/report_dashboard/data_test.rb
-- test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/tailoring_file_test.rb
 - webpack/components/ConfirmModal.js
 - webpack/components/ConfirmModal.scss
@@ -429,7 +457,7 @@ homepage: https://github.com/theforeman/foreman_openscap
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -444,8 +472,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.2.33
+signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
@@ -493,5 +521,4 @@ test_files:
 - test/unit/services/hostgroup_overrider_test.rb
 - test/unit/services/lookup_key_overrider_test.rb
 - test/unit/services/report_dashboard/data_test.rb
-- test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/tailoring_file_test.rb

data/app/helpers/tailoring_files_helper.rb

@@ -1,5 +0,0 @@
-module TailoringFilesHelper
-  def run_tailoring_proxy_check
-    ForemanOpenscap::OpenscapProxyVersionCheck.new.run
-  end
-end

data/app/services/foreman_openscap/openscap_proxy_assigned_version_check.rb

@@ -1,14 +0,0 @@
-module ForemanOpenscap
-  class OpenscapProxyAssignedVersionCheck < OpenscapProxyVersionCheck
-    def initialize(host)
-      @host = host
-      super()
-    end
-
-    private
-
-    def get_openscap_proxies
-      @host.openscap_proxy ? [@host.openscap_proxy] : []
-    end
-  end
-end

data/app/services/foreman_openscap/openscap_proxy_version_check.rb

@@ -1,62 +0,0 @@
-module ForemanOpenscap
-  class OpenscapProxyVersionCheck
-    def initialize
-      @versions = {}
-      @message = ''
-      @down = []
-    end
-
-    def run
-      @versions = openscap_proxy_versions.select do |key, value|
-        Gem::Version.new(value) < Gem::Version.new("0.6.1")
-      end
-      self
-    end
-
-    def pass?
-      !any_outdated? && !any_unreachable?
-    end
-
-    def any_outdated?
-      !@versions.empty?
-    end
-
-    def any_unreachable?
-      !@down.empty?
-    end
-
-    def message
-      if pass?
-        @message
-      else
-        build_message
-      end
-    end
-
-    private
-
-    def build_message
-      @message = _('This feature is temporarily disabled. ')
-      @message << _('The following Smart Proxies need to be updated to unlock the feature: %s. ') % @versions.keys.to_sentence if any_outdated?
-      @message << _('The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.') % @down.to_sentence if any_unreachable?
-      @message
-    end
-
-    def get_openscap_proxies
-      SmartProxy.with_features "Openscap"
-    end
-
-    def openscap_proxy_versions
-      get_openscap_proxies.inject({}) do |memo, proxy|
-        begin
-          status = ProxyStatus::Version.new(proxy).version
-          openscap_version = status["modules"]["openscap"]
-          memo[proxy.name] = openscap_version
-        rescue Foreman::WrappedException
-          @down << proxy.name
-        end
-        memo
-      end
-    end
-  end
-end

data/test/unit/services/tailoring_files_proxy_check_test.rb

@@ -1,27 +0,0 @@
-require 'test_plugin_helper'
-
-class TailoringFilesProxyCheckTest < ActiveSupport::TestCase
-  test 'should find proxies with old versions' do
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                              .returns('old-proxy.test.com' => "0.5.4", "outdate-proxy.test.com" => "0.6.0")
-    check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
-    refute check.pass?
-    refute check.message.empty?
-  end
-
-  test 'should not find any outdated proxies' do
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                              .returns({})
-    check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
-    assert check.pass?
-    assert check.message.empty?
-  end
-
-  test 'should fail when proxy cannot be reached' do
-    ProxyStatus::Version.any_instance.stubs(:version).raises(Foreman::WrappedException.new(nil, 'test message'))
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:get_openscap_proxies).returns([FactoryBot.create(:openscap_proxy)])
-    check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
-    refute check.pass?
-    refute check.message.empty?
-  end
-end