Clarification of Jobs completions column data when sorting

bug https://bugzilla.redhat.com/show_bug.cgi?id=1902003
openshift · Jan 7, 2021 · 981a870 · 981a870
1 parent 644e302
commit 981a870
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 38 deletions.
diff --git a/frontend/public/components/job.tsx b/frontend/public/components/job.tsx
@@ -58,44 +58,6 @@ const tableColumnClasses = [
   Kebab.columnClass,
 ];
 
-const JobTableRow: RowFunction<JobKind> = ({ obj: job, index, key, style }) => {
-  const { type, completions } = getJobTypeAndCompletions(job);
-  return (
-    <TableRow id={job.metadata.uid} index={index} trKey={key} style={style}>
-      <TableData className={tableColumnClasses[0]}>
-        <ResourceLink
-          kind={kind}
-          name={job.metadata.name}
-          namespace={job.metadata.namespace}
-          title={job.metadata.uid}
-        />
-      </TableData>
-      <TableData
-        className={classNames(tableColumnClasses[1], 'co-break-word')}
-        columnID="namespace"
-      >
-        <ResourceLink
-          kind="Namespace"
-          name={job.metadata.namespace}
-          title={job.metadata.namespace}
-        />
-      </TableData>
-      <TableData className={tableColumnClasses[2]}>
-        <LabelList kind={kind} labels={job.metadata.labels} />
-      </TableData>
-      <TableData className={tableColumnClasses[3]}>
-        <Link to={`/k8s/ns/${job.metadata.namespace}/jobs/${job.metadata.name}/pods`} title="pods">
-          {job.status.succeeded || 0} of {completions}
-        </Link>
-      </TableData>
-      <TableData className={tableColumnClasses[4]}>{type}</TableData>
-      <TableData className={tableColumnClasses[5]}>
-        <ResourceKebab actions={menuActions} kind="Job" resource={job} />
-      </TableData>
-    </TableRow>
-  );
-};
-
 export const JobDetails: React.FC<JobsDetailsProps> = ({ obj: job }) => {
   const { t } = useTranslation();
   return (
@@ -232,6 +194,51 @@ const JobsList: React.FC = (props) => {
       props: { className: tableColumnClasses[5] },
     },
   ];
+  const JobTableRow: RowFunction<JobKind> = ({ obj: job, index, key, style }) => {
+    const { type, completions } = getJobTypeAndCompletions(job);
+    return (
+      <TableRow id={job.metadata.uid} index={index} trKey={key} style={style}>
+        <TableData className={tableColumnClasses[0]}>
+          <ResourceLink
+            kind={kind}
+            name={job.metadata.name}
+            namespace={job.metadata.namespace}
+            title={job.metadata.uid}
+          />
+        </TableData>
+        <TableData
+          className={classNames(tableColumnClasses[1], 'co-break-word')}
+          columnID="namespace"
+        >
+          <ResourceLink
+            kind="Namespace"
+            name={job.metadata.namespace}
+            title={job.metadata.namespace}
+          />
+        </TableData>
+        <TableData className={tableColumnClasses[2]}>
+          <LabelList kind={kind} labels={job.metadata.labels} />
+        </TableData>
+        <TableData className={tableColumnClasses[3]}>
+          <Link
+            to={`/k8s/ns/${job.metadata.namespace}/jobs/${job.metadata.name}/pods`}
+            title="pods"
+          >
+            <div>
+              {t('workload~Desired')} {completions}
+            </div>
+            <div>
+              {t('workload~Succeeded')} {job.status.succeeded || 0}
+            </div>
+          </Link>
+        </TableData>
+        <TableData className={tableColumnClasses[4]}>{type}</TableData>
+        <TableData className={tableColumnClasses[5]}>
+          <ResourceKebab actions={menuActions} kind="Job" resource={job} />
+        </TableData>
+      </TableRow>
+    );
+  };
 
   return (
     <Table

diff --git a/frontend/public/locales/en/workload.json b/frontend/public/locales/en/workload.json
@@ -84,6 +84,8 @@
   "Active pods": "Active pods",
   "Failed pods": "Failed pods",
   "Completions": "Completions",
+  "Desired": "Desired",
+  "Succeeded": "Succeeded",
   "Reconnect": "Reconnect",
   "Ready": "Ready",
   "Restarts": "Restarts",