foreman_remote_execution 9.0.1 → 9.1.0

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}>
@@ -85,7 +105,7 @@ describe('Schedule', () => {
     });
     act(() => {
       fireEvent.click(screen.getByRole('button', { name: 'Future execution' }));
-      jest.runAllTimers(); // to handle pf4 date picker popover useTimer
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover useTimer
     });
 
     const newStartAtDate = '2030/03/12';
@@ -115,7 +135,7 @@ describe('Schedule', () => {
       fireEvent.change(startsBeforeTimeField(), {
         target: { value: newStartBeforeTime },
       });
-      jest.runOnlyPendingTimers();
+      jest.advanceTimersByTime(1000);
     });
 
     act(() => {
@@ -123,7 +143,7 @@ describe('Schedule', () => {
     });
     act(() => {
       fireEvent.click(screen.getByRole('button', { name: 'Future execution' }));
-      jest.runAllTimers(); // to handle pf4 date picker popover useTimer
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover useTimer
     });
     expect(startsAtDateField().value).toBe(newStartAtDate);
     expect(startsAtTimeField().value).toBe(newStartAtTime);
@@ -140,7 +160,7 @@ describe('Schedule', () => {
         target: { value: '2030/03/11' },
       });
       await fireEvent.click(startsBeforeTimeField());
-      await jest.runOnlyPendingTimers();
+      await jest.advanceTimersByTime(1000);
     });
     expect(startsBeforeDateField().value).toBe('2030/03/11');
     expect(
@@ -157,13 +177,13 @@ describe('Schedule', () => {
       await fireEvent.change(startsAtDateField(), {
         target: { value: '' },
       });
-      jest.runOnlyPendingTimers();
+      jest.advanceTimersByTime(1000);
     });
 
     expect(startsBeforeDateField().value).toBe('2019/03/11');
     expect(
       screen.getAllByText("'Starts before' date must in the future")
-    ).toHaveLength(1);
+    ).toHaveLength(2);
   });
 
   it('Recurring execution - date pickers', async () => {
@@ -182,7 +202,7 @@ describe('Schedule', () => {
       fireEvent.click(
         screen.getByRole('button', { name: 'Recurring execution' })
       );
-      jest.runAllTimers(); // to handle pf4 date picker popover useTimer
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover useTimer
     });
 
     const newStartAtDate = '2030/03/12';
@@ -207,7 +227,7 @@ describe('Schedule', () => {
       fireEvent.change(startsAtTimeField(), {
         target: { value: newStartAtTime },
       });
-      jest.runOnlyPendingTimers();
+      jest.advanceTimersByTime(1000);
     });
 
     expect(endsAtDateField().disabled).toBeTruthy();
@@ -222,7 +242,7 @@ describe('Schedule', () => {
       fireEvent.change(endsAtTimeField(), {
         target: { value: newStartAtTime },
       });
-      jest.runOnlyPendingTimers();
+      jest.advanceTimersByTime(1000);
     });
 
     act(() => {
@@ -232,7 +252,7 @@ describe('Schedule', () => {
       fireEvent.click(
         screen.getByRole('button', { name: 'Recurring execution' })
       );
-      jest.runAllTimers(); // to handle pf4 date picker popover useTimer
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover useTimer
     });
     expect(startsAtDateField().value).toBe(newStartAtDate);
     expect(startsAtTimeField().value).toBe(newStartAtTime);
@@ -266,7 +286,7 @@ describe('Schedule', () => {
       fireEvent.click(
         screen.getByRole('button', { name: 'Recurring execution' })
       );
-      jest.runAllTimers(); // to handle pf4 date picker popover useTimer
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover useTimer
     });
     await act(async () => {
       fireEvent.click(screen.getByLabelText('Daily', { selector: 'button' }));
@@ -294,7 +314,7 @@ describe('Schedule', () => {
       fireEvent.click(
         screen.getByRole('button', { name: 'Recurring execution' })
       );
-      jest.runAllTimers();
+      jest.advanceTimersByTime(1000);
     });
     expect(screen.queryAllByText('Recurring execution')).toHaveLength(3);
     expect(cronline.value).toBe(newCronline);

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

@@ -59,7 +59,7 @@ export const DateTimePicker = ({
     return false;
   };
 
-  const onDateChange = newDate => {
+  const onDateChange = (e, newDate) => {
     const parsedNewDate = new Date(newDate);
     if (!newDate.length && allowEmpty) {
       setDateTime('');

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({
@@ -122,7 +133,7 @@ export const submit = ({
         window.location.href = `/job_invocations/${id}`;
       },
       errorToast: ({ response }) =>
-        response?.date?.error?.message ||
+        response?.data?.error?.message ||
         response?.message ||
         response?.statusText,
     })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.1.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -327,6 +327,7 @@ files:
 - db/migrate/20210816100932_rex_setting_category_to_dsl.rb
 - db/migrate/20220321101835_rename_ssh_provider_to_script.rb
 - db/migrate/20220331112719_add_ssh_user_to_job_invocation.rb
+- db/migrate/20220426145007_add_unique_feature_label_index.rb
 - db/migrate/20220713095705_create_template_invocation_events.rb
 - db/migrate/20220822155946_add_time_to_pickup_to_job_invocation.rb
 - db/migrate/20221129170145_redefine_template_invocation_events_index.rb
@@ -418,6 +419,7 @@ files:
 - webpack/JobWizard/JobWizardHelpers.js
 - webpack/JobWizard/JobWizardPageRerun.js
 - webpack/JobWizard/JobWizardSelectors.js
+- webpack/JobWizard/StartsBeforeErrorAlert.js
 - webpack/JobWizard/__tests__/JobWizardPageRerun.test.js
 - webpack/JobWizard/__tests__/__snapshots__/integration.test.js.snap
 - webpack/JobWizard/__tests__/fixtures.js