OCPBUGS-8299: CronJobs table/details UI doesn't have Suspend indication

jeremyary · Mar 13, 2023 · 027b5bc · 027b5bc
1 parent 15f425a
commit 027b5bc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/frontend/public/components/cron-job.tsx b/frontend/public/components/cron-job.tsx
@@ -3,6 +3,7 @@ import * as React from 'react';
 import * as classNames from 'classnames';
 import { sortable } from '@patternfly/react-table';
 import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
 import {
  getPodsForResource,
  ActionServiceProvider,
@@ -52,6 +53,7 @@ const tableColumnClasses = [
  '',
  '',
  'pf-m-hidden pf-m-visible-on-md',
+ 'pf-m-hidden pf-m-visible-on-md',
  'pf-m-hidden pf-m-visible-on-lg pf-u-w-25-on-xl',
  'pf-m-hidden pf-m-visible-on-xl pf-u-w-25-on-xl',
  Kebab.columnClass,
@@ -77,12 +79,15 @@ const CronJobTableRow: React.FC<RowFunctionArgs<CronJobKind>> = ({ obj: cronjob
  </TableData>
  <TableData className={tableColumnClasses[2]}>{cronjob.spec.schedule}</TableData>
  <TableData className={tableColumnClasses[3]}>
- {_.get(cronjob.spec, 'concurrencyPolicy', '-')}
+ {cronjob.spec?.suspend ? i18next.t('public~True') : i18next.t('public~False')}
  </TableData>
  <TableData className={tableColumnClasses[4]}>
- {_.get(cronjob.spec, 'startingDeadlineSeconds', '-')}
+ {_.get(cronjob.spec, 'concurrencyPolicy', '-')}
  </TableData>
  <TableData className={tableColumnClasses[5]}>
+ {_.get(cronjob.spec, 'startingDeadlineSeconds', '-')}
+ </TableData>
+ <TableData className={tableColumnClasses[6]}>
  <LazyActionMenu context={context} />
  </TableData>
  </>
@@ -100,6 +105,9 @@ const CronJobDetails: React.FC<CronJobDetailsProps> = ({ obj: cronjob }) => {
  <SectionHeading text={t('public~CronJob details')} />
  <ResourceSummary resource={cronjob}>
  <DetailsItem label={t('public~Schedule')} obj={cronjob} path="spec.schedule" />
+ <DetailsItem label={t('public~Suspend')} obj={cronjob} path="spec.suspend">
+ {cronjob.spec?.suspend ? t('public~True') : t('public~False')}
+ </DetailsItem>
  <DetailsItem
  label={t('public~Concurrency policy')}
  obj={cronjob}
@@ -266,21 +274,27 @@ export const CronJobsList: React.FC = (props) => {
  transforms: [sortable],
  props: { className: tableColumnClasses[2] },
  },
+ {
+ title: t('public~Suspend'),
+ sortField: 'spec.suspend',
+ transforms: [sortable],
+ props: { className: tableColumnClasses[3] },
+ },
  {
  title: t('public~Concurrency policy'),
  sortField: 'spec.concurrencyPolicy',
  transforms: [sortable],
- props: { className: tableColumnClasses[3] },
+ props: { className: tableColumnClasses[4] },
  },
  {
  title: t('public~Starting deadline seconds'),
  sortField: 'spec.startingDeadlineSeconds',
  transforms: [sortable],
- props: { className: tableColumnClasses[4] },
+ props: { className: tableColumnClasses[5] },
  },
  {
  title: '',
- props: { className: tableColumnClasses[5] },
+ props: { className: tableColumnClasses[6] },
  },
  ];
 

diff --git a/frontend/public/locales/en/public.json b/frontend/public/locales/en/public.json
@@ -353,6 +353,7 @@
  "Create {{objLabel}}": "Create {{objLabel}}",
  "CronJob details": "CronJob details",
  "Schedule": "Schedule",
+ "Suspend": "Suspend",
  "Concurrency policy": "Concurrency policy",
  "Starting deadline seconds": "Starting deadline seconds",
  "{{count}} second_one": "{{count}} second",