foreman_remote_execution 4.5.5 → 4.8.0

data/webpack/JobWizard/steps/form/NumberInput.js

@@ -5,6 +5,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 
 export const NumberInput = ({ formProps, inputProps }) => {
   const [validated, setValidated] = useState();
+  const name = inputProps.id.replace(/-/g, ' ');
   return (
     <FormGroup
       {...formProps}
@@ -12,6 +13,7 @@ export const NumberInput = ({ formProps, inputProps }) => {
       validated={validated}
     >
       <TextInput
+        aria-label={name}
         type="text"
         {...inputProps}
         onChange={newValue => {

data/webpack/JobWizard/steps/form/WizardTitle.js

@@ -0,0 +1,14 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Title } from '@patternfly/react-core';
+
+export const WizardTitle = ({ title, ...props }) => (
+  <Title headingLevel="h2" className="wizard-title" {...props}>
+    {title}
+  </Title>
+);
+
+WizardTitle.propTypes = {
+  title: PropTypes.string.isRequired,
+};
+export default WizardTitle;

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

@@ -0,0 +1,43 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  CheckCircleIcon,
+  ExclamationCircleIcon,
+  QuestionCircleIcon,
+} from '@patternfly/react-icons';
+import { JOB_SUCCESS_STATUS, JOB_ERROR_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>
+      );
+    case JOB_ERROR_STATUS:
+      return (
+        <span className="job-error">
+          <ExclamationCircleIcon {...props} /> {children}
+        </span>
+      );
+    default:
+      return (
+        <span className="job-info">
+          <QuestionCircleIcon {...props} /> {children}
+        </span>
+      );
+  }
+};
+
+JobStatusIcon.propTypes = {
+  status: PropTypes.number,
+  children: PropTypes.string.isRequired,
+};
+
+JobStatusIcon.defaultProps = {
+  status: undefined,
+};
+
+export default JobStatusIcon;

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

@@ -1,76 +1,78 @@
-/* eslint-disable camelcase */
-
 import PropTypes from 'prop-types';
-import React from 'react';
-import Skeleton from 'react-loading-skeleton';
-import ElipsisWithTooltip from 'react-ellipsis-with-tooltip';
-
-import { Grid, GridItem } from '@patternfly/react-core';
-import {
-  PropertiesSidePanel,
-  PropertyItem,
-} from '@patternfly/react-catalog-view-extension';
-import { ArrowIcon, ErrorCircleOIcon, OkIcon } from '@patternfly/react-icons';
+import React, { useState } from 'react';
 
-import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
-import CardItem from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
-import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
+import { DropdownItem, Tabs, Tab, TabTitleText } from '@patternfly/react-core';
+import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
 import { translate as __ } from 'foremanReact/common/I18n';
-import './styles.css';
+import { foremanUrl } from 'foremanReact/common/helpers';
 
-const RecentJobsCard = ({ hostDetails: { name } }) => {
-  const jobsUrl =
-    name && `/api/job_invocations?search=host%3D${name}&per_page=3`;
-  const {
-    response: { results: jobs },
-  } = useAPI('get', jobsUrl);
+import {
+  FINISHED_TAB,
+  RUNNING_TAB,
+  SCHEDULED_TAB,
+  JOB_BASE_URL,
+} from './constants';
+import RecentJobsTable from './RecentJobsTable';
 
-  const iconMarkup = status => {
-    if (status === 1) return <ErrorCircleOIcon color="#C9190B" />;
-    return <OkIcon color="#3E8635" />;
-  };
+const RecentJobsCard = ({ hostDetails: { name, id } }) => {
+  const [activeTab, setActiveTab] = useState(FINISHED_TAB);
+
+  const handleTabClick = (evt, tabIndex) => setActiveTab(tabIndex);
 
   return (
-    <CardItem
-      header={
-        <span>
-          {__('Recent Jobs')}{' '}
-          <a href={`/job_invocations?search=host+%3D+${name}`}>
-            <ArrowIcon />
-          </a>
-        </span>
-      }
+    <CardTemplate
+      overrideGridProps={{ xl: 8, lg: 8, md: 12 }}
+      header={__('Recent jobs')}
+      dropdownItems={[
+        <DropdownItem
+          href={foremanUrl(`${JOB_BASE_URL}${name}`)}
+          key="link-to-all"
+        >
+          {__('View All Jobs')}
+        </DropdownItem>,
+        <DropdownItem
+          href={foremanUrl(
+            `${JOB_BASE_URL}${name}+and+status+%3D+failed+or+status%3D+succeeded`
+          )}
+          key="link-to-finished"
+        >
+          {__('View Finished Jobs')}
+        </DropdownItem>,
+        <DropdownItem
+          href={foremanUrl(`${JOB_BASE_URL}${name}+and+status+%3D+running`)}
+          key="link-to-running"
+        >
+          {__('View Running Jobs')}
+        </DropdownItem>,
+        <DropdownItem
+          href={foremanUrl(`${JOB_BASE_URL}${name}+and+status+%3D+queued`)}
+          key="link-to-scheduled"
+        >
+          {__('View Scheduled Jobs')}
+        </DropdownItem>,
+      ]}
     >
-      <PropertiesSidePanel>
-        {jobs?.map(({ status, status_label, id, start_at, description }) => (
-          <PropertyItem
-            key={id}
-            label={
-              description ? (
-                <Grid>
-                  <GridItem span={8}>
-                    <ElipsisWithTooltip>{description}</ElipsisWithTooltip>
-                  </GridItem>
-                  <GridItem span={1}>{iconMarkup(status)}</GridItem>
-                  <GridItem span={3}>{status_label}</GridItem>
-                </Grid>
-              ) : (
-                <Skeleton />
-              )
-            }
-            value={
-              start_at ? (
-                <a href={`/job_invocations/${id}`}>
-                  <RelativeDateTime date={start_at} />
-                </a>
-              ) : (
-                <Skeleton />
-              )
-            }
-          />
-        ))}
-      </PropertiesSidePanel>
-    </CardItem>
+      <Tabs mountOnEnter activeKey={activeTab} onSelect={handleTabClick}>
+        <Tab
+          eventKey={FINISHED_TAB}
+          title={<TabTitleText>{__('Finished')}</TabTitleText>}
+        >
+          <RecentJobsTable hostId={id} status="failed+or+status%3D+succeeded" />
+        </Tab>
+        <Tab
+          eventKey={RUNNING_TAB}
+          title={<TabTitleText>{__('Running')}</TabTitleText>}
+        >
+          <RecentJobsTable hostId={id} status="running" />
+        </Tab>
+        <Tab
+          eventKey={SCHEDULED_TAB}
+          title={<TabTitleText>{__('Scheduled')}</TabTitleText>}
+        >
+          <RecentJobsTable hostId={id} status="queued" />
+        </Tab>
+      </Tabs>
+    </CardTemplate>
   );
 };
 
@@ -79,5 +81,10 @@ export default RecentJobsCard;
 RecentJobsCard.propTypes = {
   hostDetails: PropTypes.shape({
     name: PropTypes.string,
-  }).isRequired,
+    id: PropTypes.number,
+  }),
+};
+
+RecentJobsCard.defaultProps = {
+  hostDetails: {},
 };

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

@@ -0,0 +1,98 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import {
+  DataList,
+  DataListItem,
+  DataListItemRow,
+  DataListItemCells,
+  DataListCell,
+  DataListWrapModifier,
+  Text,
+  Bullseye,
+} from '@patternfly/react-core';
+import { STATUS } from 'foremanReact/constants';
+
+import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import SkeletonLoader from 'foremanReact/components/common/SkeletonLoader';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from 'foremanReact/common/helpers';
+
+import JobStatusIcon from './JobStatusIcon';
+import { JOB_API_URL, JOBS_IN_CARD } from './constants';
+
+const RecentJobsTable = ({ status, hostId }) => {
+  const jobsUrl =
+    hostId &&
+    foremanUrl(
+      `${JOB_API_URL}${hostId}+and+status%3D${status}&per_page=${JOBS_IN_CARD}`
+    );
+  const {
+    response: { results: jobs },
+    status: responseStatus,
+  } = useAPI('get', jobsUrl);
+
+  return (
+    <DataList aria-label="recent-jobs-table" isCompact>
+      <SkeletonLoader
+        skeletonProps={{ count: 3 }}
+        status={responseStatus || STATUS.PENDING}
+        emptyState={
+          <Bullseye>
+            <Text style={{ marginTop: '20px' }} component="p">
+              {__('No results found')}
+            </Text>
+          </Bullseye>
+        }
+      >
+        {jobs?.length &&
+          jobs.map(
+            ({
+              status: jobStatus,
+              status_label: label,
+              id,
+              start_at: startAt,
+              description,
+            }) => (
+              <DataListItem key={id}>
+                <DataListItemRow>
+                  <DataListItemCells
+                    dataListCells={[
+                      <DataListCell
+                        wrapModifier={DataListWrapModifier.truncate}
+                        key={`name-${id}`}
+                      >
+                        <a href={foremanUrl(`/job_invocations/${id}`)}>
+                          {description}
+                        </a>
+                      </DataListCell>,
+                      <DataListCell key={`date-${id}`}>
+                        <RelativeDateTime date={startAt} />
+                      </DataListCell>,
+                      <DataListCell key={`status-${id}`}>
+                        <JobStatusIcon status={jobStatus}>
+                          {label}
+                        </JobStatusIcon>
+                      </DataListCell>,
+                    ]}
+                  />
+                </DataListItemRow>
+              </DataListItem>
+            )
+          )}
+      </SkeletonLoader>
+    </DataList>
+  );
+};
+
+RecentJobsTable.propTypes = {
+  hostId: PropTypes.number,
+  status: PropTypes.string,
+};
+
+RecentJobsTable.defaultProps = {
+  hostId: undefined,
+  status: STATUS.PENDING,
+};
+
+export default RecentJobsTable;

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

@@ -1 +1,12 @@
 export const HOST_DETAILS_JOBS = 'HOST_DETAILS_JOBS';
+export const FINISHED_TAB = 0;
+export const RUNNING_TAB = 1;
+export const SCHEDULED_TAB = 2;
+
+export const JOB_SUCCESS_STATUS = 0;
+export const JOB_ERROR_STATUS = 1;
+
+export const JOB_BASE_URL = '/job_invocations?search=host+%3D+';
+export const JOB_API_URL =
+  '/api/job_invocations?order=start_at+DESC&search=targeted_host_id%3D';
+export const JOBS_IN_CARD = 3;

data/webpack/react_app/components/RecentJobsCard/styles.scss

@@ -0,0 +1,11 @@
+.job-success {
+  color: var(--pf-global--success-color--100);
+}
+
+.job-error {
+  color: var(--pf-global--danger-color--100);
+}
+
+.job-info {
+  color: var(--pf-global--info-color--200);
+}

data/webpack/react_app/extend/fillRecentJobsCard.js

@@ -6,6 +6,6 @@ export default () =>
   addGlobalFill(
     'details-cards',
     'rex-host-details-latest-jobs',
-    <RecentJobsCard />,
+    <RecentJobsCard key="rex-host-details-latest-jobs" />,
     1000
   );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 4.5.5
+  version: 4.8.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -44,34 +44,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: foreman_remote_execution_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +136,7 @@ files:
 - app/controllers/remote_execution_features_controller.rb
 - app/controllers/template_invocations_controller.rb
 - app/controllers/ui_job_wizard_controller.rb
+- app/graphql/types/job_invocation.rb
 - app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb
 - app/helpers/concerns/foreman_remote_execution/job_templates_extensions.rb
 - app/helpers/job_invocation_output_helper.rb
@@ -163,6 +150,7 @@ files:
 - app/lib/foreman_remote_execution/renderer/scope/input.rb
 - app/lib/proxy_api/remote_execution_ssh.rb
 - app/mailers/.gitkeep
+- app/mailers/rex_job_mailer.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
@@ -190,6 +178,7 @@ files:
 - app/models/job_template_effective_user.rb
 - app/models/remote_execution_feature.rb
 - app/models/remote_execution_provider.rb
+- app/models/rex_mail_notification.rb
 - app/models/setting/remote_execution.rb
 - app/models/ssh_execution_provider.rb
 - app/models/target_remote_execution_proxy.rb
@@ -229,6 +218,7 @@ files:
 - 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
 - app/views/job_invocations/_card_schedule.html.erb
@@ -262,6 +252,8 @@ files:
 - app/views/remote_execution_features/_form.html.erb
 - app/views/remote_execution_features/index.html.erb
 - app/views/remote_execution_features/show.html.erb
+- app/views/rex_job_mailer/job_finished.html.erb
+- app/views/rex_job_mailer/job_finished.text.erb
 - app/views/template_inputs/_foreign_input_set_form.html.erb
 - app/views/template_invocations/_output_line_set.html.erb
 - app/views/template_invocations/_refresh.js.erb
@@ -331,6 +323,7 @@ files:
 - db/seeds.d/60-ssh_proxy_feature.rb
 - db/seeds.d/70-job_templates.rb
 - db/seeds.d/90-bookmarks.rb
+- db/seeds.d/95-mail_notifications.rb
 - extra/cockpit/cockpit.conf.example
 - extra/cockpit/foreman-cockpit-session
 - extra/cockpit/foreman-cockpit.service
@@ -380,6 +373,8 @@ 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/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
@@ -416,17 +411,25 @@ files:
 - webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.js
 - webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.test.js
 - webpack/JobWizard/steps/CategoryAndTemplate/index.js
+- webpack/JobWizard/steps/HostsAndInputs/SelectedChips.js
+- webpack/JobWizard/steps/HostsAndInputs/TemplateInputs.js
+- webpack/JobWizard/steps/HostsAndInputs/__tests__/SelectedChips.test.js
+- webpack/JobWizard/steps/HostsAndInputs/__tests__/TemplateInputs.test.js
+- webpack/JobWizard/steps/HostsAndInputs/index.js
 - webpack/JobWizard/steps/Schedule/QueryType.js
 - webpack/JobWizard/steps/Schedule/RepeatOn.js
 - webpack/JobWizard/steps/Schedule/ScheduleType.js
 - webpack/JobWizard/steps/Schedule/StartEndDates.js
+- webpack/JobWizard/steps/Schedule/__tests__/Schedule.test.js
 - webpack/JobWizard/steps/Schedule/__tests__/StartEndDates.test.js
 - webpack/JobWizard/steps/Schedule/index.js
+- webpack/JobWizard/steps/form/DateTimePicker.js
 - webpack/JobWizard/steps/form/FormHelpers.js
 - webpack/JobWizard/steps/form/Formatter.js
 - webpack/JobWizard/steps/form/GroupedSelectField.js
 - webpack/JobWizard/steps/form/NumberInput.js
 - webpack/JobWizard/steps/form/SelectField.js
+- webpack/JobWizard/steps/form/WizardTitle.js
 - webpack/JobWizard/steps/form/__tests__/Formatter.test.js.example
 - webpack/Routes/routes.js
 - webpack/__mocks__/foremanReact/common/I18n.js
@@ -442,10 +445,12 @@ files:
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
 - webpack/global_index.js
 - webpack/index.js
+- webpack/react_app/components/RecentJobsCard/JobStatusIcon.js
 - webpack/react_app/components/RecentJobsCard/RecentJobsCard.js
+- webpack/react_app/components/RecentJobsCard/RecentJobsTable.js
 - webpack/react_app/components/RecentJobsCard/constants.js
 - webpack/react_app/components/RecentJobsCard/index.js
-- webpack/react_app/components/RecentJobsCard/styles.css
+- webpack/react_app/components/RecentJobsCard/styles.scss
 - webpack/react_app/components/RegistrationExtension/RexInterface.js
 - webpack/react_app/components/RegistrationExtension/__tests__/RexInterface.test.js
 - webpack/react_app/components/RegistrationExtension/__tests__/__snapshots__/RexInterface.test.js.snap
@@ -520,6 +525,8 @@ 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/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