foreman_remote_execution 4.4.0 → 4.5.3

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

@@ -2,14 +2,28 @@ import React, { useState } from 'react';
 import { FormGroup, Select, SelectOption } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 
-export const SelectField = ({ label, fieldId, options, value, setValue }) => {
+export const SelectField = ({
+  label,
+  fieldId,
+  options,
+  value,
+  setValue,
+  labelIcon,
+  isRequired,
+  ...props
+}) => {
   const onSelect = (event, selection) => {
     setValue(selection);
     setIsOpen(false);
   };
   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}
@@ -17,6 +31,8 @@ export const SelectField = ({ label, fieldId, options, value, setValue }) => {
         isOpen={isOpen}
         className="without_select2"
         maxHeight="45vh"
+        menuAppendTo={() => document.body}
+        {...props}
       >
         {options.map((option, index) => (
           <SelectOption key={index} value={option} />
@@ -26,14 +42,19 @@ export const SelectField = ({ label, fieldId, options, value, setValue }) => {
   );
 };
 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/__mocks__/foremanReact/redux/API/APISelectors.js

@@ -1,2 +1,21 @@
-export const selectAPIStatus = () => 'RESOLVED';
-export const selectAPIResponse = state => state;
+export const selectAPI = state => state;
+export const selectAPIByKey = (state, key) => selectAPI(state)[key] || {};
+
+export const selectAPIStatus = (state, key) =>
+  selectAPIByKey(state, key).status;
+
+export const selectAPIPayload = (state, key) =>
+  selectAPIByKey(state, key).payload || {};
+
+export const selectAPIResponse = (state, key) =>
+  selectAPIByKey(state, key).response || {};
+
+export const selectAPIError = (state, key) =>
+  selectAPIStatus(state, key) === 'ERROR'
+    ? selectAPIResponse(state, key)
+    : null;
+
+export const selectAPIErrorMessage = (state, key) => {
+  const error = selectAPIError(state, key);
+  return error && error.message;
+};

data/webpack/global_index.js

@@ -1,8 +1,10 @@
 import { registerRoutes } from 'foremanReact/routes/RoutingService';
 import routes from './Routes/routes';
+import fillregistrationAdvanced from './react_app/extend/fillregistrationAdvanced';
+import fillRecentJobsCard from './react_app/extend/fillRecentJobsCard';
 import registerReducers from './react_app/extend/reducers';
-import registerFills from './react_app/extend/fills';
 
-registerRoutes('foreman_remote_execution', routes);
 registerReducers();
-registerFills();
+registerRoutes('foreman_remote_execution', routes);
+fillRecentJobsCard();
+fillregistrationAdvanced();

data/webpack/index.js

@@ -1,6 +1,9 @@
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import JobInvocationContainer from './react_app/components/jobInvocations';
 import TargetingHosts from './react_app/components/TargetingHosts';
+import registerReducers from './react_app/extend/reducers';
+
+registerReducers();
 
 const components = [
   { name: 'JobInvocationContainer', type: JobInvocationContainer },

data/webpack/react_app/components/RecentJobsCard/RecentJobsCard.js

@@ -6,15 +6,11 @@ import Skeleton from 'react-loading-skeleton';
 import ElipsisWithTooltip from 'react-ellipsis-with-tooltip';
 
 import { Grid, GridItem } from '@patternfly/react-core';
-import {
-  OkIcon,
-  ErrorCircleOIcon,
-} from '@patternfly/react-icons/dist/js/icons';
 import {
   PropertiesSidePanel,
   PropertyItem,
 } from '@patternfly/react-catalog-view-extension';
-import { ArrowIcon } from '@patternfly/react-icons';
+import { ArrowIcon, ErrorCircleOIcon, OkIcon } from '@patternfly/react-icons';
 
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
 import CardItem from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';

data/webpack/react_app/components/TargetingHosts/__tests__/TargetingHostsSelectors.test.js

@@ -9,9 +9,14 @@ import {
 } from '../TargetingHostsSelectors';
 
 const state = {
-  hosts: [],
-  autoRefresh: 'true',
-  total_hosts: 0,
+  TARGETING_HOSTS: {
+    status: 'RESOLVED',
+    response: {
+      hosts: [1, 2],
+      total_hosts: 2,
+      autoRefresh: 'true',
+    },
+  },
 };
 
 const fixtures = {

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>

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

@@ -4,8 +4,13 @@ exports[`TargetingHostsSelectors should return apiStatus 1`] = `"RESOLVED"`;
 
 exports[`TargetingHostsSelectors should return autoRefresh 1`] = `"true"`;
 
-exports[`TargetingHostsSelectors should return hosts 1`] = `Array []`;
+exports[`TargetingHostsSelectors should return hosts 1`] = `
+Array [
+  1,
+  2,
+]
+`;
 
 exports[`TargetingHostsSelectors should return intervalExists 1`] = `false`;
 
-exports[`TargetingHostsSelectors should return totalHosts 1`] = `0`;
+exports[`TargetingHostsSelectors should return totalHosts 1`] = `2`;

data/webpack/react_app/extend/{fills.js → fillRecentJobsCard.js}

@@ -2,9 +2,10 @@ import React from 'react';
 import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
 import RecentJobsCard from '../components/RecentJobsCard';
 
-export default addGlobalFill(
-  'details-cards',
-  'rex-host-details-latest-jobs',
-  <RecentJobsCard />,
-  1000
-);
+export default () =>
+  addGlobalFill(
+    'details-cards',
+    'rex-host-details-latest-jobs',
+    <RecentJobsCard />,
+    1000
+  );

data/webpack/react_app/extend/fillregistrationAdvanced.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
+import RexInterface from '../components/RegistrationExtension/RexInterface';
+
+export default () =>
+  addGlobalFill(
+    'registrationAdvanced',
+    'foreman-remote-exectuion-rex-interface',
+    <RexInterface key="registration-rex-interface" />,
+    100
+  );

data/webpack/react_app/extend/reducers.js

@@ -1,4 +1,5 @@
 import { registerReducer } from 'foremanReact/common/MountingService';
 import rootReducer from '../redux/reducers';
 
-export default registerReducer('foremanRemoteExecutionReducers', rootReducer);
+export default () =>
+  registerReducer('foremanRemoteExecutionReducers', rootReducer);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.3
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -171,7 +171,6 @@ files:
 - app/models/concerns/foreman_remote_execution/foreman_tasks_triggering_extensions.rb
 - app/models/concerns/foreman_remote_execution/host_extensions.rb
 - app/models/concerns/foreman_remote_execution/nic_extensions.rb
-- app/models/concerns/foreman_remote_execution/orchestration/ssh.rb
 - app/models/concerns/foreman_remote_execution/smart_proxy_extensions.rb
 - app/models/concerns/foreman_remote_execution/subnet_extensions.rb
 - app/models/concerns/foreman_remote_execution/taxonomy_extensions.rb
@@ -180,6 +179,7 @@ files:
 - app/models/concerns/foreman_remote_execution/template_overrides.rb
 - app/models/concerns/foreman_remote_execution/user_extensions.rb
 - app/models/foreign_input_set.rb
+- app/models/host_proxy_invocation.rb
 - app/models/host_status/execution_status.rb
 - app/models/input_template_renderer.rb
 - app/models/invocation_provider_input_value.rb
@@ -324,6 +324,7 @@ files:
 - db/migrate/20200623073022_rename_sudo_password_to_effective_user_password.rb
 - db/migrate/20200820122057_add_proxy_selector_override_to_remote_execution_feature.rb
 - db/migrate/20210312074713_add_provider_inputs.rb
+- db/migrate/2021051713291621250977_add_host_proxy_invocations.rb
 - db/seeds.d/100-assign_features_with_templates.rb
 - db/seeds.d/20-permissions.rb
 - db/seeds.d/50-notification_blueprints.rb
@@ -380,7 +381,6 @@ files:
 - test/functional/job_templates_controller_test.rb
 - test/functional/ui_job_wizard_controller_test.rb
 - test/helpers/remote_execution_helper_test.rb
-- test/models/orchestration/ssh_test.rb
 - test/support/remote_execution_helper.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
@@ -404,19 +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__/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
@@ -429,7 +440,6 @@ files:
 - webpack/__mocks__/foremanReact/redux/API/index.js
 - webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware/IntervalSelectors.js
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
-- webpack/fills_index.js
 - webpack/global_index.js
 - webpack/index.js
 - webpack/react_app/components/RecentJobsCard/RecentJobsCard.js
@@ -462,7 +472,8 @@ files:
 - webpack/react_app/components/jobInvocations/AggregateStatus/index.js
 - webpack/react_app/components/jobInvocations/AggregateStatus/index.test.js
 - webpack/react_app/components/jobInvocations/index.js
-- webpack/react_app/extend/fills.js
+- webpack/react_app/extend/fillRecentJobsCard.js
+- webpack/react_app/extend/fillregistrationAdvanced.js
 - webpack/react_app/extend/reducers.js
 - webpack/react_app/redux/actions/jobInvocations/index.js
 - webpack/react_app/redux/consts.js
@@ -510,7 +521,6 @@ test_files:
 - test/functional/job_templates_controller_test.rb
 - test/functional/ui_job_wizard_controller_test.rb
 - test/helpers/remote_execution_helper_test.rb
-- test/models/orchestration/ssh_test.rb
 - test/support/remote_execution_helper.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb