foreman_remote_execution 7.2.1 → 8.0.0

data/webpack/JobWizard/JobWizardPageRerun.js

@@ -0,0 +1,112 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import URI from 'urijs';
+import { Alert, Title, Divider, Skeleton } from '@patternfly/react-core';
+import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
+import { STATUS } from 'foremanReact/constants';
+import {
+  useForemanOrganization,
+  useForemanLocation,
+} from 'foremanReact/Root/Context/ForemanContext';
+import { JobWizard } from './JobWizard';
+import { JOB_API_KEY } from './JobWizardConstants';
+
+const JobWizardPageRerun = ({
+  match: {
+    params: { id },
+  },
+  location: { search },
+}) => {
+  const uri = new URI(search);
+  const { failed_only: failedOnly } = uri.search(true);
+  const { response, status } = useAPI(
+    'get',
+    `/ui_job_wizard/job_invocation?id=${id}${
+      failedOnly ? '&failed_only=1' : ''
+    }`,
+    JOB_API_KEY
+  );
+  const title = __('Run job');
+  const breadcrumbOptions = {
+    breadcrumbItems: [
+      { caption: __('Jobs'), url: `/jobs` },
+      { caption: title },
+    ],
+  };
+
+  const jobOrganization = response.job_organization;
+  const jobLocation = response.job_location;
+  const currentOrganization = useForemanOrganization();
+  const currentLocation = useForemanLocation();
+
+  return (
+    <PageLayout
+      header={title}
+      breadcrumbOptions={breadcrumbOptions}
+      searchable={false}
+    >
+      <React.Fragment>
+        <Title headingLevel="h2" size="2xl">
+          {title}
+        </Title>
+        {!status || status === STATUS.PENDING ? (
+          <div style={{ height: '400px' }}>
+            <Skeleton
+              height="100%"
+              screenreaderText="Loading large rectangle contents"
+            />
+          </div>
+        ) : (
+          <React.Fragment>
+            {jobOrganization?.id !== currentOrganization?.id && (
+              <Alert
+                className="job-wizard-alert"
+                variant="warning"
+                title={sprintf(
+                  __(
+                    "Current organization %s is different from job's organization %s. This job may run on different hosts than before.",
+                    currentOrganization,
+                    jobOrganization
+                  )
+                )}
+              />
+            )}
+            {jobLocation?.id !== currentLocation?.id && (
+              <Alert
+                className="job-wizard-alert"
+                variant="warning"
+                title={sprintf(
+                  __(
+                    "Current location %s is different from job's location %s. This job may run on different hosts than before.",
+                    currentLocation,
+                    jobLocation
+                  )
+                )}
+              />
+            )}
+            <Divider component="div" />
+            <JobWizard
+              rerunData={{ ...response?.job, inputs: response?.inputs } || null}
+            />
+          </React.Fragment>
+        )}
+      </React.Fragment>
+    </PageLayout>
+  );
+};
+JobWizardPageRerun.propTypes = {
+  match: PropTypes.shape({
+    params: PropTypes.shape({
+      id: PropTypes.string.isRequired,
+    }),
+  }).isRequired,
+  location: PropTypes.shape({
+    search: PropTypes.string,
+  }),
+};
+JobWizardPageRerun.defaultProps = {
+  location: { search: '' },
+};
+export default JobWizardPageRerun;

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

@@ -0,0 +1,79 @@
+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 './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 {};
+});
+
+describe('Job wizard fill', () => {
+  it('fill defaults into fields', async () => {
+    render(
+      <MockedProvider mocks={gqlMock} addTypename={false}>
+        <Provider store={store}>
+          <JobWizardPageRerun
+            match={{
+              params: { id: '57' },
+            }}
+          />
+        </Provider>
+      </MockedProvider>
+    );
+    await act(async () => {
+      fireEvent.click(screen.getByText('Target hosts and inputs'));
+    });
+    await screen.findByLabelText('plain hidden', {
+      selector: 'textarea',
+    });
+
+    expect(
+      screen.getByLabelText('plain hidden', {
+        selector: 'textarea',
+      }).value
+    ).toBe('test command');
+
+    await act(async () => {
+      fireEvent.click(screen.getByText('Advanced fields'));
+    });
+
+    expect(
+      screen.getByLabelText('ssh user', {
+        selector: 'input',
+      }).value
+    ).toBe('ssh user');
+    expect(
+      screen.getByLabelText('effective user', {
+        selector: 'input',
+      }).value
+    ).toBe('Effective user');
+    expect(
+      screen.getByLabelText('timeout to kill', {
+        selector: 'input',
+      }).value
+    ).toBe('1');
+
+    expect(
+      screen.getByLabelText('Concurrency level', {
+        selector: 'input',
+      }).value
+    ).toBe('6');
+    expect(
+      screen.getByLabelText('Time span', {
+        selector: 'input',
+      }).value
+    ).toBe('4');
+  });
+});

data/webpack/JobWizard/__tests__/fixtures.js

@@ -106,6 +106,7 @@ export const testSetup = (selectors, api) => {
   jest.spyOn(selectors, 'selectJobCategories');
   jest.spyOn(selectors, 'selectJobCategoriesStatus');
   jest.spyOn(selectors, 'selectWithKatello');
+  jest.spyOn(selectors, 'selectEffectiveUser');
 
   jest.spyOn(selectors, 'selectTemplateInputs');
   jest.spyOn(selectors, 'selectAdvancedTemplateInputs');
@@ -122,6 +123,10 @@ export const testSetup = (selectors, api) => {
     { ...jobTemplate, id: 2, name: 'template2' },
   ]);
   selectors.selectJobTemplate.mockImplementation(() => jobTemplateResponse);
+
+  selectors.selectEffectiveUser.mockImplementation(
+    () => jobTemplateResponse.effective_user
+  );
   const mockStore = configureMockStore([]);
   const store = mockStore({
     ForemanTasksTask: {
@@ -224,3 +229,71 @@ export const gqlMock = [
     },
   },
 ];
+
+export const jobInvocation = {
+  job: {
+    job_category: 'Ansible Commands',
+    targeting: {
+      user_id: 4,
+      search_query: 'name ~ *',
+      bookmark_id: null,
+      targeting_type: 'static_query',
+      randomized_ordering: true,
+    },
+    triggering: {
+      mode: 'immediate',
+      start_at: null,
+      start_before: null,
+    },
+    ssh_user: 'ssh user',
+    description_format: null,
+    concurrency_control: {
+      level: 6,
+      time_span: 4,
+    },
+    execution_timeout_interval: 1,
+    remote_execution_feature_id: null,
+    template_invocations: [
+      {
+        template_id: 263,
+        effective_user: 'Effective user',
+        input_values: [
+          {
+            template_input_id: 162,
+            value: 'test command',
+          },
+        ],
+      },
+    ],
+    reruns: 57,
+  },
+  job_organization: {
+    id: 5,
+    name: 'ana-praley',
+    created_at: '2021-08-26T13:47:35.655+02:00',
+    updated_at: '2021-08-26T13:48:21.435+02:00',
+    ignore_types: [],
+    description: null,
+    label: 'ana-praley',
+    ancestry: null,
+    title: 'ana-praley',
+    manifest_refreshed_at: null,
+    created_in_katello: true,
+  },
+  job_location: {
+    id: 2,
+    name: 'Default Location',
+    created_at: '2021-08-24T15:32:18.830+02:00',
+    updated_at: '2021-08-24T15:32:18.830+02:00',
+    ignore_types: ['ProvisioningTemplate', 'Hostgroup'],
+    description: null,
+    label: null,
+    ancestry: null,
+    title: 'Default Location',
+    manifest_refreshed_at: null,
+    created_in_katello: false,
+  },
+  inputs: {
+    'inputs[plain hidden]': 'test command',
+  },
+};

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

@@ -45,7 +45,7 @@ describe('Job wizard fill', () => {
       </Provider>
     );
     expect(wrapper.find('.pf-c-wizard__nav-link.pf-m-disabled')).toHaveLength(
-      4
+      5
     );
     selectors.selectJobCategoriesStatus.mockImplementation(() => 'RESOLVED');
     expect(store.getActions()).toMatchSnapshot('initial');
@@ -79,8 +79,12 @@ describe('Job wizard fill', () => {
         </Provider>
       </MockedProvider>
     );
-    const titles = Object.values(WIZARD_TITLES);
-    const steps = [titles[1], titles[0], ...titles.slice(2)]; // the first title is selected at the beggining
+    const steps = [
+      WIZARD_TITLES.hostsAndInputs,
+      WIZARD_TITLES.categoryAndTemplate,
+      WIZARD_TITLES.advanced,
+      WIZARD_TITLES.review,
+    ];
     // eslint-disable-next-line no-unused-vars
     for await (const step of steps) {
       const stepSelector = screen.getByText(step);
@@ -92,5 +96,15 @@ describe('Job wizard fill', () => {
       const stepTitles = screen.getAllByText(step);
       expect(stepTitles).toHaveLength(3);
     }
+    const step = WIZARD_TITLES.typeOfExecution;
+    const stepTitle = screen.getAllByText(step);
+    expect(stepTitle).toHaveLength(1);
+    expect(screen.queryAllByText('Select the type of execution')).toHaveLength(
+      0
+    );
+    await act(async () => {
+      await fireEvent.click(stepTitle[0]);
+    });
+    expect(screen.getAllByText('Select the type of execution')).toHaveLength(1);
   });
 });

data/webpack/JobWizard/autofill.js

@@ -11,6 +11,7 @@ export const useAutoFill = ({
   setHostsSearchQuery,
   setJobTemplateID,
   setTemplateValues,
+  setAdvancedValues,
 }) => {
   const dispatch = useDispatch();
 
@@ -49,15 +50,21 @@ export const useAutoFill = ({
             },
           })
         );
+      }
+      if (rest) {
         Object.keys(rest).forEach(key => {
           const re = /inputs\[(?<input>.*)\]/g;
           const input = re.exec(key)?.groups?.input;
           if (input) {
             setTemplateValues(prev => ({ ...prev, [input]: rest[key] }));
+            setAdvancedValues(prev => ({
+              ...prev,
+              templateValues: { ...prev.templateValues, [input]: rest[key] },
+            }));
           }
         });
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [fills]);
 };

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

@@ -17,14 +17,14 @@ import {
 } from '../../../__tests__/fixtures';
 import { WIZARD_TITLES } from '../../../JobWizardConstants';
 
+const lodash = require('lodash');
+
+lodash.debounce = fn => fn;
 const store = testSetup(selectors, api);
 mockApi(api);
 
-jest.spyOn(selectors, 'selectEffectiveUser');
+jest.useFakeTimers();
 
-selectors.selectEffectiveUser.mockImplementation(
-  () => jobTemplateResponse.effective_user
-);
 describe('AdvancedFields', () => {
   it('should save data between steps for advanced fields', async () => {
     const wrapper = mount(
@@ -49,6 +49,10 @@ describe('AdvancedFields', () => {
       .find('.pf-c-wizard__nav-link')
       .at(2)
       .simulate('click'); // Advanced step
+
+    await act(async () => {
+      jest.runAllTimers(); // to handle pf4 date picker popover
+    });
     const effectiveUserInput = () => wrapper.find('input#effective-user');
     const advancedTemplateInput = () =>
       wrapper.find('.pf-c-form__group-control textarea');
@@ -78,6 +82,9 @@ describe('AdvancedFields', () => {
       .at(2)
       .simulate('click'); // Advanced step
 
+    await act(async () => {
+      jest.runOnlyPendingTimers(); // to handle pf4 date picker popover
+    });
     expect(effectiveUserInput().prop('value')).toEqual(effectiveUesrValue);
     expect(advancedTemplateInput().prop('value')).toEqual(
       advancedTemplateInputValue
@@ -93,10 +100,13 @@ describe('AdvancedFields', () => {
     );
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
+      jest.runOnlyPendingTimers(); // to handle pf4 date picker popover
     });
+
     const searchValue = 'search test';
     const textValue = 'I am a text';
-    const dateValue = '08/07/2021';
+    const dateValue = '2022/06/24';
+    const timeValue = '12:34:56';
     const textField = screen.getByLabelText('adv plain hidden', {
       selector: 'textarea',
     });
@@ -105,9 +115,8 @@ describe('AdvancedFields', () => {
       'adv resource select toggle'
     );
     const searchField = screen.getByPlaceholderText('Filter...');
-    const dateField = screen.getByLabelText('adv date', {
-      selector: 'input',
-    });
+    const dateField = screen.getByLabelText('adv date datepicker');
+    const timeField = screen.getByLabelText('adv date timepicker');
 
     fireEvent.click(selectField);
     await act(async () => {
@@ -115,18 +124,20 @@ describe('AdvancedFields', () => {
       fireEvent.click(screen.getAllByText(WIZARD_TITLES.advanced)[0]); // to remove focus
 
       fireEvent.click(resourceSelectField);
-      await fireEvent.click(screen.getByText('resource2'));
-
-      await fireEvent.change(textField, {
+      fireEvent.click(screen.getByText('resource2'));
+      fireEvent.change(textField, {
         target: { value: textValue },
       });
-
-      await fireEvent.change(searchField, {
+      fireEvent.change(searchField, {
         target: { value: searchValue },
       });
       await fireEvent.change(dateField, {
         target: { value: dateValue },
       });
+      fireEvent.change(timeField, {
+        target: { value: timeValue },
+      });
+      jest.runAllTimers(); // to handle pf4 date picker popover
     });
     expect(
       screen.getByLabelText('adv plain hidden', {
@@ -134,7 +145,8 @@ describe('AdvancedFields', () => {
       }).value
     ).toBe(textValue);
     expect(searchField.value).toBe(searchValue);
-    expect(dateField.value).toBe(dateValue);
+    expect(screen.getByLabelText('adv date datepicker').value).toBe(dateValue);
+    expect(timeField.value).toBe(timeValue);
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.categoryAndTemplate));
     });
@@ -143,11 +155,13 @@ describe('AdvancedFields', () => {
     );
 
     await act(async () => {
-      fireEvent.click(screen.getByText('Advanced fields'));
+      await fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
+      jest.runOnlyPendingTimers();
     });
     expect(textField.value).toBe(textValue);
     expect(searchField.value).toBe(searchValue);
     expect(dateField.value).toBe(dateValue);
+    expect(timeField.value).toBe(timeValue);
     expect(screen.queryAllByText('option 1')).toHaveLength(0);
     expect(screen.queryAllByText('option 2')).toHaveLength(1);
     expect(screen.queryAllByDisplayValue('resource1')).toHaveLength(0);
@@ -162,7 +176,8 @@ describe('AdvancedFields', () => {
       </MockedProvider>
     );
     await act(async () => {
-      fireEvent.click(screen.getByText('Advanced fields'));
+      fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
+      jest.runAllTimers(); // to handle pf4 date picker popover
     });
 
     expect(
@@ -197,6 +212,7 @@ describe('AdvancedFields', () => {
     );
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
+      jest.runAllTimers(); // to handle pf4 date picker popover
     });
 
     const textField = screen.getByLabelText('adv plain hidden', {
@@ -264,6 +280,7 @@ describe('AdvancedFields', () => {
     );
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
+      jest.runAllTimers(); // to handle pf4 date picker popover
     });
     expect(
       screen.getByLabelText('description preview', {
@@ -332,6 +349,7 @@ describe('AdvancedFields', () => {
     );
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
+      jest.runAllTimers(); // to handle pf4 date picker popover
     });
     expect(
       screen.getByLabelText('description preview', {
@@ -351,6 +369,7 @@ describe('AdvancedFields', () => {
     );
     await act(async () => {
       fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
+      jest.runAllTimers(); // to handle pf4 date picker popover
     });
     const resourceSelectField = screen.getByLabelText(
       'adv resource select typeahead input'
@@ -361,7 +380,7 @@ describe('AdvancedFields', () => {
         target: { value: 'some search' },
       });
 
-      await jest.runAllTimers();
+      jest.runAllTimers();
     });
     expect(newStore.getActions()).toMatchSnapshot('resource search');
   });

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

@@ -25,7 +25,7 @@ const ConnectedCategoryAndTemplate = ({
   setJobTemplate,
   category,
   setCategory,
-  isFeature,
+  isCategoryPreselected,
 }) => {
   const dispatch = useDispatch();
 
@@ -44,7 +44,7 @@ const ConnectedCategoryAndTemplate = ({
               default_template: defaultTemplate,
             },
           }) => {
-            if (!isFeature) {
+            if (!isCategoryPreselected) {
               setCategory(defaultCategory || jobCategories[0] || '');
               if (defaultTemplate) setJobTemplate(defaultTemplate);
             }
@@ -106,7 +106,7 @@ ConnectedCategoryAndTemplate.propTypes = {
   setJobTemplate: PropTypes.func.isRequired,
   category: PropTypes.string.isRequired,
   setCategory: PropTypes.func.isRequired,
-  isFeature: PropTypes.bool.isRequired,
+  isCategoryPreselected: PropTypes.bool.isRequired,
 };
 ConnectedCategoryAndTemplate.defaultProps = { jobTemplate: null };
 

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

@@ -108,9 +108,7 @@ const ReviewDetails = ({
   const detailsSecondHalf = [
     {
       label: __('Schedule type'),
-      value: scheduleValue.isFuture
-        ? __('Schedule for future execution')
-        : __('Execute now'),
+      value: scheduleValue.scheduleType,
     },
     {
       label: __('Recurrence'),

data/webpack/JobWizard/steps/Schedule/PurposeField.js

@@ -4,7 +4,7 @@ import { TextInput, FormGroup } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { helpLabel } from '../form/FormHelpers';
 
-export const PurposeField = ({ isDisabled, purpose, setPurpose }) => (
+export const PurposeField = ({ purpose, setPurpose }) => (
   <FormGroup
     label={__('Purpose')}
     labelIcon={helpLabel(
@@ -14,7 +14,6 @@ export const PurposeField = ({ isDisabled, purpose, setPurpose }) => (
     )}
   >
     <TextInput
-      isDisabled={isDisabled}
       aria-label="purpose"
       type="text"
       value={purpose}
@@ -25,7 +24,6 @@ export const PurposeField = ({ isDisabled, purpose, setPurpose }) => (
   </FormGroup>
 );
 PurposeField.propTypes = {
-  isDisabled: PropTypes.bool.isRequired,
   purpose: PropTypes.string.isRequired,
   setPurpose: PropTypes.func.isRequired,
 };

data/webpack/JobWizard/steps/Schedule/QueryType.js

@@ -1,48 +1,41 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import { FormGroup, Radio } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { helpLabel } from '../form/FormHelpers';
 
 export const QueryType = ({ isTypeStatic, setIsTypeStatic }) => (
-  <FormGroup
-    label={__('Query type')}
-    fieldId="query-type"
-    labelIcon={helpLabel(
-      <p>
-        {__('Type has impact on when is the query evaluated to hosts.')}
-        <br />
-        <ul>
-          <li>
-            <b>{__('Static')}</b> -{' '}
-            {__('evaluates just after you submit this form')}
-          </li>
-          <li>
-            <b>{__('Dynamic')}</b> -{' '}
-            {__(
-              "evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it"
-            )}
-          </li>
-        </ul>
-      </p>,
-      'query-type'
-    )}
-  >
-    <Radio
-      isChecked={isTypeStatic}
-      name="query-type"
-      onChange={() => setIsTypeStatic(true)}
-      id="query-type-static"
-      label={__('Static query')}
-    />
-    <Radio
-      isChecked={!isTypeStatic}
-      name="query-type"
-      onChange={() => setIsTypeStatic(false)}
-      id="query-type-dynamic"
-      label={__('Dynamic query')}
-    />
-  </FormGroup>
+  <>
+    <FormGroup
+      label={__('Query type')}
+      fieldId="query-type-static"
+      labelIcon={helpLabel(
+        __('Type has impact on when is the query evaluated to hosts.'),
+        'query-type'
+      )}
+    >
+      <Radio
+        isChecked={isTypeStatic}
+        name="query-type"
+        onChange={() => setIsTypeStatic(true)}
+        id="query-type-static"
+        label={__('Static query')}
+        body={__('evaluates just after you submit this form')}
+      />
+    </FormGroup>
+    <FormGroup fieldId="query-type-dynamic">
+      <Radio
+        isChecked={!isTypeStatic}
+        name="query-type"
+        onChange={() => setIsTypeStatic(false)}
+        id="query-type-dynamic"
+        label={__('Dynamic query')}
+        body={__(
+          "evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it"
+        )}
+      />
+    </FormGroup>
+  </>
 );
 
 QueryType.propTypes = {