foreman_remote_execution 14.0.2 → 14.1.1

data/webpack/JobInvocationDetail/index.js

@@ -1,12 +1,17 @@
 import PropTypes from 'prop-types';
 import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { Divider, Flex } from '@patternfly/react-core';
+import {
+  Divider,
+  Flex,
+  PageSection,
+  PageSectionVariants,
+} from '@patternfly/react-core';
 import { translate as __, documentLocale } from 'foremanReact/common/I18n';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
 import { stopInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
-import { getData, getTask } from './JobInvocationActions';
+import { getJobInvocation, getTask } from './JobInvocationActions';
 import {
   CURRENT_PERMISSIONS,
   DATE_OPTIONS,
@@ -19,6 +24,7 @@ import JobInvocationOverview from './JobInvocationOverview';
 import { selectItems } from './JobInvocationSelectors';
 import JobInvocationSystemStatusChart from './JobInvocationSystemStatusChart';
 import JobInvocationToolbarButtons from './JobInvocationToolbarButtons';
+import JobInvocationHostTable from './JobInvocationHostTable';
 
 const JobInvocationDetailPage = ({
   match: {
@@ -32,6 +38,7 @@ const JobInvocationDetailPage = ({
     status_label: statusLabel,
     task,
     start_at: startAt,
+    targeting,
   } = items;
   const finished =
     statusLabel === STATUS.FAILED ||
@@ -57,7 +64,7 @@ const JobInvocationDetailPage = ({
   }
 
   useEffect(() => {
-    dispatch(getData(`/api/job_invocations/${id}`));
+    dispatch(getJobInvocation(`/api/job_invocations/${id}?host_status=true`));
     if (finished && !autoRefresh) {
       dispatch(stopInterval(JOB_INVOCATION_KEY));
     }
@@ -82,45 +89,60 @@ const JobInvocationDetailPage = ({
   };
 
   return (
-    <PageLayout
-      header={description}
-      breadcrumbOptions={breadcrumbOptions}
-      toolbarButtons={
-        <JobInvocationToolbarButtons
-          jobId={id}
-          data={items}
-          currentPermissions={response.results}
-          permissionsStatus={status}
-        />
-      }
-      searchable={false}
-    >
-      <Flex
-        className="job-invocation-detail-flex"
-        alignItems={{ default: 'alignItemsFlexStart' }}
+    <>
+      <PageLayout
+        header={description}
+        breadcrumbOptions={breadcrumbOptions}
+        toolbarButtons={
+          <JobInvocationToolbarButtons
+            jobId={id}
+            data={items}
+            currentPermissions={response.results}
+            permissionsStatus={status}
+          />
+        }
+        searchable={false}
       >
-        <JobInvocationSystemStatusChart
-          data={items}
-          isAlreadyStarted={isAlreadyStarted}
-          formattedStartDate={formattedStartDate}
-        />
-        <Divider
-          orientation={{
-            default: 'vertical',
-          }}
-        />
         <Flex
-          className="job-overview"
-          alignItems={{ default: 'alignItemsCenter' }}
+          className="job-invocation-detail-flex"
+          alignItems={{ default: 'alignItemsFlexStart' }}
         >
-          <JobInvocationOverview
+          <JobInvocationSystemStatusChart
             data={items}
             isAlreadyStarted={isAlreadyStarted}
             formattedStartDate={formattedStartDate}
           />
+          <Divider
+            orientation={{
+              default: 'vertical',
+            }}
+          />
+          <Flex
+            className="job-overview"
+            alignItems={{ default: 'alignItemsCenter' }}
+          >
+            <JobInvocationOverview
+              data={items}
+              isAlreadyStarted={isAlreadyStarted}
+              formattedStartDate={formattedStartDate}
+            />
+          </Flex>
         </Flex>
-      </Flex>
-    </PageLayout>
+      </PageLayout>
+      <PageSection
+        variant={PageSectionVariants.light}
+        className="table-section"
+      >
+        {items.id !== undefined && (
+          <JobInvocationHostTable
+            id={id}
+            targeting={targeting}
+            finished={finished}
+            autoRefresh={autoRefresh}
+          />
+        )}
+      </PageSection>
+    </>
   );
 };
 

data/webpack/__mocks__/foremanReact/components/HostDetails/DetailsCard/DefaultLoaderEmptyState.js

@@ -1,8 +1,7 @@
 import React from 'react';
-import { translate as __ } from '../../../common/I18n';
 
 const DefaultLoaderEmptyState = () => (
-  <span className="disabled-text">{__('Not available')}</span>
+  <span className="disabled-text">Not available</span>
 );
 
 export default DefaultLoaderEmptyState;

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

@@ -3,29 +3,60 @@ import PropTypes from 'prop-types';
 import {
   CheckCircleIcon,
   ExclamationCircleIcon,
+  BuildIcon,
+  RunningIcon,
+  ExclamationTriangleIcon,
   QuestionCircleIcon,
 } from '@patternfly/react-icons';
-import { JOB_SUCCESS_STATUS, JOB_ERROR_STATUS } from './constants';
+import {
+  JOB_SUCCESS_STATUS,
+  JOB_ERROR_STATUS,
+  JOB_PLANNED_STATUS,
+  JOB_RUNNING_STATUS,
+  JOB_CANCELLED_STATUS,
+  JOB_AWAITING_STATUS,
+} from './constants';
 import './styles.scss';
 
 const JobStatusIcon = ({ status, children, ...props }) => {
   switch (status) {
     case JOB_SUCCESS_STATUS:
       return (
-        <span className="job-success">
-          <CheckCircleIcon {...props} /> {children}
+        <span>
+          <CheckCircleIcon className="job-success" {...props} /> {children}
         </span>
       );
     case JOB_ERROR_STATUS:
       return (
-        <span className="job-error">
-          <ExclamationCircleIcon {...props} /> {children}
+        <span>
+          <ExclamationCircleIcon className="job-error" {...props} /> {children}
+        </span>
+      );
+    case JOB_PLANNED_STATUS:
+      return (
+        <span>
+          <BuildIcon className="job-planned" {...props} /> {children}
+        </span>
+      );
+    case JOB_RUNNING_STATUS:
+      return (
+        <span>
+          <RunningIcon className="job-running" {...props} /> {children}
+        </span>
+      );
+    case JOB_CANCELLED_STATUS:
+      return (
+        <span>
+          <ExclamationTriangleIcon className="job-cancelled" {...props} />{' '}
+          {children}
         </span>
       );
+    case JOB_AWAITING_STATUS:
+      return <span className="job-awaiting_start">{children}</span>;
     default:
       return (
-        <span className="job-info">
-          <QuestionCircleIcon {...props} /> {children}
+        <span>
+          <QuestionCircleIcon className="job-unknown" {...props} /> {children}
         </span>
       );
   }

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

@@ -5,6 +5,10 @@ export const SCHEDULED_TAB = 2;
 
 export const JOB_SUCCESS_STATUS = 0;
 export const JOB_ERROR_STATUS = 1;
+export const JOB_PLANNED_STATUS = 2;
+export const JOB_RUNNING_STATUS = 3;
+export const JOB_CANCELLED_STATUS = 4;
+export const JOB_AWAITING_STATUS = 5;
 
 export const JOB_BASE_URL = '/job_invocations?search=targeted_host_id+%3D+';
 export const JOB_API_URL =

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

@@ -7,6 +7,6 @@ exports[`HostStatus renders 1`] = `
     type="pf"
   />
    
-  success
+  Succeeded
 </div>
 `;

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

@@ -8,38 +8,38 @@ const HostStatus = ({ status }) => {
     case 'cancelled':
       return (
         <div>
-          <Icon type="pf" name="warning-triangle-o" /> {status}
+          <Icon type="pf" name="warning-triangle-o" /> {__('Cancelled')}
         </div>
       );
     case 'N/A':
       return (
         <div>
-          <Icon type="fa" name="question" /> {status}
+          <Icon type="fa" name="question" /> {__('Awaiting start')}
         </div>
       );
     case 'running':
       return (
         <div>
-          <Icon type="pf" name="running" /> {status}
+          <Icon type="pf" name="running" /> {__('Pending')}
         </div>
       );
     case 'planned':
       return (
         <div>
-          <Icon type="pf" name="build" /> {status}
+          <Icon type="pf" name="build" /> {__('Scheduled')}
         </div>
       );
     case 'warning':
     case 'error':
       return (
         <div>
-          <Icon type="pf" name="error-circle-o" /> {__('failed')}
+          <Icon type="pf" name="error-circle-o" /> {__('Failed')}
         </div>
       );
     case 'success':
       return (
         <div>
-          <Icon type="pf" name="ok" /> {status}
+          <Icon type="pf" name="ok" /> {__('Succeeded')}
         </div>
       );
     default:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 14.0.2
+  version: 14.1.1
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -96,19 +96,6 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- ".babelrc.js"
-- ".eslintignore"
-- ".eslintrc"
-- ".github/workflows/js_ci.yml"
-- ".github/workflows/release.yml"
-- ".github/workflows/ruby_ci.yml"
-- ".gitignore"
-- ".packit.yaml"
-- ".prettierrc"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".tx/config"
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -172,7 +159,6 @@ files:
 - app/lib/foreman_remote_execution/renderer/scope/input.rb
 - app/lib/foreman_remote_execution/renderer_methods.rb
 - app/lib/proxy_api/remote_execution_ssh.rb
-- app/mailers/.gitkeep
 - app/mailers/rex_job_mailer.rb
 - app/models/concerns/api/v2/hosts_controller_extensions.rb
 - app/models/concerns/api/v2/interfaces_controller_extensions.rb
@@ -224,6 +210,7 @@ files:
 - app/views/api/v2/interfaces/execution_flag.json.rabl
 - app/views/api/v2/job_invocations/base.json.rabl
 - app/views/api/v2/job_invocations/create.json.rabl
+- app/views/api/v2/job_invocations/hosts.json.rabl
 - app/views/api/v2/job_invocations/index.json.rabl
 - app/views/api/v2/job_invocations/main.json.rabl
 - app/views/api/v2/job_invocations/show.json.rabl
@@ -242,7 +229,6 @@ files:
 - app/views/api/v2/subnets/remote_execution_proxies.json.rabl
 - app/views/api/v2/template_invocations/base.json.rabl
 - app/views/api/v2/template_invocations/template_invocations.json.rabl
-- app/views/dashboard/.gitkeep
 - app/views/dashboard/_latest-jobs.html.erb
 - app/views/job_invocation_task_groups/_job_invocation_task_groups.html.erb
 - app/views/job_invocations/_card_results.html.erb
@@ -352,6 +338,7 @@ files:
 - db/migrate/20220822155946_add_time_to_pickup_to_job_invocation.rb
 - db/migrate/20221129170145_redefine_template_invocation_events_index.rb
 - db/migrate/20230816154510_drop_time_span_from_job_invocations.rb
+- db/migrate/20240312133027_extend_template_invocation_events.rb
 - db/migrate/20240522093412_add_smart_proxy_id_to_template_invocation.rb
 - db/migrate/20240522093413_migrate_smart_proxy_ids_to_template_invocations.rb
 - db/seeds.d/100-assign_features_with_templates.rb
@@ -365,8 +352,6 @@ files:
 - extra/cockpit/foreman-cockpit-session
 - extra/cockpit/foreman-cockpit.service
 - extra/cockpit/settings.yml.example
-- foreman_remote_execution.gemspec
-- jsconfig.json
 - lib/foreman_remote_execution.rb
 - lib/foreman_remote_execution/engine.rb
 - lib/foreman_remote_execution/tasks/explain_proxy_selection.rake
@@ -440,6 +425,7 @@ files:
 - webpack/JobInvocationDetail/JobInvocationActions.js
 - webpack/JobInvocationDetail/JobInvocationConstants.js
 - webpack/JobInvocationDetail/JobInvocationDetail.scss
+- webpack/JobInvocationDetail/JobInvocationHostTable.js
 - webpack/JobInvocationDetail/JobInvocationOverview.js
 - webpack/JobInvocationDetail/JobInvocationSelectors.js
 - webpack/JobInvocationDetail/JobInvocationSystemStatusChart.js
@@ -615,41 +601,4 @@ signing_key:
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config
   management functionality with remote management functionality.
-test_files:
-- test/benchmark/run_hosts_job_benchmark.rb
-- test/benchmark/targeting_benchmark.rb
-- test/factories/foreman_remote_execution_factories.rb
-- test/functional/api/v2/foreign_input_sets_controller_test.rb
-- test/functional/api/v2/job_invocations_controller_test.rb
-- test/functional/api/v2/job_templates_controller_test.rb
-- test/functional/api/v2/registration_controller_test.rb
-- test/functional/api/v2/remote_execution_features_controller_test.rb
-- test/functional/api/v2/template_invocations_controller_test.rb
-- 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/graphql/mutations/job_invocations/create_test.rb
-- test/graphql/queries/job_invocation_query_test.rb
-- test/graphql/queries/job_invocations_query_test.rb
-- test/helpers/remote_execution_helper_test.rb
-- test/support/remote_execution_helper.rb
-- test/test_plugin_helper.rb
-- test/unit/actions/run_host_job_test.rb
-- test/unit/actions/run_hosts_job_test.rb
-- test/unit/api_params_test.rb
-- test/unit/concerns/foreman_tasks_cleaner_extensions_test.rb
-- test/unit/concerns/host_extensions_test.rb
-- test/unit/concerns/nic_extensions_test.rb
-- 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
-- test/unit/remote_execution_feature_test.rb
-- test/unit/remote_execution_provider_test.rb
-- test/unit/renderer_scope_input_test.rb
-- test/unit/targeting_test.rb
-- test/unit/template_invocation_input_value_test.rb
+test_files: []

data/.babelrc.js

@@ -1,3 +0,0 @@
-module.exports = {
-  presets: ['@theforeman/builder/babel'],
-};

data/.eslintignore

@@ -1,3 +0,0 @@
-# Ignore all files except webpack directory
-**/*.js
-!webpack/**/*.js

data/.eslintrc

@@ -1,13 +0,0 @@
-{
-  "plugins": [
-    "@theforeman/foreman",
-    "@theforeman/rules"
-  ],
-  "extends": [
-    "plugin:@theforeman/foreman/core",
-    "plugin:@theforeman/foreman/plugins"
-  ],
-  "rules":{
-    "@theforeman/rules/require-ouiaid": ["error"]
-  }
-}

data/.github/workflows/js_ci.yml

@@ -1,32 +0,0 @@
-name: JS
-on:
-  pull_request:
-    paths:
-      - 'webpack/**'
-      - 'package.json'
-      - '.github/workflows/js_ci.yml'
-jobs:
-  test_js:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        node-version: [14]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Node
-        uses: actions/setup-node@v1
-        with:
-          node-version:  ${{ matrix.node-version }}
-      - name: Npm install
-        run: |
-          npm install
-      - name: Run plugin linter
-        run: |
-          npm run lint
-      - name: Run custom plugin linter
-        run: |
-          npm run lint:custom
-      - name: Run plugin tests
-        run: |
-          npm run test

data/.github/workflows/release.yml

@@ -1,16 +0,0 @@
-name: Release
-
-on:
-  push:
-    # Pattern matched against refs/tags
-    tags:
-      - '**'
-
-jobs:
-  release:
-    name: Release gem
-    uses: theforeman/actions/.github/workflows/release-gem.yml@v0
-    with:
-      allowed_owner: theforeman
-    secrets:
-      api_key: ${{ secrets.RUBYGEM_API_KEY }}

data/.github/workflows/ruby_ci.yml

@@ -1,19 +0,0 @@
-name: CI
-
-on: pull_request
-
-concurrency:
-  group: ${{ github.ref_name }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  rubocop:
-    name: Rubocop
-    uses: theforeman/actions/.github/workflows/rubocop.yml@v0
-
-  test:
-    name: Ruby
-    needs: rubocop
-    uses: theforeman/actions/.github/workflows/foreman_plugin.yml@v0
-    with:
-      plugin: foreman_remote_execution

data/.gitignore

@@ -1,19 +0,0 @@
-*.sw?
-.idea
-.bundle/
-log/*.log
-pkg/
-test/dummy/db/*.sqlite3
-test/dummy/log/*.log
-test/dummy/tmp/
-test/dummy/.sass-cache
-locale/*.mo
-locale/*/*.pox
-locale/*/*.edit.po
-locale/*/*.po.time_stamp
-Gemfile.lock
-node_modules/
-package-lock.json
-coverage/
-public/
-locale/action_names.rb

data/.packit.yaml

@@ -1,45 +0,0 @@
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
-
-specfile_path: rubygem-foreman_remote_execution.spec
-
-# add or remove files that should be synced
-files_to_sync:
-    - rubygem-foreman_remote_execution.spec
-    - .packit.yaml
-
-# name in upstream package repository or registry (e.g. in PyPI)
-upstream_package_name: foreman_remote_execution
-# downstream (Fedora) RPM package name
-downstream_package_name: rubygem-foreman_remote_execution
-
-upstream_tag_template: v{version}
-
-actions:
-  post-upstream-clone:
-    - "wget https://raw.githubusercontent.com/theforeman/foreman-packaging/rpm/develop/packages/plugins/rubygem-foreman_remote_execution/rubygem-foreman_remote_execution.spec -O rubygem-foreman_remote_execution.spec"
-  get-current-version:
-    - ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("*.gemspec").first).version'
-  create-archive:
-    - gem build foreman_remote_execution.gemspec
-    - bash -c "ls -1t ./foreman_remote_execution-*.gem | head -n 1"
-
-jobs:
-  - job: copr_build
-    trigger: pull_request
-    targets:
-      rhel-8:
-        additional_modules: "foreman-devel:el8"
-        additional_repos:
-          - https://yum.theforeman.org/releases/nightly/el8/x86_64/
-          - https://yum.theforeman.org/plugins/nightly/el8/x86_64/
-      rhel-9:
-        additional_modules: "foreman-devel:el9"
-        additional_repos:
-          - https://yum.theforeman.org/releases/nightly/el9/x86_64/
-          - https://yum.theforeman.org/plugins/nightly/el9/x86_64/
-    module_hotfixes: true
-
-srpm_build_deps:
-  - wget
-  - rubygems

data/.prettierrc

@@ -1,4 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "es5"
-}

data/.rubocop.yml

@@ -1,105 +0,0 @@
-inherit_gem:
-  theforeman-rubocop:
-    - lenient.yml
-    - minitest.yml
-
-inherit_from: .rubocop_todo.yml
-
-inherit_mode:
-  merge:
-    - Exclude
-
-AllCops:
-  TargetRubyVersion: 2.7
-  TargetRailsVersion: 5.2
-  Exclude:
-    - 'node_modules/**/*'
-    - 'vendor/bundle/**/*'
-
-Bundler/OrderedGems:
-  Enabled: false
-
-Layout/DotPosition:
-  Enabled: false
-
-Layout/HashAlignment:
-  Enabled: false
-
-Layout/LineLength:
-  Enabled: false
-
-Layout/ParameterAlignment:
-  Enabled: false
-
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: false
-
-Lint/BooleanSymbol:
-  Enabled: false
-
-Metrics:
-  Enabled: false
-
-Performance/Casecmp:
-  Enabled: false
-
-Performance/RegexpMatch:
-  Enabled: false
-
-Rails:
-  Exclude:
-    - 'lib/foreman_remote_execution_core/**/*'
-    - 'lib/foreman_remote_execution_core.rb'
-
-Rails/Blank:
-  UnlessPresent: false
-
-# Won't work with sqlite
-Rails/BulkChangeTable:
-  Enabled: false
-
-Rails/RefuteMethods:
-  Enabled: false
-
-# Don't prefer is_a? over kind_of?
-Style/ClassCheck:
-  Enabled: false
-
-# Don't enforce certain methods, e.g. detect over find
-Style/CollectionMethods:
-  Enabled: false
-
-Style/ConditionalAssignment:
-  Enabled: false
-
-# Don't enforce frozen string literals
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-# Support both, Ruby 1.9 hashmap and hash-rocket syntax
-Style/HashSyntax:
-  Enabled: false
-
-Style/IfUnlessModifier:
-  Enabled: false
-
-Style/InverseMethods:
-  Enabled: false
-
-Style/MultipleComparison:
-  Enabled: false
-
-Style/NumericPredicate:
-  Enabled: false
-
-Style/ParallelAssignment:
-  Enabled: false
-
-Style/ParenthesesAroundCondition:
-  Enabled: false
-
-Style/PreferredHashMethods:
-  Enabled: false
-
-Style/RaiseArgs:
-  Enabled: false