foreman_remote_execution 13.2.3 → 13.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e86e40030829ea1e82f832a45615c93e2c77ff50ef2d2998f2ee933ef4526252
-  data.tar.gz: c1e97626289a621bea70337993e65d05736ed839844cd0762f40d6b77ef91241
+  metadata.gz: f9049b84ffeb17c5603ee539e395f8de3180211896386064769bdec137a55aa2
+  data.tar.gz: 819932602c95357b78f56a1b04ed837c6f10ada81d653e0c621f832f594c6749
 SHA512:
-  metadata.gz: 076f55dc40c9a0a82e4d69347128063c11c15299966b8ba5b96bdf59755e170473d58acdf32cb937b06aef6277c8fc9a43c842ba59fb250001c691f1cba95439
-  data.tar.gz: def9eff7af10885ecbaa2e88f2773108a17ae1683301f0b5312fef964a640a61fabf96bd275c56928fcca2db6171a2fb6447b4e7043a329e8c9daae9446ea5cc
+  metadata.gz: bd6873c9f48b728cb4d7627c57bade8f1693355ef87d1ec2e7ece5af689fff10b2990edf8da0ae24a438afc0effab6de27be4db0c28908e340ea51dd1cc2bb4a
+  data.tar.gz: 6f56b251e5678619ae91cc0627096a468c04f3c28ad87e0f76adb3978d213d75bf7889d71e4f1228810f52f25a913f6e026e3828f5b5f45d721bd588de0c566e

data/app/helpers/remote_execution_helper.rb

@@ -73,12 +73,14 @@ module RemoteExecutionHelper
       buttons << link_to(_('Rerun'), rerun_job_invocation_path(:id => job_invocation.id),
         :class => 'btn btn-default',
         :title => _('Rerun the job'))
-    end
-    if authorized_for(controller: :job_invocations, action: :create)
       buttons << link_to(_('Rerun failed'), rerun_job_invocation_path(:id => job_invocation.id, :failed_only => 1),
         :class => 'btn btn-default',
         :disabled => job_invocation.failed_hosts.none?,
         :title => _('Rerun on failed hosts'))
+      buttons << link_to(_('Rerun succeeded'), rerun_job_invocation_path(:id => job_invocation.id, :succeeded_only => 1),
+        :class => 'btn btn-default',
+        :disabled => job_invocation.succeeded_hosts.none?,
+        :title => _('Rerun on succeeded hosts'))
     end
     if authorized_for(:permission => :view_foreman_tasks, :auth_object => task, :authorizer => task_authorizer)
       buttons << link_to(_('Job Task'), foreman_tasks_task_path(task),

data/app/views/template_invocations/show.html.erb

@@ -44,13 +44,13 @@ end
     <% if @error %>
       <div class="line error"><%= @error %></div>
     <% else %>
-      <%= link_to_function(_('Scroll to bottom'), '$("html, body").animate({ scrollTop: $(document).height() }, "slow");', :class => 'pull-right scroll-link-bottom') %>
+      <%= link_to_function(_('Scroll to bottom'), '$("#rails-app-content").scrollTop($("#rails-app-content").prop("scrollHeight"));', :class => 'pull-right scroll-link-bottom') %>
 
       <div class="printable">
         <%= render :partial => 'output_line_set', :collection => normalize_line_sets(@line_sets) %>
       </div>
 
-      <%= link_to_function(_('Scroll to top'), '$("html, body").animate({ scrollTop: 0 }, "slow");', :class => 'pull-right scroll-link-top') %>
+      <%= link_to_function(_('Scroll to top'), '$("#rails-app-content").scrollTop(0);', :class => 'pull-right scroll-link-top') %>
     <% end %>
   </div>
 

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

@@ -0,0 +1,15 @@
+<%#
+kind: job_template
+name: Download and run a script
+model: JobTemplate
+job_category: Commands
+description_format: "Download the script from %{url} and run it locally"
+provider_type: script
+template_inputs:
+- name: url
+  description: URL of the script to download and execute
+  input_type: user
+  required: true
+%>
+
+set -o pipefail && curl -sS '<%= input("url") %>' | bash

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '13.2.3'.freeze
+  VERSION = '13.2.5'.freeze
 end

data/locale/foreman_remote_execution.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_remote_execution 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-10 20:01+0200\n"
-"PO-Revision-Date: 2024-07-10 20:01+0200\n"
+"POT-Creation-Date: 2024-07-17 17:11+0200\n"
+"PO-Revision-Date: 2024-07-17 17:11+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/webpack/JobWizard/JobWizardPageRerun.js

@@ -1,16 +1,33 @@
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import React from 'react';
 import URI from 'urijs';
-import { Alert, Button, Divider, Skeleton } from '@patternfly/react-core';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  Alert,
+  Divider,
+  Skeleton,
+  Button,
+  Title,
+  EmptyState,
+  EmptyStateVariant,
+  EmptyStateIcon,
+  EmptyStateBody,
+} from '@patternfly/react-core';
+import { ExclamationCircleIcon } from '@patternfly/react-icons';
+import { global_palette_red_200 as exclamationColor } from '@patternfly/react-tokens';
+import { get } from 'foremanReact/redux/API';
+import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
+import { STATUS } from 'foremanReact/constants';
 import {
   useForemanLocation,
   useForemanOrganization,
 } from 'foremanReact/Root/Context/ForemanContext';
-import { translate as __, sprintf } from 'foremanReact/common/I18n';
-import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
-import { STATUS } from 'foremanReact/constants';
-import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
 import { JobWizard } from './JobWizard';
+import {
+  selectRerunJobInvocationResponse,
+  selectRerunJobInvocationStatus,
+} from './JobWizardSelectors';
 import { JOB_API_KEY } from './JobWizardConstants';
 
 const JobWizardPageRerun = ({
@@ -19,6 +36,7 @@ const JobWizardPageRerun = ({
   },
   location: { search },
 }) => {
+  const dispatch = useDispatch();
   const uri = new URI(search);
   const { failed_only: failedOnly } = uri.search(true);
   const { succeeded_only: succeededOnly } = uri.search(true);
@@ -28,11 +46,6 @@ const JobWizardPageRerun = ({
   } else if (succeededOnly) {
     queryParams = '&succeeded_only=1';
   }
-  const { response, status } = useAPI(
-    'get',
-    `/ui_job_wizard/job_invocation?id=${id}${queryParams}`,
-    JOB_API_KEY
-  );
   const title = __('Run job');
   const breadcrumbOptions = {
     breadcrumbItems: [
@@ -41,11 +54,55 @@ const JobWizardPageRerun = ({
     ],
   };
 
-  const jobOrganization = response.job_organization;
-  const jobLocation = response.job_location;
+  const [errorMessage, setErrorMessage] = useState('');
+  const jobInvocationResponse = useSelector(selectRerunJobInvocationResponse);
+  const jobInvocationStatus = useSelector(selectRerunJobInvocationStatus);
+  const jobOrganization = jobInvocationResponse.job_organization;
+  const jobLocation = jobInvocationResponse.job_location;
   const currentOrganization = useForemanOrganization();
   const currentLocation = useForemanLocation();
 
+  const emptyStateLarge = (
+    <EmptyState variant={EmptyStateVariant.large}>
+      <EmptyStateIcon
+        icon={ExclamationCircleIcon}
+        color={exclamationColor.value}
+      />
+      <Title ouiaId="job-wizard-empty-state-header" headingLevel="h4" size="lg">
+        {__('Unable to run job')}
+      </Title>
+      <EmptyStateBody>{sprintf(errorMessage)}</EmptyStateBody>
+      <Button
+        ouiaId="job-wizard-run-job-button"
+        component="a"
+        href="/job_invocations/new"
+        variant="primary"
+      >
+        {__('Create job')}
+      </Button>
+    </EmptyState>
+  );
+
+  useEffect(() => {
+    let isMounted = true;
+    if (id !== undefined) {
+      dispatch(
+        get({
+          key: JOB_API_KEY,
+          url: `/ui_job_wizard/job_invocation?id=${id}${queryParams}`,
+          handleError: ({ response }) => {
+            if (isMounted) {
+              setErrorMessage(response?.data?.error?.message);
+            }
+          },
+        })
+      );
+    }
+    return () => {
+      isMounted = false;
+    };
+  }, [dispatch, id, failedOnly, queryParams]);
+
   return (
     <PageLayout
       header={title}
@@ -66,14 +123,16 @@ const JobWizardPageRerun = ({
         <React.Fragment>
           <Divider component="div" />
         </React.Fragment>
-        {!status || status === STATUS.PENDING ? (
+        {jobInvocationStatus === STATUS.ERROR && emptyStateLarge}
+        {(!jobInvocationStatus || jobInvocationStatus === STATUS.PENDING) && (
           <div style={{ height: '400px' }}>
             <Skeleton
               height="100%"
               screenreaderText="Loading large rectangle contents"
             />
           </div>
-        ) : (
+        )}
+        {jobInvocationStatus === STATUS.RESOLVED && (
           <React.Fragment>
             {jobOrganization?.id !== currentOrganization?.id && (
               <Alert
@@ -107,7 +166,12 @@ const JobWizardPageRerun = ({
             )}
             <Divider component="div" />
             <JobWizard
-              rerunData={{ ...response?.job, inputs: response?.inputs } || null}
+              rerunData={
+                {
+                  ...jobInvocationResponse?.job,
+                  inputs: jobInvocationResponse?.inputs,
+                } || null
+              }
             />
           </React.Fragment>
         )}

data/webpack/JobWizard/JobWizardSelectors.js

@@ -14,8 +14,15 @@ import {
   JOB_TEMPLATE,
   HOSTS_API,
   JOB_INVOCATION,
+  JOB_API_KEY,
 } from './JobWizardConstants';
 
+export const selectRerunJobInvocationResponse = state =>
+  selectAPIResponse(state, JOB_API_KEY) || {};
+
+export const selectRerunJobInvocationStatus = state =>
+  selectAPIStatus(state, JOB_API_KEY);
+
 export const selectJobTemplatesStatus = state =>
   selectAPIStatus(state, JOB_TEMPLATES);
 

data/webpack/JobWizard/__tests__/fixtures.js

@@ -114,6 +114,8 @@ export const jobCategories = ['Services', 'Ansible Commands', 'Puppet'];
 
 export const testSetup = (selectors, api) => {
   jest.spyOn(api, 'get');
+  jest.spyOn(selectors, 'selectRerunJobInvocationResponse');
+  jest.spyOn(selectors, 'selectRerunJobInvocationStatus');
   jest.spyOn(selectors, 'selectJobTemplate');
   jest.spyOn(selectors, 'selectJobTemplates');
   jest.spyOn(selectors, 'selectJobCategories');
@@ -123,6 +125,10 @@ export const testSetup = (selectors, api) => {
 
   jest.spyOn(selectors, 'selectTemplateInputs');
   jest.spyOn(selectors, 'selectAdvancedTemplateInputs');
+  selectors.selectRerunJobInvocationResponse.mockImplementation(
+    () => jobInvocation
+  );
+  selectors.selectRerunJobInvocationStatus.mockImplementation(() => 'RESOLVED');
   selectors.selectWithKatello.mockImplementation(() => true);
   selectors.selectTemplateInputs.mockImplementation(
     () => jobTemplateResponse.template_inputs

data/webpack/JobWizard/steps/ReviewDetails/ReviewDetails.test.js

@@ -14,16 +14,17 @@ import {
   jobInvocation,
 } from '../../__tests__/fixtures';
 
+jest.useFakeTimers();
 const store = testSetup(selectors, api);
 mockApi(api);
 jest.spyOn(APIHooks, 'useAPI');
+store.dispatch = jest.fn();
 APIHooks.useAPI.mockImplementation((action, url) => {
   if (url === '/ui_job_wizard/job_invocation?id=57') {
     return { response: jobInvocation, status: 'RESOLVED' };
   }
   return {};
 });
-jest.useFakeTimers();
 
 describe('ReviewDetails', () => {
   it('should call goToStepByName function when StepButton is clicked', async () => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 13.2.3
+  version: 13.2.5
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -295,6 +295,7 @@ files:
 - app/views/templates/script/puppet_install_modules_from_git.erb
 - app/views/templates/script/puppet_run_once.erb
 - app/views/templates/script/run_command.erb
+- app/views/templates/script/run_downloaded_script.erb
 - app/views/templates/script/service_action.erb
 - config/routes.rb
 - db/migrate/20150612121541_add_job_template_to_template.rb