foreman_remote_execution 8.3.1 → 9.0.0

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

@@ -39,35 +39,15 @@ 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({
-  HOSTS_API: {
-    response: {
-      subtotal: 3,
-    },
-  },
-});
+const store = mockStore({});
 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}>
@@ -139,7 +119,7 @@ describe('Schedule', () => {
     });
 
     act(() => {
-      fireEvent.click(screen.getByText('Category and template'));
+      fireEvent.click(screen.getByText('Category and Template'));
     });
     act(() => {
       fireEvent.click(screen.getByRole('button', { name: 'Future execution' }));
@@ -246,7 +226,7 @@ describe('Schedule', () => {
     });
 
     act(() => {
-      fireEvent.click(screen.getByText('Category and template'));
+      fireEvent.click(screen.getByText('Category and Template'));
     });
     act(() => {
       fireEvent.click(
@@ -306,9 +286,9 @@ describe('Schedule', () => {
     expect(screen.getByText('Review details').disabled).toBeFalsy();
 
     await act(async () => {
-      fireEvent.click(screen.getByText('Category and template'));
+      fireEvent.click(screen.getByText('Category and Template'));
     });
-    expect(screen.getAllByText('Category and template')).toHaveLength(3);
+    expect(screen.getAllByText('Category and Template')).toHaveLength(3);
 
     await act(async () => {
       fireEvent.click(

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

@@ -119,6 +119,7 @@ export const DateTimePicker = ({
         is24Hour
         isDisabled={isDisabled || formattedDate.length === 0}
         invalidFormatErrorMessage={__('Invalid time format')}
+        menuAppendTo={() => document.body}
         includeSeconds={includeSeconds}
       />
     </>

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

@@ -1,16 +1,12 @@
-import React, { useEffect } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
+import React from 'react';
 import { FormGroup, TextArea } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 import SearchBar from 'foremanReact/components/SearchBar';
 import { getControllerSearchProps } from 'foremanReact/constants';
-import { TRIGGERS } from 'foremanReact/components/AutoComplete/AutoCompleteConstants';
-import { getResults } from 'foremanReact/components/AutoComplete/AutoCompleteActions';
 import { helpLabel, ResetDefault } from './FormHelpers';
 import { SelectField } from './SelectField';
 import { ResourceSelect } from './ResourceSelect';
 import { DateTimePicker } from '../form/DateTimePicker';
-import { noop } from '../../../helpers';
 
 const TemplateSearchField = ({
   name,
@@ -22,51 +18,33 @@ const TemplateSearchField = ({
   setValue,
   values,
 }) => {
-  const searchQuery = useSelector(
-    state => state.autocomplete?.[name]?.searchQuery
-  );
-  const dispatch = useDispatch();
-  useEffect(() => {
-    setValue({ ...values, [name]: searchQuery });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [searchQuery]);
   const id = name.replace(/ /g, '-');
   const props = getControllerSearchProps(controller.replace('/', '_'), name);
-
-  const setSearch = newSearchQuery => {
-    dispatch(
-      getResults({
-        url,
-        searchQuery: newSearchQuery,
-        controller,
-        trigger: TRIGGERS.INPUT_CHANGE,
-        id: name,
-      })
-    );
-  };
   return (
     <FormGroup
       label={name}
       labelIcon={helpLabel(labelText, name)}
       labelInfo={
-        <ResetDefault defaultValue={defaultValue} setValue={setSearch} />
+        <ResetDefault
+          defaultValue={defaultValue}
+          setValue={search => setValue({ ...values, [name]: search })}
+        />
       }
       fieldId={id}
       isRequired={required}
       className="foreman-search-field"
     >
       <SearchBar
-        initialQuery={values[name]}
         data={{
           ...props,
           autocomplete: {
             id: name,
             url,
-            useKeyShortcuts: true,
+            searchQuery: values[name],
           },
         }}
-        onSearch={noop}
-        onBookmarkClick={search => setSearch(search)}
+        onSearch={null}
+        onSearchChange={search => setValue({ ...values, [name]: search })}
       />
     </FormGroup>
   );

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

@@ -68,6 +68,7 @@ export const GroupedSelectField = ({
         selections={selected}
         className="without_select2"
         onClear={onClear}
+        menuAppendTo={() => document.body}
         aria-labelledby={fieldId}
         toggleAriaLabel={`${label} toggle`}
         {...props}

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

@@ -43,6 +43,7 @@ export const SelectField = ({
         isOpen={isOpen}
         className="without_select2"
         maxHeight="45vh"
+        menuAppendTo={() => document.body}
         placeholderText=" " // To prevent showing first option as selected
         aria-labelledby={fieldId}
         toggleAriaLabel={`${label} toggle`}

data/webpack/JobWizard/submit.js

@@ -12,8 +12,6 @@ export const submit = ({
   location,
   organization,
   feature,
-  provider,
-  advancedInputs,
   dispatch,
 }) => {
   const {
@@ -39,13 +37,6 @@ 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(':')
@@ -113,16 +104,14 @@ export const submit = ({
         concurrency_level: concurrencyLevel,
       },
       bookmark_id: null,
-      search_query: buildHostQuery(selectedTargets, hostsSearchQuery),
+      search_query:
+        buildHostQuery(selectedTargets, hostsSearchQuery) || 'name ~ *',
       description_format: description,
       execution_timeout_interval: timeoutToKill,
       feature,
       time_to_pickup: timeToPickup,
     },
   };
-  if (Object.keys(providerValues).length) {
-    api.job_invocation[provider] = providerValues;
-  }
 
   dispatch(
     post({

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

@@ -25,7 +25,7 @@ const RecentJobsCard = ({ hostDetails: { name, id } }) => {
       header={__('Recent jobs')}
       dropdownItems={[
         <DropdownItem
-          href={foremanUrl(`${JOB_BASE_URL}${id}`)}
+          href={foremanUrl(`${JOB_BASE_URL}${name}`)}
           key="link-to-all"
           ouiaId="link-to-all-dropdown-item"
         >
@@ -33,7 +33,7 @@ const RecentJobsCard = ({ hostDetails: { name, id } }) => {
         </DropdownItem>,
         <DropdownItem
           href={foremanUrl(
-            `${JOB_BASE_URL}${id}+and+status+%3D+failed+or+status%3D+succeeded`
+            `${JOB_BASE_URL}${name}+and+status+%3D+failed+or+status%3D+succeeded`
           )}
           key="link-to-finished"
           ouiaId="link-to-finished-dropdown-item"
@@ -41,14 +41,14 @@ const RecentJobsCard = ({ hostDetails: { name, id } }) => {
           {__('View finished jobs')}
         </DropdownItem>,
         <DropdownItem
-          href={foremanUrl(`${JOB_BASE_URL}${id}+and+status+%3D+running`)}
+          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}${id}+and+status+%3D+queued`)}
+          href={foremanUrl(`${JOB_BASE_URL}${name}+and+status+%3D+queued`)}
           key="link-to-scheduled"
           ouiaId="link-to-scheduled-dropdown-item"
         >

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

@@ -17,10 +17,10 @@ const RecentJobsTable = ({ status, hostId }) => {
   const jobsUrl =
     hostId &&
     foremanUrl(
-      `${JOB_API_URL}${hostId}&status=${status}&limit=${JOBS_IN_CARD}`
+      `${JOB_API_URL}${hostId}+and+status%3D${status}&per_page=${JOBS_IN_CARD}`
     );
   const {
-    response: { job_invocations: jobs },
+    response: { results: jobs },
     status: responseStatus,
   } = useAPI('get', jobsUrl, RECENT_JOBS_KEY);
 

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

@@ -6,8 +6,8 @@ export const SCHEDULED_TAB = 2;
 export const JOB_SUCCESS_STATUS = 0;
 export const JOB_ERROR_STATUS = 1;
 
-export const JOB_BASE_URL = '/job_invocations?search=targeted_host_id+%3D+';
+export const JOB_BASE_URL = '/job_invocations?search=host+%3D+';
 export const JOB_API_URL =
-  '/job_invocations/preview_job_invocations_per_host?host_id=';
+  '/api/job_invocations?order=start_at+DESC&search=targeted_host_id%3D';
 export const JOBS_IN_CARD = 3;
 export const RECENT_JOBS_KEY = { key: 'RECENT_JOBS_KEY' };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 8.3.1
+  version: 9.0.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2022-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -543,7 +543,7 @@ homepage: https://github.com/theforeman/foreman_remote_execution
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -559,7 +559,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config
   management functionality with remote management functionality.