From 03eb9bafb7fdc4e51d2dfeff4798912c4407588a Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Thu, 28 Jan 2021 14:28:08 -0800
Subject: [PATCH] add missing template list data; add ids to relevant page
 elements

---
 .../src/components/CopyButton/CopyButton.jsx  |  4 ++-
 .../src/components/DetailList/Detail.jsx      |  3 ++
 .../src/components/JobList/JobList.jsx        |  1 +
 .../ResourceAccessListItem.test.jsx.snap      |  8 +++++
 .../Template/TemplateList/TemplateList.jsx    |  3 +-
 .../TemplateList/TemplateListItem.jsx         | 32 +++++++++++++++----
 6 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/awx/ui_next/src/components/CopyButton/CopyButton.jsx b/awx/ui_next/src/components/CopyButton/CopyButton.jsx
index fe4580f4bf..30927f22c5 100644
--- a/awx/ui_next/src/components/CopyButton/CopyButton.jsx
+++ b/awx/ui_next/src/components/CopyButton/CopyButton.jsx
@@ -10,12 +10,13 @@ import AlertModal from '../AlertModal';
 import ErrorDetail from '../ErrorDetail';
 
 function CopyButton({
-  i18n,
+  id,
   copyItem,
   isDisabled,
   onCopyStart,
   onCopyFinish,
   helperText,
+  i18n,
 }) {
   const { isLoading, error: copyError, request: copyItemToAPI } = useRequest(
     copyItem
@@ -34,6 +35,7 @@ function CopyButton({
     <>
       <Tooltip content={helperText.tooltip} position="top">
         <Button
+          id={id}
           isDisabled={isLoading || isDisabled}
           aria-label={i18n._(t`Copy`)}
           variant="plain"
diff --git a/awx/ui_next/src/components/DetailList/Detail.jsx b/awx/ui_next/src/components/DetailList/Detail.jsx
index b58f09a8dc..dc434a1fe8 100644
--- a/awx/ui_next/src/components/DetailList/Detail.jsx
+++ b/awx/ui_next/src/components/DetailList/Detail.jsx
@@ -34,6 +34,7 @@ const DetailValue = styled(
 `;
 
 const Detail = ({
+  id,
   label,
   value,
   fullWidth,
@@ -77,6 +78,7 @@ const Detail = ({
   );
 };
 Detail.propTypes = {
+  id: string,
   label: node.isRequired,
   value: node,
   fullWidth: bool,
@@ -84,6 +86,7 @@ Detail.propTypes = {
   helpText: string,
 };
 Detail.defaultProps = {
+  id: null,
   value: null,
   fullWidth: false,
   alwaysVisible: false,
diff --git a/awx/ui_next/src/components/JobList/JobList.jsx b/awx/ui_next/src/components/JobList/JobList.jsx
index f4a39e839a..30804d4b7f 100644
--- a/awx/ui_next/src/components/JobList/JobList.jsx
+++ b/awx/ui_next/src/components/JobList/JobList.jsx
@@ -242,6 +242,7 @@ function JobList({ i18n, defaultParams, showTypeColumn = false }) {
               <HeaderCell sortKey="finished">
                 {i18n._(t`Finish Time`)}
               </HeaderCell>
+              <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
             </HeaderRow>
           }
           toolbarSearchableKeys={searchableKeys}
diff --git a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap
index 355a9396e9..039bf50bd7 100644
--- a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap
+++ b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap
@@ -77,6 +77,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                       alwaysVisible={false}
                       fullWidth={false}
                       helpText={null}
+                      id={null}
                       label="Name"
                       value="jane brown"
                     />
@@ -90,6 +91,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                       alwaysVisible={false}
                       fullWidth={false}
                       helpText={null}
+                      id={null}
                       label="Team Roles"
                       value={
                         <WithI18n
@@ -143,6 +145,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                         alwaysVisible={false}
                         fullWidth={false}
                         helpText={null}
+                        id={null}
                         label="Name"
                         value="jane brown"
                       />
@@ -156,6 +159,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                         alwaysVisible={false}
                         fullWidth={false}
                         helpText={null}
+                        id={null}
                         label="Team Roles"
                         value={
                           <WithI18n
@@ -232,6 +236,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                           alwaysVisible={false}
                           fullWidth={false}
                           helpText={null}
+                          id={null}
                           label="Name"
                           value="jane brown"
                         />
@@ -245,6 +250,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                           alwaysVisible={false}
                           fullWidth={false}
                           helpText={null}
+                          id={null}
                           label="Team Roles"
                           value={
                             <WithI18n
@@ -456,6 +462,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                                       alwaysVisible={false}
                                       fullWidth={false}
                                       helpText={null}
+                                      id={null}
                                       label="Name"
                                       value="jane brown"
                                     >
@@ -680,6 +687,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                                       alwaysVisible={false}
                                       fullWidth={false}
                                       helpText={null}
+                                      id={null}
                                       label="Team Roles"
                                       value={
                                         <WithI18n
diff --git a/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx b/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
index 1380291a26..90d740988a 100644
--- a/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
+++ b/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
@@ -215,8 +215,9 @@ function TemplateList({ i18n }) {
               <HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
               <HeaderCell sortKey="type">{i18n._(t`Type`)}</HeaderCell>
               <HeaderCell sortKey="last_job_run">
-                {i18n._(t`Last Run`)}
+                {i18n._(t`Last Ran`)}
               </HeaderCell>
+              <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
             </HeaderRow>
           }
           renderToolbar={props => (
diff --git a/awx/ui_next/src/screens/Template/TemplateList/TemplateListItem.jsx b/awx/ui_next/src/screens/Template/TemplateList/TemplateListItem.jsx
index b836ffef64..58339275e0 100644
--- a/awx/ui_next/src/screens/Template/TemplateList/TemplateListItem.jsx
+++ b/awx/ui_next/src/screens/Template/TemplateList/TemplateListItem.jsx
@@ -25,6 +25,7 @@ import { JobTemplatesAPI, WorkflowJobTemplatesAPI } from '../../../api';
 import LaunchButton from '../../../components/LaunchButton';
 import Sparkline from '../../../components/Sparkline';
 import { toTitleCase } from '../../../util/strings';
+import { formatDateString } from '../../../util/dates';
 import CopyButton from '../../../components/CopyButton';
 
 function TemplateListItem({
@@ -87,6 +88,15 @@ function TemplateListItem({
       </Link>
     );
   };
+  let lastRun = '';
+  const mostRecentJob = template.summary_fields.recent_jobs
+    ? template.summary_fields.recent_jobs[0]
+    : null;
+  if (mostRecentJob) {
+    lastRun = mostRecentJob.finished
+      ? formatDateString(mostRecentJob.finished)
+      : i18n._(t`Running`);
+  }
 
   return (
     <>
@@ -122,15 +132,14 @@ function TemplateListItem({
           )}
         </Td>
         <Td dataLabel={i18n._(t`Type`)}>{toTitleCase(template.type)}</Td>
-        <Td dataLabel={i18n._(t`Recent Jobs`)}>
-          <Sparkline jobs={template.summary_fields.recent_jobs} />
-        </Td>
+        <Td dataLabel={i18n._(t`Last Ran`)}>{lastRun}</Td>
         <ActionsTd dataLabel={i18n._(t`Actions`)}>
           <ActionItem
             visible={template.type === 'workflow_job_template'}
             tooltip={i18n._(t`Visualizer`)}
           >
             <Button
+              id={`template-action-visualizer-${template.id}`}
               isDisabled={isDisabled}
               aria-label={i18n._(t`Visualizer`)}
               variant="plain"
@@ -147,6 +156,7 @@ function TemplateListItem({
             <LaunchButton resource={template}>
               {({ handleLaunch }) => (
                 <Button
+                  id={`template-action-launch-${template.id}`}
                   isDisabled={isDisabled}
                   aria-label={i18n._(t`Launch template`)}
                   variant="plain"
@@ -162,6 +172,7 @@ function TemplateListItem({
             tooltip={i18n._(t`Edit Template`)}
           >
             <Button
+              id={`template-action-edit-${template.id}`}
               isDisabled={isDisabled}
               aria-label={i18n._(t`Edit Template`)}
               variant="plain"
@@ -173,6 +184,7 @@ function TemplateListItem({
           </ActionItem>
           <ActionItem visible={template.summary_fields.user_capabilities.copy}>
             <CopyButton
+              id={`template-action-copy-${template.id}`}
               helperText={{
                 errorMessage: i18n._(t`Failed to copy template.`),
                 tooltip: i18n._(t`Copy Template`),
@@ -193,6 +205,7 @@ function TemplateListItem({
               <Detail
                 label={i18n._(t`Activity`)}
                 value={<Sparkline jobs={summaryFields.recent_jobs} />}
+                dataCy={`template-${template.id}-activity`}
               />
               {summaryFields.credentials && summaryFields.credentials.length && (
                 <Detail
@@ -207,6 +220,7 @@ function TemplateListItem({
                       ))}
                     </ChipGroup>
                   }
+                  dataCy={`template-${template.id}-credentials`}
                 />
               )}
               {summaryFields.inventory ? (
@@ -216,6 +230,7 @@ function TemplateListItem({
                     summaryFields.inventory.kind,
                     summaryFields.inventory.id
                   )}
+                  dataCy={`template-${template.id}-inventory`}
                 />
               ) : (
                 !askInventoryOnLaunch && (
@@ -237,9 +252,10 @@ function TemplateListItem({
                       ))}
                     </ChipGroup>
                   }
+                  dataCy={`template-${template.id}-labels`}
                 />
               )}
-              {summaryFields.project ? (
+              {summaryFields.project && (
                 <Detail
                   label={i18n._(t`Project`)}
                   value={
@@ -247,10 +263,14 @@ function TemplateListItem({
                       {summaryFields.project.name}
                     </Link>
                   }
+                  dataCy={`template-${template.id}-project`}
                 />
-              ) : (
-                <DeletedDetail label={i18n._(t`Project`)} />
               )}
+              <Detail
+                label={i18n._(t`Last Modified`)}
+                value={formatDateString(template.modified)}
+                dataCy={`template-${template.id}-last-modified`}
+              />
             </DetailList>
           </ExpandableRowContent>
         </Td>