From ae0018bebf3ba82a2f5e42d91738224d3dc4f716 Mon Sep 17 00:00:00 2001
From: Werner Kramer <werner.kramer@vortech.nl>
Date: Tue, 1 Oct 2024 14:03:59 +0200
Subject: [PATCH] Simplify table header definition

---
 src/components/table/TimeSeriesTable.vue | 35 ++++++++++++++++--------
 src/lib/table/createTableHeaders.ts      |  4 ---
 src/lib/table/types/TableHeaders.ts      |  2 --
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/components/table/TimeSeriesTable.vue b/src/components/table/TimeSeriesTable.vue
index 2c7a701de..2483b5bb6 100644
--- a/src/components/table/TimeSeriesTable.vue
+++ b/src/components/table/TimeSeriesTable.vue
@@ -20,14 +20,19 @@
         <tr>
           <template v-for="(column, index) in columns" :key="column.key">
             <th
-              :class="[
-                (column as unknown as TableHeaders).class,
-                {
-                  'table-header--editing': isEditingTimeSeries(
-                    column.key as string,
-                  ),
-                },
-              ]"
+              v-if="column.key === 'date'"
+              class="table-date sticky-column mb-4"
+            >
+              <span>{{ column.title }}</span>
+            </th>
+            <th
+              v-else
+              class="table-header"
+              :class="{
+                'table-header--editing': isEditingTimeSeries(
+                  column.key as string,
+                ),
+              }"
             >
               <div class="table-header-indicator">
                 <div class="table-header-indicator-text">
@@ -119,7 +124,7 @@
           :class="{ highlighted: selected?.date === item.date }"
           @click="(e) => handleRowClick(e, item)"
         >
-          <td class="sticky-column">
+          <td class="table-date sticky-column">
             <v-text-field
               v-if="isEditing && item.isNewRow"
               :modelValue="toISOString(item.date)"
@@ -482,22 +487,28 @@ function onUpdateItem(event: TableData) {
   width: 100%;
 }
 
-.date-header {
+th.table-date {
+  vertical-align: top;
   min-width: 24ch;
   width: 24ch;
+  border-right: thin solid rgba(var(--v-border-color), var(--v-border-opacity));
+  align-items: center;
 }
 
 th.sticky-column {
   position: sticky;
-  border-right: thin solid rgba(var(--v-border-color), var(--v-border-opacity));
   left: 0;
 }
 
+td.table-date {
+  border-right: thin solid rgba(var(--v-border-color), var(--v-border-opacity));
+  align-items: center;
+}
+
 td.sticky-column {
   position: sticky;
   left: 0;
   background-color: rgb(var(--v-theme-surface));
-  border-right: thin solid rgba(var(--v-border-color), var(--v-border-opacity));
 }
 
 :deep(.v-select .v-select__selection-text) {
diff --git a/src/lib/table/createTableHeaders.ts b/src/lib/table/createTableHeaders.ts
index 029b80a26..eabdffd84 100644
--- a/src/lib/table/createTableHeaders.ts
+++ b/src/lib/table/createTableHeaders.ts
@@ -10,8 +10,6 @@ export function createTableHeaders(
   tableHeaders.push({
     key: 'date',
     title: 'Date',
-    class: 'table-header sticky-column date-header',
-    editable: false,
   })
   seriesIds.forEach((seriesId) => {
     const chartSeries = chartSeriesArray.find((s) => s.id === seriesId)
@@ -20,8 +18,6 @@ export function createTableHeaders(
         key: chartSeries.id,
         title: formatHeader(chartSeries),
         color: chartSeries.style.stroke?.toString(),
-        class: 'table-header',
-        editable: true,
       })
     }
   })
diff --git a/src/lib/table/types/TableHeaders.ts b/src/lib/table/types/TableHeaders.ts
index f8f15fee5..ed4f59c6d 100644
--- a/src/lib/table/types/TableHeaders.ts
+++ b/src/lib/table/types/TableHeaders.ts
@@ -4,6 +4,4 @@ type ReadonlyDataTableHeader = (typeof VDataTable)['headers']
 
 export interface TableHeaders extends ReadonlyDataTableHeader {
   color?: string
-  class?: string
-  editable: boolean
 }