foreman_remote_execution 10.0.5 → 10.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afb4ca6a8728877e0e6447afaa11603a53932025e3eeecfeedb32b7f7dcf9b03
-  data.tar.gz: daf0a3e69e8a1202ac718995a294a8072f02d34abbf56c58c665d8c3dcd7e71f
+  metadata.gz: 0d1dfb7b78f7d6b17a97fe16984983f966bb6f4bb8598601923fabccb31a31ff
+  data.tar.gz: ba03ab056e8d4fd77b61f3dee350c9aa8c029849e1837abe687fd138c5bf8f7a
 SHA512:
-  metadata.gz: 538a79f73bd6284f220f1203395255a5e36af2de580c99a9e17135e22206b2ac1cdcf5f363e1c2d207569b0a8323d22cb84b59b910be09806bf8b6991a684c98
-  data.tar.gz: 97ff7054e8a90c82c676cbe093b8977c589a8df2a7c14207e43103097c3827b7a0cc639e79ce8a929c0f634c93f7030e48a72f85f102531781ab1a06150f92f5
+  metadata.gz: d246ff28f82ce483e189979542a02c7e5e35e850ca61761d73ae11468cfc152593571c5e9aee562b2869b80c3201885812bc779fb82d2138c61725ac203d5c50
+  data.tar.gz: f970e87c94079104ea58f7654559d3bf4b0ca02af756e7ac63201a0608ac3010c6502a68492d635f1daa62690c4e501739c53932c9da2a300aa56d84801e6a55

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '10.0.5'.freeze
+  VERSION = '10.0.6'.freeze
 end

data/package.json

@@ -21,6 +21,7 @@
     "url": "http://projects.theforeman.org/projects/foreman_remote_execution/issues"
   },
   "devDependencies": {
+    "@adobe/css-tools": "~4.2.0",
     "@babel/core": "^7.7.0",
     "@theforeman/builder": "^12.0.1",
     "@theforeman/eslint-plugin-foreman": "^12.0.1",

data/webpack/JobWizard/JobWizard.js

@@ -41,6 +41,8 @@ import { Footer } from './Footer';
 import './JobWizard.scss';
 
 export const JobWizard = ({ rerunData }) => {
+  const routerSearch = useSelector(selectRouterSearch);
+  const [feature, setFeature] = useState(routerSearch.feature);
   const jobCategoriesResponse = useSelector(selectJobCategoriesResponse);
   const [jobTemplateID, setJobTemplateID] = useState(
     rerunData?.template_invocations?.[0]?.template_id ||
@@ -58,7 +60,6 @@ export const JobWizard = ({ rerunData }) => {
     hostGroups: [],
   });
   const [hostsSearchQuery, setHostsSearchQuery] = useState('');
-  const routerSearch = useSelector(selectRouterSearch);
   const [fills, setFills] = useState(
     rerunData
       ? {
@@ -169,8 +170,23 @@ export const JobWizard = ({ rerunData }) => {
                   job_template: { name, description_format },
                 },
               }) => {
+                const allowedInputs = template_inputs
+                  .map(({ name: _name }) => _name)
+                  .concat(
+                    advanced_template_inputs.map(({ name: _name }) => _name)
+                  );
+                const prune = inputs =>
+                  allowedInputs.reduce(
+                    (acc, key) =>
+                      inputs.hasOwnProperty(key)
+                        ? { [key]: inputs[key], ...acc }
+                        : acc,
+                    {}
+                  );
+                setTemplateValues(prune);
                 setAdvancedValues(currentAdvancedValues => ({
                   ...currentAdvancedValues,
+                  templateValues: prune(currentAdvancedValues.templateValues),
                   description:
                     generateDefaultDescription({
                       description_format,
@@ -243,6 +259,7 @@ export const JobWizard = ({ rerunData }) => {
           setJobTemplate={setJobTemplateID}
           category={category}
           setCategory={setCategory}
+          setFeature={setFeature}
           isCategoryPreselected={
             !!rerunData || !!fills.feature || !!fills.template_id
           }
@@ -432,7 +449,7 @@ export const JobWizard = ({ rerunData }) => {
       hostsSearchQuery,
       location,
       organization,
-      feature: routerSearch?.feature,
+      feature,
       provider: templateResponse.provider_name,
       advancedInputs: templateResponse.advanced_template_inputs,
     });

data/webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.js

@@ -16,6 +16,7 @@ export const CategoryAndTemplate = ({
   selectedTemplateID,
   selectedCategory,
   setCategory,
+  setFeature,
   errors,
 }) => {
   const templatesGroups = {};
@@ -45,8 +46,16 @@ export const CategoryAndTemplate = ({
     if (selectedCategory !== newCategory) {
       setCategory(newCategory);
       setJobTemplate(null);
+      setFeature(null);
     }
   };
+  const onSelectTemplate = newTemplate => {
+    if (selectedTemplate !== newTemplate) {
+      setJobTemplate(newTemplate);
+      setFeature(null);
+    }
+  };
+
   const { categoryError, allTemplatesError, templateError } = errors;
   const isError = !!(categoryError || allTemplatesError || templateError);
   return (
@@ -68,7 +77,7 @@ export const CategoryAndTemplate = ({
           label={__('Job template')}
           fieldId="job_template"
           groups={Object.values(templatesGroups)}
-          setSelected={setJobTemplate}
+          setSelected={onSelectTemplate}
           selected={isTemplatesLoading ? [] : selectedTemplate}
           isDisabled={
             !!(categoryError || allTemplatesError || isTemplatesLoading)
@@ -103,6 +112,7 @@ CategoryAndTemplate.propTypes = {
   jobCategories: PropTypes.array,
   jobTemplates: PropTypes.array,
   setJobTemplate: PropTypes.func.isRequired,
+  setFeature: PropTypes.func.isRequired,
   selectedTemplateID: PropTypes.number,
   setCategory: PropTypes.func.isRequired,
   selectedCategory: PropTypes.string,

data/webpack/JobWizard/steps/CategoryAndTemplate/index.js

@@ -26,6 +26,7 @@ const ConnectedCategoryAndTemplate = ({
   setJobTemplate,
   category,
   setCategory,
+  setFeature,
   isCategoryPreselected,
 }) => {
   const dispatch = useDispatch();
@@ -104,6 +105,7 @@ const ConnectedCategoryAndTemplate = ({
       selectedTemplateID={jobTemplate}
       setCategory={setCategory}
       selectedCategory={category}
+      setFeature={setFeature}
       errors={errors}
     />
   );
@@ -114,6 +116,7 @@ ConnectedCategoryAndTemplate.propTypes = {
   setJobTemplate: PropTypes.func.isRequired,
   category: PropTypes.string.isRequired,
   setCategory: PropTypes.func.isRequired,
+  setFeature: PropTypes.func.isRequired,
   isCategoryPreselected: PropTypes.bool.isRequired,
 };
 ConnectedCategoryAndTemplate.defaultProps = { jobTemplate: null };

data/webpack/JobWizard/steps/Schedule/RepeatCron.js

@@ -1,3 +1,4 @@
+import URI from 'urijs';
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import {
@@ -9,10 +10,25 @@ import {
   FormGroup,
   ValidatedOptions,
 } from '@patternfly/react-core';
+import { foremanUrl } from 'foremanReact/common/helpers';
+import { useForemanVersion } from 'foremanReact/Root/Context/ForemanContext';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { helpLabel } from '../form/FormHelpers';
 
+const docUrl = foremanVersion => {
+  const rootUrl = `https://docs.theforeman.org/${foremanVersion}/`;
+  const section =
+    'Managing_Hosts/index-foreman-el.html#using-extended-cron-lines_managing-hosts';
+
+  const url = new URI({
+    path: '/links/manual',
+    query: { root_url: rootUrl, section },
+  });
+  return foremanUrl(url.href());
+};
+
 export const RepeatCron = ({ repeatData, setRepeatData, setValid }) => {
+  const foremanVersion = useForemanVersion();
   const { cronline } = repeatData;
   useEffect(() => {
     if (cronline) {
@@ -24,7 +40,7 @@ export const RepeatCron = ({ repeatData, setRepeatData, setValid }) => {
   }, [setValid, cronline]);
   return (
     <FormGroup
-      label={__('Cron line')}
+      label={__('Cron line (extended)')}
       labelIcon={helpLabel(
         <div>
           {__("Cron line format '1 2 3 4 5', where:")}
@@ -36,6 +52,14 @@ export const RepeatCron = ({ repeatData, setRepeatData, setValid }) => {
             <ListItem>{__('is month (range: 1-12)')}</ListItem>
             <ListItem>{__('is day of week (range: 0-6)')}</ListItem>
           </List>
+          <br />
+          {__(
+            'The cron line supports extended cron line syntax. For details please refer to the '
+          )}
+          <a href={docUrl(foremanVersion)} target="_blank" rel="noreferrer">
+            {__('documentation')}
+          </a>
+          .
         </div>
       )}
       isRequired

data/webpack/__mocks__/foremanReact/Root/Context/ForemanContext/index.js

@@ -1,2 +1,3 @@
 export const useForemanOrganization = () => ({ id: 1 });
 export const useForemanLocation = () => ({ id: 2 });
+export const useForemanVersion = () => '3.7';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 10.0.5
+  version: 10.0.6
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface