foreman_remote_execution 4.5.1 → 4.7.0

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

@@ -8,6 +8,8 @@ export const SelectField = ({
   options,
   value,
   setValue,
+  labelIcon,
+  isRequired,
   ...props
 }) => {
   const onSelect = (event, selection) => {
@@ -16,7 +18,12 @@ export const SelectField = ({
   };
   const [isOpen, setIsOpen] = useState(false);
   return (
-    <FormGroup label={label} fieldId={fieldId}>
+    <FormGroup
+      label={label}
+      fieldId={fieldId}
+      labelIcon={labelIcon}
+      isRequired={isRequired}
+    >
       <Select
         selections={value}
         onSelect={onSelect}
@@ -35,14 +42,19 @@ export const SelectField = ({
   );
 };
 SelectField.propTypes = {
-  label: PropTypes.string.isRequired,
+  label: PropTypes.string,
   fieldId: PropTypes.string.isRequired,
   options: PropTypes.array,
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   setValue: PropTypes.func.isRequired,
+  labelIcon: PropTypes.node,
+  isRequired: PropTypes.bool,
 };
 
 SelectField.defaultProps = {
+  label: null,
   options: [],
+  labelIcon: null,
   value: null,
+  isRequired: false,
 };

data/webpack/JobWizard/steps/form/__tests__/Formatter.test.js.example

@@ -0,0 +1,76 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import * as patternfly from '@patternfly/react-core';
+import { mount, shallow } from '@theforeman/test';
+import { formatter } from '../Formatter';
+
+jest.spyOn(patternfly, 'Select');
+jest.spyOn(patternfly, 'SelectOption');
+jest.spyOn(patternfly, 'FormGroup');
+patternfly.Select.mockImplementation(props => <div props={props} />);
+patternfly.SelectOption.mockImplementation(props => <div props={props} />);
+patternfly.FormGroup.mockImplementation(props => <div props={props} />);
+const mockStore = configureMockStore([]);
+const store = mockStore({});
+
+describe('formatter', () => {
+  it('render date input', () => {
+    const props = {
+      name: 'date adv',
+      required: false,
+      options: '',
+      advanced: true,
+      value_type: 'date',
+      resource_type: 'ansible_roles',
+      default: '',
+      hidden_value: false,
+    };
+    expect(shallow(formatter(props, {}, jest.fn()))).toMatchSnapshot();
+  });
+  it('render text input', () => {
+    const props = {
+      name: 'plain adv hidden',
+      required: true,
+      description: 'some Description',
+      options: '',
+      advanced: true,
+      value_type: 'plain',
+      resource_type: 'ansible_roles',
+      default: 'Default val',
+      hidden_value: true,
+    };
+    expect(shallow(formatter(props, {}, jest.fn()))).toMatchSnapshot();
+  });
+  it('render select input', () => {
+    const props = {
+      name: 'adv plain search',
+      required: false,
+      input_type: 'user',
+      options: 'option 1\r\noption 2\r\noption 3\r\noption 4',
+      advanced: true,
+      value_type: 'plain',
+      resource_type: 'ansible_roles',
+      default: '',
+      hidden_value: false,
+    };
+    expect(shallow(formatter(props, {}, jest.fn()))).toMatchSnapshot();
+  });
+  it('render search input', () => {
+    const props = {
+      name: 'search adv',
+      required: false,
+      options: '',
+      advanced: true,
+      value_type: 'search',
+      resource_type: 'foreman_tasks/tasks',
+      default: '',
+      hidden_value: false,
+    };
+    expect(
+      mount(
+        <Provider store={store}>{formatter(props, {}, jest.fn())}</Provider>
+      )
+    ).toMatchSnapshot();
+  });
+});

data/webpack/__mocks__/foremanReact/components/SearchBar.js

@@ -1,2 +1,19 @@
-const SearchBar = () => jest.fn();
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const SearchBar = ({ onChange }) => (
+  <input
+    className="foreman-search"
+    onChange={onChange}
+    placeholder="Filter..."
+  />
+);
 export default SearchBar;
+
+SearchBar.propTypes = {
+  onChange: PropTypes.func,
+};
+
+SearchBar.defaultProps = {
+  onChange: () => null,
+};

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,77 @@
-/* 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
+      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 +80,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;