foreman_remote_execution 9.1.0 → 10.0.1

data/locale/ru/foreman_remote_execution.po

@@ -29,6 +29,9 @@ msgstr "%s назад"
 msgid "%s job has been invoked"
 msgstr ""
 
+msgid "%s more"
+msgstr ""
+
 msgid "%{description} on %{host}"
 msgstr "%{description} на %{host}"
 
@@ -38,9 +41,6 @@ msgstr ""
 msgid "'Starts before' date must in the future"
 msgstr ""
 
-msgid ", and %s more"
-msgstr ""
-
 msgid "...and %s more"
 msgstr ""
 
@@ -100,6 +100,9 @@ msgstr ""
 msgid "After"
 msgstr ""
 
+msgid "After %s occurences"
+msgstr ""
+
 msgid "All fields are required."
 msgstr ""
 
@@ -157,7 +160,7 @@ msgstr "bookmark_id и search_query не могут использоваться
 msgid "Categories list failed with:"
 msgstr ""
 
-msgid "Category and Template"
+msgid "Category and template"
 msgstr ""
 
 msgid "Choose a job template that is pre-selected in job invocation form"
@@ -169,7 +172,7 @@ msgstr "При добавлении входных параметров из «%
 msgid "Cleanup working directories"
 msgstr ""
 
-msgid "Clear filters"
+msgid "Clear all filters"
 msgstr ""
 
 msgid "Clear input"
@@ -379,6 +382,18 @@ msgstr ""
 msgid "Evaluated at:"
 msgstr "Обработано:"
 
+msgid "Every day at %s"
+msgstr ""
+
+msgid "Every hour at minute %s"
+msgstr ""
+
+msgid "Every month on %s at %s"
+msgstr ""
+
+msgid "Every week on %s at %s"
+msgstr ""
+
 msgid "Execute the job later, at a scheduled time."
 msgstr ""
 
@@ -739,6 +754,9 @@ msgstr "Организация"
 msgid "Override the description format from the template for this invocation only"
 msgstr "Переопределить формат описания из шаблона только на время этого вызова"
 
+msgid "Override the global time to pickup interval for this invocation only"
+msgstr ""
+
 msgid "Override the timeout interval from the template for this invocation only"
 msgstr ""
 
@@ -766,9 +784,24 @@ msgstr ""
 msgid "Perform no more executions after this time"
 msgstr "Остановить после указанного числа повторений"
 
+msgid "Please enter a search query"
+msgstr ""
+
+msgid "Please go back to \\\"Schedule\\\" - \\\"Future execution\\\" step to fix the error"
+msgstr ""
+
 msgid "Please refine your search."
 msgstr ""
 
+msgid "Please select at least one host"
+msgstr ""
+
+msgid "Please select at least one host collection"
+msgstr ""
+
+msgid "Please select at least one host group"
+msgstr ""
+
 msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
 msgstr ""
 
@@ -910,6 +943,12 @@ msgstr "Выполнить задание"
 msgid "Run Puppet Once"
 msgstr ""
 
+msgid "Run Script"
+msgstr ""
+
+msgid "Run a script"
+msgstr ""
+
 msgid "Run at most N tasks at a time"
 msgstr "Максимальное количество параллельно выполняемых задач"
 
@@ -1060,6 +1099,9 @@ msgstr ""
 msgid "Starts"
 msgstr "Начало"
 
+msgid "Starts Before"
+msgstr ""
+
 msgid "Starts at"
 msgstr ""
 
@@ -1244,7 +1286,7 @@ msgstr "Тип"
 msgid "Type has impact on when is the query evaluated to hosts."
 msgstr ""
 
-msgid "Type has impact on when is the query evaluated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it</li></ul>"
+msgid "Type has impact on when is the query evaluated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planned in future, targeted hosts set may change before it</li></ul>"
 msgstr ""
 
 msgid "Type of execution"
@@ -1400,7 +1442,7 @@ msgstr "ошибка при обработке шаблонов: %s"
 msgid "evaluates just after you submit this form"
 msgstr ""
 
-msgid "evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it"
+msgid "evaluates just before the execution is started, so if it's planned in future, targeted hosts set may change before it"
 msgstr ""
 
 msgid "failed"
@@ -1484,5 +1526,8 @@ msgstr ""
 msgid "using Smart Proxy"
 msgstr ""
 
+msgid "view host names"
+msgstr ""
+
 msgid "yes"
 msgstr "да"

data/locale/zh_CN/foreman_remote_execution.po

@@ -26,6 +26,9 @@ msgstr "%s 前"
 msgid "%s job has been invoked"
 msgstr "%s 任务已被调用"
 
+msgid "%s more"
+msgstr ""
+
 msgid "%{description} on %{host}"
 msgstr "%{host} 的 %{description}"
 
@@ -35,9 +38,6 @@ msgstr ""
 msgid "'Starts before' date must in the future"
 msgstr ""
 
-msgid ", and %s more"
-msgstr ", 和 %s 个更多"
-
 msgid "...and %s more"
 msgstr "...和 %s 个更多"
 
@@ -96,6 +96,9 @@ msgstr "高级项"
 msgid "After"
 msgstr ""
 
+msgid "After %s occurences"
+msgstr ""
+
 msgid "All fields are required."
 msgstr "各个项都需要。"
 
@@ -153,8 +156,8 @@ msgstr "无法同时指定 bookmark_id 和 search_query"
 msgid "Categories list failed with:"
 msgstr "类别列表失败并带有："
 
-msgid "Category and Template"
-msgstr "类别和模板"
+msgid "Category and template"
+msgstr ""
 
 msgid "Choose a job template that is pre-selected in job invocation form"
 msgstr "选择在作业调用表单中预先选择的作业模板"
@@ -165,8 +168,8 @@ msgstr "在外部输入设置中发现了循环的依赖关系 '%{template}' ->
 msgid "Cleanup working directories"
 msgstr "清理工作目录"
 
-msgid "Clear filters"
-msgstr "清除过滤器"
+msgid "Clear all filters"
+msgstr ""
 
 msgid "Clear input"
 msgstr ""
@@ -375,6 +378,18 @@ msgstr "错误："
 msgid "Evaluated at:"
 msgstr "评估于："
 
+msgid "Every day at %s"
+msgstr ""
+
+msgid "Every hour at minute %s"
+msgstr ""
+
+msgid "Every month on %s at %s"
+msgstr ""
+
+msgid "Every week on %s at %s"
+msgstr ""
+
 msgid "Execute the job later, at a scheduled time."
 msgstr ""
 
@@ -735,6 +750,9 @@ msgstr "机构"
 msgid "Override the description format from the template for this invocation only"
 msgstr "只为此调用覆盖来自模板的描述格式"
 
+msgid "Override the global time to pickup interval for this invocation only"
+msgstr ""
+
 msgid "Override the timeout interval from the template for this invocation only"
 msgstr "只为此调用使用该模板覆盖超时间隔"
 
@@ -762,9 +780,24 @@ msgstr "执行一个单独 Puppet 运行"
 msgid "Perform no more executions after this time"
 msgstr "在此时间后不再执行"
 
+msgid "Please enter a search query"
+msgstr ""
+
+msgid "Please go back to \\\"Schedule\\\" - \\\"Future execution\\\" step to fix the error"
+msgstr ""
+
 msgid "Please refine your search."
 msgstr "请重新调整您的搜索。"
 
+msgid "Please select at least one host"
+msgstr ""
+
+msgid "Please select at least one host collection"
+msgstr ""
+
+msgid "Please select at least one host group"
+msgstr ""
+
 msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
 msgstr "要用于 SSH 通信的端口。默认端口 22。您可以通过设置名为 remote_execution_ssh_port 的参数来按主机进行覆盖。"
 
@@ -906,6 +939,12 @@ msgstr "运行作业"
 msgid "Run Puppet Once"
 msgstr "运行 Puppet 一次"
 
+msgid "Run Script"
+msgstr ""
+
+msgid "Run a script"
+msgstr ""
+
 msgid "Run at most N tasks at a time"
 msgstr "一次最多运行 N 个任务"
 
@@ -1056,6 +1095,9 @@ msgstr "已启动"
 msgid "Starts"
 msgstr "开始"
 
+msgid "Starts Before"
+msgstr ""
+
 msgid "Starts at"
 msgstr "开始于"
 
@@ -1237,8 +1279,8 @@ msgstr "类型"
 msgid "Type has impact on when is the query evaluated to hosts."
 msgstr "类型会影响到什么时候会评估到主机。"
 
-msgid "Type has impact on when is the query evaluated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it</li></ul>"
-msgstr "类型会对何时评估主机查询产生影响。<br><ul><li><b>静态</b> - 提交此表格后立即评估</li><li><b>动态</b> - 开始执行前进行评估，因此，如果以后计划，则目标主机集可能会在它之前发生变化</li></ul>"
+msgid "Type has impact on when is the query evaluated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planned in future, targeted hosts set may change before it</li></ul>"
+msgstr ""
 
 msgid "Type of execution"
 msgstr ""
@@ -1393,8 +1435,8 @@ msgstr "呈现时出错：%s"
 msgid "evaluates just after you submit this form"
 msgstr "提交此表单后评估"
 
-msgid "evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it"
-msgstr "在执行启动前进行评估，因此如果将来需要它，则目标主机设置可能会在它之前改变。"
+msgid "evaluates just before the execution is started, so if it's planned in future, targeted hosts set may change before it"
+msgstr ""
 
 msgid "failed"
 msgstr "失败"
@@ -1477,5 +1519,8 @@ msgstr "使用 "
 msgid "using Smart Proxy"
 msgstr "使用智能代理"
 
+msgid "view host names"
+msgstr ""
+
 msgid "yes"
 msgstr "是"

data/locale/zh_TW/foreman_remote_execution.po

@@ -26,6 +26,9 @@ msgstr "%s 之前"
 msgid "%s job has been invoked"
 msgstr ""
 
+msgid "%s more"
+msgstr ""
+
 msgid "%{description} on %{host}"
 msgstr "%{description} 於 %{host} 之上"
 
@@ -35,9 +38,6 @@ msgstr ""
 msgid "'Starts before' date must in the future"
 msgstr ""
 
-msgid ", and %s more"
-msgstr ""
-
 msgid "...and %s more"
 msgstr ""
 
@@ -97,6 +97,9 @@ msgstr ""
 msgid "After"
 msgstr ""
 
+msgid "After %s occurences"
+msgstr ""
+
 msgid "All fields are required."
 msgstr ""
 
@@ -154,7 +157,7 @@ msgstr "無法指定 bookmark_id 和 search_query"
 msgid "Categories list failed with:"
 msgstr ""
 
-msgid "Category and Template"
+msgid "Category and template"
 msgstr ""
 
 msgid "Choose a job template that is pre-selected in job invocation form"
@@ -166,7 +169,7 @@ msgstr "在外部輸入集偵測到環狀相依性： '%{template}' -> '%{target
 msgid "Cleanup working directories"
 msgstr ""
 
-msgid "Clear filters"
+msgid "Clear all filters"
 msgstr ""
 
 msgid "Clear input"
@@ -376,6 +379,18 @@ msgstr ""
 msgid "Evaluated at:"
 msgstr "評量於："
 
+msgid "Every day at %s"
+msgstr ""
+
+msgid "Every hour at minute %s"
+msgstr ""
+
+msgid "Every month on %s at %s"
+msgstr ""
+
+msgid "Every week on %s at %s"
+msgstr ""
+
 msgid "Execute the job later, at a scheduled time."
 msgstr ""
 
@@ -736,6 +751,9 @@ msgstr "組織"
 msgid "Override the description format from the template for this invocation only"
 msgstr "僅為這祈願從範本覆寫描述格式"
 
+msgid "Override the global time to pickup interval for this invocation only"
+msgstr ""
+
 msgid "Override the timeout interval from the template for this invocation only"
 msgstr ""
 
@@ -763,9 +781,24 @@ msgstr ""
 msgid "Perform no more executions after this time"
 msgstr "此時間之後不再進行任何執行"
 
+msgid "Please enter a search query"
+msgstr ""
+
+msgid "Please go back to \\\"Schedule\\\" - \\\"Future execution\\\" step to fix the error"
+msgstr ""
+
 msgid "Please refine your search."
 msgstr ""
 
+msgid "Please select at least one host"
+msgstr ""
+
+msgid "Please select at least one host collection"
+msgstr ""
+
+msgid "Please select at least one host group"
+msgstr ""
+
 msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
 msgstr ""
 
@@ -907,6 +940,12 @@ msgstr "執行工作"
 msgid "Run Puppet Once"
 msgstr ""
 
+msgid "Run Script"
+msgstr ""
+
+msgid "Run a script"
+msgstr ""
+
 msgid "Run at most N tasks at a time"
 msgstr "一次最多執行 N 個任務"
 
@@ -1057,6 +1096,9 @@ msgstr ""
 msgid "Starts"
 msgstr "起始"
 
+msgid "Starts Before"
+msgstr ""
+
 msgid "Starts at"
 msgstr ""
 
@@ -1239,7 +1281,7 @@ msgstr "類型"
 msgid "Type has impact on when is the query evaluated to hosts."
 msgstr ""
 
-msgid "Type has impact on when is the query evaluated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it</li></ul>"
+msgid "Type has impact on when is the query evaluated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planned in future, targeted hosts set may change before it</li></ul>"
 msgstr ""
 
 msgid "Type of execution"
@@ -1395,7 +1437,7 @@ msgstr "處理時發生錯誤：%s"
 msgid "evaluates just after you submit this form"
 msgstr ""
 
-msgid "evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it"
+msgid "evaluates just before the execution is started, so if it's planned in future, targeted hosts set may change before it"
 msgstr ""
 
 msgid "failed"
@@ -1479,5 +1521,8 @@ msgstr ""
 msgid "using Smart Proxy"
 msgstr ""
 
+msgid "view host names"
+msgstr ""
+
 msgid "yes"
 msgstr "是"

data/webpack/JobWizard/Footer.js

@@ -0,0 +1,104 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
+import {
+  Button,
+  WizardFooter,
+  WizardContextConsumer,
+  Tooltip,
+  Spinner,
+} from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { WIZARD_TITLES } from './JobWizardConstants';
+import { selectIsSubmitting } from './JobWizardSelectors';
+
+export const Footer = ({ canSubmit, onSave }) => {
+  const isSubmitting = useSelector(selectIsSubmitting);
+  return (
+    <WizardFooter>
+      <WizardContextConsumer>
+        {({ activeStep, onNext, onBack, onClose, goToStepByName }) => {
+          const isValid =
+            activeStep && activeStep.enableNext !== undefined
+              ? activeStep.enableNext
+              : true;
+
+          return (
+            <>
+              <Button
+                variant="primary"
+                type="submit"
+                onClick={onNext}
+                isDisabled={!isValid || isSubmitting}
+              >
+                {activeStep.name === WIZARD_TITLES.review
+                  ? __('Submit')
+                  : __('Next')}
+              </Button>
+              <Button
+                variant="secondary"
+                onClick={onBack}
+                isDisabled={
+                  activeStep.name === WIZARD_TITLES.categoryAndTemplate
+                }
+              >
+                {__('Back')}
+              </Button>
+              <Tooltip
+                content={
+                  <div>
+                    {canSubmit
+                      ? __('Start job')
+                      : __('Fill all required fields in all the steps')}
+                  </div>
+                }
+              >
+                <Button
+                  variant="tertiary"
+                  onClick={onSave}
+                  isAriaDisabled={!canSubmit}
+                  isDisabled={isSubmitting}
+                >
+                  {__('Run on selected hosts')}
+                </Button>
+              </Tooltip>
+              <Tooltip
+                content={
+                  <div>
+                    {canSubmit
+                      ? __('Skip to review step')
+                      : __(
+                          'Fill all required fields in all the steps to start the job'
+                        )}
+                  </div>
+                }
+              >
+                <Button
+                  variant="tertiary"
+                  onClick={() => goToStepByName(WIZARD_TITLES.review)}
+                  isAriaDisabled={!canSubmit}
+                  isDisabled={isSubmitting}
+                >
+                  {__('Skip to review')}
+                </Button>
+              </Tooltip>
+              <Button variant="link" onClick={onClose}>
+                {__('Cancel')}
+              </Button>
+              {isSubmitting && (
+                <div>
+                  <Spinner size="lg" />
+                </div>
+              )}
+            </>
+          );
+        }}
+      </WizardContextConsumer>
+    </WizardFooter>
+  );
+};
+
+Footer.propTypes = {
+  canSubmit: PropTypes.bool.isRequired,
+  onSave: PropTypes.func.isRequired,
+};

data/webpack/JobWizard/JobWizard.js

@@ -37,6 +37,7 @@ import { useAutoFill } from './autofill';
 import { submit } from './submit';
 import { generateDefaultDescription } from './JobWizardHelpers';
 import { StartsBeforeErrorAlert } from './StartsBeforeErrorAlert';
+import { Footer } from './Footer';
 import './JobWizard.scss';
 
 export const JobWizard = ({ rerunData }) => {
@@ -420,6 +421,22 @@ export const JobWizard = ({ rerunData }) => {
   ];
   const location = useForemanLocation();
   const organization = useForemanOrganization();
+  const onSave = () => {
+    submit({
+      jobTemplateID,
+      templateValues,
+      advancedValues,
+      scheduleValue,
+      dispatch,
+      selectedTargets,
+      hostsSearchQuery,
+      location,
+      organization,
+      feature: routerSearch?.feature,
+      provider: templateResponse.provider_name,
+      advancedInputs: templateResponse.advanced_template_inputs,
+    });
+  };
   return (
     <>
       {isStartsBeforeError && <StartsBeforeErrorAlert />}
@@ -429,22 +446,13 @@ export const JobWizard = ({ rerunData }) => {
         steps={steps}
         height="100%"
         className="job-wizard"
-        onSave={() => {
-          submit({
-            jobTemplateID,
-            templateValues,
-            advancedValues,
-            scheduleValue,
-            dispatch,
-            selectedTargets,
-            hostsSearchQuery,
-            location,
-            organization,
-            feature: routerSearch?.feature,
-            provider: templateResponse.provider_name,
-            advancedInputs: templateResponse.advanced_template_inputs,
-          });
-        }}
+        onSave={onSave}
+        footer={
+          <Footer
+            canSubmit={!!steps[steps.length - 1].enableNext}
+            onSave={onSave}
+          />
+        }
       />
     </>
   );

data/webpack/JobWizard/JobWizard.scss

@@ -6,20 +6,15 @@
 
   .pf-c-wizard__nav.pf-m-expanded {
     z-index: calc(
-      var(--pf-c-wizard__footer--ZIndex) + 2
-    ); // So the small screen navigation can be shown above the select box
+      var(--pf-c-wizard__toggle--ZIndex) + 2
+    ); // So the small screen navigation can be shown above the select box and wizard body
   }
 
   .pf-c-wizard__main {
     overflow: visible;
     z-index: calc(
-      var(--pf-c-wizard__footer--ZIndex) + 1
-    ); // So the select box can be shown above the wizard footer
-  }
-  .pf-c-wizard__nav {
-    z-index: calc(
-      var(--pf-c-wizard__footer--ZIndex) + 2
-    ); // So the navigation box can be shown above the wizard body
+      var(--pf-c-wizard__toggle--ZIndex) + 1
+    ); // So the select box can be shown above the wizard footer and navigation toggle
   }
   .pf-c-wizard__main-body {
     max-width: 500px;
@@ -34,14 +29,8 @@
   }
 
   .target-hosts-and-inputs {
-    .hosts-chip-group {
-      margin-top: 8px;
-      float: left;
-      clear: left;
-      display: block;
-    }
-    .clear-chips {
-      margin-top: 8px;
+    .pf-c-chip-group.pf-m-category {
+      margin-bottom: 10px;
     }
     .pf-c-select__toggle-typeahead {
       border: 0px;

data/webpack/JobWizard/JobWizardConstants.js

@@ -23,7 +23,7 @@ export const SCHEDULE_TYPES = {
 };
 
 export const WIZARD_TITLES = {
-  categoryAndTemplate: __('Category and Template'),
+  categoryAndTemplate: __('Category and template'),
   hostsAndInputs: __('Target hosts and inputs'),
   advanced: __('Advanced fields'),
   schedule: __('Schedule'),

data/webpack/JobWizard/JobWizardPageRerun.js

@@ -86,6 +86,7 @@ const JobWizardPageRerun = ({
           <React.Fragment>
             {jobOrganization?.id !== currentOrganization?.id && (
               <Alert
+                isInline
                 className="job-wizard-alert"
                 variant="warning"
                 title={sprintf(
@@ -99,6 +100,7 @@ const JobWizardPageRerun = ({
             )}
             {jobLocation?.id !== currentLocation?.id && (
               <Alert
+                isInline
                 className="job-wizard-alert"
                 variant="warning"
                 title={sprintf(