From 2c969ed7fd1610c2a9041bdbb263822adb1276a9 Mon Sep 17 00:00:00 2001
From: yingfeng <yingfeng@iu.edu>
Date: Thu, 2 May 2024 17:54:44 -0400
Subject: [PATCH] AMP-3080 - fix wrong order of testDate vs dateCreated -
 remove commented code

---
 src/components/dashboard/Dashboard.vue      | 5 -----
 src/components/dashboard/DashboardTable.vue | 7 ++-----
 src/store/state.js                          | 1 -
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/components/dashboard/Dashboard.vue b/src/components/dashboard/Dashboard.vue
index 1f4f2f85..4fa9cc9e 100644
--- a/src/components/dashboard/Dashboard.vue
+++ b/src/components/dashboard/Dashboard.vue
@@ -648,7 +648,6 @@
                                   (item) => {
                                     if (parent === 'TestResults')
                                       return (
-                                        // item.field !== 'dateCreated' &&
                                         item.field !== 'status' &&
                                         item.field !== 'actions' &&
                                         item.field !== 'addToTest'
@@ -656,7 +655,6 @@
                                     else
                                       return (
                                         item.field !== 'testDate' &&
-                                        // item.field !== 'dateCreated' &&
                                         item.field !== 'groundTruth' &&
                                         item.field !== 'scores' &&
                                         item.field !== 'addToTest'
@@ -1195,7 +1193,6 @@ export default {
         }
 
         return (
-          //column.field !== "dateCreated" &&
           column.field !== "status" &&
           column.field !== "actions"
         );
@@ -1212,7 +1209,6 @@ export default {
 
         return (
           column.field !== "testDate" &&
-          //column.field !== "dateCreated" &&
           column.field !== "groundTruth" &&
           column.field !== "scores" &&
           column.field !== "status" &&
@@ -1231,7 +1227,6 @@ export default {
       this.columns = this.columns.filter((column) => {
         return (
           column.field !== "testDate" &&
-          //column.field !== "dateCreated" &&
           column.field !== "unit" &&
           column.field !== "externalSource" &&
           column.field !== "workflowStep" &&
diff --git a/src/components/dashboard/DashboardTable.vue b/src/components/dashboard/DashboardTable.vue
index accf5b64..d972680d 100644
--- a/src/components/dashboard/DashboardTable.vue
+++ b/src/components/dashboard/DashboardTable.vue
@@ -111,15 +111,12 @@
                 isSelected(rec.id),
             }"
           >
-            <td v-if="checkAvailability('dateCreated')">
-              {{ new Date(rec.dateCreated) | LOCAL_DATE_VALUE }}
-            </td>
             <td v-if="checkAvailability('testDate')">
               {{ new Date(rec.testDate) | LOCAL_DATE_VALUE }}
-            </td><!--
+            </td>
             <td v-if="checkAvailability('dateCreated')">
               {{ new Date(rec.dateCreated) | LOCAL_DATE_VALUE }}
-            </td>-->
+            </td>
             <td v-if="checkAvailability('submitter')">{{ rec.submitter }}</td>
             <td v-if="checkAvailability('unit')">{{ rec.unitName }}</td>
             <td v-if="checkAvailability('collectionName')">
diff --git a/src/store/state.js b/src/store/state.js
index f95f640d..eb9a2387 100644
--- a/src/store/state.js
+++ b/src/store/state.js
@@ -125,7 +125,6 @@ const state = {
   dashboardColumns: [
     { order: "a", label: "Test Date", field: "testDate" },
     { order: "b", label: "Date", field: "dateCreated" },
-    //{ order: "c", label: "Workflow Date", field: "dateCreated" },
     { order: "d", label: "Submitter", field: "submitter" },
     { order: "e", label: "Unit", field: "unit" },
     { order: "f", label: "Collection", field: "collectionName" },