foreman_remote_execution 14.1.4 → 15.0.0

data/webpack/JobInvocationDetail/__tests__/fixtures.js

@@ -1,3 +1,20 @@
+const targeting = {
+  bookmark_id: null,
+  bookmark_name: null,
+  search_query: 'id ^ (50)',
+  targeting_type: 'static_query',
+  user_id: 4,
+  randomized_ordering: null,
+  hosts: [
+    {
+      name: 'alton-bennette.iris-starley.kari-stadtler.example.net',
+      id: 50,
+      display_name: 'alton-bennette.iris-starley.kari-stadtler.example.net',
+      job_status: 'N/A',
+    },
+  ],
+};
+
 export const jobInvocationData = {
   search: '',
   per_page: 20,
@@ -40,6 +57,7 @@ export const jobInvocationData = {
       ],
     },
   ],
+  targeting,
 };
 
 export const jobInvocationDataScheduled = {
@@ -65,6 +83,7 @@ export const jobInvocationDataScheduled = {
   total: 6,
   missing: 5,
   total_hosts: 6,
+  targeting,
 };
 
 export const jobInvocationDataRecurring = {
@@ -109,6 +128,7 @@ export const jobInvocationDataRecurring = {
     last_occurence: null,
     next_occurence: '3000-01-01 12:00:00 +0100',
   },
+  targeting,
 };
 
 export const mockPermissionsData = {
@@ -124,3 +144,113 @@ export const mockReportTemplatesResponse = {
 export const mockReportTemplateInputsResponse = {
   results: [{ id: '34', name: 'job_id' }],
 };
+
+const templateInvocationID = 157;
+
+export const jobInvocationOutput = [
+  {
+    id: 1958,
+    template_invocation_id: templateInvocationID,
+    timestamp: 1733931147.2044532,
+    meta: null,
+    external_id: '0',
+    output_type: 'stdout',
+    output:
+      '\u001b[31mThis is red text\u001b[0m\n\u001b[32mThis is green text\u001b[0m\n\u001b[33mThis is yellow text\u001b[0m\n\u001b[34mThis is blue text\u001b[0m\n\u001b[35mThis is magenta text\u001b[0m\n\u001b[36mThis is cyan text\u001b[0m\n\u001b[0mThis is default text\n',
+  },
+  {
+    output_type: 'stdout',
+    output: 'Exit status: 6',
+    timestamp: 1733931142.2044532,
+  },
+  {
+    output_type: 'stdout',
+    output: 'Exit status: 5',
+    timestamp: 1733931143.2044532,
+  },
+  {
+    output_type: 'stdout',
+    output: 'Exit status: 4',
+    timestamp: 1733931144.2044532,
+  },
+  {
+    output_type: 'stdout',
+    output: 'Exit status: 3',
+    timestamp: 1733931145.2044532,
+  },
+  {
+    output_type: 'stdout',
+    output: 'Exit status: 2',
+    timestamp: 1733931146.2044532,
+  },
+  {
+    output_type: 'stdout',
+    output: 'Exit status: 1',
+    timestamp: 1733931147.2044532,
+  },
+
+  {
+    output_type: 'stdout',
+    output: 'Exit status: 0',
+    timestamp: 1733931148.2044532,
+  },
+
+  {
+    id: 1907,
+    template_invocation_id: templateInvocationID,
+    timestamp: 1718719863.184878,
+    meta: null,
+    external_id: '15',
+    output_type: 'debug',
+    output: 'StandardError: Job execution failed',
+  },
+  {
+    id: 1892,
+    template_invocation_id: templateInvocationID,
+    timestamp: 1718719857.078763,
+    meta: null,
+    external_id: '0',
+    output_type: 'stderr',
+    output:
+      '[DEPRECATION WARNING]: ANSIBLE_CALLBACK_WHITELIST option, normalizing names to \n',
+  },
+];
+
+export const mockTemplateInvocationResponse = {
+  output: jobInvocationOutput,
+  preview: {
+    plain: 'PREVIEW TEXT \n TEST',
+  },
+  input_values: [
+    {
+      id: 40,
+      template_invocation_id: 157,
+      template_input_id: 74,
+      value:
+        'echo -e "\\e[31mThis is red text\\e[0m"\necho -e "\\e[32mThis is green text\\e[0m"\necho -e "\\e[33mThis is yellow text\\e[0m"\necho -e "\\e[34mThis is blue text\\e[0m"\necho -e "\\e[35mThis is magenta text\\e[0m"\necho -e "\\e[36mThis is cyan text\\e[0m"\necho -e "\\e[0mThis is default text"',
+      template_input: {
+        id: 74,
+        name: 'command',
+        required: true,
+        input_type: 'user',
+        fact_name: null,
+        variable_name: null,
+        puppet_class_name: null,
+        puppet_parameter_name: null,
+        description: 'Command to run on the host',
+        template_id: 189,
+        created_at: '2024-06-11T10:31:24.084+01:00',
+        updated_at: '2024-06-11T10:31:24.084+01:00',
+        options: null,
+        advanced: false,
+        value_type: 'plain',
+        resource_type: null,
+        default: null,
+        hidden_value: false,
+      },
+    },
+  ],
+
+  job_invocation_description: 'Run tst',
+  host_name: 'alton-bennette.iris-starley.kari-stadtler.example.net',
+};

data/webpack/JobInvocationDetail/index.js

@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   Divider,
@@ -25,6 +25,7 @@ import { selectItems } from './JobInvocationSelectors';
 import JobInvocationSystemStatusChart from './JobInvocationSystemStatusChart';
 import JobInvocationToolbarButtons from './JobInvocationToolbarButtons';
 import JobInvocationHostTable from './JobInvocationHostTable';
+import { JobAdditionInfo } from './JobAdditionInfo';
 
 const JobInvocationDetailPage = ({
   match: {
@@ -50,6 +51,11 @@ const JobInvocationDetailPage = ({
     currentPermissionsUrl,
     CURRENT_PERMISSIONS
   );
+  const [selectedFilter, setSelectedFilter] = useState('');
+
+  const handleFilterChange = filter => {
+    setSelectedFilter(filter);
+  };
 
   let isAlreadyStarted = false;
   let formattedStartDate;
@@ -78,7 +84,8 @@ const JobInvocationDetailPage = ({
     if (task?.id !== undefined) {
       dispatch(getTask(`${task?.id}`));
     }
-  }, [dispatch, task]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [dispatch, task?.id]);
 
   const breadcrumbOptions = {
     breadcrumbItems: [
@@ -125,13 +132,20 @@ const JobInvocationDetailPage = ({
               data={items}
               isAlreadyStarted={isAlreadyStarted}
               formattedStartDate={formattedStartDate}
+              onFilterChange={handleFilterChange}
             />
           </Flex>
         </Flex>
+        <PageSection
+          variant={PageSectionVariants.light}
+          className="job-additional-info"
+        >
+          {items.id !== undefined && <JobAdditionInfo data={items} />}
+        </PageSection>
       </PageLayout>
       <PageSection
         variant={PageSectionVariants.light}
-        className="table-section"
+        className="job-details-table-section table-section"
       >
         {items.id !== undefined && (
           <JobInvocationHostTable
@@ -139,6 +153,7 @@ const JobInvocationDetailPage = ({
             targeting={targeting}
             finished={finished}
             autoRefresh={autoRefresh}
+            initialFilter={selectedFilter}
           />
         )}
       </PageSection>

data/webpack/JobWizard/JobWizard.js

@@ -36,7 +36,7 @@ import { useValidation } from './validation';
 import { useAutoFill } from './autofill';
 import { submit } from './submit';
 import { generateDefaultDescription } from './JobWizardHelpers';
-import { StartsBeforeErrorAlert } from './StartsBeforeErrorAlert';
+import { StartsBeforeErrorAlert, StartsAtErrorAlert } from './StartsErrorAlert';
 import { Footer } from './Footer';
 import './JobWizard.scss';
 
@@ -203,22 +203,37 @@ export const JobWizard = ({ rerunData }) => {
   }, [rerunData, jobTemplateID, dispatch]);
 
   const [isStartsBeforeError, setIsStartsBeforeError] = useState(false);
+  const [isStartsAtError, setIsStartsAtError] = useState(false);
   useEffect(() => {
-    const updateStartsBeforeError = () => {
-      setIsStartsBeforeError(
-        scheduleValue.scheduleType === SCHEDULE_TYPES.FUTURE &&
-          new Date().getTime() >= new Date(scheduleValue.startsBefore).getTime()
-      );
+    const updateStartsError = () => {
+      if (scheduleValue.scheduleType === SCHEDULE_TYPES.FUTURE) {
+        setIsStartsAtError(
+          !!scheduleValue?.startsAt?.length &&
+            new Date().getTime() >= new Date(scheduleValue.startsAt).getTime()
+        );
+        setIsStartsBeforeError(
+          !!scheduleValue?.startsBefore?.length &&
+            new Date().getTime() >=
+              new Date(scheduleValue.startsBefore).getTime()
+        );
+      } else if (scheduleValue.scheduleType === SCHEDULE_TYPES.RECURRING) {
+        setIsStartsAtError(
+          !!scheduleValue?.startsAt?.length &&
+            new Date().getTime() >= new Date(scheduleValue.startsAt).getTime()
+        );
+        setIsStartsBeforeError(false);
+      } else {
+        setIsStartsAtError(false);
+        setIsStartsBeforeError(false);
+      }
     };
-    let interval;
-    if (scheduleValue.scheduleType === SCHEDULE_TYPES.FUTURE) {
-      updateStartsBeforeError();
-      interval = setInterval(updateStartsBeforeError, 5000);
-    }
+    updateStartsError();
+    const interval = setInterval(updateStartsError, 5000);
+
     return () => {
       interval && clearInterval(interval);
     };
-  }, [scheduleValue.scheduleType, scheduleValue.startsBefore]);
+  }, [scheduleValue]);
 
   const [valid, setValid] = useValidation({
     advancedValues,
@@ -369,7 +384,9 @@ export const JobWizard = ({ rerunData }) => {
                   valid.hostsAndInputs &&
                   areHostsSelected &&
                   valid.advanced &&
-                  valid.schedule,
+                  valid.schedule &&
+                  !isStartsBeforeError &&
+                  !isStartsAtError,
               },
             ]
           : []),
@@ -399,7 +416,8 @@ export const JobWizard = ({ rerunData }) => {
                   valid.hostsAndInputs &&
                   areHostsSelected &&
                   valid.advanced &&
-                  valid.schedule,
+                  valid.schedule &&
+                  !isStartsAtError,
               },
             ]
           : []),
@@ -424,7 +442,9 @@ export const JobWizard = ({ rerunData }) => {
         valid.advanced &&
         valid.hostsAndInputs &&
         areHostsSelected &&
-        valid.schedule,
+        valid.schedule &&
+        !isStartsBeforeError &&
+        !isStartsAtError,
       enableNext:
         isTemplate &&
         valid.hostsAndInputs &&
@@ -432,7 +452,8 @@ export const JobWizard = ({ rerunData }) => {
         valid.advanced &&
         valid.schedule &&
         !isSubmitting &&
-        !isStartsBeforeError,
+        !isStartsBeforeError &&
+        !isStartsAtError,
     },
   ];
   const location = useForemanLocation();
@@ -456,6 +477,7 @@ export const JobWizard = ({ rerunData }) => {
   return (
     <>
       {isStartsBeforeError && <StartsBeforeErrorAlert />}
+      {isStartsAtError && <StartsAtErrorAlert />}
       <Wizard
         onClose={() => history.goBack()}
         navAriaLabel="Run Job steps"

data/webpack/JobWizard/{StartsBeforeErrorAlert.js → StartsErrorAlert.js}

@@ -7,7 +7,7 @@ export const StartsBeforeErrorAlert = () => (
     <Alert
       ouiaId="starts-before-error-alert"
       variant="danger"
-      title={__("'Starts before' date must in the future")}
+      title={__("'Starts before' date must be in the future")}
     >
       {__(
         'Please go back to "Schedule" - "Future execution" step to fix the error'
@@ -16,3 +16,18 @@ export const StartsBeforeErrorAlert = () => (
     <Divider component="div" />
   </>
 );
+
+export const StartsAtErrorAlert = () => (
+  <>
+    <Alert
+      ouiaId="starts-at-error-alert"
+      variant="danger"
+      title={__("'Starts at' date must be in the future")}
+    >
+      {__(
+        'Please go back to "Schedule" - "Future execution" or "Recurring execution" step to fix the error'
+      )}
+    </Alert>
+    <Divider component="div" />
+  </>
+);

data/webpack/JobWizard/steps/AdvancedFields/__tests__/AdvancedFields.test.js

@@ -399,7 +399,7 @@ describe('AdvancedFields', () => {
         target: { value: 'some search' },
       });
 
-      jest.runAllTimers();
+      jest.advanceTimersByTime(10000);
     });
     expect(newStore.getActions()).toMatchSnapshot('resource search');
   });

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

@@ -38,7 +38,7 @@ export const ScheduleFuture = ({
       setError(__("'Starts before' date must be after 'Starts at' date"));
     } else if (new Date().getTime() >= new Date(startsBefore).getTime()) {
       wrappedSetValid(false);
-      setError(__("'Starts before' date must in the future"));
+      setError(__("'Starts before' date must be in the future"));
     } else {
       wrappedSetValid(true);
       setError(null);

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

@@ -51,7 +51,7 @@ export const ScheduleRecurring = ({
     if (isNeverEnds) setValidEnd(true);
     else if (!ends) setValidEnd(true);
     else if (
-      !startsAt.length &&
+      !startsAt?.length &&
       new Date().getTime() <= new Date(ends).getTime()
     )
       setValidEnd(true);
@@ -63,7 +63,7 @@ export const ScheduleRecurring = ({
 
     if (!validEnd || !repeatValid) {
       wrappedSetValid(false);
-    } else if (isFuture && startsAt.length) {
+    } else if (isFuture && startsAt?.length) {
       wrappedSetValid(true);
     } else if (!isFuture) {
       wrappedSetValid(true);
@@ -111,7 +111,9 @@ export const ScheduleRecurring = ({
                 onChange={() =>
                   setScheduleValue(current => ({
                     ...current,
-                    startsAt: new Date().toISOString(),
+                    startsAt: new Date(
+                      new Date().getTime() + 60000
+                    ).toISOString(), // 1 minute in the future
                     isFuture: true,
                   }))
                 }

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

@@ -49,7 +49,7 @@ export const ScheduleType = ({
           onChange={() => {
             setScheduleValue(current => ({
               ...current,
-              startsAt: new Date().toISOString(),
+              startsAt: new Date(new Date().getTime() + 60000).toISOString(), // 1 minute in the future
               scheduleType: SCHEDULE_TYPES.FUTURE,
               repeatType: repeatTypes.noRepeat,
             }));

data/webpack/JobWizard/steps/Schedule/__tests__/Schedule.test.js

@@ -168,7 +168,7 @@ describe('Schedule', () => {
     ).toHaveLength(1);
 
     expect(
-      screen.queryAllByText("'Starts before' date must in the future")
+      screen.queryAllByText("'Starts before' date must be in the future")
     ).toHaveLength(0);
     await act(async () => {
       await fireEvent.change(startsBeforeDateField(), {
@@ -182,7 +182,7 @@ describe('Schedule', () => {
 
     expect(startsBeforeDateField().value).toBe('2019/03/11');
     expect(
-      screen.getAllByText("'Starts before' date must in the future")
+      screen.getAllByText("'Starts before' date must be in the future")
     ).toHaveLength(2);
   });
 
@@ -329,7 +329,7 @@ describe('Schedule', () => {
       fireEvent.click(
         screen.getByRole('button', { name: 'Recurring execution' })
       );
-      jest.runAllTimers();
+      jest.advanceTimersByTime(1000);
     });
     expect(screen.queryAllByText('Recurring execution')).toHaveLength(3);
 

data/webpack/JobWizard/steps/form/DateTimePicker.js

@@ -22,6 +22,7 @@ export const DateTimePicker = ({
   ariaLabel,
   allowEmpty,
   includeSeconds,
+  isFutureOnly,
 }) => {
   const [validated, setValidated] = useState();
   const dateFormat = date =>
@@ -87,6 +88,15 @@ export const DateTimePicker = ({
       setValidated(ValidatedOptions.error);
     }
   };
+  const validateFuture = date => {
+    if (
+      isFutureOnly &&
+      date.setHours(1, 0, 0, 0) < new Date().setHours(0, 0, 0, 0)
+    ) {
+      return __('Date must be in the future');
+    }
+    return '';
+  };
   return (
     <>
       <DatePicker
@@ -105,6 +115,7 @@ export const DateTimePicker = ({
           validated === ValidatedOptions.error ? __('Invalid date') : ''
         }
         inputProps={{ validated }}
+        validators={[validateFuture]}
       />
       <TimePicker
         aria-label={`${ariaLabel} timepicker`}
@@ -132,6 +143,7 @@ DateTimePicker.propTypes = {
   ariaLabel: PropTypes.string,
   allowEmpty: PropTypes.bool,
   includeSeconds: PropTypes.bool,
+  isFutureOnly: PropTypes.bool,
 };
 DateTimePicker.defaultProps = {
   dateTime: null,
@@ -139,4 +151,5 @@ DateTimePicker.defaultProps = {
   ariaLabel: '',
   allowEmpty: true,
   includeSeconds: false,
+  isFutureOnly: true,
 };

data/webpack/JobWizard/steps/form/Formatter.js

@@ -143,6 +143,7 @@ export const formatter = (input, values, setValue) => {
         isRequired={required}
       >
         <DateTimePicker
+          isFutureOnly={false}
           ariaLabel={name}
           className={hidden ? 'masked-input' : null}
           id={id}

data/webpack/JobWizard/steps/form/ResourceSelect.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
 import Immutable from 'seamless-immutable';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
 import { useSelector, useDispatch } from 'react-redux';
 import URI from 'urijs';
 import { get } from 'foremanReact/redux/API';
@@ -17,7 +18,8 @@ export const ResourceSelect = ({
   apiKey,
   url,
 }) => {
-  const maxResults = 100;
+  const { perPage } = useForemanSettings();
+  const maxResults = perPage;
   const dispatch = useDispatch();
   const uri = new URI(url);
   const onSearch = search => {
@@ -50,8 +52,7 @@ export const ResourceSelect = ({
         description={__('Please refine your search.')}
       >
         {sprintf(
-          __('You have %s results to display. Showing first %s results'),
-          response.subtotal,
+          __('You have more results to display. Showing first %s results'),
           maxResults
         )}
       </SelectOption>,
@@ -59,17 +60,35 @@ export const ResourceSelect = ({
   }
   selectOptions = [
     ...selectOptions,
-    ...Immutable.asMutable(response?.results || [])?.map((result, index) => (
-      <SelectOption key={index + 1} value={result.id}>
-        {result.name}
-      </SelectOption>
-    )),
+    ...Immutable.asMutable(response?.results || [])
+      ?.slice(0, maxResults)
+      ?.map((result, index) => (
+        <SelectOption key={index + 1} value={result.id}>
+          {result.name}
+        </SelectOption>
+      )),
   ];
 
   const onSelect = (event, selection) => {
     setSelected(selection);
     setIsOpen(false);
   };
+  const onFilter = (_, value) => {
+    if (!value) {
+      return selectOptions;
+    }
+    return selectOptions.filter(
+      o =>
+        typeof o.props.children === 'string' &&
+        o.props.children.toLowerCase().indexOf(value.toLowerCase()) > -1
+    );
+  };
+  const onClear = () => {
+    setSelected(null);
+    setIsOpen(false);
+    if (typingTimeout) clearTimeout(typingTimeout);
+    onSearch({});
+  };
   const autoSearch = searchTerm => {
     if (typingTimeout) clearTimeout(typingTimeout);
     setTypingTimeout(
@@ -86,11 +105,17 @@ export const ResourceSelect = ({
       loadingVariant={isLoading ? 'spinner' : null}
       onSelect={onSelect}
       onToggle={setIsOpen}
+      onFilter={onFilter}
+      onClear={onClear}
       isOpen={isOpen}
       className="without_select2"
       maxHeight="45vh"
       onTypeaheadInputChanged={value => {
-        autoSearch(value || '');
+        if (value) {
+          autoSearch(value);
+        } else {
+          onClear();
+        }
       }}
       placeholderText={placeholderText}
       typeAheadAriaLabel={`${name} typeahead input`}

data/webpack/Routes/routes.js

@@ -2,6 +2,7 @@ import React from 'react';
 import JobWizardPage from '../JobWizard';
 import JobWizardPageRerun from '../JobWizard/JobWizardPageRerun';
 import JobInvocationDetailPage from '../JobInvocationDetail';
+import TemplateInvocationPage from '../JobInvocationDetail/TemplateInvocationPage';
 
 const ForemanREXRoutes = [
   {
@@ -19,6 +20,11 @@ const ForemanREXRoutes = [
     exact: true,
     render: props => <JobInvocationDetailPage {...props} />,
   },
+  {
+    path: '/job_invocations_detail/:jobID/host_invocation/:hostID',
+    exact: true,
+    render: props => <TemplateInvocationPage {...props} />,
+  },
 ];
 
 export default ForemanREXRoutes;

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

@@ -3,3 +3,4 @@ export const useForemanLocation = () => ({ id: 2 });
 export const useForemanVersion = () => '3.7';
 export const useForemanHostsPageUrl = () => '/hosts';
 export const useForemanHostDetailsPageUrl = () => '/hosts/';
+export const useForemanSettings = () => ({ perPage: 20 });

data/webpack/react_app/components/RegistrationExtension/RexPull.js

@@ -1,8 +1,10 @@
+/* eslint-disable camelcase */
 import React from 'react';
 import PropTypes from 'prop-types';
 
 import { translate as __ } from 'foremanReact/common/I18n';
 import LabelIcon from 'foremanReact/components/common/LabelIcon';
+import { Alert } from 'patternfly-react';
 
 import {
   FormGroup,
@@ -23,6 +25,25 @@ const options = (value = '') => {
   );
 };
 
+const pullWarning = (
+  <Alert type="info" isInline style={{ marginTop: '10px' }}>
+    {__(
+      'Please make sure that the Smart Proxy is configured correctly for the Pull provider.'
+    )}
+  </Alert>
+);
+
+function showPullWarning(valueFromParam, value) {
+  if (value === 'true') {
+    return pullWarning;
+  }
+  if (valueFromParam && (value === undefined || value === '')) {
+    return pullWarning;
+  }
+
+  return null;
+}
+
 const RexPull = ({ isLoading, onChange, pluginValues, configParams }) => (
   <FormGroup
     label={__('REX pull mode')}
@@ -45,9 +66,13 @@ const RexPull = ({ isLoading, onChange, pluginValues, configParams }) => (
       id="registration_setup_remote_execution_pull"
       isDisabled={isLoading}
     >
-      {/* eslint-disable-next-line camelcase */
-      options(configParams?.host_registration_remote_execution_pull)}
+      {options(configParams?.host_registration_remote_execution_pull)}
     </FormSelect>
+
+    {showPullWarning(
+      configParams?.host_registration_remote_execution_pull,
+      pluginValues.setupRemoteExecutionPull
+    )}
   </FormGroup>
 );
 

data/webpack/react_app/components/TargetingHosts/components/HostStatus.js

@@ -17,7 +17,7 @@ const HostStatus = ({ status }) => {
           <Icon type="fa" name="question" /> {__('Awaiting start')}
         </div>
       );
-    case 'running':
+    case 'running' || 'pending':
       return (
         <div>
           <Icon type="pf" name="running" /> {__('Pending')}