foreman_remote_execution 4.4.0 → 4.5.0

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

@@ -8,6 +8,9 @@ import {
   selectJobTemplates,
   selectJobCategoriesStatus,
   filterJobTemplates,
+  selectCategoryError,
+  selectAllTemplatesError,
+  selectTemplateError,
 } from '../../JobWizardSelectors';
 import { CategoryAndTemplate } from './CategoryAndTemplate';
 
@@ -41,7 +44,6 @@ const ConnectedCategoryAndTemplate = ({
   }, [jobCategoriesStatus, dispatch, setCategory]);
 
   const jobCategories = useSelector(selectJobCategories);
-
   useEffect(() => {
     if (category) {
       const templatesUrlObject = new URI(templatesUrl);
@@ -63,6 +65,11 @@ const ConnectedCategoryAndTemplate = ({
 
   const jobTemplates = useSelector(selectJobTemplates);
 
+  const errors = {
+    categoryError: useSelector(selectCategoryError),
+    allTemplatesError: useSelector(selectAllTemplatesError),
+    templateError: useSelector(selectTemplateError),
+  };
   return (
     <CategoryAndTemplate
       jobTemplates={jobTemplates}
@@ -71,6 +78,7 @@ const ConnectedCategoryAndTemplate = ({
       selectedTemplateID={jobTemplate}
       setCategory={setCategory}
       selectedCategory={category}
+      errors={errors}
     />
   );
 };

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

@@ -0,0 +1,19 @@
+import React from 'react';
+import { Popover } from '@patternfly/react-core';
+import { HelpIcon } from '@patternfly/react-icons';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export const helpLabel = (text, id) => {
+  if (!text) return null;
+  return (
+    <Popover id={`${id}-help`} bodyContent={text} aria-label="help-text">
+      <button
+        aria-label={__('open-help-tooltip-button')}
+        onClick={e => e.preventDefault()}
+        className="pf-c-form__group-label-help"
+      >
+        <HelpIcon noVerticalAlign />
+      </button>
+    </Popover>
+  );
+};

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

@@ -14,6 +14,7 @@ export const GroupedSelectField = ({
   groups,
   selected,
   setSelected,
+  ...props
 }) => {
   const [isOpen, setIsOpen] = useState(false);
   const onSelect = selection => {
@@ -67,6 +68,8 @@ export const GroupedSelectField = ({
         selections={selected}
         className="without_select2"
         onClear={onClear}
+        menuAppendTo={() => document.body}
+        {...props}
       >
         {options}
       </Select>

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

@@ -2,7 +2,14 @@ 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,
+  ...props
+}) => {
   const onSelect = (event, selection) => {
     setValue(selection);
     setIsOpen(false);
@@ -17,6 +24,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} />

data/webpack/JobWizard/steps/form/__tests__/__snapshots__/GroupedSelectField.test.js.snap

@@ -9,6 +9,7 @@ exports[`GroupedSelectField rendering renders with props 1`] = `
     className="without_select2"
     isGrouped={true}
     isOpen={false}
+    menuAppendTo={[Function]}
     onClear={[Function]}
     onFilter={[Function]}
     onSelect={[Function]}

data/webpack/JobWizard/steps/form/__tests__/__snapshots__/SelectField.test.js.snap

@@ -9,6 +9,7 @@ exports[`SelectField rendering renders with props 1`] = `
     className="without_select2"
     isOpen={false}
     maxHeight="45vh"
+    menuAppendTo={[Function]}
     onSelect={[Function]}
     onToggle={[Function]}
     selections="Commands"

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__/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.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -406,11 +406,19 @@ files:
 - 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/Fields.js
+- webpack/JobWizard/steps/AdvancedFields/__tests__/AdvancedFields.test.js
+- webpack/JobWizard/steps/AdvancedFields/__tests__/__snapshots__/AdvancedFields.test.js.snap
 - 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/form/FormHelpers.js
 - webpack/JobWizard/steps/form/GroupedSelectField.js
 - webpack/JobWizard/steps/form/SelectField.js
 - webpack/JobWizard/steps/form/__tests__/GroupedSelectField.test.js
@@ -429,7 +437,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 +469,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

data/webpack/fills_index.js

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