foreman_remote_execution 11.1.3 → 12.0.0

data/webpack/JobInvocationDetail/JobInvocationOverview.js

@@ -0,0 +1,104 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  Button,
+  DescriptionList,
+  DescriptionListTerm,
+  DescriptionListGroup,
+  DescriptionListDescription,
+} from '@patternfly/react-core';
+import DefaultLoaderEmptyState from 'foremanReact/components/HostDetails/DetailsCard/DefaultLoaderEmptyState';
+import { translate as __, documentLocale } from 'foremanReact/common/I18n';
+
+const JobInvocationOverview = ({ data }) => {
+  const {
+    start_at: startAt,
+    ssh_user: sshUser,
+    template_id: templateId,
+    template_name: templateName,
+    effective_user: effectiveUser,
+    permissions,
+  } = data;
+  const canEditJobTemplates = permissions
+    ? permissions.edit_job_templates
+    : false;
+  const dateOptions = {
+    day: 'numeric',
+    month: 'short',
+    year: 'numeric',
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false,
+    timeZoneName: 'short',
+  };
+  let formattedStartDate = __('Not yet');
+
+  if (startAt) {
+    // Ensures date string compatibility across browsers
+    const convertedDate = new Date(startAt.replace(/[-.]/g, '/'));
+    if (convertedDate.getTime() <= new Date().getTime()) {
+      formattedStartDate = convertedDate.toLocaleString(
+        documentLocale(),
+        dateOptions
+      );
+    }
+  }
+
+  return (
+    <DescriptionList
+      columnModifier={{
+        default: '2Col',
+      }}
+      isHorizontal
+      isCompact
+      isFluid
+      isAutoColumnWidths
+    >
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('Effective user:')}</DescriptionListTerm>
+        <DescriptionListDescription>
+          {effectiveUser || <DefaultLoaderEmptyState />}
+        </DescriptionListDescription>
+      </DescriptionListGroup>
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('Started at:')}</DescriptionListTerm>
+        <DescriptionListDescription>
+          {formattedStartDate}
+        </DescriptionListDescription>
+      </DescriptionListGroup>
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('SSH user:')}</DescriptionListTerm>
+        <DescriptionListDescription>
+          {sshUser || <DefaultLoaderEmptyState />}
+        </DescriptionListDescription>
+      </DescriptionListGroup>
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('Template:')}</DescriptionListTerm>
+        <DescriptionListDescription>
+          {templateName ? (
+            <Button
+              ouiaId="template-link"
+              variant="link"
+              component="a"
+              isInline
+              isDisabled={!canEditJobTemplates}
+              href={
+                templateId ? `/job_templates/${templateId}/edit` : undefined
+              }
+            >
+              {templateName}
+            </Button>
+          ) : (
+            <DefaultLoaderEmptyState />
+          )}
+        </DescriptionListDescription>
+      </DescriptionListGroup>
+    </DescriptionList>
+  );
+};
+
+JobInvocationOverview.propTypes = {
+  data: PropTypes.object.isRequired,
+};
+
+export default JobInvocationOverview;

data/webpack/JobInvocationDetail/JobInvocationSelectors.js

@@ -0,0 +1,5 @@
+import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
+import { JOB_INVOCATION_KEY } from './JobInvocationConstants';
+
+export const selectItems = state =>
+  selectAPIResponse(state, JOB_INVOCATION_KEY);

data/webpack/JobInvocationDetail/index.js

@@ -0,0 +1,77 @@
+import React, { useEffect } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import PropTypes from 'prop-types';
+import { Divider, PageSection, Flex, FlexItem } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
+import { stopInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import { getData } from './JobInvocationActions';
+import { selectItems } from './JobInvocationSelectors';
+import JobInvocationOverview from './JobInvocationOverview';
+import { JOB_INVOCATION_KEY, STATUS } from './JobInvocationConstants';
+
+const JobInvocationDetailPage = ({
+  match: {
+    params: { id },
+  },
+}) => {
+  const dispatch = useDispatch();
+  const items = useSelector(selectItems);
+  const { description, status_label: statusLabel, task } = items;
+  const finished =
+    statusLabel === STATUS.FAILED || statusLabel === STATUS.SUCCEEDED;
+  const autoRefresh = task?.state === STATUS.PENDING || false;
+
+  useEffect(() => {
+    dispatch(getData(`/api/job_invocations/${id}`));
+    if (finished && !autoRefresh) {
+      dispatch(stopInterval(JOB_INVOCATION_KEY));
+    }
+    return () => {
+      dispatch(stopInterval(JOB_INVOCATION_KEY));
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [dispatch, id, finished, autoRefresh]);
+
+  const breadcrumbOptions = {
+    breadcrumbItems: [
+      { caption: __('Jobs'), url: `/job_invocations` },
+      { caption: description },
+    ],
+    isPf4: true,
+  };
+
+  return (
+    <PageLayout
+      header={description}
+      breadcrumbOptions={breadcrumbOptions}
+      searchable={false}
+    >
+      <React.Fragment>
+        <PageSection isFilled variant="light">
+          <Flex>
+            <FlexItem> </FlexItem>
+            <Divider
+              orientation={{
+                default: 'vertical',
+              }}
+            />
+            <FlexItem>
+              <JobInvocationOverview data={items} />
+            </FlexItem>
+          </Flex>
+        </PageSection>
+      </React.Fragment>
+    </PageLayout>
+  );
+};
+
+JobInvocationDetailPage.propTypes = {
+  match: PropTypes.shape({
+    params: PropTypes.shape({
+      id: PropTypes.string.isRequired,
+    }),
+  }).isRequired,
+};
+
+export default JobInvocationDetailPage;

data/webpack/JobWizard/JobWizardPageRerun.js

@@ -1,15 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import URI from 'urijs';
-import {
-  Alert,
-  Title,
-  Divider,
-  Skeleton,
-  Flex,
-  FlexItem,
-  Button,
-} from '@patternfly/react-core';
+import { Alert, Divider, Skeleton, Button } from '@patternfly/react-core';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
@@ -54,25 +46,18 @@ const JobWizardPageRerun = ({
       header={title}
       breadcrumbOptions={breadcrumbOptions}
       searchable={false}
+      toolbarButtons={
+        <Button
+          variant="link"
+          component="a"
+          href={`/old/job_invocations/${id}/rerun${search}`}
+        >
+          {__('Use old form')}
+        </Button>
+      }
     >
       <React.Fragment>
         <React.Fragment>
-          <Flex>
-            <FlexItem>
-              <Title headingLevel="h2" size="2xl">
-                {title}
-              </Title>
-            </FlexItem>
-            <FlexItem align={{ default: 'alignRight' }}>
-              <Button
-                variant="link"
-                component="a"
-                href={`/old/job_invocations/${id}/rerun${search}`}
-              >
-                {__('Use old form')}
-              </Button>
-            </FlexItem>
-          </Flex>
           <Divider component="div" />
         </React.Fragment>
         {!status || status === STATUS.PENDING ? (

data/webpack/JobWizard/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Title, Flex, FlexItem, Button } from '@patternfly/react-core';
+import { Button } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
 import { JobWizard } from './JobWizard';
@@ -18,23 +18,14 @@ const JobWizardPage = ({ location: { search } }) => {
       header={title}
       breadcrumbOptions={breadcrumbOptions}
       searchable={false}
-      beforeToolbarComponent={
-        <Flex>
-          <FlexItem>
-            <Title headingLevel="h2" size="2xl">
-              {title}
-            </Title>
-          </FlexItem>
-          <FlexItem align={{ default: 'alignRight' }}>
-            <Button
-              variant="link"
-              component="a"
-              href={`/old/job_invocations/new${search}`}
-            >
-              {__('Use legacy form')}
-            </Button>
-          </FlexItem>
-        </Flex>
+      toolbarButtons={
+        <Button
+          variant="link"
+          component="a"
+          href={`/old/job_invocations/new${search}`}
+        >
+          {__('Use legacy form')}
+        </Button>
       }
       pageSectionType="wizard"
     >

data/webpack/Routes/routes.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import JobWizardPage from '../JobWizard';
 import JobWizardPageRerun from '../JobWizard/JobWizardPageRerun';
+import JobInvocationDetailPage from '../JobInvocationDetail';
 
 const ForemanREXRoutes = [
   {
@@ -13,6 +14,11 @@ const ForemanREXRoutes = [
     exact: true,
     render: props => <JobWizardPageRerun {...props} />,
   },
+  {
+    path: '/experimental/job_invocations_detail/:id',
+    exact: true,
+    render: props => <JobInvocationDetailPage {...props} />,
+  },
 ];
 
 export default ForemanREXRoutes;

data/webpack/react_app/components/FeaturesDropdown/actions.js

@@ -2,9 +2,11 @@ import { foremanUrl } from 'foremanReact/common/helpers';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { post } from 'foremanReact/redux/API';
 
-export const runFeature = (hostId, feature, label) => dispatch => {
+export const runFeature = (hostId, feature, label, hostSearch) => dispatch => {
   const url = foremanUrl(
-    `/job_invocations?feature=${feature}&host_ids%5B%5D=${hostId}`
+    hostId
+      ? `/job_invocations?feature=${feature}&host_ids%5B%5D=${hostId}`
+      : `/job_invocations?feature=${feature}&search=${hostSearch}`
   );
   const redirectUrl = 'job_invocations/new';
 

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

@@ -0,0 +1,5 @@
+export const REX_FEATURES_HOST_URL = host =>
+  `/api/v2/hosts/${host}/available_remote_execution_features`;
+export const ALL_REX_FEATURES_URL = '/api/v2/remote_execution_features';
+export const NEW_JOB_PAGE = '/job_invocations/new?host_ids%5B%5D';
+export const ALL_HOSTS_NEW_JOB_PAGE = '/job_invocations/new?search';

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

@@ -11,58 +11,83 @@ import { push } from 'connected-react-router';
 
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { foremanUrl } from 'foremanReact/common/helpers';
+import { foremanUrl, propsToCamelCase } from 'foremanReact/common/helpers';
 import { STATUS } from 'foremanReact/constants';
 
-import { REX_FEATURES_API, NEW_JOB_PAGE } from './constant';
+import {
+  REX_FEATURES_HOST_URL,
+  ALL_REX_FEATURES_URL,
+  NEW_JOB_PAGE,
+  ALL_HOSTS_NEW_JOB_PAGE,
+} from './constants';
 import { runFeature } from './actions';
+import './index.scss';
 
-const FeaturesDropdown = ({ hostId }) => {
+const FeaturesDropdown = ({
+  hostId,
+  hostSearch,
+  hostResponse,
+  selectedCount,
+}) => {
   const [isOpen, setIsOpen] = useState(false);
-  const { response, status } = useAPI(
-    'get',
-    foremanUrl(REX_FEATURES_API(hostId))
-  );
+  const isSingleHost = !!hostId; // identifies whether we're on the host details or host overview page
+  const rexFeaturesUrl = isSingleHost
+    ? REX_FEATURES_HOST_URL(hostId)
+    : ALL_REX_FEATURES_URL;
+  const { response, status } = useAPI('get', foremanUrl(rexFeaturesUrl));
   const dispatch = useDispatch();
-  // eslint-disable-next-line camelcase
-  const canRunJob = response?.permissions?.can_run_job;
+  const permissions = propsToCamelCase(
+    (isSingleHost ? response?.permissions : hostResponse?.response) || {}
+  );
+  const canRunJob = isSingleHost
+    ? permissions.canRunJob
+    : permissions.canCreateJobInvocations;
   if (!canRunJob) {
     return null;
   }
-  // eslint-disable-next-line camelcase
-  const features = response?.remote_execution_features;
+
+  const features = isSingleHost
+    ? response?.remote_execution_features // eslint-disable-line camelcase
+    : response?.results;
   const dropdownItems = features
     ?.filter(feature => feature.host_action_button)
     ?.map(({ name, label, id, description }) => (
       <DropdownItem
-        onClick={() => dispatch(runFeature(hostId, label, name))}
+        onClick={() => dispatch(runFeature(hostId, label, name, hostSearch))}
         key={id}
         description={description}
       >
         {name}
       </DropdownItem>
     ));
+  const newJobPageUrl = hostId
+    ? `${NEW_JOB_PAGE}=${hostId}`
+    : `${ALL_HOSTS_NEW_JOB_PAGE}=${hostSearch}`;
   const scheduleJob = [
     <DropdownToggleAction
-      onClick={() => dispatch(push(`${NEW_JOB_PAGE}=${hostId}`))}
+      onClick={() => dispatch(push(newJobPageUrl))}
       key="schedule-job-action"
     >
       {__('Schedule a job')}
     </DropdownToggleAction>,
   ];
 
+  const disableDropdown = !isSingleHost && selectedCount === 0;
+
   return (
     <Dropdown
       ouiaId="schedule-a-job-dropdown"
+      id="schedule-a-job-dropdown"
       alignments={{ default: 'right' }}
       onSelect={() => setIsOpen(false)}
       toggle={
         <DropdownToggle
           ouiaId="schedule-a-job-dropdown-toggle"
+          id="schedule-a-job-dropdown-toggle"
           splitButtonItems={scheduleJob}
           toggleVariant="secondary"
           onToggle={() => setIsOpen(prev => !prev)}
-          isDisabled={status === STATUS.PENDING}
+          isDisabled={status === STATUS.PENDING || disableDropdown}
           splitButtonVariant="action"
         />
       }
@@ -74,9 +99,23 @@ const FeaturesDropdown = ({ hostId }) => {
 
 FeaturesDropdown.propTypes = {
   hostId: PropTypes.number,
+  hostSearch: PropTypes.string,
+  selectedCount: PropTypes.number,
+  hostResponse: PropTypes.shape({
+    response: PropTypes.shape({
+      results: PropTypes.arrayOf(
+        PropTypes.shape({
+          can_create_job_invocations: PropTypes.bool,
+        })
+      ),
+    }),
+  }),
 };
 FeaturesDropdown.defaultProps = {
   hostId: undefined,
+  hostSearch: undefined,
+  selectedCount: 0,
+  hostResponse: undefined,
 };
 
 export default FeaturesDropdown;

data/webpack/react_app/components/FeaturesDropdown/index.scss

@@ -0,0 +1,11 @@
+#schedule-a-job-dropdown ul.pf-c-dropdown__menu {
+  padding-left: 0;
+  li {
+    display: unset;
+    a {
+      font-size: 16px;
+      color: var(--pf-c-dropdown__menu-item--Color);
+      font-weight: 300;
+    }
+  }
+}

data/webpack/react_app/extend/Fills.js

@@ -38,6 +38,12 @@ const fills = [
     component: props => <FeaturesDropdown {...props} />,
     weight: 1000,
   },
+  {
+    slot: '_all-hosts-schedule-a-job',
+    name: '_all-hosts-schedule-a-job',
+    component: props => <FeaturesDropdown {...props} />,
+    weight: 1000,
+  },
 ];
 
 const registerFills = () => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 11.1.3
+  version: 12.0.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.2.0
+        version: 8.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.2.0
+        version: 8.3.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - app/assets/javascripts/foreman_remote_execution/locale/es/foreman_remote_execution.js
 - app/assets/javascripts/foreman_remote_execution/locale/fr/foreman_remote_execution.js
 - app/assets/javascripts/foreman_remote_execution/locale/ja/foreman_remote_execution.js
+- app/assets/javascripts/foreman_remote_execution/locale/ka/foreman_remote_execution.js
 - app/assets/javascripts/foreman_remote_execution/locale/ko/foreman_remote_execution.js
 - app/assets/javascripts/foreman_remote_execution/locale/pt_BR/foreman_remote_execution.js
 - app/assets/javascripts/foreman_remote_execution/locale/ru/foreman_remote_execution.js
@@ -162,6 +163,7 @@ files:
 - app/helpers/job_invocations_helper.rb
 - app/helpers/remote_execution_helper.rb
 - app/lib/actions/middleware/bind_job_invocation.rb
+- app/lib/actions/remote_execution/event_helpers.rb
 - app/lib/actions/remote_execution/proxy_action.rb
 - app/lib/actions/remote_execution/run_host_job.rb
 - app/lib/actions/remote_execution/run_hosts_job.rb
@@ -171,6 +173,7 @@ files:
 - 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
 - app/models/concerns/foreman_remote_execution/bookmark_extensions.rb
 - app/models/concerns/foreman_remote_execution/errors_flattener.rb
@@ -381,6 +384,8 @@ files:
 - locale/gemspec.rb
 - locale/ja/LC_MESSAGES/foreman_remote_execution.mo
 - locale/ja/foreman_remote_execution.po
+- locale/ka/LC_MESSAGES/foreman_remote_execution.mo
+- locale/ka/foreman_remote_execution.po
 - locale/ko/LC_MESSAGES/foreman_remote_execution.mo
 - locale/ko/foreman_remote_execution.po
 - locale/pt_BR/LC_MESSAGES/foreman_remote_execution.mo
@@ -405,7 +410,7 @@ files:
 - 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.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
@@ -426,9 +431,14 @@ files:
 - 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.rb
+- test/unit/renderer_scope_input_test.rb
 - test/unit/targeting_test.rb
 - test/unit/template_invocation_input_value_test.rb
+- webpack/JobInvocationDetail/JobInvocationActions.js
+- webpack/JobInvocationDetail/JobInvocationConstants.js
+- webpack/JobInvocationDetail/JobInvocationOverview.js
+- webpack/JobInvocationDetail/JobInvocationSelectors.js
+- webpack/JobInvocationDetail/index.js
 - webpack/JobWizard/Footer.js
 - webpack/JobWizard/JobWizard.js
 - webpack/JobWizard/JobWizard.scss
@@ -513,8 +523,9 @@ files:
 - webpack/helpers.js
 - webpack/index.js
 - webpack/react_app/components/FeaturesDropdown/actions.js
-- webpack/react_app/components/FeaturesDropdown/constant.js
+- webpack/react_app/components/FeaturesDropdown/constants.js
 - webpack/react_app/components/FeaturesDropdown/index.js
+- webpack/react_app/components/FeaturesDropdown/index.scss
 - webpack/react_app/components/HostKebab/KebabItems.js
 - webpack/react_app/components/RecentJobsCard/JobStatusIcon.js
 - webpack/react_app/components/RecentJobsCard/RecentJobsCard.js
@@ -572,7 +583,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -598,7 +612,7 @@ test_files:
 - 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.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
@@ -619,6 +633,6 @@ test_files:
 - 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.rb
+- test/unit/renderer_scope_input_test.rb
 - test/unit/targeting_test.rb
 - test/unit/template_invocation_input_value_test.rb

data/webpack/react_app/components/FeaturesDropdown/constant.js

@@ -1,3 +0,0 @@
-export const REX_FEATURES_API = host =>
-  `/api/v2/hosts/${host}/available_remote_execution_features`;
-export const NEW_JOB_PAGE = '/job_invocations/new?host_ids%5B%5D';