foreman_remote_execution 8.2.1 → 9.0.0

data/webpack/JobWizard/JobWizard.js

@@ -209,11 +209,6 @@ 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,
@@ -243,7 +238,7 @@ export const JobWizard = ({ rerunData }) => {
         />
       ),
       canJumpTo: isTemplate,
-      enableNext: isTemplate && valid.hostsAndInputs && areHostsSelected,
+      enableNext: isTemplate && valid.hostsAndInputs,
     },
     {
       name: WIZARD_TITLES.advanced,
@@ -259,26 +254,14 @@ export const JobWizard = ({ rerunData }) => {
           templateValues={templateValues}
         />
       ),
-      canJumpTo: isTemplate && valid.hostsAndInputs && areHostsSelected,
-      enableNext:
-        isTemplate &&
-        valid.hostsAndInputs &&
-        areHostsSelected &&
-        valid.advanced,
+      canJumpTo: isTemplate && valid.hostsAndInputs,
+      enableNext: isTemplate && valid.hostsAndInputs && valid.advanced,
     },
     {
       name: WIZARD_TITLES.schedule,
-      canJumpTo:
-        isTemplate &&
-        valid.hostsAndInputs &&
-        areHostsSelected &&
-        valid.advanced,
+      canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
       enableNext:
-        isTemplate &&
-        valid.hostsAndInputs &&
-        areHostsSelected &&
-        valid.advanced &&
-        valid.schedule,
+        isTemplate && valid.hostsAndInputs && valid.advanced && valid.schedule,
       steps: [
         {
           name: WIZARD_TITLES.typeOfExecution,
@@ -295,17 +278,9 @@ export const JobWizard = ({ rerunData }) => {
               }}
             />
           ),
-          canJumpTo:
-            isTemplate &&
-            valid.hostsAndInputs &&
-            areHostsSelected &&
-            valid.advanced,
+          canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
 
-          enableNext:
-            isTemplate &&
-            valid.hostsAndInputs &&
-            areHostsSelected &&
-            valid.advanced,
+          enableNext: isTemplate && valid.hostsAndInputs && valid.advanced,
         },
         ...(scheduleValue.scheduleType === SCHEDULE_TYPES.FUTURE
           ? [
@@ -323,15 +298,10 @@ export const JobWizard = ({ rerunData }) => {
                     }}
                   />
                 ),
-                canJumpTo:
-                  isTemplate &&
-                  valid.hostsAndInputs &&
-                  areHostsSelected &&
-                  valid.advanced,
+                canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
                 enableNext:
                   isTemplate &&
                   valid.hostsAndInputs &&
-                  areHostsSelected &&
                   valid.advanced &&
                   valid.schedule,
               },
@@ -353,15 +323,10 @@ export const JobWizard = ({ rerunData }) => {
                     }}
                   />
                 ),
-                canJumpTo:
-                  isTemplate &&
-                  valid.hostsAndInputs &&
-                  areHostsSelected &&
-                  valid.advanced,
+                canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
                 enableNext:
                   isTemplate &&
                   valid.hostsAndInputs &&
-                  areHostsSelected &&
                   valid.advanced &&
                   valid.schedule,
               },
@@ -384,15 +349,10 @@ export const JobWizard = ({ rerunData }) => {
       ),
       nextButtonText: 'Run',
       canJumpTo:
-        isTemplate &&
-        valid.advanced &&
-        valid.hostsAndInputs &&
-        areHostsSelected &&
-        valid.schedule,
+        isTemplate && valid.hostsAndInputs && valid.advanced && valid.schedule,
       enableNext:
         isTemplate &&
         valid.hostsAndInputs &&
-        areHostsSelected &&
         valid.advanced &&
         valid.schedule &&
         !isSubmitting,
@@ -419,8 +379,6 @@ export const JobWizard = ({ rerunData }) => {
           location,
           organization,
           feature: routerSearch?.feature,
-          provider: templateResponse.provider_name,
-          advancedInputs: templateResponse.advanced_template_inputs,
         });
       }}
     />

data/webpack/JobWizard/JobWizard.scss

@@ -1,4 +1,5 @@
 .job-wizard {
+  font-size: var(--pf-global--FontSize--md);
   .wizard-title {
     margin-bottom: 25px;
   }
@@ -134,11 +135,6 @@
       margin-left: 10px;
     }
   }
-  .foreman-search-field {
-    .autocomplete-search-btn {
-      display: none;
-    }
-  }
   .pf-c-radio__body {
     font-size: var(--pf-c-radio__label--FontSize);
   }

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

@@ -7,14 +7,6 @@ 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,11 +161,6 @@ export const testSetup = (selectors, api) => {
         ],
       },
     },
-    HOSTS_API: {
-      response: {
-        subtotal: 3,
-      },
-    },
   });
   return store;
 };

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

@@ -18,15 +18,6 @@ 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') {
@@ -42,13 +33,7 @@ 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,26 +41,11 @@ 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' },
       });
@@ -100,20 +85,8 @@ 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,7 +72,6 @@ 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,15 +26,6 @@ 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}>
@@ -279,11 +270,6 @@ describe('AdvancedFields', () => {
           handleSuccess({
             data: { results: [jobTemplate] },
           });
-      } else if (action.key === 'HOST_IDS') {
-        handleSuccess &&
-          handleSuccess({
-            data: { results: [{ name: 'host1' }, { name: 'host3' }] },
-          });
       }
       return { type: 'get', ...action };
     });
@@ -353,11 +339,6 @@ 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,14 +7,6 @@ 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",
@@ -57,7 +49,7 @@ Array [
         "port": null,
         "preventInvalidHostname": false,
         "protocol": null,
-        "query": "resource=ForemanTasks%3A%3ATask",
+        "query": "resource=ForemanTasks%3A%3ATask&name=some+search",
         "urn": null,
         "username": null,
       },

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

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

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

@@ -1,33 +1,10 @@
-import React, { useEffect } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
+import React from 'react';
 import PropTypes from 'prop-types';
 import SearchBar from 'foremanReact/components/SearchBar';
 import { getControllerSearchProps } from 'foremanReact/constants';
-import { getResults } from 'foremanReact/components/AutoComplete/AutoCompleteActions';
-import { TRIGGERS } from 'foremanReact/components/AutoComplete/AutoCompleteConstants';
 import { hostsController, hostQuerySearchID } from '../../JobWizardConstants';
-import { noop } from '../../../helpers';
 
 export const HostSearch = ({ value, setValue }) => {
-  const searchQuery = useSelector(
-    state => state.autocomplete?.[hostQuerySearchID]?.searchQuery
-  );
-  useEffect(() => {
-    setValue(searchQuery || '');
-  }, [setValue, searchQuery]);
-  const dispatch = useDispatch();
-  const setSearch = newSearchQuery => {
-    dispatch(
-      getResults({
-        url: '/hosts/auto_complete_search',
-        searchQuery: newSearchQuery,
-        controller: 'hostsController',
-        trigger: TRIGGERS.INPUT_CHANGE,
-        id: hostQuerySearchID,
-      })
-    );
-  };
-
   const props = getControllerSearchProps(hostsController, hostQuerySearchID);
   return (
     <div className="foreman-search-field">
@@ -37,12 +14,11 @@ export const HostSearch = ({ value, setValue }) => {
           autocomplete: {
             id: hostQuerySearchID,
             url: '/hosts/auto_complete_search',
-            useKeyShortcuts: true,
+            searchQuery: value,
           },
         }}
-        onSearch={noop}
-        initialQuery={value}
-        onBookmarkClick={search => setSearch(search)}
+        onSearch={null}
+        onSearchChange={search => setValue(search)}
       />
     </div>
   );

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

@@ -30,27 +30,6 @@ 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'));
@@ -172,9 +151,8 @@ describe('Hosts', () => {
 
   it('input fill from url', async () => {
     const inputText = 'test text';
-    const advancedInputText = 'test adv text';
     routerSelectors.selectRouterLocation.mockImplementation(() => ({
-      search: `host_ids%5B%5D=host1&host_ids%5B%5D=host3&feature=test_feature&inputs[plain hidden]=${inputText}&inputs[adv plain hidden]=${advancedInputText}`,
+      search: `feature=test_feature&inputs[plain hidden]=${inputText}`,
     }));
     render(
       <MockedProvider mocks={gqlMock} addTypename={false}>
@@ -197,13 +175,5 @@ 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,24 +1,18 @@
 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(',')})`;
-  const queryParts = [
+    .join(',')}))`;
+  return [
     hosts.length ? hostsSearch : false,
     hostCollections.length ? hostCollectionsSearch : false,
     hostGroups.length ? hostGroupsSearch : false,
-    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';
+    search.length ? `(${search})` : false,
+  ]
+    .filter(Boolean)
+    .join(' or ');
 };

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

@@ -13,7 +13,6 @@ import { FilterIcon } from '@patternfly/react-icons';
 import { debounce } from 'lodash';
 import { get } from 'foremanReact/redux/API';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { resetData } from 'foremanReact/components/AutoComplete/AutoCompleteActions';
 import {
   selectTemplateInputs,
   selectWithKatello,
@@ -31,8 +30,6 @@ import {
   HOST_COLLECTIONS,
   HOST_GROUPS,
   hostMethods,
-  hostsController,
-  hostQuerySearchID,
   HOSTS_API,
   HOSTS_TO_PREVIEW_AMOUNT,
   DEBOUNCE_API,
@@ -54,30 +51,6 @@ 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(
@@ -124,12 +97,8 @@ const HostsAndInputs = ({
   };
 
   const clearSearch = () => {
-    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} />
@@ -141,13 +110,8 @@ const HostsAndInputs = ({
         />
       )}
       <Form>
-        <FormGroup
-          fieldId="host_selection"
-          id="host-selection"
-          helperTextInvalid={errorText}
-          validated={isError ? 'error' : 'default'}
-        >
-          <InputGroup onBlur={() => setWasFocus(true)}>
+        <FormGroup fieldId="host_selection" id="host-selection">
+          <InputGroup>
             <SelectField
               isRequired
               className="target-method-select"
@@ -159,23 +123,7 @@ const HostsAndInputs = ({
                 }
                 return true;
               })}
-              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'));
-                }
-              }}
+              setValue={setHostMethod}
               value={hostMethod}
             />
             {hostMethod === hostMethods.searchQuery && (

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