From 65a749a1f5dd7b7fc8d86f7a0f0d6781a7d1190d Mon Sep 17 00:00:00 2001
From: hms243 <hms243@cornell.edu>
Date: Tue, 15 Nov 2022 16:14:12 -0500
Subject: [PATCH 1/4] [BI-1194] - Preview display and ordering

---
 src/breeding-insight/model/Observation.ts          |  1 +
 src/breeding-insight/model/import/ImportPreview.ts |  5 ++++-
 src/views/import/ImportExperiment.vue              | 11 +++++++----
 src/views/import/ImportTemplate.vue                |  4 +++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/breeding-insight/model/Observation.ts b/src/breeding-insight/model/Observation.ts
index 06fbbf972..3611b5963 100644
--- a/src/breeding-insight/model/Observation.ts
+++ b/src/breeding-insight/model/Observation.ts
@@ -30,6 +30,7 @@ export class Observation {
   season?: Season;
   level?: string;
   value?: any;
+  observationTimeStamp?: string;
 
   constructor(id?: string,
               studyId?: string,
diff --git a/src/breeding-insight/model/import/ImportPreview.ts b/src/breeding-insight/model/import/ImportPreview.ts
index 6c8de2787..519fb8a2e 100644
--- a/src/breeding-insight/model/import/ImportPreview.ts
+++ b/src/breeding-insight/model/import/ImportPreview.ts
@@ -20,9 +20,12 @@ import {ImportPreviewStatistics} from "@/breeding-insight/model/import/ImportPre
 export class ImportPreview {
   statistics?: {[key: string]: ImportPreviewStatistics};
   rows?: any[];
+  dynamicColumnNames?: string[];
 
-  constructor({statistics, rows}: ImportPreview) {
+  constructor({statistics, rows, dynamicColumnNames}: ImportPreview) {
     this.statistics = statistics;
     this.rows = rows;
+    this.dynamicColumnNames = dynamicColumnNames;
+
   }
 }
\ No newline at end of file
diff --git a/src/views/import/ImportExperiment.vue b/src/views/import/ImportExperiment.vue
index 5b3fb57f7..e6ddb7b9e 100644
--- a/src/views/import/ImportExperiment.vue
+++ b/src/views/import/ImportExperiment.vue
@@ -78,6 +78,7 @@
             v-bind:loading="false"
             v-bind:pagination="previewData.pagination"
             v-on:show-error-notification="$emit('show-error-notification', $event)"
+            scrollable
         >
           <!-- Germplasm Name -->
           <b-table-column field="germplasmName" label="Germplasm Name" v-slot="props" :th-attrs="(column) => ({scope:'col'})"
@@ -130,7 +131,8 @@
           </b-table-column>
 
           <b-table-column v-for="variable in phenotypeColumns" :key="variable" :label="variable" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
-            {{ props.row.data.observations.filter(observation => observation.brAPIObject.observationVariableName === variable)[0].brAPIObject.value }}
+            <p v-if="variable.startsWith('TS: ')">{{ props.row.data.observations.filter(observation => observation.brAPIObject.observationVariableName === variable.replace("TS: ",""))[0].brAPIObject.observationTimeStamp}}</p>
+            <p v-else>{{ props.row.data.observations.filter(observation => observation.brAPIObject.observationVariableName === variable)[0].brAPIObject.value }}</p>
           </b-table-column>
 
           <template v-slot:emptyMessage>
@@ -231,16 +233,17 @@ export default class ImportExperiment extends ProgramsBase {
 
   importFinished(){}
 
-  previewDataLoaded(data: any[]) {
+  //todo may streamline
+  previewDataLoaded(data: any[], dynamicColumns: String[]) {
     if (data.length > 0) {
       const firstRow = data[0];
       if (firstRow.observations && firstRow.observations.length > 0) {
-        this.phenotypeColumns = firstRow.observations.map((observation: any) =>
-        {
+        this.phenotypeColumns = firstRow.observations.map((observation: any) => {
           return observation.brAPIObject.observationVariableName;
         });
       }
     }
+    this.phenotypeColumns = dynamicColumns;
   }
 
   isExisting(rows: any[]) {
diff --git a/src/views/import/ImportTemplate.vue b/src/views/import/ImportTemplate.vue
index 8b90e753b..36492855d 100644
--- a/src/views/import/ImportTemplate.vue
+++ b/src/views/import/ImportTemplate.vue
@@ -192,6 +192,7 @@ export default class ImportTemplate extends ProgramsBase {
   private previewData: any[] = [];
   private previewTotalRows: number = 0;
   private newObjectCounts: any = [];
+  private dynamicColumns: string[] | undefined = [];
 
   private file : File | null = null;
   private import_errors: ValidationError | String | null = null;
@@ -493,7 +494,8 @@ export default class ImportTemplate extends ProgramsBase {
             this.previewTotalRows = previewResponse.preview.rows.length;
             this.previewData = previewResponse.preview.rows as any[];
             this.newObjectCounts = previewResponse.preview.statistics;
-            this.$emit('preview-data-loaded', this.previewData);
+            this.dynamicColumns = previewResponse.preview.dynamicColumnNames;
+            this.$emit('preview-data-loaded', this.previewData, this.dynamicColumns);
             this.importService.send(ImportEvent.IMPORT_SUCCESS);
             // TODO: Temp pagination
             this.pagination.totalCount = previewResponse.preview.rows.length;

From 080ffb4db7a2c4c85b7aeb702c465191436ca0a8 Mon Sep 17 00:00:00 2001
From: hms243 <hms243@cornell.edu>
Date: Wed, 16 Nov 2022 13:50:22 -0500
Subject: [PATCH 2/4] [BI-1194] - Whitespace flexibility

---
 src/views/import/ImportExperiment.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/import/ImportExperiment.vue b/src/views/import/ImportExperiment.vue
index e6ddb7b9e..2698a53db 100644
--- a/src/views/import/ImportExperiment.vue
+++ b/src/views/import/ImportExperiment.vue
@@ -131,7 +131,7 @@
           </b-table-column>
 
           <b-table-column v-for="variable in phenotypeColumns" :key="variable" :label="variable" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
-            <p v-if="variable.startsWith('TS: ')">{{ props.row.data.observations.filter(observation => observation.brAPIObject.observationVariableName === variable.replace("TS: ",""))[0].brAPIObject.observationTimeStamp}}</p>
+            <p v-if="variable.startsWith('TS:')">{{ props.row.data.observations.filter(observation => observation.brAPIObject.observationVariableName === variable.replace(/TS:\s*/,""))[0].brAPIObject.observationTimeStamp}}</p>
             <p v-else>{{ props.row.data.observations.filter(observation => observation.brAPIObject.observationVariableName === variable)[0].brAPIObject.value }}</p>
           </b-table-column>
 

From a515f7c3b5338058c7acc96645e25343015fe838 Mon Sep 17 00:00:00 2001
From: hms243 <hms243@cornell.edu>
Date: Thu, 17 Nov 2022 15:26:02 -0500
Subject: [PATCH 3/4] [BI-1194] - Cleanup

---
 src/views/import/ImportExperiment.vue | 11 +----------
 src/views/import/ImportTemplate.vue   |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/views/import/ImportExperiment.vue b/src/views/import/ImportExperiment.vue
index 2698a53db..aa7b5489a 100644
--- a/src/views/import/ImportExperiment.vue
+++ b/src/views/import/ImportExperiment.vue
@@ -233,16 +233,7 @@ export default class ImportExperiment extends ProgramsBase {
 
   importFinished(){}
 
-  //todo may streamline
-  previewDataLoaded(data: any[], dynamicColumns: String[]) {
-    if (data.length > 0) {
-      const firstRow = data[0];
-      if (firstRow.observations && firstRow.observations.length > 0) {
-        this.phenotypeColumns = firstRow.observations.map((observation: any) => {
-          return observation.brAPIObject.observationVariableName;
-        });
-      }
-    }
+  previewDataLoaded(dynamicColumns: String[]) {
     this.phenotypeColumns = dynamicColumns;
   }
 
diff --git a/src/views/import/ImportTemplate.vue b/src/views/import/ImportTemplate.vue
index 36492855d..bf1749154 100644
--- a/src/views/import/ImportTemplate.vue
+++ b/src/views/import/ImportTemplate.vue
@@ -495,7 +495,7 @@ export default class ImportTemplate extends ProgramsBase {
             this.previewData = previewResponse.preview.rows as any[];
             this.newObjectCounts = previewResponse.preview.statistics;
             this.dynamicColumns = previewResponse.preview.dynamicColumnNames;
-            this.$emit('preview-data-loaded', this.previewData, this.dynamicColumns);
+            this.$emit('preview-data-loaded', this.dynamicColumns);
             this.importService.send(ImportEvent.IMPORT_SUCCESS);
             // TODO: Temp pagination
             this.pagination.totalCount = previewResponse.preview.rows.length;

From 12c4fb6f88cb67fd7dd6c1d7e8d56f0cc7e6c585 Mon Sep 17 00:00:00 2001
From: hms243 <hms243@cornell.edu>
Date: Tue, 29 Nov 2022 14:22:14 -0500
Subject: [PATCH 4/4] [BI-1194] - Code review improvements

---
 src/views/import/ImportExperiment.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/import/ImportExperiment.vue b/src/views/import/ImportExperiment.vue
index aa7b5489a..d1fef65e2 100644
--- a/src/views/import/ImportExperiment.vue
+++ b/src/views/import/ImportExperiment.vue
@@ -129,10 +129,9 @@
           <b-table-column field="expTreatmentFactorName" label="Treatment Factors" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
             {{ getTreatment(props.row.data.observationUnit) }}
           </b-table-column>
-
+          <!-- Dynamic Phenotype and Timestamp Columns -->
           <b-table-column v-for="variable in phenotypeColumns" :key="variable" :label="variable" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
-            <p v-if="variable.startsWith('TS:')">{{ props.row.data.observations.filter(observation => observation.brAPIObject.observationVariableName === variable.replace(/TS:\s*/,""))[0].brAPIObject.observationTimeStamp}}</p>
-            <p v-else>{{ props.row.data.observations.filter(observation => observation.brAPIObject.observationVariableName === variable)[0].brAPIObject.value }}</p>
+            <p> {{ retrieveDynamicColVal(props.row.data.observations, variable) }}</p>
           </b-table-column>
 
           <template v-slot:emptyMessage>
@@ -241,5 +240,14 @@ export default class ImportExperiment extends ProgramsBase {
     return rows.length && rows[0].trial.state === ImportObjectState.EXISTING;
   }
 
+  retrieveDynamicColVal(importReturnObject: any, column: string){
+    if (column.startsWith('TS:')) {
+      //Is timestamp
+      return importReturnObject.filter((observation: { brAPIObject: { observationVariableName: string; }; }) => observation.brAPIObject.observationVariableName === column.replace(/TS:\s*/,""))[0].brAPIObject.observationTimeStamp;
+    } else {
+      //Is phenotype observation
+      return importReturnObject.filter((observation: { brAPIObject: { observationVariableName: string; }; }) => observation.brAPIObject.observationVariableName === column)[0].brAPIObject.value
+    }
+  }
 }
 </script>
\ No newline at end of file