foreman_openscap 9.0.3 → 10.0.0

data/locale/zh_TW/foreman_openscap.edit.po

@@ -166,7 +166,7 @@ msgstr ""
 msgid "XML containing SCAP content"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:42 ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:37
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:42 ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:36
 msgid "Original file name of the XML file"
 msgstr ""
 
@@ -202,35 +202,35 @@ msgstr ""
 msgid "Please specify import type, received: %{received}, expected one of: %{expected}"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:11
+#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:10
 msgid "List Tailoring files"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:19
+#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:18
 msgid "Download a Tailoring file as XML"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:28
+#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:27
 msgid "Show a Tailoring file"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:35
+#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:34
 msgid "Tailoring file name"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:36
+#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:35
 msgid "XML containing tailoring file"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:42
+#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:41
 msgid "Create a Tailoring file"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:50
+#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:49
 msgid "Update a Tailoring file"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:58
+#: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:57
 msgid "Deletes a Tailoring file"
 msgstr ""
 
@@ -441,7 +441,7 @@ msgstr "取消指定合規政策"
 msgid "Change OpenSCAP Proxy"
 msgstr ""
 
-#: ../app/helpers/compliance_hosts_helper.rb:37 ../app/models/foreman_openscap/compliance_status.rb:8 ../lib/foreman_openscap/engine.rb:140 ../webpack/components/HostExtentions/HostKebabItems.js:39
+#: ../app/helpers/compliance_hosts_helper.rb:37 ../app/models/foreman_openscap/compliance_status.rb:8 ../lib/foreman_openscap/engine.rb:132 ../webpack/components/HostExtentions/HostKebabItems.js:39
 msgid "Compliance"
 msgstr "合規"
 
@@ -489,7 +489,7 @@ msgstr ""
 msgid "Submit"
 msgstr "提交"
 
-#: ../app/helpers/policies_helper.rb:115 ../app/views/arf_reports/_list.html.erb:53 ../webpack/components/ConfirmModal.js:29
+#: ../app/helpers/policies_helper.rb:115 ../app/views/arf_reports/_list.html.erb:53 ../webpack/components/ConfirmModal.js:29 ../webpack/components/OpenscapRemediationWizard/Footer.js:47
 msgid "Cancel"
 msgstr "取消"
 
@@ -617,23 +617,23 @@ msgstr ""
 msgid "Cannot generate HTML guide, no valid OpenSCAP proxy server found."
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:227
+#: ../app/models/foreman_openscap/policy.rb:223
 msgid "must be present when tailoring file profile present"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:228
+#: ../app/models/foreman_openscap/policy.rb:224
 msgid "must be present when tailoring file present"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:233
+#: ../app/models/foreman_openscap/policy.rb:229
 msgid "does not come from selected tailoring file"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:239
+#: ../app/models/foreman_openscap/policy.rb:235
 msgid "does not have the selected SCAP content profile"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:271
+#: ../app/models/foreman_openscap/policy.rb:267
 msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
@@ -697,18 +697,6 @@ msgstr ""
 msgid "Failed to save when overriding parameters for %{config_tool}, cause: %{errors}"
 msgstr ""
 
-#: ../app/services/foreman_openscap/openscap_proxy_version_check.rb:39
-msgid "This feature is temporarily disabled. "
-msgstr ""
-
-#: ../app/services/foreman_openscap/openscap_proxy_version_check.rb:40
-msgid "The following Smart Proxies need to be updated to unlock the feature: %s. "
-msgstr ""
-
-#: ../app/services/foreman_openscap/openscap_proxy_version_check.rb:41
-msgid "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions."
-msgstr ""
-
 #: ../app/validators/foreman_openscap/data_stream_validator.rb:9
 msgid "No proxy with OpenSCAP feature was found."
 msgstr ""
@@ -817,7 +805,7 @@ msgstr "刪除"
 msgid "these Compliance reports"
 msgstr ""
 
-#: ../app/views/arf_reports/show.html.erb:14
+#: ../app/views/arf_reports/show.html.erb:14 ../webpack/components/OpenscapRemediationWizard/Footer.js:40
 msgid "Back"
 msgstr "上一頁"
 
@@ -871,7 +859,7 @@ msgstr "%s 一直以來的報告"
 msgid "No report for this policy"
 msgstr "此政策沒有報告"
 
-#: ../app/views/dashboard/_compliance_host_reports_widget.html.erb:1 ../lib/foreman_openscap/engine.rb:156
+#: ../app/views/dashboard/_compliance_host_reports_widget.html.erb:1 ../lib/foreman_openscap/engine.rb:148
 msgid "Latest Compliance Reports"
 msgstr ""
 
@@ -887,7 +875,7 @@ msgstr "主機不復存在"
 msgid "Policy is missing"
 msgstr ""
 
-#: ../app/views/dashboard/_compliance_reports_breakdown_widget.html.erb:1 ../lib/foreman_openscap/engine.rb:158
+#: ../app/views/dashboard/_compliance_reports_breakdown_widget.html.erb:1 ../lib/foreman_openscap/engine.rb:150
 msgid "Compliance Reports Breakdown"
 msgstr ""
 
@@ -1041,7 +1029,7 @@ msgstr ""
 msgid "Choose day in month"
 msgstr ""
 
-#: ../app/views/policies/steps/_step_form.html.erb:11
+#: ../app/views/policies/steps/_step_form.html.erb:11 ../webpack/components/OpenscapRemediationWizard/Footer.js:31
 msgid "Next"
 msgstr "下一個"
 
@@ -1201,7 +1189,7 @@ msgstr ""
 msgid "Delete tailoring file %s?"
 msgstr ""
 
-#: ../app/views/tailoring_files/index.html.erb:1 ../app/views/tailoring_files/welcome.html.erb:1 ../app/views/tailoring_files/welcome.html.erb:6 ../lib/foreman_openscap/engine.rb:150
+#: ../app/views/tailoring_files/index.html.erb:1 ../app/views/tailoring_files/welcome.html.erb:1 ../app/views/tailoring_files/welcome.html.erb:6 ../lib/foreman_openscap/engine.rb:142
 msgid "Tailoring Files"
 msgstr ""
 
@@ -1223,7 +1211,7 @@ msgid ""
 "    via %s"
 msgstr ""
 
-#: ../app/views/tailoring_files/welcome.html.erb:13
+#: ../app/views/tailoring_files/welcome.html.erb:12
 msgid "New Tailoring File"
 msgstr ""
 
@@ -1267,39 +1255,39 @@ msgstr ""
 msgid "%s content"
 msgstr ""
 
-#: ../lib/foreman_openscap/engine.rb:141
+#: ../lib/foreman_openscap/engine.rb:133
 msgid "Policies"
 msgstr "方針"
 
-#: ../lib/foreman_openscap/engine.rb:144
+#: ../lib/foreman_openscap/engine.rb:136
 msgid "SCAP contents"
 msgstr "SCAP 內容"
 
-#: ../lib/foreman_openscap/engine.rb:147
+#: ../lib/foreman_openscap/engine.rb:139
 msgid "Reports"
 msgstr "報告"
 
-#: ../lib/foreman_openscap/engine.rb:172
+#: ../lib/foreman_openscap/engine.rb:164
 msgid "OpenSCAP Proxy to use for fetching SCAP content and uploading ARF reports. Leave blank and override appropriate parameters when using proxy load balancer."
 msgstr ""
 
-#: ../lib/foreman_openscap/engine.rb:176 ../lib/foreman_openscap/engine.rb:181
+#: ../lib/foreman_openscap/engine.rb:168 ../lib/foreman_openscap/engine.rb:173
 msgid "OpenSCAP Proxy"
 msgstr ""
 
-#: ../lib/foreman_openscap/engine.rb:178 ../lib/foreman_openscap/engine.rb:183
+#: ../lib/foreman_openscap/engine.rb:170 ../lib/foreman_openscap/engine.rb:175
 msgid "ID of OpenSCAP Proxy"
 msgstr ""
 
-#: ../lib/foreman_openscap/engine.rb:222 ../lib/foreman_openscap/engine.rb:240
+#: ../lib/foreman_openscap/engine.rb:215 ../lib/foreman_openscap/engine.rb:233
 msgid "Run OpenSCAP scan"
 msgstr ""
 
-#: ../lib/foreman_openscap/engine.rb:227 ../lib/foreman_openscap/engine.rb:241
+#: ../lib/foreman_openscap/engine.rb:220 ../lib/foreman_openscap/engine.rb:234
 msgid "Run OpenSCAP remediation with Ansible"
 msgstr ""
 
-#: ../lib/foreman_openscap/engine.rb:232 ../lib/foreman_openscap/engine.rb:242
+#: ../lib/foreman_openscap/engine.rb:225 ../lib/foreman_openscap/engine.rb:235
 msgid "Run OpenSCAP remediation with Shell"
 msgstr ""
 
@@ -1315,31 +1303,31 @@ msgstr ""
 msgid "There's no available report for this host"
 msgstr ""
 
-#: ../webpack/components/OpenscapRemediationWizard/ViewSelectedHostsLink.js:28
-msgid "View selected hosts"
+#: ../webpack/components/OpenscapRemediationWizard/Footer.js:30 ../webpack/components/OpenscapRemediationWizard/index.js:94
+msgid "Run"
 msgstr ""
 
-#: ../webpack/components/OpenscapRemediationWizard/index.js:69 ../webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js:193
-msgid "Review hosts"
+#: ../webpack/components/OpenscapRemediationWizard/ViewSelectedHostsLink.js:28
+msgid "View selected hosts"
 msgstr ""
 
-#: ../webpack/components/OpenscapRemediationWizard/index.js:77 ../webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js:123
+#: ../webpack/components/OpenscapRemediationWizard/constants.js:19 ../webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js:123
 msgid "Select snippet"
 msgstr ""
 
-#: ../webpack/components/OpenscapRemediationWizard/index.js:85 ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:97
-msgid "Review remediation"
+#: ../webpack/components/OpenscapRemediationWizard/constants.js:20 ../webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js:193
+msgid "Review hosts"
 msgstr ""
 
-#: ../webpack/components/OpenscapRemediationWizard/index.js:89
-msgid "Run"
+#: ../webpack/components/OpenscapRemediationWizard/constants.js:21 ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:97
+msgid "Review remediation"
 msgstr ""
 
-#: ../webpack/components/OpenscapRemediationWizard/index.js:93
+#: ../webpack/components/OpenscapRemediationWizard/constants.js:22
 msgid "Done"
 msgstr ""
 
-#: ../webpack/components/OpenscapRemediationWizard/index.js:127
+#: ../webpack/components/OpenscapRemediationWizard/index.js:132
 msgid "Remediate %s rule"
 msgstr ""
 
@@ -1454,18 +1442,3 @@ msgstr ""
 #: ../webpack/helpers/permissionsHelper.js:37
 msgid "Request the following permissions from administrator: %s."
 msgstr ""
-
-#~ msgid "Action with sub plans"
-#~ msgstr "有子計畫的動作"
-
-#~ msgid "Import Puppet classes"
-#~ msgstr "匯入 Puppet 類別"
-
-#~ msgid "Import facts"
-#~ msgstr "匯入詳情"
-
-#~ msgid "Remote action:"
-#~ msgstr "遠端動作："
-
-#~ msgid "hosts"
-#~ msgstr "主機"

data/locale/zh_TW/foreman_openscap.po

@@ -914,12 +914,6 @@ msgstr ""
 msgid "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding."
 msgstr ""
 
-msgid "The following Smart Proxies need to be updated to unlock the feature: %s. "
-msgstr ""
-
-msgid "The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions."
-msgstr ""
-
 msgid "The identifier of the host"
 msgstr ""
 
@@ -938,9 +932,6 @@ msgstr ""
 msgid "There's no available report for this host"
 msgstr ""
 
-msgid "This feature is temporarily disabled. "
-msgstr ""
-
 msgid "This leaves the setup of the foreman_scap_client solely on the user. The policy still needs to be defined in order to link incoming ARF reports."
 msgstr ""
 

data/test/unit/message_cleaner_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'foreman_openscap/message_cleaner'
 
 class MessageCleanerTest < ActiveSupport::TestCase
   setup do

data/webpack/components/OpenscapRemediationWizard/Footer.js

@@ -0,0 +1,54 @@
+import React from 'react';
+import {
+  Button,
+  WizardFooter,
+  WizardContextConsumer,
+} from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { WIZARD_TITLES } from './constants';
+
+export const Footer = () => (
+  <WizardFooter>
+    <WizardContextConsumer>
+      {({ activeStep, onNext, onBack, onClose, goToStepByName }) => {
+        const isValid =
+          activeStep && activeStep.enableNext !== undefined
+            ? activeStep.enableNext
+            : true;
+
+        return (
+          <>
+            {!activeStep.isFinishedStep ? (
+              <Button
+                ouiaId="oscap-rem-wiz-next-button"
+                variant="primary"
+                type="submit"
+                onClick={onNext}
+                isDisabled={!isValid}
+              >
+                {activeStep.name === WIZARD_TITLES.reviewRemediation
+                  ? __('Run')
+                  : __('Next')}
+              </Button>
+            ) : null}
+            <Button
+              ouiaId="oscap-rem-wiz-back-button"
+              variant="secondary"
+              onClick={onBack}
+              isDisabled={activeStep.name === WIZARD_TITLES.snippetSelect}
+            >
+              {__('Back')}
+            </Button>
+            <Button
+              ouiaId="oscap-rem-wiz-cancel-button"
+              variant="link"
+              onClick={onClose}
+            >
+              {__('Cancel')}
+            </Button>
+          </>
+        );
+      }}
+    </WizardContextConsumer>
+  </WizardFooter>
+);

data/webpack/components/OpenscapRemediationWizard/constants.js

@@ -1,3 +1,5 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
 export const OPENSCAP_REMEDIATION_MODAL_ID = 'openscapRemediationModal';
 export const HOSTS_PATH = '/hosts';
 export const FAIL_RULE_SEARCH = 'fails_xccdf_rule';
@@ -12,3 +14,10 @@ export const JOB_INVOCATION_API_REQUEST_KEY = 'OPENSCAP_REX_JOB_INVOCATIONS';
 
 export const SNIPPET_SH = 'urn:xccdf:fix:script:sh';
 export const SNIPPET_ANSIBLE = 'urn:xccdf:fix:script:ansible';
+
+export const WIZARD_TITLES = {
+  snippetSelect: __('Select snippet'),
+  reviewHosts: __('Review hosts'),
+  reviewRemediation: __('Review remediation'),
+  finish: __('Done'),
+};

data/webpack/components/OpenscapRemediationWizard/index.js

@@ -7,12 +7,17 @@ import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { API_OPERATIONS, get } from 'foremanReact/redux/API';
 
 import OpenscapRemediationWizardContext from './OpenscapRemediationWizardContext';
+import { Footer } from './Footer';
 import {
   selectLogResponse,
   selectLogError,
   selectLogStatus,
 } from './OpenscapRemediationSelectors';
-import { REPORT_LOG_REQUEST_KEY, FAIL_RULE_SEARCH } from './constants';
+import {
+  REPORT_LOG_REQUEST_KEY,
+  FAIL_RULE_SEARCH,
+  WIZARD_TITLES,
+} from './constants';
 import { SnippetSelect, ReviewHosts, ReviewRemediation, Finish } from './steps';
 
 const OpenscapRemediationWizard = ({
@@ -66,7 +71,7 @@ const OpenscapRemediationWizard = ({
 
   const reviewHostsStep = {
     id: 2,
-    name: __('Review hosts'),
+    name: WIZARD_TITLES.reviewHosts,
     component: <ReviewHosts />,
     canJumpTo: Boolean(snippet && method === 'job'),
     enableNext: Boolean(snippet && method),
@@ -74,7 +79,7 @@ const OpenscapRemediationWizard = ({
   const steps = [
     {
       id: 1,
-      name: __('Select snippet'),
+      name: WIZARD_TITLES.snippetSelect,
       component: <SnippetSelect />,
       canJumpTo: true,
       enableNext: Boolean(snippet && method),
@@ -82,7 +87,7 @@ const OpenscapRemediationWizard = ({
     ...(snippet && method === 'job' ? [reviewHostsStep] : []),
     {
       id: 3,
-      name: __('Review remediation'),
+      name: WIZARD_TITLES.reviewRemediation,
       component: <ReviewRemediation />,
       canJumpTo: Boolean(snippet && method),
       enableNext: method === 'job',
@@ -90,7 +95,7 @@ const OpenscapRemediationWizard = ({
     },
     {
       id: 4,
-      name: __('Done'),
+      name: WIZARD_TITLES.finish,
       component: <Finish onClose={onWizardClose} />,
       isFinishedStep: true,
     },
@@ -128,6 +133,7 @@ const OpenscapRemediationWizard = ({
             isOpen={isRemediationWizardOpen}
             steps={steps}
             onClose={onWizardClose}
+            footer={<Footer />}
           />
         </OpenscapRemediationWizardContext.Provider>
       )}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 9.0.3
+  version: 10.0.0
 platform: ruby
 authors:
 - slukasik@redhat.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -418,6 +418,7 @@ files:
 - webpack/components/IndexTable/IndexTableHelper.js
 - webpack/components/IndexTable/index.js
 - webpack/components/LinkButton.js
+- webpack/components/OpenscapRemediationWizard/Footer.js
 - webpack/components/OpenscapRemediationWizard/OpenscapRemediationSelectors.js
 - webpack/components/OpenscapRemediationWizard/OpenscapRemediationWizardContext.js
 - webpack/components/OpenscapRemediationWizard/ViewSelectedHostsLink.js
@@ -457,7 +458,7 @@ homepage: https://github.com/theforeman/foreman_openscap
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -473,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.33
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files: