foreman_remote_execution 16.0.1 → 16.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a41cb26fee902fc19cc5a8fe4adcbacdef4944095478f1d55a6220c718c16ea
-  data.tar.gz: a0332ea0045f6c1365ff40ae80824f4f7cae6689faa5de33c06684f602ad980d
+  metadata.gz: 40f170b56effb3a3f7f415ac040d45242641bc3210266bf723d957a4337e8aa2
+  data.tar.gz: c6a8e5a792629049aa8e40fdc2a3b6b20cc182af3e0e3d1578e5e3614525e7d0
 SHA512:
-  metadata.gz: b0c82d765d09a001fde64799b48d76c70f7801f438311c77ed0e4d6a1f8baa1f19f1e2a7d3a88175676c3d426c0a623fce59a8fbd1a4cd6c6a05e60b12eeb3b0
-  data.tar.gz: 565ae8340a1238de653aec41ac1f210f47105b14977bd51d923ec7bd75631222962a9bb5e6df63d757ddd67a114109edb05626e30fc050fa6b84b2e900c0a529
+  metadata.gz: 7b47defe2e23b8ce3ac1ebc08164749d7c2a03a133f78dfcb702c76cd4f434786b0dbeceb72c2d7ca47cedbd5d1f688175b9e0680245eac4e1064f9739d2b68c
+  data.tar.gz: c0d069ef4dde5b1a07cb38b60f0dcc7218487cc58a5a2961039f2603517a2fdc5060b603b4a13b5ff4c659a13b9b25eb836b59e5e3d6efbe1e69202364cc0f87

data/app/controllers/template_invocations_controller.rb

@@ -38,9 +38,17 @@ class TemplateInvocationsController < ApplicationController
       }
     end
 
+    smart_proxy = @template_invocation.smart_proxy
+    if smart_proxy
+      proxy = {
+        name: smart_proxy.name,
+        href: smart_proxy_path(smart_proxy),
+      }
+    end
+
     auto_refresh = @job_invocation.task.try(:pending?)
     finished = @job_invocation.status_label == 'failed' || @job_invocation.status_label == 'succeeded' || @job_invocation.status_label == 'cancelled'
-    render :json => { :output => lines, :preview => template_invocation_preview(@template_invocation, @host), :input_values => transformed_input_values, :job_invocation_description => @job_invocation.description, :task_id => @template_invocation_task.id, :task_cancellable => @template_invocation_task.cancellable?, :host_name => @host.name, :permissions => {
+    render :json => { :output => lines, :preview => template_invocation_preview(@template_invocation, @host), :proxy => proxy, :input_values => transformed_input_values, :job_invocation_description => @job_invocation.description, :task_id => @template_invocation_task.id, :task_cancellable => @template_invocation_task.cancellable?, :host_name => @host.name, :permissions => {
       :view_foreman_tasks => User.current.allowed_to?(:view_foreman_tasks),
       :cancel_job_invocations => User.current.allowed_to?(:cancel_job_invocations),
       :execute_jobs => User.current.allowed_to?(:create_job_invocations) && (!@host.infrastructure_host? || User.current.can?(:execute_jobs_on_infrastructure_hosts)),

data/app/views/templates/script/package_action.erb

@@ -105,7 +105,11 @@ handle_zypp_res_codes () {
 
 # Action
 <% if package_manager == 'yum' -%>
-  yum -y <%= input("options") %> <%= action %> <%= input("package") %>
+  <% if @host.respond_to?(:yum_or_yum_transient) -%>
+    <%= @host.yum_or_yum_transient %> -y <%= input("options") %> <%= action %> <%= input("package") %>
+  <% else -%>
+    yum -y <%= input("options") %> <%= action %> <%= input("package") %>
+  <% end -%>
 <% elsif package_manager == 'apt' -%>
   <%-
     action = 'install' if action == 'group install'

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '16.0.1'.freeze
+  VERSION = '16.0.3'.freeze
 end

data/webpack/JobInvocationDetail/JobAdditionInfo.js

@@ -169,7 +169,7 @@ const Inputs = ({ data }) => {
   const inputs =
     data?.pattern_template_invocations?.[0]?.template_invocation_input_values;
 
-  if (!inputs) return null;
+  if (!inputs || inputs.length === 0) return null;
   return (
     <ExpandableSection
       toggleText={__('User Inputs')}

data/webpack/JobInvocationDetail/TemplateInvocation.js

@@ -53,6 +53,7 @@ export const TemplateInvocation = ({
   jobID,
   isInTableView,
   hostName,
+  hostProxy,
 }) => {
   const templateURL = showTemplateInvocationUrl(hostID, jobID);
   const hostDetailsPageUrl = useForemanHostDetailsPageUrl();
@@ -150,10 +151,18 @@ export const TemplateInvocation = ({
         permissions={permissions}
       />
       {!isInTableView && (
-        <div>
-          {__('Target:')}{' '}
-          <a href={`${hostDetailsPageUrl}${hostName}`}>{hostName}</a>
-        </div>
+        <>
+          <div>
+            {__('Target:')}{' '}
+            <a href={`${hostDetailsPageUrl}${hostName}`}>{hostName}</a>{' '}
+            {!!hostProxy && (
+              <>
+                {__('using Smart Proxy')}{' '}
+                <a href={hostProxy.href}>{hostProxy.name}</a>
+              </>
+            )}
+          </div>
+        </>
       )}
       {showTemplatePreview && <PreviewTemplate inputValues={inputValues} />}
       {showCommand && (
@@ -185,6 +194,7 @@ export const TemplateInvocation = ({
 TemplateInvocation.propTypes = {
   hostID: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   hostName: PropTypes.string, // only used when isInTableView is false
+  hostProxy: PropTypes.object, // only used when isInTableView is false
   jobID: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   isInTableView: PropTypes.bool,
 };
@@ -192,6 +202,7 @@ TemplateInvocation.propTypes = {
 TemplateInvocation.defaultProps = {
   isInTableView: true,
   hostName: '',
+  hostProxy: {},
 };
 
 CopyToClipboard.propTypes = {

data/webpack/JobInvocationDetail/TemplateInvocationComponents/OutputCodeBlock.js

@@ -1,4 +1,9 @@
-import React from 'react';
+import React, {
+  useEffect,
+  useLayoutEffect,
+  useState,
+  useCallback,
+} from 'react';
 import PropTypes from 'prop-types';
 import { Button } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -55,6 +60,48 @@ export const OutputCodeBlock = ({ code, showOutputType, scrollElement }) => {
   const filteredCode = code.filter(
     ({ output_type: outputType }) => showOutputType[outputType]
   );
+
+  const scrollElementSelected = useCallback(
+    () => document.querySelector(scrollElement),
+    [scrollElement]
+  );
+  const onClickScrollToTop = useCallback(() => {
+    if (scrollElementSelected()) scrollElementSelected().scrollTo(0, 0);
+  }, [scrollElementSelected]);
+
+  const onClickScrollToBottom = useCallback(() => {
+    if (scrollElementSelected())
+      scrollElementSelected().scrollTo(0, scrollElementSelected().scrollHeight);
+  }, [scrollElementSelected]);
+
+  const [isScrolledBottom, setIsScrolledBottom] = useState(true);
+  useEffect(() => {
+    const element = scrollElementSelected();
+    const onScroll = () => {
+      if (
+        Math.abs(
+          element.scrollHeight - element.scrollTop - element.clientHeight
+        ) < 1
+      )
+        setIsScrolledBottom(true);
+      else setIsScrolledBottom(false);
+    };
+    if (element) {
+      element.addEventListener('scroll', onScroll);
+    }
+    return () => {
+      if (element) {
+        element.removeEventListener('scroll', onScroll);
+      }
+    };
+  }, [scrollElementSelected]);
+
+  useLayoutEffect(() => {
+    if (isScrolledBottom) {
+      onClickScrollToBottom();
+    }
+  }, [code.length, isScrolledBottom, onClickScrollToBottom]);
+
   if (!filteredCode.length) {
     return <div>{__('No output for the selected filters')}</div>;
   }
@@ -81,13 +128,7 @@ export const OutputCodeBlock = ({ code, showOutputType, scrollElement }) => {
       );
     });
   });
-  const scrollElementSeleceted = () => document.querySelector(scrollElement);
-  const onClickScrollToTop = () => {
-    scrollElementSeleceted().scrollTo(0, 0);
-  };
-  const onClickScrollToBottom = () => {
-    scrollElementSeleceted().scrollTo(0, scrollElementSeleceted().scrollHeight);
-  };
+
   return (
     <div className="invocation-output">
       <Button

data/webpack/JobInvocationDetail/TemplateInvocationComponents/TemplateActionButtons.js

@@ -102,12 +102,10 @@ export const RowActions = ({ hostID, jobID }) => {
     .map(({ text, href, onClick, permission, isDisabled }) =>
       permission
         ? {
-            title: text,
-            component: 'a',
-            className: 'jobs-table-action-item',
-            href,
+            title: <a href={href}>{text}</a>,
             onClick,
             isDisabled,
+            className: 'jobs-table-action-item',
           }
         : null
     )

data/webpack/JobInvocationDetail/TemplateInvocationComponents/index.scss

@@ -1,3 +1,9 @@
-.jobs-table-action-item:hover {
-    color: var(--pf-v5-c-dropdown__menu-item--Color);
+.jobs-table-action-item a {
+
+    color: inherit;
+    text-decoration: none;
+
+    :hover {
+        color: var(--pf-v5-c-dropdown__menu-item--Color);
+    }
 }

data/webpack/JobInvocationDetail/TemplateInvocationPage.js

@@ -15,6 +15,7 @@ const TemplateInvocationPage = ({
   const {
     job_invocation_description: jobDescription,
     host_name: hostName,
+    proxy: hostProxy,
   } = useSelector(selectTemplateInvocation);
   const description = sprintf(__('Template Invocation for %s'), hostName);
   const breadcrumbOptions = {
@@ -36,6 +37,7 @@ const TemplateInvocationPage = ({
         jobID={jobID}
         isInTableView={false}
         hostName={hostName}
+        hostProxy={hostProxy}
       />
     </PageLayout>
   );

data/webpack/JobInvocationDetail/__tests__/TemplateInvocation.test.js

@@ -32,12 +32,16 @@ describe('TemplateInvocation', () => {
           jobID="1"
           isInTableView={false}
           hostName="example-host"
+          hostProxy={{ name: 'example-proxy', href: '#' }}
         />
       </Provider>
     );
 
-    expect(screen.getByText('Target:')).toBeInTheDocument();
     expect(screen.getByText('example-host')).toBeInTheDocument();
+    expect(screen.getByText('example-proxy')).toBeInTheDocument();
+
+    expect(screen.getByText(/using Smart Proxy/)).toBeInTheDocument();
+    expect(screen.getByText(/Target:/)).toBeInTheDocument();
 
     expect(screen.getByText('This is red text')).toBeInTheDocument();
     expect(screen.getByText('This is default text')).toBeInTheDocument();
@@ -50,6 +54,7 @@ describe('TemplateInvocation', () => {
           jobID="1"
           isInTableView={false}
           hostName="example-host"
+          hostProxy={{ name: 'example-proxy', href: '#' }}
         />
       </Provider>
     );
@@ -101,6 +106,7 @@ describe('TemplateInvocation', () => {
         jobID="1"
         isInTableView={false}
         hostName="example-host"
+        hostProxy={{ name: 'example-proxy', href: '#' }}
       />
     );
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 16.0.1
+  version: 16.0.3
 platform: ruby
 authors:
 - Foreman Remote Execution team
 bindir: bin
 cert_chain: []
-date: 2025-03-26 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -92,8 +92,8 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE
+- README.md
 files:
 - LICENSE
 - README.md
@@ -605,7 +605,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config
   management functionality with remote management functionality.