foreman_remote_execution 7.2.2 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d32320885b2dc2343cf6efc7c1f7b0f4ac1e0668ea3d0c2dc817c691f1e7d2
-  data.tar.gz: 0655a041907bc30339ac53479220adb5434b20f7e6f38d5ce843dfb675f375cd
+  metadata.gz: aa3c6d67549990da3bbd1d7cbf55408bd4a1dc4d7fc5cbcec8db99eded747964
+  data.tar.gz: ca4e519773be6b0493341fd25ba55e8d4345367c88e0b068183ebe66d020e22e
 SHA512:
-  metadata.gz: 307bb3022d6fca4c61897443448638d84069ce943abb08d63b4e7de99cebdcf4f9956b9aed33c6e3effe2dad9a897c8981e80c775866ea5f32081ddf8950606d
-  data.tar.gz: b32a13df6917c8d41832b66dce88ecdc55383e296e250cbdecfb935f162b5e6e42fb694d57a7338ef6c5c102be9c6a6d2c2e95e1b04df9ac7bfa115b469364c1
+  metadata.gz: bbeb56766cc65ed9fcd587f260fb29fca965b961b0787230f0510166702351cb5ff0c78387b3f818b9741f281519f33931bc8d0aa36a923d92e0d50f620d113e
+  data.tar.gz: 3238dc8bc7cdbaa361a6c077e5d611839cb549424ad98daea9e68ac81a932dd6c8de2f233b31f019cc7a1d037b6fea4a656ca3d7e789eb9a794170fb26ac1f68

data/.github/workflows/ruby_ci.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5
+          ruby-version: 2.7
           bundler-cache: true
           cache-version: 1
           rubygems: 3.0.0
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         foreman-core-branch: [develop]
-        ruby-version: [2.5, 2.7]
+        ruby-version: [2.7]
         node-version: [12]
     steps:
       - run: sudo apt-get update

data/app/controllers/ui_job_wizard_controller.rb

@@ -57,4 +57,19 @@ class UiJobWizardController < ApplicationController
     render :json => { :results =>
       resource_list.sort_by { |r| r[:name] }.take(100), :subtotal => resource_list.count}
   end
+
+  def job_invocation
+    job = JobInvocation.authorized.find(params[:id])
+    composer = JobInvocationComposer.from_job_invocation(job, params).params
+    job_template_inputs = JobTemplate.authorized.find(composer[:template_invocations][0][:template_id]).template_inputs_with_foreign
+    inputs = Hash[job_template_inputs.map { |input| ["inputs[#{input[:name]}]", (composer[:template_invocations][0][:input_values].find { |value| value[:template_input_id] == input[:id] })[:value]] }]
+    job_organization = Taxonomy.find_by(id: job.task.input[:current_organization_id])
+    job_location = Taxonomy.find_by(id: job.task.input[:current_location_id])
+    render :json => {
+      :job => composer,
+      :job_organization => job_organization,
+      :job_location => job_location,
+      :inputs => inputs,
+    }
+  end
 end

data/app/helpers/remote_execution_helper.rb

@@ -246,7 +246,7 @@ module RemoteExecutionHelper
   def job_report_template
     template = ReportTemplate.where(name: Setting['remote_execution_job_invocation_report_template']).first
 
-    template if template.template_inputs.where(name: 'job_id').exists?
+    template if template && template.template_inputs.where(name: 'job_id').exists?
   end
 
   def job_report_template_parameters(job_invocation, template)

data/app/models/job_invocation.rb

@@ -62,16 +62,14 @@ class JobInvocation < ApplicationRecord
 
   has_many :targeted_hosts, :through => :targeting, :source => :hosts
   scoped_search :on => 'targeted_host_id', :rename => 'targeted_host_id', :operators => ['= '],
-    :complete_value => false, :only_explicit => true, :ext_method => :search_by_targeted_host,
-    :validator => ScopedSearch::Validators::INTEGER
+    :complete_value => false, :only_explicit => true, :ext_method => :search_by_targeted_host
 
   scoped_search :on => 'pattern_template_name', :rename => 'pattern_template_name', :operators => ['= '],
     :complete_value => false, :only_explicit => true, :ext_method => :search_by_pattern_template
 
   scoped_search :relation => :recurring_logic, :on => 'purpose', :rename => 'recurring_logic.purpose'
 
-  scoped_search :relation => :recurring_logic, :on => 'id', :rename => 'recurring_logic.id',
-    :validator => ScopedSearch::Validators::INTEGER
+  scoped_search :relation => :recurring_logic, :on => 'id', :rename => 'recurring_logic.id'
 
   scoped_search :relation => :recurring_logic, :on => 'id', :rename => 'recurring',
     :ext_method => :search_by_recurring_logic, :only_explicit => true,

data/app/models/job_invocation_composer.rb

@@ -441,8 +441,11 @@ class JobInvocationComposer
   end
 
   def valid?
-    targeting.valid? & job_invocation.valid? & !pattern_template_invocations.map(&:valid?).include?(false) &
-      triggering.valid?
+    unless triggering.valid?
+      job_invocation.errors.add(:triggering, 'is invalid')
+      return false
+    end
+    targeting.valid? & job_invocation.valid? & !pattern_template_invocations.map(&:valid?).include?(false)
   end
 
   def save

data/app/models/remote_execution_provider.rb

@@ -9,7 +9,7 @@ class RemoteExecutionProvider
 
     def registered_name
       klass = self
-      ::RemoteExecutionProvider.providers.key(klass)
+      providers.key(klass)
     end
 
     def proxy_feature

data/app/views/templates/script/package_action.erb

@@ -16,6 +16,11 @@ template_inputs:
   input_type: user
   required: true
   options: "install\nupdate\nremove\ngroup install\ngroup remove"
+- name: options
+  description: Additional options for the package manager
+  input_type: user
+  required: false
+  advanced: true
 - name: package
   description: The name of the package, if any
   input_type: user
@@ -87,7 +92,7 @@ handle_zypp_res_codes () {
 
 # Action
 <% if package_manager == 'yum' -%>
-  yum -y <%= action %> <%= input("package") %>
+  yum -y <%= input("options") %> <%= action %> <%= input("package") %>
 <% elsif package_manager == 'apt' -%>
   <%-
     action = 'install' if action == 'group install'
@@ -103,7 +108,7 @@ handle_zypp_res_codes () {
   [ -x "$(command -v subscription-manager)" ] && subscription-manager refresh
   export DEBIAN_FRONTEND=noninteractive
   apt-get -y update
-  apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y <%= action %> <%= input("package") %>
+  apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y <%= input("options") %> <%= action %> <%= input("package") %>
 <% elsif package_manager == 'zypper' -%>
   <%-
     if action == "group install"
@@ -113,7 +118,7 @@ handle_zypp_res_codes () {
     end
   -%>
   zypper refresh
-  zypper -n <%= action %> <%= input("package") %>
+  zypper -n <%= action %> <%= input("options") %> <%= input("package") %>
   handle_zypp_res_codes $?
 <% end -%>
 RETVAL=$?

data/config/routes.rb

@@ -46,8 +46,10 @@ Rails.application.routes.draw do
   get 'ui_job_wizard/categories', to: 'ui_job_wizard#categories'
   get 'ui_job_wizard/template/:id', to: 'ui_job_wizard#template'
   get 'ui_job_wizard/resources', to: 'ui_job_wizard#resources'
+  get 'ui_job_wizard/job_invocation', to: 'ui_job_wizard#job_invocation'
 
-  match '/experimental/job_wizard', to: 'react#index', :via => [:get]
+  match '/experimental/job_wizard/new', to: 'react#index', :via => [:get]
+  match '/experimental/job_wizard/:id/rerun', to: 'react#index', :via => [:get]
 
   namespace :api, :defaults => {:format => 'json'} do
     scope '(:apiv)', :module => :v2, :defaults => {:apiv => 'v2'}, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do

data/lib/foreman_remote_execution/engine.rb

@@ -47,7 +47,7 @@ module ForemanRemoteExecution
 
     initializer 'foreman_remote_execution.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_remote_execution do
-        requires_foreman '>= 3.3'
+        requires_foreman '>= 3.4'
         register_global_js_file 'global'
 
         apipie_documented_controllers ["#{ForemanRemoteExecution::Engine.root}/app/controllers/api/v2/*.rb"]
@@ -152,7 +152,7 @@ module ForemanRemoteExecution
             setting 'remote_execution_job_invocation_report_template',
               type: :string,
               description: N_('Select a report template used for generating a report for a particular remote execution job'),
-              default: 'Job invocation - report template',
+              default: 'Job - Invocation Report',
               full_name: N_('Job Invocation Report Template'),
               collection: proc { ForemanRemoteExecution.job_invocation_report_templates_select }
           end
@@ -164,7 +164,7 @@ module ForemanRemoteExecution
                                             :'api/v2/job_templates' => [:index, :show, :revision, :export],
                                             :'api/v2/template_inputs' => [:index, :show],
                                             :'api/v2/foreign_input_sets' => [:index, :show],
-                                            :ui_job_wizard => [:categories, :template, :resources]}, :resource_type => 'JobTemplate'
+                                            :ui_job_wizard => [:categories, :template, :resources, :job_invocation]}, :resource_type => 'JobTemplate'
           permission :create_job_templates, { :job_templates => [:new, :create, :clone_template, :import],
                                               :'api/v2/job_templates' => [:create, :clone, :import] }, :resource_type => 'JobTemplate'
           permission :edit_job_templates, { :job_templates => [:edit, :update],
@@ -181,7 +181,7 @@ module ForemanRemoteExecution
           permission :view_job_invocations, { :job_invocations => [:index, :chart, :show, :auto_complete_search], :template_invocations => [:show],
                                               'api/v2/job_invocations' => [:index, :show, :output, :raw_output, :outputs] }, :resource_type => 'JobInvocation'
           permission :view_template_invocations, { :template_invocations => [:show],
-                                                   'api/v2/template_invocations' => [:template_invocations] }, :resource_type => 'TemplateInvocation'
+                                                   'api/v2/template_invocations' => [:template_invocations], :ui_job_wizard => [:job_invocation] }, :resource_type => 'TemplateInvocation'
           permission :create_template_invocations, {}, :resource_type => 'TemplateInvocation'
           permission :execute_jobs_on_infrastructure_hosts, {}, :resource_type => 'JobInvocation'
           permission :cancel_job_invocations, { :job_invocations => [:cancel], 'api/v2/job_invocations' => [:cancel] }, :resource_type => 'JobInvocation'
@@ -242,7 +242,7 @@ module ForemanRemoteExecution
           url_hash: { controller: 'job_wizard', action: :index },
           caption: N_('Job wizard'),
           parent: :lab_features_menu,
-          url: '/experimental/job_wizard',
+          url: '/experimental/job_wizard/new',
           after: :host_wizard
 
         register_custom_status HostStatus::ExecutionStatus

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '7.2.2'.freeze
+  VERSION = '8.0.0'.freeze
 end

data/test/functional/api/v2/job_invocations_controller_test.rb

@@ -82,6 +82,14 @@ module Api
           assert_response :success
         end
 
+        test 'should propagate errors from triggering' do
+          @attrs[:recurrence] = { cron_line: 'foo' }
+          post :create, params: { job_invocation: @attrs }
+          invocation = ActiveSupport::JSON.decode(@response.body)
+          assert_match(/foo is not valid format of cron line/, invocation['error']['message'])
+          assert_response 500
+        end
+
         test 'should create with schedule' do
           @attrs[:scheduling] = { start_at: Time.now.to_s }
           post :create, params: { job_invocation: @attrs }

data/test/helpers/remote_execution_helper_test.rb

@@ -37,5 +37,9 @@ class RemoteExecutionHelperTest < ActionView::TestCase
 
       assert_equal template.id, found_template.id
     end
+
+    it 'should not crash if the template cannot be found' do
+      assert_nil job_report_template
+    end
   end
 end

data/test/unit/job_invocation_report_template_test.rb

@@ -9,7 +9,7 @@ class JobReportTemplateTest < ActiveSupport::TestCase
 
   context 'with valid job invocation report template' do
     let(:job_invocation_template) do
-      file_path = File.read(File.expand_path(Rails.root + "app/views/unattended/report_templates/job_invocation_-_report_template.erb"))
+      file_path = File.read(File.expand_path(Rails.root + "app/views/unattended/report_templates/job_-_invocation_report.erb"))
       template = ReportTemplate.import_without_save("Job Invocation Report Template", file_path)
       template.save!
       template

data/test/unit/job_invocation_test.rb

@@ -95,9 +95,8 @@ class JobInvocationTest < ActiveSupport::TestCase
       end
 
       it 'truncates generated description to 255 characters' do
-        column_limit = 255
+        column_limit = 255 # There is a 255 character limit on the database level
         expected_result = 'a' * column_limit
-        JobInvocation.columns_hash['description'].expects(:limit).returns(column_limit)
         job_invocation.description_format = '%{job_category}'
         job_invocation.job_category = 'a' * 1000
         job_invocation.generate_description

data/test/unit/remote_execution_provider_test.rb

@@ -56,28 +56,6 @@ class RemoteExecutionProviderTest < ActiveSupport::TestCase
     end
   end
 
-  describe '.proxy_feature' do
-    # rubocop:disable Naming/ConstantName
-    it 'handles provider subclasses properly' do
-      old = ::RemoteExecutionProvider
-
-      class P2 < old
-      end
-      ::RemoteExecutionProvider = P2
-
-      class CustomProvider < ::RemoteExecutionProvider
-      end
-
-      ::RemoteExecutionProvider.register('custom', CustomProvider)
-
-      feature = CustomProvider.proxy_feature
-      _(feature).must_equal 'custom'
-    ensure
-      ::RemoteExecutionProvider = old
-    end
-    # rubocop:enable Naming/ConstantName
-  end
-
   describe '.provider_proxy_features' do
     it 'returns correct values' do
       RemoteExecutionProvider.stubs(:providers).returns(

data/webpack/JobWizard/JobWizard.js

@@ -1,6 +1,8 @@
+/* eslint-disable max-lines */
 /* eslint-disable camelcase */
 import React, { useState, useEffect, useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
 import { Wizard } from '@patternfly/react-core';
 import { get } from 'foremanReact/redux/API';
 import history from 'foremanReact/history';
@@ -14,6 +16,7 @@ import { AdvancedFields } from './steps/AdvancedFields/AdvancedFields';
 import {
   JOB_TEMPLATE,
   WIZARD_TITLES,
+  SCHEDULE_TYPES,
   initialScheduleState,
 } from './JobWizardConstants';
 import {
@@ -23,7 +26,9 @@ import {
   selectRouterSearch,
   selectIsLoading,
 } from './JobWizardSelectors';
-import Schedule from './steps/Schedule/';
+import { ScheduleType } from './steps/Schedule/ScheduleType';
+import { ScheduleFuture } from './steps/Schedule/ScheduleFuture';
+import { ScheduleRecurring } from './steps/Schedule/ScheduleRecurring';
 import HostsAndInputs from './steps/HostsAndInputs/';
 import ReviewDetails from './steps/ReviewDetails/';
 import { useValidation } from './validation';
@@ -31,9 +36,11 @@ import { useAutoFill } from './autofill';
 import { submit } from './submit';
 import './JobWizard.scss';
 
-export const JobWizard = () => {
-  const [jobTemplateID, setJobTemplateID] = useState(null);
-  const [category, setCategory] = useState('');
+export const JobWizard = ({ rerunData }) => {
+  const [jobTemplateID, setJobTemplateID] = useState(
+    rerunData?.template_invocations?.[0]?.template_id
+  );
+  const [category, setCategory] = useState(rerunData?.job_category || '');
   const [advancedValues, setAdvancedValues] = useState({ templateValues: {} });
   const [templateValues, setTemplateValues] = useState({}); // TODO use templateValues in advanced fields - description https://github.com/theforeman/foreman_remote_execution/pull/605
   const [scheduleValue, setScheduleValue] = useState(initialScheduleState);
@@ -43,14 +50,22 @@ export const JobWizard = () => {
     hostGroups: [],
   });
   const [hostsSearchQuery, setHostsSearchQuery] = useState('');
-  const [fills, setFills] = useState(useSelector(selectRouterSearch));
+  const routerSearch = useSelector(selectRouterSearch);
+  const [fills, setFills] = useState(
+    rerunData
+      ? {
+          search: rerunData?.targeting?.search_query,
+          ...rerunData.inputs,
+        }
+      : routerSearch
+  );
   const dispatch = useDispatch();
 
   const setDefaults = useCallback(
     ({
       data: {
-        template_inputs,
-        advanced_template_inputs,
+        template_inputs = [],
+        advanced_template_inputs = [],
         effective_user,
         job_template: {
           name,
@@ -58,6 +73,9 @@ export const JobWizard = () => {
           description_format,
           job_category,
         },
+        randomized_ordering,
+        ssh_user,
+        concurrency_control = {},
       },
     }) => {
       if (!category.length) {
@@ -98,23 +116,43 @@ export const JobWizard = () => {
           timeoutToKill: execution_timeout_interval || '',
           templateValues: advancedTemplateValues,
           description: generateDefaultDescription() || '',
-          isRandomizedOrdering: false,
+          isRandomizedOrdering: randomized_ordering,
+          sshUser: ssh_user || '',
+          timeSpan: concurrency_control.time_span || '',
+          concurrencyLevel: concurrency_control.level || '',
         };
       });
     },
     [category.length]
   );
+  useEffect(() => {
+    if (rerunData) {
+      setDefaults({
+        data: {
+          effective_user: {
+            value: rerunData.template_invocations[0].effective_user,
+          },
+          job_template: {
+            execution_timeout_interval: rerunData.execution_timeout_interval,
+          },
+          randomized_ordering: rerunData.targeting.randomized_ordering,
+          ssh_user: rerunData.ssh_user,
+          concurrency_control: rerunData.concurrency_control,
+        },
+      });
+    }
+  }, [rerunData, setDefaults]);
   useEffect(() => {
     if (jobTemplateID) {
       dispatch(
         get({
           key: JOB_TEMPLATE,
           url: `/ui_job_wizard/template/${jobTemplateID}`,
-          handleSuccess: setDefaults,
+          handleSuccess: rerunData ? () => {} : setDefaults,
         })
       );
     }
-  }, [jobTemplateID, setDefaults, dispatch]);
+  }, [rerunData, jobTemplateID, setDefaults, dispatch]);
 
   const [valid, setValid] = useValidation({
     advancedValues,
@@ -127,6 +165,7 @@ export const JobWizard = () => {
     setHostsSearchQuery,
     setJobTemplateID,
     setTemplateValues,
+    setAdvancedValues,
   });
   const templateError = !!useSelector(selectTemplateError);
   const templateResponse = useSelector(selectJobTemplate);
@@ -148,7 +187,7 @@ export const JobWizard = () => {
           setJobTemplate={setJobTemplateID}
           category={category}
           setCategory={setCategory}
-          isFeature={!!fills.feature}
+          isCategoryPreselected={!!rerunData || !!fills.feature}
         />
       ),
       enableNext: isTemplate,
@@ -187,18 +226,80 @@ export const JobWizard = () => {
     },
     {
       name: WIZARD_TITLES.schedule,
-      component: (
-        <Schedule
-          scheduleValue={scheduleValue}
-          setScheduleValue={setScheduleValue}
-          setValid={newValue => {
-            setValid(currentValid => ({ ...currentValid, schedule: newValue }));
-          }}
-        />
-      ),
       canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
       enableNext:
         isTemplate && valid.hostsAndInputs && valid.advanced && valid.schedule,
+      steps: [
+        {
+          name: WIZARD_TITLES.typeOfExecution,
+          component: (
+            <ScheduleType
+              scheduleType={scheduleValue.scheduleType}
+              isTypeStatic={scheduleValue.isTypeStatic}
+              setScheduleValue={setScheduleValue}
+              setValid={newValue => {
+                setValid(currentValid => ({
+                  ...currentValid,
+                  schedule: newValue,
+                }));
+              }}
+            />
+          ),
+          canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
+
+          enableNext: isTemplate && valid.hostsAndInputs && valid.advanced,
+        },
+        ...(scheduleValue.scheduleType === SCHEDULE_TYPES.FUTURE
+          ? [
+              {
+                name: SCHEDULE_TYPES.FUTURE,
+                component: (
+                  <ScheduleFuture
+                    scheduleValue={scheduleValue}
+                    setScheduleValue={setScheduleValue}
+                    setValid={newValue => {
+                      setValid(currentValid => ({
+                        ...currentValid,
+                        schedule: newValue,
+                      }));
+                    }}
+                  />
+                ),
+                canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
+                enableNext:
+                  isTemplate &&
+                  valid.hostsAndInputs &&
+                  valid.advanced &&
+                  valid.schedule,
+              },
+            ]
+          : []),
+        ...(scheduleValue.scheduleType === SCHEDULE_TYPES.RECURRING
+          ? [
+              {
+                name: SCHEDULE_TYPES.RECURRING,
+                component: (
+                  <ScheduleRecurring
+                    scheduleValue={scheduleValue}
+                    setScheduleValue={setScheduleValue}
+                    setValid={newValue => {
+                      setValid(currentValid => ({
+                        ...currentValid,
+                        schedule: newValue,
+                      }));
+                    }}
+                  />
+                ),
+                canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
+                enableNext:
+                  isTemplate &&
+                  valid.hostsAndInputs &&
+                  valid.advanced &&
+                  valid.schedule,
+              },
+            ]
+          : []),
+      ],
     },
     {
       name: WIZARD_TITLES.review,
@@ -250,4 +351,37 @@ export const JobWizard = () => {
   );
 };
 
+JobWizard.propTypes = {
+  rerunData: PropTypes.shape({
+    job_category: PropTypes.string,
+    targeting: PropTypes.shape({
+      search_query: PropTypes.string,
+      targeting_type: PropTypes.string,
+      randomized_ordering: PropTypes.bool,
+    }),
+    triggering: PropTypes.shape({
+      mode: PropTypes.string,
+      start_at: PropTypes.string,
+      start_before: PropTypes.string,
+    }),
+    ssh_user: PropTypes.string,
+    concurrency_control: PropTypes.shape({
+      level: PropTypes.number,
+      time_span: PropTypes.number,
+    }),
+    execution_timeout_interval: PropTypes.number,
+    remote_execution_feature_id: PropTypes.string,
+    template_invocations: PropTypes.arrayOf(
+      PropTypes.shape({
+        template_id: PropTypes.number,
+        effective_user: PropTypes.string,
+        input_values: PropTypes.array,
+      })
+    ),
+    inputs: PropTypes.object,
+  }),
+};
+JobWizard.defaultProps = {
+  rerunData: null,
+};
 export default JobWizard;

data/webpack/JobWizard/JobWizard.scss

@@ -71,8 +71,42 @@
       max-height: 300px;
       overflow: scroll;
     }
+    .schedule-radio label {
+      width: 100%;
+    }
+    .schedule-radio input {
+      align-self: center;
+    }
+    .schedule-radio-repeat-text {
+      width: 100px;
+      display: inline-block;
+      margin-right: 5px;
+      align-self: center;
+    }
+    .schedule-radio-title {
+      width: 80px;
+      display: inline-block;
+      align-self: center;
+    }
+    .schedule-radio-occurences {
+      display: inline-block;
+      align-self: center;
+    }
+    .scheudle-radio-wrapper {
+      display: flex;
+    }
+  }
+  .future-schedule-tab {
+    .clear-datetime-button {
+      margin-left: 10px;
+      align-self: center;
+      font-size: var(--pf-global--FontSize--md);
+    }
+    .pf-c-form__group-control {
+      display: flex;
+      flex-wrap: wrap;
+    }
   }
-
   .pf-c-date-picker {
     vertical-align: top;
   }
@@ -108,4 +142,12 @@
       display: none;
     }
   }
+  .pf-c-radio__body {
+    font-size: var(--pf-c-radio__label--FontSize);
+  }
 }
+
+.job-wizard-alert.pf-c-alert.pf-m-warning {
+  margin-bottom: 10px;
+  margin-top: 10px;
+}

data/webpack/JobWizard/JobWizardConstants.js

@@ -16,23 +16,31 @@ export const repeatTypes = {
   hourly: __('Hourly'),
 };
 
+export const SCHEDULE_TYPES = {
+  NOW: __('Immediate execution'),
+  FUTURE: __('Future execution'),
+  RECURRING: __('Recurring execution'),
+};
+
 export const WIZARD_TITLES = {
   categoryAndTemplate: __('Category and Template'),
   hostsAndInputs: __('Target hosts and inputs'),
   advanced: __('Advanced fields'),
   schedule: __('Schedule'),
   review: __('Review details'),
+  typeOfExecution: __('Type of execution'),
 };
 
 export const initialScheduleState = {
   repeatType: repeatTypes.noRepeat,
+  scheduleType: SCHEDULE_TYPES.NOW,
   repeatAmount: '',
   repeatData: {},
   startsAt: '',
   startsBefore: '',
   ends: '',
   isFuture: false,
-  isNeverEnds: false,
+  isNeverEnds: true,
   isTypeStatic: true,
   purpose: '',
 };
@@ -59,3 +67,5 @@ export const HOSTS_TO_PREVIEW_AMOUNT = 20;
 export const DEBOUNCE_HOST_COUNT = 700;
 export const HOST_IDS = 'HOST_IDS';
 export const REX_FEATURE = 'REX_FEATURE';
+
+export const JOB_API_KEY = 'JOB_API_KEY';