foreman_remote_execution 9.0.1 → 10.0.0

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Chip, ChipGroup, Button } from '@patternfly/react-core';
-import { translate as __ } from 'foremanReact/common/I18n';
+import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { hostMethods } from '../../JobWizardConstants';
 
 const SelectedChip = ({ selected, setSelected, categoryName }) => {
@@ -10,19 +10,33 @@ const SelectedChip = ({ selected, setSelected, categoryName }) => {
       oldSelected.filter(({ id }) => id !== itemToRemove)
     );
   };
+  const NUM_CHIPS = 3;
   return (
-    <ChipGroup className="hosts-chip-group" categoryName={categoryName}>
-      {selected.map(({ name, id }, index) => (
-        <Chip
-          key={index}
-          id={`${categoryName}-${id}`}
-          onClick={() => deleteItem(id)}
-          closeBtnAriaLabel={`Close ${name}`}
-        >
-          {name}
-        </Chip>
-      ))}
-    </ChipGroup>
+    <>
+      <ChipGroup
+        className="hosts-chip-group"
+        categoryName={categoryName}
+        isClosable
+        closeBtnAriaLabel="Remove all"
+        collapsedText={sprintf(__('%s more'), selected.length - NUM_CHIPS)}
+        numChips={NUM_CHIPS}
+        onClick={() => {
+          setSelected(() => []);
+        }}
+      >
+        {selected.map(({ name, id }, index) => (
+          <Chip
+            key={index}
+            id={`${categoryName}-${id}`}
+            onClick={() => deleteItem(id)}
+            closeBtnAriaLabel={`Remove ${name}`}
+          >
+            {name}
+          </Chip>
+        ))}
+      </ChipGroup>
+      {selected.length > 0 && <br />}
+    </>
   );
 };
 
@@ -75,7 +89,7 @@ export const SelectedChips = ({
       />
       {showClear && (
         <Button variant="link" className="clear-chips" onClick={clearAll}>
-          {__('Clear filters')}
+          {__('Clear all filters')}
         </Button>
       )}
     </div>

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'));
@@ -59,7 +80,7 @@ describe('Hosts', () => {
     expect(screen.queryAllByText('host1')).toHaveLength(1);
     expect(screen.queryAllByText('host2')).toHaveLength(1);
     expect(screen.queryAllByText('host3')).toHaveLength(0);
-    const chip1 = screen.getByRole('button', { name: 'Close host1 host1' });
+    const chip1 = screen.getByRole('button', { name: 'Remove host1 host1' });
     await act(async () => {
       fireEvent.click(chip1);
     });
@@ -70,7 +91,7 @@ describe('Hosts', () => {
     expect(screen.queryAllByText('host_collection1')).toHaveLength(1);
 
     await act(async () => {
-      fireEvent.click(screen.getByText('Category and Template'));
+      fireEvent.click(screen.getByText('Category and template'));
     });
     await act(async () => {
       fireEvent.click(screen.getByText('Target hosts and inputs'));
@@ -79,7 +100,7 @@ describe('Hosts', () => {
     expect(screen.queryAllByText('host_group1')).toHaveLength(1);
 
     await act(async () => {
-      fireEvent.click(screen.getByText('Clear filters'));
+      fireEvent.click(screen.getByText('Clear all filters'));
     });
 
     expect(screen.queryAllByText('host2')).toHaveLength(0);
@@ -107,6 +128,13 @@ describe('Hosts', () => {
     expect(screen.queryAllByText('Host groups')).toHaveLength(1);
     expect(screen.queryAllByText('Search query')).toHaveLength(1);
     expect(screen.queryAllByText('Host collections')).toHaveLength(0);
+
+    await act(async () => {
+      fireEvent.click(
+        // Close the select
+        screen.getByText('Hosts', { selector: '.pf-c-select__toggle-text' })
+      );
+    });
   });
   it('Host fill list from url', async () => {
     routerSelectors.selectRouterLocation.mockImplementation(() => ({
@@ -151,8 +179,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 +204,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

@@ -51,6 +51,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(
@@ -99,6 +123,9 @@ const HostsAndInputs = ({
   const clearSearch = () => {
     setHostsSearchQuery('');
   };
+  const [errorText, setErrorText] = useState(
+    __('Please select at least one host')
+  );
   return (
     <div className="target-hosts-and-inputs">
       <WizardTitle title={WIZARD_TITLES.hostsAndInputs} />
@@ -110,8 +137,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"
@@ -123,7 +155,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/ReviewDetails/ReviewDetails.test.js

@@ -0,0 +1,117 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { render, fireEvent, screen, act } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import * as APIHooks from 'foremanReact/common/hooks/API/APIHooks';
+import * as api from 'foremanReact/redux/API';
+
+import JobWizardPageRerun from '../../JobWizardPageRerun';
+import * as selectors from '../../JobWizardSelectors';
+import {
+  testSetup,
+  mockApi,
+  gqlMock,
+  jobInvocation,
+} from '../../__tests__/fixtures';
+
+const store = testSetup(selectors, api);
+mockApi(api);
+jest.spyOn(APIHooks, 'useAPI');
+APIHooks.useAPI.mockImplementation((action, url) => {
+  if (url === '/ui_job_wizard/job_invocation?id=57') {
+    return { response: jobInvocation, status: 'RESOLVED' };
+  }
+  return {};
+});
+jest.useFakeTimers();
+
+describe('ReviewDetails', () => {
+  it('should call goToStepByName function when StepButton is clicked', async () => {
+    render(
+      <MockedProvider mocks={gqlMock} addTypename={false}>
+        <Provider store={store}>
+          <JobWizardPageRerun
+            match={{
+              params: { id: '57' },
+            }}
+          />
+        </Provider>
+      </MockedProvider>
+    );
+
+    act(() => {
+      fireEvent.click(screen.getByText('Type of execution'));
+    });
+    act(() => {
+      fireEvent.click(screen.getByText('Future execution'));
+
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover useTimer
+    });
+    act(() => {
+      fireEvent.click(screen.getByRole('button', { name: 'Future execution' }));
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover useTimer
+    });
+
+    const newStartAtDate = '2030/03/12';
+    const newStartAtTime = '14:27';
+    const startsAtDateField = () =>
+      screen.getByLabelText('starts at datepicker');
+    const startsAtTimeField = () =>
+      screen.getByLabelText('starts at timepicker');
+
+    await act(async () => {
+      await fireEvent.change(startsAtDateField(), {
+        target: { value: newStartAtDate },
+      });
+      fireEvent.change(startsAtTimeField(), {
+        target: { value: newStartAtTime },
+      });
+      jest.advanceTimersByTime(1000);
+    });
+
+    act(() => {
+      fireEvent.click(screen.getByText('Review details'));
+    });
+    expect(screen.getAllByText('Review details')).toHaveLength(3);
+    fireEvent.click(
+      screen.getByText('Job template', {
+        selector: '.pf-c-button',
+      })
+    );
+    expect(screen.getAllByText('Category and template')).toHaveLength(3);
+
+    await act(async () => {
+      fireEvent.click(screen.getByText('Review details'));
+      jest.advanceTimersByTime(1000);
+    });
+    act(() => {
+      fireEvent.click(
+        screen.getByText('Target hosts', {
+          selector: '.pf-c-button',
+        })
+      );
+      jest.advanceTimersByTime(1000); // to handle pf4 date picker popover useTimer
+    });
+    expect(screen.getAllByText('Target hosts and inputs')).toHaveLength(3);
+    act(() => {
+      fireEvent.click(screen.getByText('Review details'));
+    });
+    act(() => {
+      fireEvent.click(
+        screen.getByText('Advanced fields', {
+          selector: '.pf-c-button',
+        })
+      );
+      jest.advanceTimersByTime(1000);
+    });
+    expect(screen.getAllByText('Advanced fields')).toHaveLength(3);
+
+    act(() => {
+      fireEvent.click(screen.getByText('Review details'));
+    });
+    act(() => {
+      fireEvent.click(screen.getByText('Recurrence'));
+    });
+    expect(screen.getAllByText('Schedule')).toHaveLength(3);
+  });
+});

data/webpack/JobWizard/steps/ReviewDetails/helpers.js

@@ -0,0 +1,43 @@
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
+import { getWeekDays } from '../Schedule/RepeatWeek';
+import { repeatTypes } from '../../JobWizardConstants';
+
+export const parseEnd = (ends, isNeverEnds, repeatAmount) => {
+  if (isNeverEnds) {
+    return __('Never');
+  }
+  if (ends) {
+    const endsDate = new Date(ends);
+    return endsDate.toString();
+  }
+  return sprintf(__('After %s occurences'), repeatAmount);
+};
+
+export const parseRepeat = (repeatType, repeatData) => {
+  switch (repeatType) {
+    case repeatTypes.hourly:
+      return sprintf(__('Every hour at minute %s'), repeatData.minute);
+    case repeatTypes.daily:
+      return sprintf(__('Every day at %s'), repeatData.at);
+    case repeatTypes.weekly: {
+      const daysKeys = Object.keys(repeatData.daysOfWeek).filter(
+        k => repeatData.daysOfWeek[k]
+      );
+      const days = getWeekDays()
+        .filter((d, index) => index in daysKeys)
+        .join(', ');
+      return sprintf(__('Every week on %s at %s'), days, repeatData.at);
+    }
+    case repeatTypes.monthly:
+      return sprintf(
+        __('Every month on %s at %s'),
+        repeatData.days,
+        repeatData.at
+      );
+    case repeatTypes.cronline:
+      return `${__('Cron line')} - ${repeatData.cronline}`;
+
+    default:
+      return '';
+  }
+};