foreman_remote_execution 13.2.4 → 13.2.6

data/locale/zh_TW/foreman_remote_execution.po

@@ -5,11 +5,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_remote_execution 9.0.1\n"
+"Project-Id-Version: foreman_remote_execution 14.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-15 13:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
+"Language-Team: Chinese (Taiwan) (http://app.transifex.com/foreman/foreman/lang"
 "uage/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,7 +86,7 @@ msgid "Abort Job"
 msgstr ""
 
 msgid "Access denied"
-msgstr ""
+msgstr "拒絕存取"
 
 msgid "Actions"
 msgstr "動作"
@@ -137,7 +137,7 @@ msgid "Awaiting start"
 msgstr ""
 
 msgid "Back"
-msgstr ""
+msgstr "上一步"
 
 msgid "Back to Job"
 msgstr "回到工作"
@@ -776,7 +776,7 @@ msgid "New UI"
 msgstr ""
 
 msgid "Next"
-msgstr ""
+msgstr "下一步"
 
 msgid "No (override)"
 msgstr ""
@@ -1555,7 +1555,7 @@ msgid "You are not allowed to see the currently assigned template. Saving the fo
 msgstr "您不能看到目前指定的範本。現在儲存表單會取消指定範本。"
 
 msgid "You are not authorized to perform this action."
-msgstr ""
+msgstr "您未經許可執行這項動作。"
 
 msgid "You have %s results to display. Showing first %s results"
 msgstr ""

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.4
+  version: 13.2.6
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface