VADC-904 (#1519)

* add username to results table

Author: tianj7

src/Analysis/GWASResults/TestData/TableData.js

@@ -3,6 +3,7 @@ const TableData = [
     uid: '123',
     wf_name: 'User Added WF Name 1',
     name: 'Workflow 1',
+    gen3username: '[email protected]',
     startedAt: '2022-02-15T13:00:00Z',
     finishedAt: '2022-02-15T13:00:00Z',
     phase: 'Pending',
@@ -12,6 +13,7 @@ const TableData = [
     uid: '456',
     wf_name: 'User Added WF Name 2',
     name: 'Workflow 2',
+    gen3username: '[email protected]',
     startedAt: '2022-02-16T10:00:00Z',
     finishedAt: '2022-02-16T10:00:00Z',
     phase: 'Running',
@@ -21,6 +23,7 @@ const TableData = [
     uid: '789',
     wf_name: 'User Added WF Name 3',
     name: 'Workflow 3',
+    gen3username: '[email protected]',
     startedAt: '2023-02-16T10:00:00Z',
     finishedAt: '2023-02-16T10:00:00Z',
     phase: 'Succeeded',

src/Analysis/GWASResults/Views/Home/Home.stories.jsx

@@ -73,6 +73,7 @@ const getMockWorkflowList = () => {
   if (requestCount % 2 == 0) {
     workflowList.splice(0, 0, {
       name: 'argo-wrapper-workflow-' + createWorkflowNum(),
+      gen3username: `${(requestCount*Math.E).toString(36).substr(2, 5)}@aol.com`,
       wf_name: 'User Added WF Name ' + requestCount,
       uid: 'uid-' + requestCount,
       phase: getMockPhase(requestCount/2),

src/Analysis/GWASResults/Views/Home/HomeTable/HomeTable.jsx

@@ -55,6 +55,13 @@ const HomeTable = ({ data }) => {
         nameSearchTerm: event.target.value,
       });
     }
+    if (searchTermKey === 'gen3username') {
+      setHomeTableState({
+        ...homeTableState,
+        currentPage: 1,
+        userNameSearchTerm: event.target.value,
+      });
+    }
     if (searchTermKey === 'wf_name') {
       setHomeTableState({
         ...homeTableState,
@@ -136,6 +143,29 @@ const HomeTable = ({ data }) => {
         },
       ],
     },
+    {
+      title: 'User Name',
+      dataIndex: 'gen3username',
+      key: 'gen3username',
+      show: homeTableState.columnManagement.showUserName,
+      sorter: (a, b) => a.gen3username.localeCompare(b.gen3username),
+      sortOrder:
+        homeTableState.sortInfo?.columnKey === 'gen3username'
+        && homeTableState.sortInfo.order,
+      children: [
+        {
+          title: (
+            <Input
+              placeholder='Search by User Name'
+              value={homeTableState.userNameSearchTerm}
+              onChange={(event) => handleSearchTermChange(event, 'gen3username')}
+              suffix={<SearchOutlined />}
+            />
+          ),
+          dataIndex: 'gen3username',
+        },
+      ],
+    },
     {
       title: 'Workflow name',
       dataIndex: 'wf_name',

src/Analysis/GWASResults/Views/Home/HomeTable/HomeTable.test.jsx

@@ -31,6 +31,7 @@ describe('HomeTable component', () => {
       const formattedSubmittedTestDate = submittedTestDate.toLocaleDateString();
 
       expect(screen.getAllByText(item.name)[0]).toBeInTheDocument();
+      expect(screen.getAllByText(item.gen3username)[0]).toBeInTheDocument();
       expect(screen.getAllByText(item.wf_name)[0]).toBeInTheDocument();
       expect(
         screen.getAllByText(formattedFinishedTestDate)[0],

src/Analysis/GWASResults/Views/Home/HomeTable/tableDataProcessing/filterTableData.js

@@ -25,6 +25,13 @@ const filterTableData = (data, homeTableState) => {
       homeTableState.nameSearchTerm,
     );
   }
+  if (homeTableState.userNameSearchTerm.length > 0) {
+    filteredDataResult = filterBySearchTerm(
+      filteredDataResult,
+      'gen3username',
+      homeTableState.userNameSearchTerm,
+    );
+  }
   if (homeTableState.wfNameSearchTerm.length > 0) {
     filteredDataResult = filterBySearchTerm(
       filteredDataResult,

src/Analysis/GWASResults/Views/Home/HomeTableState/DefaultColumnManagement.js

@@ -1,5 +1,6 @@
 const DefaultColumnManagement = {
   showRunId: true,
+  showUserName: true,
   showWorkflowName: true,
   showDateSubmitted: true,
   showJobStatus: true,

src/Analysis/GWASResults/Views/Home/HomeTableState/InitialHomeTableState.js

@@ -3,6 +3,7 @@ import DetermineInitialColumnManagement from './DetermineInitialColumnManagement
 
 const InitialHomeTableState = {
   nameSearchTerm: '',
+  userNameSearchTerm: '',
   wfNameSearchTerm: '',
   submittedAtSelections: [],
   finishedAtSelections: [],

src/Analysis/GWASResults/Views/Home/ManageColumns/ManageColumns.jsx

@@ -29,6 +29,7 @@ const ManageColumns = () => {
 
   const filteringResets = {
     runId: { nameSearchTerm: '' },
+    userName: { userNameSearchTerm: '' },
     workflowName: { wfNameSearchTerm: '' },
     dateSubmitted: { submittedAtSelections: [] },
     jobStatus: { jobStatusSelections: [] },
@@ -95,30 +96,34 @@ const ManageColumns = () => {
       key: '1',
     },
     {
-      label: columnSwitch('Workflow Name', 'showWorkflowName'),
+      label: columnSwitch('User Name', 'showUserName'),
       key: '2',
     },
 
     {
-      label: columnSwitch('Date/Time Submitted', 'showDateSubmitted'),
+      label: columnSwitch('Workflow Name', 'showWorkflowName'),
       key: '3',
     },
     {
-      label: columnSwitch('Job Status', 'showJobStatus'),
+      label: columnSwitch('Date/Time Submitted', 'showDateSubmitted'),
       key: '4',
     },
     {
-      label: columnSwitch('Date/Time Finished', 'showDateFinished'),
+      label: columnSwitch('Job Status', 'showJobStatus'),
       key: '5',
     },
     {
-      label: columnSwitch('View Details', 'showViewDetails'),
+      label: columnSwitch('Date/Time Finished', 'showDateFinished'),
       key: '6',
     },
     {
-      label: columnSwitch('Actions', 'showActions'),
+      label: columnSwitch('View Details', 'showViewDetails'),
       key: '7',
     },
+    {
+      label: columnSwitch('Actions', 'showActions'),
+      key: '8',
+    },
   ];
 
   return (