foreman_remote_execution 9.0.1 → 10.0.0

data/locale/zh_CN/foreman_remote_execution.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_remote_execution 8.1.1\n"
+"Project-Id-Version: foreman_remote_execution 9.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-15 13:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -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 个更多"
 
@@ -84,6 +84,9 @@ msgstr "有子计划的操作"
 msgid "Actions"
 msgstr "操作"
 
+msgid "Active Filters:"
+msgstr ""
+
 msgid "Add Foreign Input Set"
 msgstr "添加外部输入集"
 
@@ -93,6 +96,9 @@ msgstr "高级项"
 msgid "After"
 msgstr ""
 
+msgid "After %s occurences"
+msgstr ""
+
 msgid "All fields are required."
 msgstr "各个项都需要。"
 
@@ -150,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 "选择在作业调用表单中预先选择的作业模板"
@@ -162,8 +168,8 @@ msgstr "在外部输入设置中发现了循环的依赖关系 '%{template}' ->
 msgid "Cleanup working directories"
 msgstr "清理工作目录"
 
-msgid "Clear filters"
-msgstr "清除过滤器"
+msgid "Clear all filters"
+msgstr ""
 
 msgid "Clear input"
 msgstr ""
@@ -208,7 +214,7 @@ msgid "Could not use any template used in the job invocation"
 msgstr "无法使用作业调用中使用的任何模板"
 
 msgid "Create"
-msgstr ""
+msgstr "创建"
 
 msgid "Create Report"
 msgstr "创建报告"
@@ -328,7 +334,7 @@ msgid "Edit job description template"
 msgstr "编辑作业描述模板"
 
 msgid "Effective User"
-msgstr ""
+msgstr "有效用户"
 
 msgid "Effective User Method"
 msgstr "有效用户方法"
@@ -372,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 ""
 
@@ -520,7 +538,7 @@ msgid "Indicates that the action should be cancelled if it cannot be started bef
 msgstr "这代表，如果操作无法在这个时间前开始则操作应该被取消。"
 
 msgid "Inherit from host parameter"
-msgstr ""
+msgstr "从主机参数继承"
 
 msgid "Input"
 msgstr "输入"
@@ -685,13 +703,13 @@ msgid "Name"
 msgstr "名称"
 
 msgid "Never"
-msgstr ""
+msgstr "决不"
 
 msgid "New Job Template"
 msgstr "新作业模板"
 
 msgid "No (override)"
-msgstr ""
+msgstr "否（覆盖）"
 
 msgid "No Target Hosts"
 msgstr "没有目标主机"
@@ -718,7 +736,7 @@ msgid "Now"
 msgstr ""
 
 msgid "On"
-msgstr ""
+msgstr "上"
 
 msgid "Only one of feature or job_template_id can be specified"
 msgstr "只能指定一个功能或 job_template_id"
@@ -732,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 "只为此调用使用该模板覆盖超时间隔"
 
@@ -759,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 的参数来按主机进行覆盖。"
 
@@ -862,7 +898,7 @@ msgid "Repeat amount can only be a positive number"
 msgstr "重复数量只能是一个正数"
 
 msgid "Repeats"
-msgstr ""
+msgstr "重复"
 
 msgid "Rerun"
 msgstr "重新运行"
@@ -883,7 +919,7 @@ msgid "Rerun the job"
 msgstr "重新运行作业"
 
 msgid "Reset to default"
-msgstr ""
+msgstr "重置为默认"
 
 msgid "Resolves to"
 msgstr "解析到"
@@ -903,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 个任务"
 
@@ -1051,6 +1093,9 @@ msgid "Started"
 msgstr "已启动"
 
 msgid "Starts"
+msgstr "开始"
+
+msgid "Starts Before"
 msgstr ""
 
 msgid "Starts at"
@@ -1234,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 ""
@@ -1361,7 +1406,7 @@ msgid "Workers pool size"
 msgstr "工作节点池的大小"
 
 msgid "Yes (override)"
-msgstr ""
+msgstr "是（覆盖）"
 
 msgid "You are not allowed to see the currently assigned template. Saving the form now would unassign the template."
 msgstr "您没有权限查看当前分配的模板。现在保存表单将取消分配模板。"
@@ -1390,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 "失败"
@@ -1430,7 +1475,7 @@ msgid "is month (range: 1-12)"
 msgstr "月份（范围：1-12）"
 
 msgid "no"
-msgstr ""
+msgstr "否"
 
 msgid "occurences"
 msgstr ""
@@ -1474,5 +1519,8 @@ msgstr "使用 "
 msgid "using Smart Proxy"
 msgstr "使用智能代理"
 
-msgid "yes"
+msgid "view host names"
 msgstr ""
+
+msgid "yes"
+msgstr "是"

data/locale/zh_TW/foreman_remote_execution.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_remote_execution 8.1.1\n"
+"Project-Id-Version: foreman_remote_execution 9.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-15 13:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -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 ""
 
@@ -85,6 +85,9 @@ msgstr "有子計畫的動作"
 msgid "Actions"
 msgstr "動作"
 
+msgid "Active Filters:"
+msgstr ""
+
 msgid "Add Foreign Input Set"
 msgstr "新增外部輸入集"
 
@@ -94,6 +97,9 @@ msgstr ""
 msgid "After"
 msgstr ""
 
+msgid "After %s occurences"
+msgstr ""
+
 msgid "All fields are required."
 msgstr ""
 
@@ -151,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"
@@ -163,7 +169,7 @@ msgstr "在外部輸入集偵測到環狀相依性： '%{template}' -> '%{target
 msgid "Cleanup working directories"
 msgstr ""
 
-msgid "Clear filters"
+msgid "Clear all filters"
 msgstr ""
 
 msgid "Clear input"
@@ -209,7 +215,7 @@ msgid "Could not use any template used in the job invocation"
 msgstr "無法使用任何用於這工作祈願的範本"
 
 msgid "Create"
-msgstr ""
+msgstr "建立"
 
 msgid "Create Report"
 msgstr ""
@@ -373,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 ""
 
@@ -686,7 +704,7 @@ msgid "Name"
 msgstr "名稱"
 
 msgid "Never"
-msgstr ""
+msgstr "永不"
 
 msgid "New Job Template"
 msgstr "新工作範本"
@@ -719,7 +737,7 @@ msgid "Now"
 msgstr ""
 
 msgid "On"
-msgstr ""
+msgstr "開啟"
 
 msgid "Only one of feature or job_template_id can be specified"
 msgstr ""
@@ -733,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 ""
 
@@ -760,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 ""
 
@@ -863,7 +899,7 @@ msgid "Repeat amount can only be a positive number"
 msgstr ""
 
 msgid "Repeats"
-msgstr ""
+msgstr "重複"
 
 msgid "Rerun"
 msgstr "重新執行"
@@ -884,7 +920,7 @@ msgid "Rerun the job"
 msgstr "重新執行工作"
 
 msgid "Reset to default"
-msgstr ""
+msgstr "重設為預設值"
 
 msgid "Resolves to"
 msgstr "解析至"
@@ -904,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 個任務"
 
@@ -1052,6 +1094,9 @@ msgid "Started"
 msgstr ""
 
 msgid "Starts"
+msgstr "起始"
+
+msgid "Starts Before"
 msgstr ""
 
 msgid "Starts at"
@@ -1236,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"
@@ -1392,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"
@@ -1432,7 +1477,7 @@ msgid "is month (range: 1-12)"
 msgstr "是月份（範圍：1-12）"
 
 msgid "no"
-msgstr ""
+msgstr "否"
 
 msgid "occurences"
 msgstr ""
@@ -1476,5 +1521,8 @@ msgstr ""
 msgid "using Smart Proxy"
 msgstr ""
 
-msgid "yes"
+msgid "view host names"
 msgstr ""
+
+msgid "yes"
+msgstr "是"

data/package.json

@@ -21,11 +21,11 @@
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^10.1.0",
-    "@theforeman/eslint-plugin-foreman": "^10.1.0",
-    "@theforeman/stories": "^10.1.0",
-    "@theforeman/test": "^10.1.0",
-    "@theforeman/vendor-dev": "^10.1.0",
+    "@theforeman/builder": "^12.0.1",
+    "@theforeman/eslint-plugin-foreman": "^12.0.1",
+    "@theforeman/stories": "^12.0.1",
+    "@theforeman/test": "^12.0.1",
+    "@theforeman/vendor-dev": "^12.0.1",
     "babel-eslint": "^10.0.0",
     "eslint": "^6.8.0",
     "prettier": "^1.19.1",
@@ -34,6 +34,6 @@
     "graphql": "^15.5.0"
   },
   "peerDependencies": {
-    "@theforeman/vendor": "^10.1.0"
+    "@theforeman/vendor": "^12.0.1"
   }
 }

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,
+};