foreman_remote_execution 7.2.2 → 8.0.0

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

@@ -8,12 +8,20 @@ import {
 import { debounce } from 'lodash';
 import { translate as __, documentLocale } from 'foremanReact/common/I18n';
 
+const formatDateTime = d =>
+  `${d.getFullYear()}-${`0${d.getMonth() + 1}`.slice(
+    -2
+  )}-${`0${d.getDate()}`.slice(-2)} ${`0${d.getHours()}`.slice(
+    -2
+  )}:${`0${d.getMinutes()}`.slice(-2)}:${`0${d.getSeconds()}`.slice(-2)}`;
+
 export const DateTimePicker = ({
   dateTime,
   setDateTime,
   isDisabled,
   ariaLabel,
   allowEmpty,
+  includeSeconds,
 }) => {
   const [validated, setValidated] = useState();
   const dateFormat = date =>
@@ -35,12 +43,18 @@ export const DateTimePicker = ({
     if (!time) return false;
     const split = time.split(':');
     if (!(split[0].length === 2 && split[1].length === 2)) return false;
+    if (includeSeconds) {
+      if (split[2]?.length !== 2) return false;
+    }
     if (isValidDate(new Date(`${formattedDate} ${time}`))) return true;
     if (!formattedDate.length && isValidDate(new Date(`01/01/2020 ${time}`))) {
       const today = new Date();
       today.setHours(split[0]);
       today.setMinutes(split[1]);
-      setDateTime(today.toString());
+      if (includeSeconds) {
+        today.setSeconds(split[2]);
+      }
+      setDateTime(formatDateTime(today));
     }
     return false;
   };
@@ -53,7 +67,7 @@ export const DateTimePicker = ({
     } else if (isValidDate(parsedNewDate)) {
       parsedNewDate.setHours(dateObject.getHours());
       parsedNewDate.setMinutes(dateObject.getMinutes());
-      setDateTime(parsedNewDate.toString());
+      setDateTime(formatDateTime(parsedNewDate));
       setValidated(ValidatedOptions.noval);
     } else {
       setValidated(ValidatedOptions.error);
@@ -63,11 +77,11 @@ export const DateTimePicker = ({
   const onTimeChange = newTime => {
     if (!newTime.length && allowEmpty) {
       const parsedNewTime = new Date(`${formattedDate} 00:00`);
-      setDateTime(parsedNewTime.toString());
+      setDateTime(formatDateTime(parsedNewTime));
       setValidated(ValidatedOptions.noval);
     } else if (isValidTime(newTime)) {
       const parsedNewTime = new Date(`${formattedDate} ${newTime}`);
-      setDateTime(parsedNewTime.toString());
+      setDateTime(formatDateTime(parsedNewTime));
       setValidated(ValidatedOptions.noval);
     } else {
       setValidated(ValidatedOptions.error);
@@ -97,15 +111,16 @@ export const DateTimePicker = ({
         className="time-picker"
         time={dateTime ? dateObject.toString() : ''}
         inputProps={dateTime ? {} : { value: '' }}
-        placeholder="hh:mm"
+        placeholder={includeSeconds ? 'hh:mm:ss' : 'hh:mm'}
         onChange={debounce(onTimeChange, 1000, {
           leading: false,
           trailing: true,
         })}
         is24Hour
-        isDisabled={isDisabled}
+        isDisabled={isDisabled || formattedDate.length === 0}
         invalidFormatErrorMessage={__('Invalid time format')}
         menuAppendTo={() => document.body}
+        includeSeconds={includeSeconds}
       />
     </>
   );
@@ -117,10 +132,12 @@ DateTimePicker.propTypes = {
   isDisabled: PropTypes.bool,
   ariaLabel: PropTypes.string,
   allowEmpty: PropTypes.bool,
+  includeSeconds: PropTypes.bool,
 };
 DateTimePicker.defaultProps = {
   dateTime: null,
   isDisabled: false,
   ariaLabel: '',
   allowEmpty: true,
+  includeSeconds: false,
 };

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

@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { FormGroup, TextInput, TextArea } from '@patternfly/react-core';
+import { FormGroup, TextArea } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 import SearchBar from 'foremanReact/components/SearchBar';
 import { getControllerSearchProps } from 'foremanReact/constants';
@@ -9,6 +9,7 @@ import { getResults } from 'foremanReact/components/AutoComplete/AutoCompleteAct
 import { helpLabel } from './FormHelpers';
 import { SelectField } from './SelectField';
 import { ResourceSelectAPI } from './ResourceSelect';
+import { DateTimePicker } from '../form/DateTimePicker';
 import { noop } from '../../../helpers';
 
 const TemplateSearchField = ({
@@ -147,15 +148,13 @@ export const formatter = (input, values, setValue) => {
         fieldId={id}
         isRequired={required}
       >
-        <TextInput
-          aria-label={name}
-          placeholder="YYYY-mm-dd HH:MM"
+        <DateTimePicker
+          ariaLabel={name}
           className={hidden ? 'masked-input' : null}
-          required={required}
           id={id}
-          type="text"
-          value={value}
-          onChange={newValue => setValue({ ...values, [name]: newValue })}
+          dateTime={value}
+          setDateTime={newValue => setValue({ ...values, [name]: newValue })}
+          includeSeconds
         />
       </FormGroup>
     );

data/webpack/JobWizard/submit.js

@@ -44,8 +44,13 @@ export const submit = ({
         return repeatData.cronline;
       case repeatTypes.monthly:
         return `${minute} ${hour} ${repeatData.days} * *`;
-      case repeatTypes.weekly:
-        return `${minute} ${hour} * * ${repeatData.daysOfWeek}`;
+      case repeatTypes.weekly: {
+        const daysKeys = Object.keys(repeatData.daysOfWeek).filter(
+          k => repeatData.daysOfWeek[k]
+        );
+        const days = daysKeys.join(',');
+        return `${minute} ${hour} * * ${days}`;
+      }
       case repeatTypes.daily:
         return `${minute} ${hour} * * *`;
       case repeatTypes.hourly:
@@ -77,7 +82,7 @@ export const submit = ({
           ? {
               cron_line: getCronLine(),
               max_iteration: repeatAmount,
-              end_time: ends.length ? new Date(ends).toISOString() : null,
+              end_time: ends?.length ? new Date(ends).toISOString() : null,
               purpose,
             }
           : null,

data/webpack/Routes/routes.js

@@ -1,11 +1,17 @@
 import React from 'react';
 import JobWizardPage from '../JobWizard';
+import JobWizardPageRerun from '../JobWizard/JobWizardPageRerun';
 
 const ForemanREXRoutes = [
   {
-    path: '/experimental/job_wizard',
+    path: '/experimental/job_wizard/new',
     exact: true,
-    render: props => <JobWizardPage {...props} />,
+    render: () => <JobWizardPage />,
+  },
+  {
+    path: '/experimental/job_wizard/:id/rerun',
+    exact: true,
+    render: props => <JobWizardPageRerun {...props} />,
   },
 ];
 

data/webpack/__mocks__/foremanReact/common/hooks/API/APIHooks.js

@@ -0,0 +1 @@
+export const useAPI = jest.fn();

data/webpack/react_app/components/HostKebab/KebabItems.js

@@ -14,7 +14,6 @@ const HostKebabItems = () => {
   if (!consoleUrl) return null;
   return (
     <DropdownItem
-      ouiaId="web-console-dropdown-item"
       icon={<CodeIcon />}
       href={consoleUrl}
       target="_blank"

data/webpack/react_app/components/RecentJobsCard/RecentJobsCard.js

@@ -27,7 +27,6 @@ const RecentJobsCard = ({ hostDetails: { name, id } }) => {
         <DropdownItem
           href={foremanUrl(`${JOB_BASE_URL}${name}`)}
           key="link-to-all"
-          ouiaId="link-to-all-dropdown-item"
         >
           {__('View all jobs')}
         </DropdownItem>,
@@ -36,28 +35,24 @@ const RecentJobsCard = ({ hostDetails: { name, id } }) => {
             `${JOB_BASE_URL}${name}+and+status+%3D+failed+or+status%3D+succeeded`
           )}
           key="link-to-finished"
-          ouiaId="link-to-finished-dropdown-item"
         >
           {__('View finished jobs')}
         </DropdownItem>,
         <DropdownItem
           href={foremanUrl(`${JOB_BASE_URL}${name}+and+status+%3D+running`)}
           key="link-to-running"
-          ouiaId="link-to-running-dropdown-item"
         >
           {__('View running jobs')}
         </DropdownItem>,
         <DropdownItem
           href={foremanUrl(`${JOB_BASE_URL}${name}+and+status+%3D+queued`)}
           key="link-to-scheduled"
-          ouiaId="link-to-scheduled-dropdown-item"
         >
           {__('View scheduled jobs')}
         </DropdownItem>,
       ]}
     >
       <Tabs
-        ouiaId="tabs"
         mountOnEnter
         unmountOnExit
         activeKey={activeTab}

data/webpack/react_app/components/RecentJobsCard/RecentJobsTable.js

@@ -1,7 +1,15 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { Text, Bullseye } from '@patternfly/react-core';
-import { TableComposable, Tr, Tbody, Td } from '@patternfly/react-table';
+import {
+  DataList,
+  DataListItem,
+  DataListItemRow,
+  DataListItemCells,
+  DataListCell,
+  DataListWrapModifier,
+  Text,
+  Bullseye,
+} from '@patternfly/react-core';
 import { STATUS } from 'foremanReact/constants';
 
 import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
@@ -25,55 +33,55 @@ const RecentJobsTable = ({ status, hostId }) => {
   } = useAPI('get', jobsUrl, RECENT_JOBS_KEY);
 
   return (
-    <SkeletonLoader
-      skeletonProps={{ count: 3 }}
-      status={responseStatus || STATUS.PENDING}
-      emptyState={
-        <Bullseye>
-          <Text
-            ouiaId="no-results-text"
-            style={{ marginTop: '20px' }}
-            component="p"
-          >
-            {__('No results found')}
-          </Text>
-        </Bullseye>
-      }
-    >
-      {!!jobs?.length && (
-        <TableComposable
-          aria-label="recent-jobs-table"
-          variant="compact"
-          borders="compactBorderless"
-        >
-          <Tbody>
-            {jobs.map(
-              ({
-                status: jobStatus,
-                status_label: label,
-                id,
-                start_at: startAt,
-                description,
-              }) => (
-                <Tr key={id}>
-                  <Td modifier="truncate" key={`name-${id}`}>
-                    <a href={foremanUrl(`/job_invocations/${id}`)}>
-                      {description}
-                    </a>
-                  </Td>
-                  <Td modifier="truncate" key={`date-${id}`}>
-                    <RelativeDateTime date={startAt} />
-                  </Td>
-                  <Td modifier="truncate" key={`status-${id}`}>
-                    <JobStatusIcon status={jobStatus}>{label}</JobStatusIcon>
-                  </Td>
-                </Tr>
-              )
-            )}
-          </Tbody>
-        </TableComposable>
-      )}
-    </SkeletonLoader>
+    <DataList aria-label="recent-jobs-table" isCompact>
+      <SkeletonLoader
+        skeletonProps={{ count: 3 }}
+        status={responseStatus || STATUS.PENDING}
+        emptyState={
+          <Bullseye>
+            <Text style={{ marginTop: '20px' }} component="p">
+              {__('No results found')}
+            </Text>
+          </Bullseye>
+        }
+      >
+        {jobs?.length &&
+          jobs.map(
+            ({
+              status: jobStatus,
+              status_label: label,
+              id,
+              start_at: startAt,
+              description,
+            }) => (
+              <DataListItem key={id}>
+                <DataListItemRow>
+                  <DataListItemCells
+                    dataListCells={[
+                      <DataListCell
+                        wrapModifier={DataListWrapModifier.truncate}
+                        key={`name-${id}`}
+                      >
+                        <a href={foremanUrl(`/job_invocations/${id}`)}>
+                          {description}
+                        </a>
+                      </DataListCell>,
+                      <DataListCell key={`date-${id}`}>
+                        <RelativeDateTime date={startAt} />
+                      </DataListCell>,
+                      <DataListCell key={`status-${id}`}>
+                        <JobStatusIcon status={jobStatus}>
+                          {label}
+                        </JobStatusIcon>
+                      </DataListCell>,
+                    ]}
+                  />
+                </DataListItemRow>
+              </DataListItem>
+            )
+          )}
+      </SkeletonLoader>
+    </DataList>
   );
 };
 

data/webpack/react_app/extend/Fills.js

@@ -18,7 +18,7 @@ const fills = [
     slot: 'host-overview-cards',
     name: 'latest-jobs',
     component: props => <RecentJobsCard {...props} />,
-    weight: 500,
+    weight: 3200,
   },
   {
     slot: 'registrationAdvanced',
@@ -41,11 +41,11 @@ const fills = [
 ];
 
 const registerFills = () => {
-  fills.forEach(({ slot, name, component: Component, weight, metadata }) =>
+  fills.forEach(({ slot, id, component: Component, weight, metadata }) =>
     addGlobalFill(
       slot,
-      `rex-${name}`,
-      <Component key={`rex-${name}`} />,
+      id,
+      <Component key={`rex-fill-${id}`} />,
       weight,
       metadata
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 7.2.2
+  version: 8.0.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -408,7 +408,9 @@ files:
 - webpack/JobWizard/JobWizard.js
 - webpack/JobWizard/JobWizard.scss
 - webpack/JobWizard/JobWizardConstants.js
+- webpack/JobWizard/JobWizardPageRerun.js
 - webpack/JobWizard/JobWizardSelectors.js
+- webpack/JobWizard/__tests__/JobWizardPageRerun.test.js
 - webpack/JobWizard/__tests__/__snapshots__/integration.test.js.snap
 - webpack/JobWizard/__tests__/fixtures.js
 - webpack/JobWizard/__tests__/integration.test.js
@@ -444,11 +446,10 @@ files:
 - webpack/JobWizard/steps/Schedule/RepeatMonth.js
 - webpack/JobWizard/steps/Schedule/RepeatOn.js
 - webpack/JobWizard/steps/Schedule/RepeatWeek.js
+- webpack/JobWizard/steps/Schedule/ScheduleFuture.js
+- webpack/JobWizard/steps/Schedule/ScheduleRecurring.js
 - webpack/JobWizard/steps/Schedule/ScheduleType.js
-- webpack/JobWizard/steps/Schedule/StartEndDates.js
 - webpack/JobWizard/steps/Schedule/__tests__/Schedule.test.js
-- webpack/JobWizard/steps/Schedule/__tests__/StartEndDates.test.js
-- webpack/JobWizard/steps/Schedule/index.js
 - webpack/JobWizard/steps/form/DateTimePicker.js
 - webpack/JobWizard/steps/form/FormHelpers.js
 - webpack/JobWizard/steps/form/Formatter.js
@@ -466,6 +467,7 @@ files:
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/globalIdHelpers.js
 - webpack/__mocks__/foremanReact/common/helpers.js
+- webpack/__mocks__/foremanReact/common/hooks/API/APIHooks.js
 - webpack/__mocks__/foremanReact/components/AutoComplete/AutoCompleteActions.js
 - webpack/__mocks__/foremanReact/components/AutoComplete/AutoCompleteConstants.js
 - webpack/__mocks__/foremanReact/components/Pagination.js
@@ -546,7 +548,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config

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

@@ -1,106 +0,0 @@
-import React, { useEffect } from 'react';
-import PropTypes from 'prop-types';
-import { FormGroup, Checkbox } from '@patternfly/react-core';
-import { translate as __ } from 'foremanReact/common/I18n';
-import { DateTimePicker } from '../form/DateTimePicker';
-import { helpLabel } from '../form/FormHelpers';
-
-export const StartEndDates = ({
-  startsAt,
-  setStartsAt,
-  startsBefore,
-  setStartsBefore,
-  ends,
-  setEnds,
-  isNeverEnds,
-  setIsNeverEnds,
-  validEnd,
-  setValidEnd,
-  isFuture,
-  isStartBeforeDisabled,
-  isEndDisabled,
-}) => {
-  const toggleIsNeverEnds = (checked, event) => {
-    const value = event?.target?.checked;
-    setIsNeverEnds(value);
-  };
-  useEffect(() => {
-    if (isNeverEnds) setValidEnd(true);
-    else if ((!startsAt.length && !startsBefore.length) || !ends)
-      setValidEnd(true);
-    else if (
-      startsAt.length
-        ? new Date(startsAt).getTime() <= new Date(ends).getTime()
-        : new Date(startsBefore).getTime() <= new Date(ends).getTime()
-    )
-      setValidEnd(true);
-    else setValidEnd(false);
-  }, [startsAt, startsBefore, ends, isNeverEnds, setValidEnd]);
-  return (
-    <>
-      <FormGroup label={__('Starts at')} fieldId="start-at-date">
-        <DateTimePicker
-          allowEmpty={!isFuture}
-          ariaLabel="starts at"
-          dateTime={startsAt}
-          setDateTime={setStartsAt}
-        />
-      </FormGroup>
-
-      <FormGroup
-        label={__('Starts before')}
-        fieldId="start-before-date"
-        labelIcon={helpLabel(
-          __(
-            'Indicates that the action should be cancelled if it cannot be started before this time.'
-          ),
-          'start-before-date'
-        )}
-      >
-        <DateTimePicker
-          isDisabled={isStartBeforeDisabled}
-          allowEmpty={!isFuture}
-          ariaLabel="starts before"
-          dateTime={startsBefore}
-          setDateTime={setStartsBefore}
-        />
-      </FormGroup>
-      <FormGroup
-        label={__('Ends')}
-        fieldId="end-date"
-        helperTextInvalid={__('End time needs to be after start time')}
-        validated={validEnd ? 'success' : 'error'}
-      >
-        <DateTimePicker
-          ariaLabel="ends"
-          dateTime={ends}
-          setDateTime={setEnds}
-          isDisabled={isNeverEnds || isEndDisabled}
-        />
-        <Checkbox
-          label={__('Never ends')}
-          isChecked={isNeverEnds}
-          onChange={toggleIsNeverEnds}
-          id="never-ends"
-          name="never-ends"
-        />
-      </FormGroup>
-    </>
-  );
-};
-
-StartEndDates.propTypes = {
-  startsAt: PropTypes.string.isRequired,
-  setStartsAt: PropTypes.func.isRequired,
-  startsBefore: PropTypes.string.isRequired,
-  setStartsBefore: PropTypes.func.isRequired,
-  ends: PropTypes.string.isRequired,
-  setEnds: PropTypes.func.isRequired,
-  isNeverEnds: PropTypes.bool.isRequired,
-  setIsNeverEnds: PropTypes.func.isRequired,
-  validEnd: PropTypes.bool.isRequired,
-  setValidEnd: PropTypes.func.isRequired,
-  isFuture: PropTypes.bool.isRequired,
-  isStartBeforeDisabled: PropTypes.bool.isRequired,
-  isEndDisabled: PropTypes.bool.isRequired,
-};

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

@@ -1,32 +0,0 @@
-import React from 'react';
-import { render, fireEvent, screen, act } from '@testing-library/react';
-import { StartEndDates } from '../StartEndDates';
-
-const setEnds = jest.fn();
-const setIsNeverEnds = jest.fn();
-const setValid = jest.fn();
-const props = {
-  startsAt: '',
-  startsBefore: '',
-  setStartsAt: jest.fn(),
-  setStartsBefore: jest.fn(),
-  ends: 'some-end-date',
-  setEnds,
-  setIsNeverEnds,
-  isNeverEnds: false,
-  validEnd: true,
-  setValidEnd: setValid,
-  isFuture: false,
-  isStartBeforeDisabled: false,
-  isEndDisabled: false,
-};
-
-describe('StartEndDates', () => {
-  it('never ends', async () => {
-    await act(async () => render(<StartEndDates {...props} />));
-    const neverEnds = screen.getByRole('checkbox', { name: 'Never ends' });
-    await act(async () => fireEvent.click(neverEnds));
-    expect(setIsNeverEnds).toBeCalledWith(true);
-    expect(setValid).toBeCalledWith(true);
-  });
-});