foreman_remote_execution 4.2.2 → 4.5.0

data/webpack/global_index.js

@@ -0,0 +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';
+
+registerReducers();
+registerRoutes('foreman_remote_execution', routes);
+fillRecentJobsCard();
+fillregistrationAdvanced();

data/webpack/index.js

@@ -1,8 +1,9 @@
-import { registerReducer } from 'foremanReact/common/MountingService';
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import JobInvocationContainer from './react_app/components/jobInvocations';
 import TargetingHosts from './react_app/components/TargetingHosts';
-import rootReducer from './react_app/redux/reducers';
+import registerReducers from './react_app/extend/reducers';
+
+registerReducers();
 
 const components = [
   { name: 'JobInvocationContainer', type: JobInvocationContainer },
@@ -12,5 +13,3 @@ const components = [
 components.forEach(component => {
   componentRegistry.register(component);
 });
-
-registerReducer('foremanRemoteExecutionReducers', rootReducer);

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

@@ -0,0 +1,83 @@
+/* eslint-disable camelcase */
+
+import PropTypes from 'prop-types';
+import React from 'react';
+import Skeleton from 'react-loading-skeleton';
+import ElipsisWithTooltip from 'react-ellipsis-with-tooltip';
+
+import { Grid, GridItem } from '@patternfly/react-core';
+import {
+  PropertiesSidePanel,
+  PropertyItem,
+} from '@patternfly/react-catalog-view-extension';
+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';
+import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
+import { translate as __ } from 'foremanReact/common/I18n';
+import './styles.css';
+
+const RecentJobsCard = ({ hostDetails: { name } }) => {
+  const jobsUrl =
+    name && `/api/job_invocations?search=host%3D${name}&per_page=3`;
+  const {
+    response: { results: jobs },
+  } = useAPI('get', jobsUrl);
+
+  const iconMarkup = status => {
+    if (status === 1) return <ErrorCircleOIcon color="#C9190B" />;
+    return <OkIcon color="#3E8635" />;
+  };
+
+  return (
+    <CardItem
+      header={
+        <span>
+          {__('Recent Jobs')}{' '}
+          <a href={`/job_invocations?search=host+%3D+${name}`}>
+            <ArrowIcon />
+          </a>
+        </span>
+      }
+    >
+      <PropertiesSidePanel>
+        {jobs?.map(({ status, status_label, id, start_at, description }) => (
+          <PropertyItem
+            key={id}
+            label={
+              description ? (
+                <Grid>
+                  <GridItem span={8}>
+                    <ElipsisWithTooltip>{description}</ElipsisWithTooltip>
+                  </GridItem>
+                  <GridItem span={1}>{iconMarkup(status)}</GridItem>
+                  <GridItem span={3}>{status_label}</GridItem>
+                </Grid>
+              ) : (
+                <Skeleton />
+              )
+            }
+            value={
+              start_at ? (
+                <a href={`/job_invocations/${id}`}>
+                  <RelativeDateTime date={start_at} />
+                </a>
+              ) : (
+                <Skeleton />
+              )
+            }
+          />
+        ))}
+      </PropertiesSidePanel>
+    </CardItem>
+  );
+};
+
+export default RecentJobsCard;
+
+RecentJobsCard.propTypes = {
+  hostDetails: PropTypes.shape({
+    name: PropTypes.string,
+  }).isRequired,
+};

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

@@ -0,0 +1 @@
+export const HOST_DETAILS_JOBS = 'HOST_DETAILS_JOBS';

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

@@ -0,0 +1 @@
+export { default } from './RecentJobsCard';

data/webpack/react_app/components/RecentJobsCard/styles.css

@@ -0,0 +1,15 @@
+.properties-side-panel-pf-property-value {
+  font-size: 14px !important;
+  margin-top: 8px;
+  word-break: break-word;
+}
+
+.properties-side-panel-pf-property-label {
+  font-weight: 700 !important;
+  font-size: 14px !important;
+  margin: 0 !important;
+}
+
+.properties-side-panel-pf-property {
+  margin-top: 24px;
+}

data/webpack/react_app/components/RegistrationExtension/RexInterface.js

@@ -0,0 +1,50 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { translate as __ } from 'foremanReact/common/I18n';
+
+import { FormGroup, TextInput, Popover } from '@patternfly/react-core';
+
+import { HelpIcon } from '@patternfly/react-icons';
+
+const RexInterface = ({ isLoading, onChange }) => (
+  <FormGroup
+    label={__('Remote Execution Interface')}
+    fieldId="reg_rex_interface"
+    labelIcon={
+      <Popover
+        bodyContent={
+          <div>
+            {__('Identifier of the Host interface for Remote execution')}
+          </div>
+        }
+      >
+        <button
+          className="pf-c-form__group-label-help"
+          onClick={e => e.preventDefault()}
+        >
+          <HelpIcon noVerticalAlign />
+        </button>
+      </Popover>
+    }
+  >
+    <TextInput
+      type="text"
+      onBlur={e => onChange({ remoteExecutionInterface: e.target.value })}
+      id="reg_rex_interface_input"
+      isDisabled={isLoading}
+    />
+  </FormGroup>
+);
+
+RexInterface.propTypes = {
+  onChange: PropTypes.func,
+  isLoading: PropTypes.bool,
+};
+
+RexInterface.defaultProps = {
+  onChange: undefined,
+  isLoading: false,
+};
+
+export default RexInterface;

data/webpack/react_app/components/RegistrationExtension/__tests__/RexInterface.test.js

@@ -0,0 +1,9 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import RexInterface from '../RexInterface';
+
+const fixtures = {
+  renders: { isLoading: false, onChange: () => {} },
+};
+
+describe('RexInterface', () =>
+  testComponentSnapshotsWithFixtures(RexInterface, fixtures));

data/webpack/react_app/components/RegistrationExtension/__tests__/__snapshots__/RexInterface.test.js.snap

@@ -0,0 +1,35 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`RexInterface renders 1`] = `
+<FormGroup
+  fieldId="reg_rex_interface"
+  label="Remote Execution Interface"
+  labelIcon={
+    <Popover
+      bodyContent={
+        <div>
+          Identifier of the Host interface for Remote execution
+        </div>
+      }
+    >
+      <button
+        className="pf-c-form__group-label-help"
+        onClick={[Function]}
+      >
+        <HelpIcon
+          color="currentColor"
+          noVerticalAlign={true}
+          size="sm"
+        />
+      </button>
+    </Popover>
+  }
+>
+  <TextInput
+    id="reg_rex_interface_input"
+    isDisabled={false}
+    onBlur={[Function]}
+    type="text"
+  />
+</FormGroup>
+`;

data/webpack/react_app/components/TargetingHosts/TargetingHostsPage.js

@@ -39,7 +39,7 @@ const TargetingHostsPage = ({
     <br />
     <TargetingHosts apiStatus={apiStatus} items={items} />
     <Pagination
-      viewType="list"
+      viewType="table"
       itemCount={totalHosts}
       pagination={pagination}
       onChange={args => handlePagination(args)}

data/webpack/react_app/components/TargetingHosts/TargetingHostsPage.scss

@@ -1,6 +1,3 @@
-.targeting-hosts-pagination {
-  margin-top: -7px;
-}
 #targeting_hosts {
   min-height: 350px;
 }

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

@@ -62,7 +62,7 @@ exports[`TargetingHostsPage renders 1`] = `
         "perPage": 20,
       }
     }
-    viewType="list"
+    viewType="table"
   />
 </div>
 `;

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/fillRecentJobsCard.js

@@ -0,0 +1,11 @@
+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
+  );

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

@@ -0,0 +1,5 @@
+import { registerReducer } from 'foremanReact/common/MountingService';
+import rootReducer from '../redux/reducers';
+
+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.2.2
+  version: 4.5.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.8.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.80.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -127,8 +113,10 @@ files:
 - ".babelrc.js"
 - ".eslintignore"
 - ".eslintrc"
-- ".github/workflows/ci.yml"
+- ".github/workflows/js_ci.yml"
+- ".github/workflows/ruby_ci.yml"
 - ".gitignore"
+- ".prettierrc"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".tx/config"
@@ -154,12 +142,14 @@ files:
 - app/controllers/concerns/foreman/controller/parameters/job_template.rb
 - app/controllers/concerns/foreman/controller/parameters/remote_execution_feature.rb
 - app/controllers/concerns/foreman/controller/parameters/targeting.rb
+- app/controllers/foreman_remote_execution/concerns/api/v2/registration_commands_controller_extensions.rb
 - app/controllers/foreman_remote_execution/concerns/api/v2/registration_controller_extensions.rb
 - app/controllers/foreman_remote_execution/concerns/api/v2/subnets_controller_extensions.rb
 - app/controllers/job_invocations_controller.rb
 - app/controllers/job_templates_controller.rb
 - app/controllers/remote_execution_features_controller.rb
 - app/controllers/template_invocations_controller.rb
+- app/controllers/ui_job_wizard_controller.rb
 - app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb
 - app/helpers/concerns/foreman_remote_execution/job_templates_extensions.rb
 - app/helpers/job_invocation_output_helper.rb
@@ -169,6 +159,7 @@ files:
 - app/lib/actions/middleware/bind_job_invocation.rb
 - app/lib/actions/remote_execution/run_host_job.rb
 - app/lib/actions/remote_execution/run_hosts_job.rb
+- app/lib/foreman_remote_execution/provider_input.rb
 - app/lib/foreman_remote_execution/renderer/scope/input.rb
 - app/lib/proxy_api/remote_execution_ssh.rb
 - app/mailers/.gitkeep
@@ -191,6 +182,7 @@ files:
 - app/models/foreign_input_set.rb
 - app/models/host_status/execution_status.rb
 - app/models/input_template_renderer.rb
+- app/models/invocation_provider_input_value.rb
 - app/models/job_invocation.rb
 - app/models/job_invocation_composer.rb
 - app/models/job_invocation_task_group.rb
@@ -209,6 +201,7 @@ files:
 - app/overrides/subnet_proxies.rb
 - app/services/default_proxy_proxy_selector.rb
 - app/services/remote_execution_proxy_selector.rb
+- app/services/renderer_methods.rb
 - app/services/ui_notifications/remote_execution_jobs/base_job_finish.rb
 - app/views/api/v2/foreign_input_sets/base.json.rabl
 - app/views/api/v2/foreign_input_sets/create.json.rabl
@@ -227,7 +220,6 @@ files:
 - app/views/api/v2/job_templates/main.json.rabl
 - app/views/api/v2/job_templates/show.json.rabl
 - app/views/api/v2/job_templates/update.json.rabl
-- app/views/api/v2/registration/_form.html.erb
 - app/views/api/v2/remote_execution_features/base.json.rabl
 - app/views/api/v2/remote_execution_features/index.json.rabl
 - app/views/api/v2/remote_execution_features/main.json.rabl
@@ -331,6 +323,7 @@ files:
 - db/migrate/20190111153330_remove_remote_execution_without_proxy_setting.rb
 - 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/seeds.d/100-assign_features_with_templates.rb
 - db/seeds.d/20-permissions.rb
 - db/seeds.d/50-notification_blueprints.rb
@@ -385,6 +378,7 @@ files:
 - test/functional/cockpit_controller_test.rb
 - test/functional/job_invocations_controller_test.rb
 - 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
@@ -397,6 +391,7 @@ files:
 - test/unit/execution_task_status_mapper_test.rb
 - test/unit/input_template_renderer_test.rb
 - test/unit/job_invocation_composer_test.rb
+- test/unit/job_invocation_report_template_test.rb
 - test/unit/job_invocation_test.rb
 - test/unit/job_template_effective_user_test.rb
 - test/unit/job_template_test.rb
@@ -405,14 +400,52 @@ files:
 - test/unit/renderer_scope_input.rb
 - test/unit/targeting_test.rb
 - test/unit/template_invocation_input_value_test.rb
+- webpack/JobWizard/JobWizard.js
+- 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/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
+- 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/Routes/routes.js
 - webpack/__mocks__/foremanReact/common/I18n.js
+- webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/SearchBar.js
 - webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
 - webpack/__mocks__/foremanReact/constants.js
+- webpack/__mocks__/foremanReact/history.js
 - webpack/__mocks__/foremanReact/redux/API/APISelectors.js
+- webpack/__mocks__/foremanReact/redux/API/index.js
 - webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware/IntervalSelectors.js
+- webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
+- webpack/global_index.js
 - webpack/index.js
+- webpack/react_app/components/RecentJobsCard/RecentJobsCard.js
+- webpack/react_app/components/RecentJobsCard/constants.js
+- webpack/react_app/components/RecentJobsCard/index.js
+- webpack/react_app/components/RecentJobsCard/styles.css
+- webpack/react_app/components/RegistrationExtension/RexInterface.js
+- webpack/react_app/components/RegistrationExtension/__tests__/RexInterface.test.js
+- webpack/react_app/components/RegistrationExtension/__tests__/__snapshots__/RexInterface.test.js.snap
 - webpack/react_app/components/TargetingHosts/TargetingHosts.js
 - webpack/react_app/components/TargetingHosts/TargetingHostsConsts.js
 - webpack/react_app/components/TargetingHosts/TargetingHostsHelpers.js
@@ -436,6 +469,9 @@ 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/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
 - webpack/react_app/redux/reducers/index.js
@@ -480,6 +516,7 @@ test_files:
 - test/functional/cockpit_controller_test.rb
 - test/functional/job_invocations_controller_test.rb
 - 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
@@ -492,6 +529,7 @@ test_files:
 - test/unit/execution_task_status_mapper_test.rb
 - test/unit/input_template_renderer_test.rb
 - test/unit/job_invocation_composer_test.rb
+- test/unit/job_invocation_report_template_test.rb
 - test/unit/job_invocation_test.rb
 - test/unit/job_template_effective_user_test.rb
 - test/unit/job_template_test.rb