foreman_remote_execution 9.0.1 → 10.0.0

data/webpack/JobWizard/JobWizard.js

@@ -36,6 +36,8 @@ import { useValidation } from './validation';
 import { useAutoFill } from './autofill';
 import { submit } from './submit';
 import { generateDefaultDescription } from './JobWizardHelpers';
+import { StartsBeforeErrorAlert } from './StartsBeforeErrorAlert';
+import { Footer } from './Footer';
 import './JobWizard.scss';
 
 export const JobWizard = ({ rerunData }) => {
@@ -185,6 +187,24 @@ export const JobWizard = ({ rerunData }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [rerunData, jobTemplateID, dispatch]);
 
+  const [isStartsBeforeError, setIsStartsBeforeError] = useState(false);
+  useEffect(() => {
+    const updateStartsBeforeError = () => {
+      setIsStartsBeforeError(
+        scheduleValue.scheduleType === SCHEDULE_TYPES.FUTURE &&
+          new Date().getTime() >= new Date(scheduleValue.startsBefore).getTime()
+      );
+    };
+    let interval;
+    if (scheduleValue.scheduleType === SCHEDULE_TYPES.FUTURE) {
+      updateStartsBeforeError();
+      interval = setInterval(updateStartsBeforeError, 5000);
+    }
+    return () => {
+      interval && clearInterval(interval);
+    };
+  }, [scheduleValue.scheduleType, scheduleValue.startsBefore]);
+
   const [valid, setValid] = useValidation({
     advancedValues,
     templateValues,
@@ -209,6 +229,11 @@ export const JobWizard = ({ rerunData }) => {
     !templateError &&
     !!jobTemplateID &&
     templateResponse.job_template;
+  const areHostsSelected =
+    selectedTargets.hosts.length > 0 ||
+    selectedTargets.hostCollections.length > 0 ||
+    selectedTargets.hostGroups.length > 0 ||
+    hostsSearchQuery.length > 0;
   const steps = [
     {
       name: WIZARD_TITLES.categoryAndTemplate,
@@ -238,7 +263,7 @@ export const JobWizard = ({ rerunData }) => {
         />
       ),
       canJumpTo: isTemplate,
-      enableNext: isTemplate && valid.hostsAndInputs,
+      enableNext: isTemplate && valid.hostsAndInputs && areHostsSelected,
     },
     {
       name: WIZARD_TITLES.advanced,
@@ -254,14 +279,26 @@ export const JobWizard = ({ rerunData }) => {
           templateValues={templateValues}
         />
       ),
-      canJumpTo: isTemplate && valid.hostsAndInputs,
-      enableNext: isTemplate && valid.hostsAndInputs && valid.advanced,
+      canJumpTo: isTemplate && valid.hostsAndInputs && areHostsSelected,
+      enableNext:
+        isTemplate &&
+        valid.hostsAndInputs &&
+        areHostsSelected &&
+        valid.advanced,
     },
     {
       name: WIZARD_TITLES.schedule,
-      canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
+      canJumpTo:
+        isTemplate &&
+        valid.hostsAndInputs &&
+        areHostsSelected &&
+        valid.advanced,
       enableNext:
-        isTemplate && valid.hostsAndInputs && valid.advanced && valid.schedule,
+        isTemplate &&
+        valid.hostsAndInputs &&
+        areHostsSelected &&
+        valid.advanced &&
+        valid.schedule,
       steps: [
         {
           name: WIZARD_TITLES.typeOfExecution,
@@ -278,9 +315,17 @@ export const JobWizard = ({ rerunData }) => {
               }}
             />
           ),
-          canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
+          canJumpTo:
+            isTemplate &&
+            valid.hostsAndInputs &&
+            areHostsSelected &&
+            valid.advanced,
 
-          enableNext: isTemplate && valid.hostsAndInputs && valid.advanced,
+          enableNext:
+            isTemplate &&
+            valid.hostsAndInputs &&
+            areHostsSelected &&
+            valid.advanced,
         },
         ...(scheduleValue.scheduleType === SCHEDULE_TYPES.FUTURE
           ? [
@@ -298,10 +343,15 @@ export const JobWizard = ({ rerunData }) => {
                     }}
                   />
                 ),
-                canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
+                canJumpTo:
+                  isTemplate &&
+                  valid.hostsAndInputs &&
+                  areHostsSelected &&
+                  valid.advanced,
                 enableNext:
                   isTemplate &&
                   valid.hostsAndInputs &&
+                  areHostsSelected &&
                   valid.advanced &&
                   valid.schedule,
               },
@@ -323,10 +373,15 @@ export const JobWizard = ({ rerunData }) => {
                     }}
                   />
                 ),
-                canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
+                canJumpTo:
+                  isTemplate &&
+                  valid.hostsAndInputs &&
+                  areHostsSelected &&
+                  valid.advanced,
                 enableNext:
                   isTemplate &&
                   valid.hostsAndInputs &&
+                  areHostsSelected &&
                   valid.advanced &&
                   valid.schedule,
               },
@@ -349,39 +404,57 @@ export const JobWizard = ({ rerunData }) => {
       ),
       nextButtonText: 'Run',
       canJumpTo:
-        isTemplate && valid.hostsAndInputs && valid.advanced && valid.schedule,
+        isTemplate &&
+        valid.advanced &&
+        valid.hostsAndInputs &&
+        areHostsSelected &&
+        valid.schedule,
       enableNext:
         isTemplate &&
         valid.hostsAndInputs &&
+        areHostsSelected &&
         valid.advanced &&
         valid.schedule &&
-        !isSubmitting,
+        !isSubmitting &&
+        !isStartsBeforeError,
     },
   ];
   const location = useForemanLocation();
   const organization = useForemanOrganization();
+  const onSave = () => {
+    submit({
+      jobTemplateID,
+      templateValues,
+      advancedValues,
+      scheduleValue,
+      dispatch,
+      selectedTargets,
+      hostsSearchQuery,
+      location,
+      organization,
+      feature: routerSearch?.feature,
+      provider: templateResponse.provider_name,
+      advancedInputs: templateResponse.advanced_template_inputs,
+    });
+  };
   return (
-    <Wizard
-      onClose={() => history.goBack()}
-      navAriaLabel="Run Job steps"
-      steps={steps}
-      height="100%"
-      className="job-wizard"
-      onSave={() => {
-        submit({
-          jobTemplateID,
-          templateValues,
-          advancedValues,
-          scheduleValue,
-          dispatch,
-          selectedTargets,
-          hostsSearchQuery,
-          location,
-          organization,
-          feature: routerSearch?.feature,
-        });
-      }}
-    />
+    <>
+      {isStartsBeforeError && <StartsBeforeErrorAlert />}
+      <Wizard
+        onClose={() => history.goBack()}
+        navAriaLabel="Run Job steps"
+        steps={steps}
+        height="100%"
+        className="job-wizard"
+        onSave={onSave}
+        footer={
+          <Footer
+            canSubmit={!!steps[steps.length - 1].enableNext}
+            onSave={onSave}
+          />
+        }
+      />
+    </>
   );
 };
 

data/webpack/JobWizard/JobWizard.scss

@@ -6,20 +6,15 @@
 
   .pf-c-wizard__nav.pf-m-expanded {
     z-index: calc(
-      var(--pf-c-wizard__footer--ZIndex) + 2
-    ); // So the small screen navigation can be shown above the select box
+      var(--pf-c-wizard__toggle--ZIndex) + 2
+    ); // So the small screen navigation can be shown above the select box and wizard body
   }
 
   .pf-c-wizard__main {
     overflow: visible;
     z-index: calc(
-      var(--pf-c-wizard__footer--ZIndex) + 1
-    ); // So the select box can be shown above the wizard footer
-  }
-  .pf-c-wizard__nav {
-    z-index: calc(
-      var(--pf-c-wizard__footer--ZIndex) + 2
-    ); // So the navigation box can be shown above the wizard body
+      var(--pf-c-wizard__toggle--ZIndex) + 1
+    ); // So the select box can be shown above the wizard footer and navigation toggle
   }
   .pf-c-wizard__main-body {
     max-width: 500px;
@@ -34,14 +29,8 @@
   }
 
   .target-hosts-and-inputs {
-    .hosts-chip-group {
-      margin-top: 8px;
-      float: left;
-      clear: left;
-      display: block;
-    }
-    .clear-chips {
-      margin-top: 8px;
+    .pf-c-chip-group.pf-m-category {
+      margin-bottom: 10px;
     }
     .pf-c-select__toggle-typeahead {
       border: 0px;

data/webpack/JobWizard/JobWizardConstants.js

@@ -23,7 +23,7 @@ export const SCHEDULE_TYPES = {
 };
 
 export const WIZARD_TITLES = {
-  categoryAndTemplate: __('Category and Template'),
+  categoryAndTemplate: __('Category and template'),
   hostsAndInputs: __('Target hosts and inputs'),
   advanced: __('Advanced fields'),
   schedule: __('Schedule'),

data/webpack/JobWizard/JobWizardPageRerun.js

@@ -86,6 +86,7 @@ const JobWizardPageRerun = ({
           <React.Fragment>
             {jobOrganization?.id !== currentOrganization?.id && (
               <Alert
+                isInline
                 className="job-wizard-alert"
                 variant="warning"
                 title={sprintf(
@@ -99,6 +100,7 @@ const JobWizardPageRerun = ({
             )}
             {jobLocation?.id !== currentLocation?.id && (
               <Alert
+                isInline
                 className="job-wizard-alert"
                 variant="warning"
                 title={sprintf(

data/webpack/JobWizard/StartsBeforeErrorAlert.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import { Divider, Alert } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export const StartsBeforeErrorAlert = () => (
+  <>
+    <Alert
+      variant="danger"
+      title={__("'Starts before' date must in the future")}
+    >
+      {__(
+        'Please go back to "Schedule" - "Future execution" step to fix the error'
+      )}
+    </Alert>
+    <Divider component="div" />
+  </>
+);

data/webpack/JobWizard/__tests__/__snapshots__/integration.test.js.snap

@@ -7,6 +7,14 @@ Array [
     "type": "get",
     "url": "/ui_job_wizard/categories",
   },
+  Object {
+    "key": "HOST_IDS",
+    "params": Object {
+      "search": "id = 105 or id = 37",
+    },
+    "type": "get",
+    "url": "/api/hosts",
+  },
   Object {
     "key": "JOB_TEMPLATES",
     "type": "get",

data/webpack/JobWizard/__tests__/fixtures.js

@@ -161,6 +161,11 @@ export const testSetup = (selectors, api) => {
         ],
       },
     },
+    HOSTS_API: {
+      response: {
+        subtotal: 3,
+      },
+    },
   });
   return store;
 };
@@ -318,6 +323,13 @@ export const jobInvocation = {
     created_in_katello: false,
   },
   inputs: {
-    'inputs[plain hidden]': 'test command',
+    'inputs[adv plain hidden]': {
+      advanced: true,
+      value: 'adv_test_command',
+    },
+    'inputs[plain hidden]': {
+      advanced: false,
+      value: 'test command',
+    },
   },
 };

data/webpack/JobWizard/__tests__/integration.test.js

@@ -18,6 +18,15 @@ import {
 const store = testSetup(selectors, api);
 
 describe('Job wizard fill', () => {
+  beforeEach(() => {
+    jest.spyOn(selectors, 'selectRouterSearch');
+    selectors.selectRouterSearch.mockImplementation(() => ({
+      'host_ids[]': ['105', '37'],
+    }));
+  });
+  afterEach(() => {
+    selectors.selectRouterSearch.mockRestore();
+  });
   it('should select template', async () => {
     api.get.mockImplementation(({ handleSuccess, ...action }) => {
       if (action.key === 'JOB_CATEGORIES') {
@@ -33,7 +42,13 @@ describe('Job wizard fill', () => {
           handleSuccess({
             data: jobTemplate,
           });
+      } else if (action.key === 'HOST_IDS') {
+        handleSuccess &&
+          handleSuccess({
+            data: { results: [{ name: 'host1' }, { name: 'host3' }] },
+          });
       }
+
       return { type: 'get', ...action };
     });
     selectors.selectJobTemplate.mockRestore();

data/webpack/JobWizard/__tests__/validation.test.js

@@ -41,11 +41,26 @@ describe('Job wizard validation', () => {
     expect(screen.getByText(WIZARD_TITLES.review)).toBeDisabled();
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.hostsAndInputs));
+      await new Promise(resolve => setTimeout(resolve, 0)); // to resolve gql
     });
+    const select = name =>
+      screen.getByRole('button', { name: `${name} toggle` });
+    fireEvent.click(select('hosts'));
+    await act(async () => {
+      fireEvent.click(screen.getByText('host1'));
+    });
+
+    expect(screen.getByText(WIZARD_TITLES.advanced)).toBeDisabled();
+    expect(screen.getByText(WIZARD_TITLES.schedule)).toBeDisabled();
+    expect(screen.getByText(WIZARD_TITLES.review)).toBeDisabled();
     const textField = screen.getByLabelText('plain hidden', {
       selector: 'textarea',
     });
     await act(async () => {
+      fireEvent.click(
+        // Close the select
+        select('hosts')
+      );
       await fireEvent.change(textField, {
         target: { value: 'text' },
       });
@@ -85,8 +100,20 @@ describe('Job wizard validation', () => {
     // setup
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.hostsAndInputs));
+      await new Promise(resolve => setTimeout(resolve, 0)); // to resolve gql
+    });
+
+    const select = name =>
+      screen.getByRole('button', { name: `${name} toggle` });
+    fireEvent.click(select('hosts'));
+    await act(async () => {
+      fireEvent.click(screen.getByText('host1'));
     });
     await act(async () => {
+      fireEvent.click(
+        // Close the host select
+        select('hosts')
+      );
       await fireEvent.change(
         screen.getByLabelText('plain hidden', {
           selector: 'textarea',
@@ -127,6 +154,10 @@ describe('Job wizard validation', () => {
     });
 
     expect(screen.getByText(WIZARD_TITLES.schedule)).toBeDisabled();
+    expect(screen.getByText('Run on selected hosts')).toHaveAttribute(
+      'aria-disabled',
+      'true'
+    );
     expect(screen.getByText(WIZARD_TITLES.review)).toBeDisabled();
 
     await act(async () => {
@@ -135,6 +166,11 @@ describe('Job wizard validation', () => {
       });
     });
 
+    expect(screen.getByText('Run on selected hosts')).toBeEnabled();
+    expect(screen.getByText('Run on selected hosts')).toHaveAttribute(
+      'aria-disabled',
+      'false'
+    );
     expect(screen.getByText(WIZARD_TITLES.schedule)).toBeEnabled();
     expect(screen.getByText(WIZARD_TITLES.review)).toBeEnabled();
   });

data/webpack/JobWizard/autofill.js

@@ -72,6 +72,7 @@ export const useAutoFill = ({
           if (input) {
             if (typeof rest[key] === 'string') {
               setTemplateValues(prev => ({ ...prev, [input]: rest[key] }));
+              setAdvancedValues(prev => ({ ...prev, [input]: rest[key] }));
             } else {
               const { value, advanced } = rest[key];
               if (advanced) {

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

@@ -26,6 +26,15 @@ mockApi(api);
 jest.useFakeTimers();
 
 describe('AdvancedFields', () => {
+  beforeEach(() => {
+    jest.spyOn(selectors, 'selectRouterSearch');
+    selectors.selectRouterSearch.mockImplementation(() => ({
+      'host_ids[]': ['105', '37'],
+    }));
+  });
+  afterEach(() => {
+    selectors.selectRouterSearch.mockRestore();
+  });
   it('should save data between steps for advanced fields', async () => {
     const wrapper = mount(
       <MockedProvider mocks={gqlMock} addTypename={false}>
@@ -51,7 +60,7 @@ describe('AdvancedFields', () => {
       .simulate('click'); // Advanced step
 
     await act(async () => {
-      jest.runAllTimers(); // to handle pf4 date picker popover
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover
     });
     const effectiveUserInput = () => wrapper.find('input#effective-user');
     const advancedTemplateInput = () =>
@@ -83,7 +92,7 @@ describe('AdvancedFields', () => {
       .simulate('click'); // Advanced step
 
     await act(async () => {
-      jest.runOnlyPendingTimers(); // to handle pf4 date picker popover
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover
     });
     expect(effectiveUserInput().prop('value')).toEqual(effectiveUesrValue);
     expect(advancedTemplateInput().prop('value')).toEqual(
@@ -100,7 +109,7 @@ describe('AdvancedFields', () => {
     );
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
-      jest.runOnlyPendingTimers(); // to handle pf4 date picker popover
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover
     });
 
     const searchValue = 'search test';
@@ -137,7 +146,7 @@ describe('AdvancedFields', () => {
       fireEvent.change(timeField, {
         target: { value: timeValue },
       });
-      jest.runAllTimers(); // to handle pf4 date picker popover
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover
     });
     expect(
       screen.getByLabelText('adv plain hidden', {
@@ -156,7 +165,7 @@ describe('AdvancedFields', () => {
 
     await act(async () => {
       await fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
-      jest.runOnlyPendingTimers();
+      jest.advanceTimersByTime(1000);
     });
     expect(textField.value).toBe(textValue);
     expect(searchField.value).toBe(searchValue);
@@ -177,7 +186,7 @@ describe('AdvancedFields', () => {
     );
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
-      jest.runAllTimers(); // to handle pf4 date picker popover
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover
     });
 
     expect(
@@ -212,7 +221,7 @@ describe('AdvancedFields', () => {
     );
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
-      jest.runAllTimers(); // to handle pf4 date picker popover
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover
     });
 
     const textField = screen.getByLabelText('adv plain hidden', {
@@ -270,6 +279,11 @@ describe('AdvancedFields', () => {
           handleSuccess({
             data: { results: [jobTemplate] },
           });
+      } else if (action.key === 'HOST_IDS') {
+        handleSuccess &&
+          handleSuccess({
+            data: { results: [{ name: 'host1' }, { name: 'host3' }] },
+          });
       }
       return { type: 'get', ...action };
     });
@@ -280,7 +294,7 @@ describe('AdvancedFields', () => {
     );
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
-      jest.runAllTimers(); // to handle pf4 date picker popover
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover
     });
     expect(
       screen.getByLabelText('description preview', {
@@ -339,6 +353,11 @@ describe('AdvancedFields', () => {
           handleSuccess({
             data: { results: [jobTemplate] },
           });
+      } else if (action.key === 'HOST_IDS') {
+        handleSuccess &&
+          handleSuccess({
+            data: { results: [{ name: 'host1' }, { name: 'host3' }] },
+          });
       }
       return { type: 'get', ...action };
     });
@@ -349,7 +368,7 @@ describe('AdvancedFields', () => {
     );
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
-      jest.runAllTimers(); // to handle pf4 date picker popover
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover
     });
     expect(
       screen.getByLabelText('description preview', {
@@ -369,7 +388,7 @@ describe('AdvancedFields', () => {
     );
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
-      jest.runAllTimers(); // to handle pf4 date picker popover
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover
     });
     const resourceSelectField = screen.getByLabelText(
       'adv resource select typeahead input'

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

@@ -7,6 +7,14 @@ Array [
     "type": "get",
     "url": "/ui_job_wizard/categories",
   },
+  Object {
+    "key": "HOST_IDS",
+    "params": Object {
+      "search": "id = 105 or id = 37",
+    },
+    "type": "get",
+    "url": "/api/hosts",
+  },
   Object {
     "key": "JOB_TEMPLATES",
     "type": "get",

data/webpack/JobWizard/steps/HostsAndInputs/HostPreviewModal.js

@@ -29,6 +29,7 @@ export const HostPreviewModal = ({ isOpen, setIsOpen, searchQuery }) => {
               variant="link"
               target="_blank"
               rel="noreferrer"
+              isInline
             >
               {host}
             </Button>
@@ -42,6 +43,7 @@ export const HostPreviewModal = ({ isOpen, setIsOpen, searchQuery }) => {
               variant="link"
               target="_blank"
               rel="noreferrer"
+              isInline
             >
               {sprintf(
                 __('...and %s more'),
@@ -60,3 +62,6 @@ HostPreviewModal.propTypes = {
   setIsOpen: PropTypes.func.isRequired,
   searchQuery: PropTypes.string.isRequired,
 };
+HostPreviewModal.defaultPropTypes = {
+  searchQuery: '',
+};