foreman_remote_execution 4.5.6 → 4.6.0

data/webpack/JobWizard/steps/AdvancedFields/Fields.js

@@ -1,10 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormGroup, TextInput, Radio } from '@patternfly/react-core';
+import { FormGroup, TextInput } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { helpLabel } from '../form/FormHelpers';
-import { formatter } from '../form/Formatter';
-import { NumberInput } from '../form/NumberInput';
 
 export const EffectiveUserField = ({ value, setValue }) => (
   <FormGroup
@@ -18,7 +16,6 @@ export const EffectiveUserField = ({ value, setValue }) => (
     fieldId="effective-user"
   >
     <TextInput
-      aria-label="effective user"
       autoComplete="effective-user"
       id="effective-user"
       type="text"
@@ -29,25 +26,25 @@ export const EffectiveUserField = ({ value, setValue }) => (
 );
 
 export const TimeoutToKillField = ({ value, setValue }) => (
-  <NumberInput
-    formProps={{
-      label: __('Timeout to kill'),
-      labelIcon: helpLabel(
-        __(
-          'Time in seconds from the start on the remote host after which the job should be killed.'
-        ),
-        'timeout-to-kill'
+  <FormGroup
+    label={__('Timeout to kill')}
+    labelIcon={helpLabel(
+      __(
+        'Time in seconds from the start on the remote host after which the job should be killed.'
       ),
-      fieldId: 'timeout-to-kill',
-    }}
-    inputProps={{
-      value,
-      placeholder: __('For example: 1, 2, 3, 4, 5...'),
-      autoComplete: 'timeout-to-kill',
-      id: 'timeout-to-kill',
-      onChange: newValue => setValue(newValue),
-    }}
-  />
+      'timeout-to-kill'
+    )}
+    fieldId="timeout-to-kill"
+  >
+    <TextInput
+      type="number"
+      value={value}
+      placeholder={__('For example: 1, 2, 3, 4, 5...')}
+      autoComplete="timeout-to-kill"
+      id="timeout-to-kill"
+      onChange={newValue => setValue(newValue)}
+    />
+  </FormGroup>
 );
 
 export const PasswordField = ({ value, setValue }) => (
@@ -59,12 +56,11 @@ export const PasswordField = ({ value, setValue }) => (
       ),
       'password'
     )}
-    fieldId="job-password"
+    fieldId="password"
   >
     <TextInput
-      aria-label="job password"
-      autoComplete="new-password" // to prevent firefox from autofilling the user password
-      id="job-password"
+      autoComplete="password"
+      id="password"
       type="password"
       placeholder="*****"
       value={value}
@@ -85,7 +81,6 @@ export const KeyPassphraseField = ({ value, setValue }) => (
     fieldId="key-passphrase"
   >
     <TextInput
-      aria-label="key passphrase"
       autoComplete="key-passphrase"
       id="key-passphrase"
       type="password"
@@ -108,7 +103,6 @@ export const EffectiveUserPasswordField = ({ value, setValue }) => (
     fieldId="effective-user-password"
   >
     <TextInput
-      aria-label="effective userpassword"
       autoComplete="effective-user-password"
       id="effective-user-password"
       type="password"
@@ -120,89 +114,51 @@ export const EffectiveUserPasswordField = ({ value, setValue }) => (
 );
 
 export const ConcurrencyLevelField = ({ value, setValue }) => (
-  <NumberInput
-    formProps={{
-      label: __('Concurrency level'),
-      labelIcon: helpLabel(
-        __(
-          'Run at most N tasks at a time. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1.'
-        ),
-        'concurrency-level'
+  <FormGroup
+    label={__('Concurrency level')}
+    labelIcon={helpLabel(
+      __(
+        'Run at most N tasks at a time. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1.'
       ),
-      fieldId: 'concurrency-level',
-    }}
-    inputProps={{
-      min: 1,
-      autoComplete: 'concurrency-level',
-      id: 'concurrency-level',
-      placeholder: __('For example: 1, 2, 3, 4, 5...'),
-      value,
-      onChange: newValue => setValue(newValue),
-    }}
-  />
+      'concurrency-level'
+    )}
+    fieldId="concurrency-level"
+  >
+    <TextInput
+      min={1}
+      type="number"
+      autoComplete="concurrency-level"
+      id="concurrency-level"
+      placeholder={__('For example: 1, 2, 3, 4, 5...')}
+      value={value}
+      onChange={newValue => setValue(newValue)}
+    />
+  </FormGroup>
 );
 
 export const TimeSpanLevelField = ({ value, setValue }) => (
-  <NumberInput
-    formProps={{
-      label: __('Time span'),
-      labelIcon: helpLabel(
-        __(
-          'Distribute execution over N seconds. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1.'
-        ),
-        'time-span'
-      ),
-      fieldId: 'time-span',
-    }}
-    inputProps={{
-      min: 1,
-      autoComplete: 'time-span',
-      id: 'time-span',
-      placeholder: __('For example: 1, 2, 3, 4, 5...'),
-      value,
-      onChange: newValue => setValue(newValue),
-    }}
-  />
-);
-
-export const ExecutionOrderingField = ({ isRandomizedOrdering, setValue }) => (
   <FormGroup
-    label={__('Execution ordering')}
-    fieldId="schedule-type"
+    label={__('Time span')}
     labelIcon={helpLabel(
-      <div
-        dangerouslySetInnerHTML={{
-          __html: __(
-            'Execution ordering determines whether the jobs should be executed on hosts in alphabetical order or in randomized order.<br><ul><li><b>Ordered</b> - executes the jobs on hosts in alphabetical order</li><li><b>Randomized</b> - randomizes the order in which jobs are executed on hosts</li></ul>'
-          ),
-        }}
-      />,
-      'effective-user-password'
+      __(
+        'Distribute execution over N seconds. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1.'
+      ),
+      'time-span'
     )}
-    isInline
+    fieldId="time-span"
   >
-    <Radio
-      aria-label="execution order alphabetical"
-      isChecked={!isRandomizedOrdering}
-      name="execution-order"
-      onChange={() => setValue(false)}
-      id="execution-order-alphabetical"
-      label={__('Alphabetical')}
-    />
-    <Radio
-      aria-label="execution order randomized"
-      isChecked={isRandomizedOrdering}
-      name="execution-order"
-      onChange={() => setValue(true)}
-      id="execution-order-randomized"
-      label={__('Randomized')}
+    <TextInput
+      min={1}
+      type="number"
+      autoComplete="time-span"
+      id="time-span"
+      placeholder={__('For example: 1, 2, 3, 4, 5...')}
+      value={value}
+      onChange={newValue => setValue(newValue)}
     />
   </FormGroup>
 );
 
-export const TemplateInputsFields = ({ inputs, value, setValue }) => (
-  <>{inputs?.map(input => formatter(input, value, setValue))}</>
-);
 EffectiveUserField.propTypes = {
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   setValue: PropTypes.func.isRequired,
@@ -223,20 +179,3 @@ ConcurrencyLevelField.propTypes = EffectiveUserField.propTypes;
 ConcurrencyLevelField.defaultProps = EffectiveUserField.defaultProps;
 TimeSpanLevelField.propTypes = EffectiveUserField.propTypes;
 TimeSpanLevelField.defaultProps = EffectiveUserField.defaultProps;
-ExecutionOrderingField.propTypes = {
-  isRandomizedOrdering: PropTypes.bool,
-  setValue: PropTypes.func.isRequired,
-};
-ExecutionOrderingField.defaultProps = {
-  isRandomizedOrdering: false,
-};
-
-TemplateInputsFields.propTypes = {
-  inputs: PropTypes.array.isRequired,
-  value: PropTypes.object,
-  setValue: PropTypes.func.isRequired,
-};
-
-TemplateInputsFields.defaultProps = {
-  value: {},
-};

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

@@ -1,159 +1,25 @@
 import React from 'react';
 import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import * as patternfly from '@patternfly/react-core';
 import { mount } from '@theforeman/test';
-import { fireEvent, screen, render, act } from '@testing-library/react';
-import * as api from 'foremanReact/redux/API';
-import { JobWizard } from '../../../JobWizard';
-import * as selectors from '../../../JobWizardSelectors';
-import {
-  jobTemplateResponse as jobTemplate,
-  testSetup,
-  mockApi,
-} from '../../../__tests__/fixtures';
-import { WIZARD_TITLES } from '../../../JobWizardConstants';
-
-const store = testSetup(selectors, api);
-mockApi(api);
-
-jest.spyOn(selectors, 'selectEffectiveUser');
-
-selectors.selectEffectiveUser.mockImplementation(
-  () => jobTemplate.effective_user
-);
+import { AdvancedFields } from '../AdvancedFields';
+
+jest.spyOn(patternfly, 'FormGroup');
+patternfly.FormGroup.mockImplementation(props => (
+  <div>{props.navAriaLabel}</div>
+));
+const mockStore = configureMockStore([]);
+const store = mockStore({
+  JOB_TEMPLATE: { response: { effective_user: { overridable: true } } },
+});
 describe('AdvancedFields', () => {
-  it('should save data between steps for advanced fields', async () => {
-    const wrapper = mount(
-      <Provider store={store}>
-        <JobWizard advancedValues={{}} setAdvancedValues={jest.fn()} />
-      </Provider>
-    );
-    // setup
-    wrapper.find('.pf-c-button.pf-c-select__toggle-button').simulate('click');
-    wrapper
-      .find('.pf-c-select__menu-item')
-      .first()
-      .simulate('click');
-
-    // test
-    expect(wrapper.find('.pf-c-wizard__nav-link.pf-m-disabled')).toHaveLength(
-      0
-    );
-    wrapper
-      .find('.pf-c-wizard__nav-link')
-      .at(2)
-      .simulate('click'); // Advanced step
-    const effectiveUserInput = () => wrapper.find('input#effective-user');
-    const advancedTemplateInput = () =>
-      wrapper.find('.pf-c-form__group-control textarea');
-    const effectiveUesrValue = 'effective user new value';
-    const advancedTemplateInputValue = 'advanced input new value';
-    effectiveUserInput().getDOMNode().value = effectiveUesrValue;
-
-    effectiveUserInput().simulate('change');
-    wrapper.update();
-    advancedTemplateInput().getDOMNode().value = advancedTemplateInputValue;
-    advancedTemplateInput().simulate('change');
-    expect(effectiveUserInput().prop('value')).toEqual(effectiveUesrValue);
-    expect(advancedTemplateInput().prop('value')).toEqual(
-      advancedTemplateInputValue
-    );
-
-    wrapper
-      .find('.pf-c-wizard__nav-link')
-      .at(1)
-      .simulate('click');
-
-    expect(wrapper.find('.pf-c-wizard__nav-link.pf-m-current').text()).toEqual(
-      'Target hosts and inputs'
-    );
-    wrapper
-      .find('.pf-c-wizard__nav-link')
-      .at(2)
-      .simulate('click'); // Advanced step
-
-    expect(effectiveUserInput().prop('value')).toEqual(effectiveUesrValue);
-    expect(advancedTemplateInput().prop('value')).toEqual(
-      advancedTemplateInputValue
-    );
-  });
-  it('fill template fields', async () => {
-    render(
+  it('rendring', () => {
+    const component = mount(
       <Provider store={store}>
-        <JobWizard />
+        <AdvancedFields advancedValues={{}} setAdvancedValues={jest.fn()} />
       </Provider>
     );
-    await act(async () => {
-      fireEvent.click(screen.getByText(WIZARD_TITLES.advanced));
-    });
-    const searchValue = 'search test';
-    const textValue = 'I am a text';
-    const dateValue = '08/07/2021';
-    const textField = screen.getByLabelText('adv plain hidden', {
-      selector: 'textarea',
-    });
-    const selectField = screen.getByText('option 1');
-    const searchField = screen.getByPlaceholderText('Filter...');
-    const dateField = screen.getByLabelText('adv date', {
-      selector: 'input',
-    });
-
-    fireEvent.click(selectField);
-    await act(async () => {
-      await fireEvent.click(screen.getByText('option 2'));
-      fireEvent.click(screen.getAllByText(WIZARD_TITLES.advanced)[0]); // to remove focus
-      await fireEvent.change(textField, {
-        target: { value: textValue },
-      });
-
-      await fireEvent.change(searchField, {
-        target: { value: searchValue },
-      });
-      await fireEvent.change(dateField, {
-        target: { value: dateValue },
-      });
-    });
-    expect(
-      screen.getByLabelText('adv plain hidden', {
-        selector: 'textarea',
-      }).value
-    ).toBe(textValue);
-    expect(searchField.value).toBe(searchValue);
-    expect(dateField.value).toBe(dateValue);
-    await act(async () => {
-      fireEvent.click(screen.getByText(WIZARD_TITLES.categoryAndTemplate));
-    });
-    expect(screen.getAllByText(WIZARD_TITLES.categoryAndTemplate)).toHaveLength(
-      3
-    );
-
-    await act(async () => {
-      fireEvent.click(screen.getByText('Advanced Fields'));
-    });
-    expect(textField.value).toBe(textValue);
-    expect(searchField.value).toBe(searchValue);
-    expect(dateField.value).toBe(dateValue);
-    expect(screen.queryAllByText('option 1')).toHaveLength(0);
-    expect(screen.queryAllByText('option 2')).toHaveLength(1);
-  });
-  it('fill defaults into fields', async () => {
-    render(
-      <Provider store={store}>
-        <JobWizard />
-      </Provider>
-    );
-    await act(async () => {
-      fireEvent.click(screen.getByText('Advanced Fields'));
-    });
-
-    expect(
-      screen.getByLabelText('effective user', {
-        selector: 'input',
-      }).value
-    ).toBe('default effective user');
-    expect(
-      screen.getByLabelText('timeout to kill', {
-        selector: 'input',
-      }).value
-    ).toBe('2');
+    expect(component).toMatchSnapshot();
   });
 });

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

@@ -0,0 +1,249 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AdvancedFields rendring 1`] = `
+<Provider
+  store={
+    Object {
+      "clearActions": [Function],
+      "dispatch": [Function],
+      "getActions": [Function],
+      "getState": [Function],
+      "replaceReducer": [Function],
+      "subscribe": [Function],
+    }
+  }
+>
+  <AdvancedFields
+    advancedValues={Object {}}
+    setAdvancedValues={[MockFunction]}
+  >
+    <Title
+      className="advanced-fields-title"
+      headingLevel="h2"
+    >
+      <h2
+        className="pf-c-title pf-m-xl advanced-fields-title"
+      >
+        Advanced Fields
+      </h2>
+    </Title>
+    <Form>
+      <form
+        className="pf-c-form"
+        noValidate={true}
+      >
+        <EffectiveUserField
+          setValue={[Function]}
+          value=""
+        >
+          <mockConstructor
+            fieldId="effective-user"
+            label="Effective user"
+            labelIcon={
+              <Popover
+                aria-label="help-text"
+                bodyContent="A user to be used for executing the script. If it differs from the SSH user, su or sudo is used to switch the accounts."
+                id="effective-user-help"
+              >
+                <button
+                  aria-label="open-help-tooltip-button"
+                  className="pf-c-form__group-label-help"
+                  onClick={[Function]}
+                >
+                  <HelpIcon
+                    color="currentColor"
+                    noVerticalAlign={true}
+                    size="sm"
+                  />
+                </button>
+              </Popover>
+            }
+          >
+            <div />
+          </mockConstructor>
+        </EffectiveUserField>
+        <TimeoutToKillField
+          setValue={[Function]}
+          value=""
+        >
+          <mockConstructor
+            fieldId="timeout-to-kill"
+            label="Timeout to kill"
+            labelIcon={
+              <Popover
+                aria-label="help-text"
+                bodyContent="Time in seconds from the start on the remote host after which the job should be killed."
+                id="timeout-to-kill-help"
+              >
+                <button
+                  aria-label="open-help-tooltip-button"
+                  className="pf-c-form__group-label-help"
+                  onClick={[Function]}
+                >
+                  <HelpIcon
+                    color="currentColor"
+                    noVerticalAlign={true}
+                    size="sm"
+                  />
+                </button>
+              </Popover>
+            }
+          >
+            <div />
+          </mockConstructor>
+        </TimeoutToKillField>
+        <PasswordField
+          setValue={[Function]}
+          value=""
+        >
+          <mockConstructor
+            fieldId="password"
+            label="Password"
+            labelIcon={
+              <Popover
+                aria-label="help-text"
+                bodyContent="Password is stored encrypted in DB until the job finishes. For future or recurring executions, it is removed after the last execution."
+                id="password-help"
+              >
+                <button
+                  aria-label="open-help-tooltip-button"
+                  className="pf-c-form__group-label-help"
+                  onClick={[Function]}
+                >
+                  <HelpIcon
+                    color="currentColor"
+                    noVerticalAlign={true}
+                    size="sm"
+                  />
+                </button>
+              </Popover>
+            }
+          >
+            <div />
+          </mockConstructor>
+        </PasswordField>
+        <KeyPassphraseField
+          setValue={[Function]}
+          value=""
+        >
+          <mockConstructor
+            fieldId="key-passphrase"
+            label="Private key passphrase"
+            labelIcon={
+              <Popover
+                aria-label="help-text"
+                bodyContent="Key passphrase is only applicable for SSH provider. Other providers ignore this field. Passphrase is stored encrypted in DB until the job finishes. For future or recurring executions, it is removed after the last execution."
+                id="key-passphrase-help"
+              >
+                <button
+                  aria-label="open-help-tooltip-button"
+                  className="pf-c-form__group-label-help"
+                  onClick={[Function]}
+                >
+                  <HelpIcon
+                    color="currentColor"
+                    noVerticalAlign={true}
+                    size="sm"
+                  />
+                </button>
+              </Popover>
+            }
+          >
+            <div />
+          </mockConstructor>
+        </KeyPassphraseField>
+        <EffectiveUserPasswordField
+          setValue={[Function]}
+          value=""
+        >
+          <mockConstructor
+            fieldId="effective-user-password"
+            label="Effective user password"
+            labelIcon={
+              <Popover
+                aria-label="help-text"
+                bodyContent="Effective user password is only applicable for SSH provider. Other providers ignore this field. Password is stored encrypted in DB until the job finishes. For future or recurring executions, it is removed after the last execution."
+                id="effective-user-password-help"
+              >
+                <button
+                  aria-label="open-help-tooltip-button"
+                  className="pf-c-form__group-label-help"
+                  onClick={[Function]}
+                >
+                  <HelpIcon
+                    color="currentColor"
+                    noVerticalAlign={true}
+                    size="sm"
+                  />
+                </button>
+              </Popover>
+            }
+          >
+            <div />
+          </mockConstructor>
+        </EffectiveUserPasswordField>
+        <ConcurrencyLevelField
+          setValue={[Function]}
+          value=""
+        >
+          <mockConstructor
+            fieldId="concurrency-level"
+            label="Concurrency level"
+            labelIcon={
+              <Popover
+                aria-label="help-text"
+                bodyContent="Run at most N tasks at a time. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
+                id="concurrency-level-help"
+              >
+                <button
+                  aria-label="open-help-tooltip-button"
+                  className="pf-c-form__group-label-help"
+                  onClick={[Function]}
+                >
+                  <HelpIcon
+                    color="currentColor"
+                    noVerticalAlign={true}
+                    size="sm"
+                  />
+                </button>
+              </Popover>
+            }
+          >
+            <div />
+          </mockConstructor>
+        </ConcurrencyLevelField>
+        <TimeSpanLevelField
+          setValue={[Function]}
+          value=""
+        >
+          <mockConstructor
+            fieldId="time-span"
+            label="Time span"
+            labelIcon={
+              <Popover
+                aria-label="help-text"
+                bodyContent="Distribute execution over N seconds. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
+                id="time-span-help"
+              >
+                <button
+                  aria-label="open-help-tooltip-button"
+                  className="pf-c-form__group-label-help"
+                  onClick={[Function]}
+                >
+                  <HelpIcon
+                    color="currentColor"
+                    noVerticalAlign={true}
+                    size="sm"
+                  />
+                </button>
+              </Popover>
+            }
+          >
+            <div />
+          </mockConstructor>
+        </TimeSpanLevelField>
+      </form>
+    </Form>
+  </AdvancedFields>
+</Provider>
+`;

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

@@ -1,11 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Text, TextVariants, Form, Alert } from '@patternfly/react-core';
+import { Title, Text, TextVariants, Form, Alert } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { SelectField } from '../form/SelectField';
 import { GroupedSelectField } from '../form/GroupedSelectField';
-import { WizardTitle } from '../form/WizardTitle';
-import { WIZARD_TITLES } from '../../JobWizardConstants';
 
 export const CategoryAndTemplate = ({
   jobCategories,
@@ -42,7 +40,7 @@ export const CategoryAndTemplate = ({
   const isError = !!(categoryError || allTemplatesError || templateError);
   return (
     <>
-      <WizardTitle title={WIZARD_TITLES.categoryAndTemplate} />
+      <Title headingLevel="h2">{__('Category and Template')}</Title>
       <Text component={TextVariants.p}>{__('All fields are required.')}</Text>
       <Form>
         <SelectField