foreman_remote_execution 8.2.0 → 8.2.1

data/webpack/JobWizard/JobWizard.js

@@ -209,6 +209,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 +243,7 @@ export const JobWizard = ({ rerunData }) => {
         />
       ),
       canJumpTo: isTemplate,
-      enableNext: isTemplate && valid.hostsAndInputs,
+      enableNext: isTemplate && valid.hostsAndInputs && areHostsSelected,
     },
     {
       name: WIZARD_TITLES.advanced,
@@ -254,14 +259,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 +295,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 +323,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 +353,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,10 +384,15 @@ 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,
@@ -379,6 +419,8 @@ export const JobWizard = ({ rerunData }) => {
           location,
           organization,
           feature: routerSearch?.feature,
+          provider: templateResponse.provider_name,
+          advancedInputs: templateResponse.advanced_template_inputs,
         });
       }}
     />

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;
 };

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',

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}>
@@ -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 };
     });
@@ -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 };
     });

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

@@ -60,3 +60,6 @@ HostPreviewModal.propTypes = {
   setIsOpen: PropTypes.func.isRequired,
   searchQuery: PropTypes.string.isRequired,
 };
+HostPreviewModal.defaultPropTypes = {
+  searchQuery: '',
+};

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

@@ -30,6 +30,27 @@ describe('Hosts', () => {
     const select = name =>
       screen.getByRole('button', { name: `${name} toggle` });
     fireEvent.click(select('hosts'));
+    await act(async () => {
+      fireEvent.click(screen.getByText('host1'));
+      fireEvent.click(select('hosts'));
+    });
+    expect(
+      screen.queryAllByText('Please select at least one host')
+    ).toHaveLength(0);
+    await act(async () => {
+      fireEvent.click(select('hosts'));
+    });
+    await act(async () => {
+      fireEvent.click(
+        screen.getByText('host1', {
+          selector: '.pf-c-select__menu-item',
+        })
+      );
+      fireEvent.blur(select('hosts'));
+    });
+    expect(
+      screen.queryAllByText('Please select at least one host')
+    ).toHaveLength(1);
     await act(async () => {
       fireEvent.click(screen.getByText('host1'));
       fireEvent.click(screen.getByText('host2'));
@@ -151,8 +172,9 @@ describe('Hosts', () => {
 
   it('input fill from url', async () => {
     const inputText = 'test text';
+    const advancedInputText = 'test adv text';
     routerSelectors.selectRouterLocation.mockImplementation(() => ({
-      search: `feature=test_feature&inputs[plain hidden]=${inputText}`,
+      search: `host_ids%5B%5D=host1&host_ids%5B%5D=host3&feature=test_feature&inputs[plain hidden]=${inputText}&inputs[adv plain hidden]=${advancedInputText}`,
     }));
     render(
       <MockedProvider mocks={gqlMock} addTypename={false}>
@@ -175,5 +197,13 @@ describe('Hosts', () => {
       selector: 'textarea',
     });
     expect(textField.value).toBe(inputText);
+
+    await act(async () => {
+      fireEvent.click(screen.getByText('Advanced fields'));
+    });
+    const advancedTextField = screen.getByLabelText('adv plain hidden', {
+      selector: 'textarea',
+    });
+    expect(advancedTextField.value).toBe(advancedInputText);
   });
 });

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

@@ -1,18 +1,24 @@
 export const buildHostQuery = (selected, search) => {
   const { hosts, hostCollections, hostGroups } = selected;
-  const hostsSearch = `(id ^ (${hosts.map(({ id }) => id).join(',')}))`;
-  const hostCollectionsSearch = `(host_collection_id ^ (${hostCollections
+  const hostsSearch = `id ^ (${hosts.map(({ id }) => id).join(',')})`;
+  const hostCollectionsSearch = `host_collection_id ^ (${hostCollections
     .map(({ id }) => id)
-    .join(',')}))`;
-  const hostGroupsSearch = `(hostgroup_id ^ (${hostGroups
+    .join(',')})`;
+  const hostGroupsSearch = `hostgroup_id ^ (${hostGroups
     .map(({ id }) => id)
-    .join(',')}))`;
-  return [
+    .join(',')})`;
+  const queryParts = [
     hosts.length ? hostsSearch : false,
     hostCollections.length ? hostCollectionsSearch : false,
     hostGroups.length ? hostGroupsSearch : false,
-    search.length ? `(${search})` : false,
-  ]
-    .filter(Boolean)
-    .join(' or ');
+    search.length ? search : false,
+  ].filter(Boolean);
+
+  if (queryParts.length === 0) {
+    return 'name=a AND name=b';
+  }
+  if (queryParts.length === 1) {
+    return queryParts[0] || 'name=a AND name=b';
+  }
+  return queryParts.map(p => `(${p})`).join(' or ') || 'name=a AND name=b';
 };

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

@@ -54,6 +54,30 @@ const HostsAndInputs = ({
   const isLoading = useSelector(selectIsLoadingHosts);
   const templateInputs = useSelector(selectTemplateInputs);
   const [hostPreviewOpen, setHostPreviewOpen] = useState(false);
+  const [wasFocus, setWasFocus] = useState(false);
+  const [isError, setIsError] = useState(false);
+  useEffect(() => {
+    if (wasFocus) {
+      if (
+        selected.hosts.length === 0 &&
+        selected.hostCollections.length === 0 &&
+        selected.hostGroups.length === 0 &&
+        hostsSearchQuery.length === 0
+      ) {
+        setIsError(true);
+      } else {
+        setIsError(false);
+      }
+    }
+  }, [
+    hostMethod,
+    hostsSearchQuery.length,
+    selected,
+    selected.hostCollections.length,
+    selected.hostGroups.length,
+    selected.hosts.length,
+    wasFocus,
+  ]);
   useEffect(() => {
     debounce(() => {
       dispatch(
@@ -103,6 +127,9 @@ const HostsAndInputs = ({
     dispatch(resetData(hostsController, hostQuerySearchID));
     setHostsSearchQuery('');
   };
+  const [errorText, setErrorText] = useState(
+    __('Please select at least one host')
+  );
   return (
     <div className="target-hosts-and-inputs">
       <WizardTitle title={WIZARD_TITLES.hostsAndInputs} />
@@ -114,8 +141,13 @@ const HostsAndInputs = ({
         />
       )}
       <Form>
-        <FormGroup fieldId="host_selection" id="host-selection">
-          <InputGroup>
+        <FormGroup
+          fieldId="host_selection"
+          id="host-selection"
+          helperTextInvalid={errorText}
+          validated={isError ? 'error' : 'default'}
+        >
+          <InputGroup onBlur={() => setWasFocus(true)}>
             <SelectField
               isRequired
               className="target-method-select"
@@ -127,7 +159,23 @@ const HostsAndInputs = ({
                 }
                 return true;
               })}
-              setValue={setHostMethod}
+              setValue={val => {
+                setHostMethod(val);
+                if (val === hostMethods.searchQuery) {
+                  setErrorText(__('Please enter a search query'));
+                }
+                if (val === hostMethods.hosts) {
+                  setErrorText(__('Please select at least one host'));
+                }
+                if (val === hostMethods.hostCollections) {
+                  setErrorText(
+                    __('Please select at least one host collection')
+                  );
+                }
+                if (val === hostMethods.hostGroups) {
+                  setErrorText(__('Please select at least one host group'));
+                }
+              }}
               value={hostMethod}
             />
             {hostMethod === hostMethods.searchQuery && (

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

@@ -39,15 +39,35 @@ api.get.mockImplementation(({ handleSuccess, ...action }) => {
       handleSuccess({
         data: { results: [jobTemplateResponse.job_template] },
       });
+  } else if (action.key === 'HOST_IDS') {
+    handleSuccess &&
+      handleSuccess({
+        data: { results: [{ name: 'host1' }, { name: 'host3' }] },
+      });
   }
   return { type: 'get', ...action };
 });
 
 const mockStore = configureMockStore([]);
-const store = mockStore({});
+const store = mockStore({
+  HOSTS_API: {
+    response: {
+      subtotal: 3,
+    },
+  },
+});
 jest.useFakeTimers();
 
 describe('Schedule', () => {
+  beforeEach(() => {
+    jest.spyOn(selectors, 'selectRouterSearch');
+    selectors.selectRouterSearch.mockImplementation(() => ({
+      'host_ids[]': ['105', '37'],
+    }));
+  });
+  afterEach(() => {
+    selectors.selectRouterSearch.mockRestore();
+  });
   it('sub steps appear', () => {
     render(
       <Provider store={store}>

data/webpack/JobWizard/submit.js

@@ -12,6 +12,8 @@ export const submit = ({
   location,
   organization,
   feature,
+  provider,
+  advancedInputs,
   dispatch,
 }) => {
   const {
@@ -37,6 +39,13 @@ export const submit = ({
     keyPassphrase,
     timeToPickup,
   } = advancedValues;
+  const providerInputs = advancedInputs.filter(v => v.provider_input);
+  const providerValues = {};
+  providerInputs.forEach(({ name }) => {
+    providerValues[name] = advancedTemplateValues[name];
+    delete advancedTemplateValues[name];
+  });
+
   const getCronLine = () => {
     const [hour, minute] = repeatData.at
       ? repeatData.at.split(':')
@@ -104,14 +113,16 @@ export const submit = ({
         concurrency_level: concurrencyLevel,
       },
       bookmark_id: null,
-      search_query:
-        buildHostQuery(selectedTargets, hostsSearchQuery) || 'name ~ *',
+      search_query: buildHostQuery(selectedTargets, hostsSearchQuery),
       description_format: description,
       execution_timeout_interval: timeoutToKill,
       feature,
       time_to_pickup: timeToPickup,
     },
   };
+  if (Object.keys(providerValues).length) {
+    api.job_invocation[provider] = providerValues;
+  }
 
   dispatch(
     post({

metadata

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