foreman_remote_execution 4.5.1 → 4.5.2

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

@@ -8,6 +8,7 @@ export const helpLabel = (text, id) => {
   return (
     <Popover id={`${id}-help`} bodyContent={text} aria-label="help-text">
       <button
+        type="button"
         aria-label={__('open-help-tooltip-button')}
         onClick={e => e.preventDefault()}
         className="pf-c-form__group-label-help"

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

@@ -0,0 +1,149 @@
+import React, { useEffect } from 'react';
+import { useSelector } from 'react-redux';
+import { FormGroup, TextInput, TextArea } from '@patternfly/react-core';
+import PropTypes from 'prop-types';
+import SearchBar from 'foremanReact/components/SearchBar';
+import { helpLabel } from './FormHelpers';
+import { SelectField } from './SelectField';
+
+const TemplateSearchField = ({
+  name,
+  controller,
+  labelText,
+  required,
+  defaultValue,
+  setValue,
+  values,
+}) => {
+  const searchQuery = useSelector(
+    state => state.autocomplete?.[name]?.searchQuery
+  );
+  useEffect(() => {
+    setValue({ ...values, [name]: searchQuery });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [searchQuery]);
+  return (
+    <FormGroup
+      label={name}
+      labelIcon={helpLabel(labelText, name)}
+      fieldId={name}
+      isRequired={required}
+      className="foreman-search-field"
+    >
+      <SearchBar
+        initialQuery={defaultValue}
+        data={{
+          controller,
+          autocomplete: {
+            id: name,
+            url: `/${controller}/auto_complete_search`,
+            useKeyShortcuts: true,
+          },
+        }}
+        onSearch={() => null}
+      />
+    </FormGroup>
+  );
+};
+
+export const formatter = (input, values, setValue) => {
+  const isSelectType = !!input?.options;
+  const inputType = input.value_type;
+  const isTextType = inputType === 'plain' || !inputType; // null defaults to plain
+
+  const { name, required, hidden_value: hidden } = input;
+  const labelText = input.description;
+  const value = values[name];
+
+  if (isSelectType) {
+    const options = input.options.split(/\r?\n/).map(option => option.trim());
+    return (
+      <SelectField
+        aria-label={name}
+        key={name}
+        isRequired={required}
+        label={name}
+        fieldId={name}
+        options={options}
+        labelIcon={helpLabel(labelText, name)}
+        value={value}
+        setValue={newValue => setValue({ ...values, [name]: newValue })}
+      />
+    );
+  }
+  if (isTextType) {
+    return (
+      <FormGroup
+        key={name}
+        label={name}
+        labelIcon={helpLabel(labelText, name)}
+        fieldId={name}
+        isRequired={required}
+      >
+        <TextArea
+          aria-label={name}
+          className={hidden ? 'masked-input' : null}
+          required={required}
+          rows={2}
+          id={name}
+          value={value}
+          onChange={newValue => setValue({ ...values, [name]: newValue })}
+        />
+      </FormGroup>
+    );
+  }
+  if (inputType === 'date') {
+    return (
+      <FormGroup
+        key={name}
+        label={name}
+        labelIcon={helpLabel(labelText, name)}
+        fieldId={name}
+        isRequired={required}
+      >
+        <TextInput
+          aria-label={name}
+          placeholder="YYYY-mm-dd HH:MM"
+          className={hidden ? 'masked-input' : null}
+          required={required}
+          id={name}
+          type="text"
+          value={value}
+          onChange={newValue => setValue({ ...values, [name]: newValue })}
+        />
+      </FormGroup>
+    );
+  }
+  if (inputType === 'search') {
+    const controller = input.resource_type;
+    // TODO: get text from redux autocomplete
+    return (
+      <TemplateSearchField
+        key={name}
+        name={name}
+        defaultValue={value}
+        controller={controller}
+        labelText={labelText}
+        required={required}
+        setValue={setValue}
+        values={values}
+      />
+    );
+  }
+
+  return null;
+};
+
+TemplateSearchField.propTypes = {
+  name: PropTypes.string.isRequired,
+  controller: PropTypes.string.isRequired,
+  labelText: PropTypes.string,
+  required: PropTypes.bool.isRequired,
+  defaultValue: PropTypes.string,
+  setValue: PropTypes.func.isRequired,
+  values: PropTypes.object.isRequired,
+};
+TemplateSearchField.defaultProps = {
+  labelText: null,
+  defaultValue: '',
+};

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

@@ -0,0 +1,33 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { FormGroup, TextInput, ValidatedOptions } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export const NumberInput = ({ formProps, inputProps }) => {
+  const [validated, setValidated] = useState();
+  return (
+    <FormGroup
+      {...formProps}
+      helperTextInvalid={__('Has to be a number')}
+      validated={validated}
+    >
+      <TextInput
+        type="text"
+        {...inputProps}
+        onChange={newValue => {
+          setValidated(
+            /^\d+$/.test(newValue) || newValue === ''
+              ? ValidatedOptions.noval
+              : ValidatedOptions.error
+          );
+          inputProps.onChange(newValue);
+        }}
+      />
+    </FormGroup>
+  );
+};
+
+NumberInput.propTypes = {
+  formProps: PropTypes.object.isRequired,
+  inputProps: PropTypes.object.isRequired,
+};

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

@@ -8,6 +8,8 @@ export const SelectField = ({
   options,
   value,
   setValue,
+  labelIcon,
+  isRequired,
   ...props
 }) => {
   const onSelect = (event, selection) => {
@@ -16,7 +18,12 @@ export const SelectField = ({
   };
   const [isOpen, setIsOpen] = useState(false);
   return (
-    <FormGroup label={label} fieldId={fieldId}>
+    <FormGroup
+      label={label}
+      fieldId={fieldId}
+      labelIcon={labelIcon}
+      isRequired={isRequired}
+    >
       <Select
         selections={value}
         onSelect={onSelect}
@@ -35,14 +42,19 @@ export const SelectField = ({
   );
 };
 SelectField.propTypes = {
-  label: PropTypes.string.isRequired,
+  label: PropTypes.string,
   fieldId: PropTypes.string.isRequired,
   options: PropTypes.array,
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   setValue: PropTypes.func.isRequired,
+  labelIcon: PropTypes.node,
+  isRequired: PropTypes.bool,
 };
 
 SelectField.defaultProps = {
+  label: null,
   options: [],
+  labelIcon: null,
   value: null,
+  isRequired: false,
 };

data/webpack/JobWizard/steps/form/__tests__/Formatter.test.js.example

@@ -0,0 +1,76 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import * as patternfly from '@patternfly/react-core';
+import { mount, shallow } from '@theforeman/test';
+import { formatter } from '../Formatter';
+
+jest.spyOn(patternfly, 'Select');
+jest.spyOn(patternfly, 'SelectOption');
+jest.spyOn(patternfly, 'FormGroup');
+patternfly.Select.mockImplementation(props => <div props={props} />);
+patternfly.SelectOption.mockImplementation(props => <div props={props} />);
+patternfly.FormGroup.mockImplementation(props => <div props={props} />);
+const mockStore = configureMockStore([]);
+const store = mockStore({});
+
+describe('formatter', () => {
+  it('render date input', () => {
+    const props = {
+      name: 'date adv',
+      required: false,
+      options: '',
+      advanced: true,
+      value_type: 'date',
+      resource_type: 'ansible_roles',
+      default: '',
+      hidden_value: false,
+    };
+    expect(shallow(formatter(props, {}, jest.fn()))).toMatchSnapshot();
+  });
+  it('render text input', () => {
+    const props = {
+      name: 'plain adv hidden',
+      required: true,
+      description: 'some Description',
+      options: '',
+      advanced: true,
+      value_type: 'plain',
+      resource_type: 'ansible_roles',
+      default: 'Default val',
+      hidden_value: true,
+    };
+    expect(shallow(formatter(props, {}, jest.fn()))).toMatchSnapshot();
+  });
+  it('render select input', () => {
+    const props = {
+      name: 'adv plain search',
+      required: false,
+      input_type: 'user',
+      options: 'option 1\r\noption 2\r\noption 3\r\noption 4',
+      advanced: true,
+      value_type: 'plain',
+      resource_type: 'ansible_roles',
+      default: '',
+      hidden_value: false,
+    };
+    expect(shallow(formatter(props, {}, jest.fn()))).toMatchSnapshot();
+  });
+  it('render search input', () => {
+    const props = {
+      name: 'search adv',
+      required: false,
+      options: '',
+      advanced: true,
+      value_type: 'search',
+      resource_type: 'foreman_tasks/tasks',
+      default: '',
+      hidden_value: false,
+    };
+    expect(
+      mount(
+        <Provider store={store}>{formatter(props, {}, jest.fn())}</Provider>
+      )
+    ).toMatchSnapshot();
+  });
+});

data/webpack/__mocks__/foremanReact/components/SearchBar.js

@@ -1,2 +1,19 @@
-const SearchBar = () => jest.fn();
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const SearchBar = ({ onChange }) => (
+  <input
+    className="foreman-search"
+    onChange={onChange}
+    placeholder="Filter..."
+  />
+);
 export default SearchBar;
+
+SearchBar.propTypes = {
+  onChange: PropTypes.func,
+};
+
+SearchBar.defaultProps = {
+  onChange: () => null,
+};

data/webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/TargetingHostsPage.test.js.snap

@@ -27,6 +27,7 @@ exports[`TargetingHostsPage renders 1`] = `
             "controller": "hosts",
           }
         }
+        onChange={[Function]}
         onSearch={[Function]}
       />
     </Col>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.5.2
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -404,27 +404,30 @@ files:
 - webpack/JobWizard/JobWizard.scss
 - webpack/JobWizard/JobWizardConstants.js
 - webpack/JobWizard/JobWizardSelectors.js
-- webpack/JobWizard/__tests__/JobWizard.test.js
-- webpack/JobWizard/__tests__/__snapshots__/JobWizard.test.js.snap
 - webpack/JobWizard/__tests__/__snapshots__/integration.test.js.snap
 - webpack/JobWizard/__tests__/fixtures.js
 - webpack/JobWizard/__tests__/integration.test.js
 - webpack/JobWizard/index.js
 - webpack/JobWizard/steps/AdvancedFields/AdvancedFields.js
+- webpack/JobWizard/steps/AdvancedFields/DescriptionField.js
 - webpack/JobWizard/steps/AdvancedFields/Fields.js
 - webpack/JobWizard/steps/AdvancedFields/__tests__/AdvancedFields.test.js
-- webpack/JobWizard/steps/AdvancedFields/__tests__/__snapshots__/AdvancedFields.test.js.snap
+- webpack/JobWizard/steps/AdvancedFields/__tests__/DescriptionField.test.js
 - webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.js
 - webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.test.js
-- webpack/JobWizard/steps/CategoryAndTemplate/__snapshots__/CategoryAndTemplate.test.js.snap
 - webpack/JobWizard/steps/CategoryAndTemplate/index.js
+- webpack/JobWizard/steps/Schedule/QueryType.js
+- webpack/JobWizard/steps/Schedule/RepeatOn.js
+- webpack/JobWizard/steps/Schedule/ScheduleType.js
+- webpack/JobWizard/steps/Schedule/StartEndDates.js
+- webpack/JobWizard/steps/Schedule/__tests__/StartEndDates.test.js
+- webpack/JobWizard/steps/Schedule/index.js
 - webpack/JobWizard/steps/form/FormHelpers.js
+- webpack/JobWizard/steps/form/Formatter.js
 - webpack/JobWizard/steps/form/GroupedSelectField.js
+- webpack/JobWizard/steps/form/NumberInput.js
 - webpack/JobWizard/steps/form/SelectField.js
-- webpack/JobWizard/steps/form/__tests__/GroupedSelectField.test.js
-- webpack/JobWizard/steps/form/__tests__/SelectField.test.js
-- webpack/JobWizard/steps/form/__tests__/__snapshots__/GroupedSelectField.test.js.snap
-- webpack/JobWizard/steps/form/__tests__/__snapshots__/SelectField.test.js.snap
+- webpack/JobWizard/steps/form/__tests__/Formatter.test.js.example
 - webpack/Routes/routes.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js

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

@@ -1,13 +0,0 @@
-import React from 'react';
-import * as patternfly from '@patternfly/react-core';
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-import JobWizardPage from '../index';
-
-jest.spyOn(patternfly, 'Wizard');
-patternfly.Wizard.mockImplementation(props => <div>{props.navAriaLabel}</div>);
-
-const fixtures = {
-  'renders ': {},
-};
-describe('JobWizardPage rendering', () =>
-  testComponentSnapshotsWithFixtures(JobWizardPage, fixtures));

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

@@ -1,32 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`JobWizardPage rendering renders  1`] = `
-<PageLayout
-  breadcrumbOptions={
-    Object {
-      "breadcrumbItems": Array [
-        Object {
-          "caption": "Jobs",
-          "url": "/jobs",
-        },
-        Object {
-          "caption": "Run job",
-        },
-      ],
-    }
-  }
-  header="Run job"
-  searchable={false}
->
-  <Title
-    headingLevel="h2"
-    size="2xl"
-  >
-    Run job
-  </Title>
-  <Divider
-    component="div"
-  />
-  <JobWizard />
-</PageLayout>
-`;