From 8e713a5c6e08400cee46180d9240732d9d1af8d4 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Fri, 11 Jul 2025 14:46:02 +0200
Subject: [PATCH] chore: added & optimized users tooltip data typings

---
 .../SceneryView/SceneryTimetable.vue          | 28 +++++------
 src/components/StationsView/StationTable.vue  | 13 +++++-
 src/components/Tooltip/Tooltip.vue            |  4 +-
 src/components/Tooltip/TrainInfoTooltip.vue   | 46 +++++++++++++++++++
 src/components/Tooltip/UsersTooltip.vue       |  4 +-
 src/store/tooltipStore.ts                     |  3 +-
 src/typings/common.ts                         | 21 +++++++++
 7 files changed, 97 insertions(+), 22 deletions(-)
 create mode 100644 src/components/Tooltip/TrainInfoTooltip.vue

diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue
index 4c5a648..d9298fe 100644
--- a/src/components/SceneryView/SceneryTimetable.vue
+++ b/src/components/SceneryView/SceneryTimetable.vue
@@ -122,28 +122,24 @@
                 </span>
 
                 <!-- Train info -->
-                <span>
-                  <b
-                    data-tooltip-type="BaseTooltip"
-                    :data-tooltip-content="
-                      getCategoryExplanation(row.train.timetableData!.category)
-                    "
-                    class="text--primary tooltip-help"
-                  >
+                <span
+                  data-tooltip-type="TrainInfoTooltip"
+                  :data-tooltip-content="JSON.stringify(row.train)"
+                  class="tooltip-help"
+                >
+                  <b class="text--primary">
                     {{ row.train.timetableData!.category }}
                   </b>
 
                   <b>&nbsp;{{ row.train.trainNo }}</b>
+                  &bull;
+                  {{ row.train.driverName }}
                 </span>
-                <span>&bull;</span>
-                <span>{{ row.train.driverName }}</span>
-                <span>&bull;</span>
-                <b style="color: #ddd">{{ row.train.stockList[0] }}</b>
 
                 <!-- Train stop comments -->
                 <span
-                  class="stop-comments-icon"
                   v-if="row.checkpointStop.comments"
+                  class="stop-comments-icon"
                   data-tooltip-type="BaseTooltip"
                   :data-tooltip-content="row.checkpointStop.comments"
                 >
@@ -243,7 +239,7 @@ import { useMainStore } from '../../store/mainStore';
 import { useApiStore } from '../../store/apiStore';
 import ScheduledTrainStatus from './ScheduledTrainStatus.vue';
 import { SceneryTimetableRow } from './typings';
-import { ActiveScenery, Station } from '../../typings/common';
+import { ActiveScenery, Station, Train } from '../../typings/common';
 import { getTrainStopStatus, stopStatusPriority } from './utils';
 
 export default defineComponent({
@@ -530,8 +526,8 @@ export default defineComponent({
 }
 
 .stop-comments-icon > img {
-  width: 1.2em;
-  vertical-align: middle;
+  width: 1.3em;
+  vertical-align: top;
 }
 
 .schedule {
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 3390b4b..44fc1a5 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -248,7 +248,9 @@
             class="station-users"
             :class="{ inactive: !station.onlineInfo }"
             data-tooltip-type="UsersTooltip"
-            :data-tooltip-content="JSON.stringify(station.onlineInfo?.stationTrains ?? [])"
+            :data-tooltip-content="
+              JSON.stringify(getStationUsersTrains(station.onlineInfo?.stationTrains ?? []))
+            "
           >
             <span class="text--primary">{{
               station.onlineInfo?.stationTrains?.length ?? '-'
@@ -318,7 +320,7 @@ import dateMixin from '../../mixins/dateMixin';
 import styleMixin from '../../mixins/styleMixin';
 import { useApiStore } from '../../store/apiStore';
 import { useMainStore } from '../../store/mainStore';
-import { Station, Status } from '../../typings/common';
+import { Station, Status, TooltipUserTrain, Train } from '../../typings/common';
 import { useTooltipStore } from '../../store/tooltipStore';
 import { getChangedFilters } from '../../managers/stationFilterManager';
 import { ActiveSorter, HeadIdsType, headIconsIds, headIds } from './typings';
@@ -394,6 +396,13 @@ export default defineComponent({
       else this.activeSorter.dir = 1;
 
       this.activeSorter.headerName = headerName;
+    },
+
+    getStationUsersTrains(stationTrains: Train[]): TooltipUserTrain[] {
+      return stationTrains.map((train) => ({
+        driverName: train.driverName,
+        trainNo: train.trainNo
+      }));
     }
   }
 });
diff --git a/src/components/Tooltip/Tooltip.vue b/src/components/Tooltip/Tooltip.vue
index 300e4fe..743a114 100644
--- a/src/components/Tooltip/Tooltip.vue
+++ b/src/components/Tooltip/Tooltip.vue
@@ -13,6 +13,7 @@ import BaseTooltip from './BaseTooltip.vue';
 import SpawnsTooltip from './SpawnsTooltip.vue';
 import UsersTooltip from './UsersTooltip.vue';
 import HtmlTooltip from './HtmlTooltip.vue';
+import TrainInfoTooltip from "./TrainInfoTooltip.vue";
 
 const BOX_PADDING_PX = 20;
 
@@ -23,7 +24,8 @@ export default defineComponent({
     BaseTooltip,
     SpawnsTooltip,
     UsersTooltip,
-    HtmlTooltip
+    HtmlTooltip,
+    TrainInfoTooltip
   },
 
   data() {
diff --git a/src/components/Tooltip/TrainInfoTooltip.vue b/src/components/Tooltip/TrainInfoTooltip.vue
new file mode 100644
index 0000000..eb3b717
--- /dev/null
+++ b/src/components/Tooltip/TrainInfoTooltip.vue
@@ -0,0 +1,46 @@
+<template>
+  <div class="tooltip-content">
+    <span v-if="trainInfoObj">
+      {{ trainInfoObj.driverName }}
+    </span>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { useTooltipStore } from '../../store/tooltipStore';
+import { Train } from '../../typings/common';
+
+const tooltipStore = useTooltipStore();
+
+const trainInfoObj = computed(() => {
+  if (tooltipStore.content == '') return null;
+
+  try {
+    return (JSON.parse(tooltipStore.content) as Train) ?? null;
+  } catch (error) {
+    return null;
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.tooltip-content {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 0.5em;
+  white-space: pre-line;
+
+  padding: 0.25em 0.5em;
+  border-radius: 0.25em;
+
+  width: 100%;
+  background-color: #1f1f1f;
+  box-shadow: 0 0 5px 2px #aaa;
+}
+
+img {
+  height: 1em;
+}
+</style>
diff --git a/src/components/Tooltip/UsersTooltip.vue b/src/components/Tooltip/UsersTooltip.vue
index e49d52f..0ca9d68 100644
--- a/src/components/Tooltip/UsersTooltip.vue
+++ b/src/components/Tooltip/UsersTooltip.vue
@@ -10,7 +10,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { useTooltipStore } from '../../store/tooltipStore';
-import { Train } from '../../typings/common';
+import { TooltipUserTrain } from '../../typings/common';
 
 export default defineComponent({
   data() {
@@ -23,7 +23,7 @@ export default defineComponent({
     trains() {
       if (this.tooltipStore.content == '') return [];
 
-      const parsedTrains = JSON.parse(this.tooltipStore.content) as Train[];
+      const parsedTrains = JSON.parse(this.tooltipStore.content) as TooltipUserTrain[];
       return (parsedTrains ?? []).sort((a, b) => a.trainNo - b.trainNo);
     }
   }
diff --git a/src/store/tooltipStore.ts b/src/store/tooltipStore.ts
index 48c6364..d7b5f15 100644
--- a/src/store/tooltipStore.ts
+++ b/src/store/tooltipStore.ts
@@ -8,7 +8,8 @@ export const tooltipKeys = [
   'VehiclePreviewTooltip',
   'SpawnsTooltip',
   'UsersTooltip',
-  'HtmlTooltip'
+  'HtmlTooltip',
+  'TrainInfoTooltip'
 ] as const;
 
 export type TooltipType = (typeof tooltipKeys)[number];
diff --git a/src/typings/common.ts b/src/typings/common.ts
index cc48644..3090d50 100644
--- a/src/typings/common.ts
+++ b/src/typings/common.ts
@@ -253,3 +253,24 @@ export interface VehicleCargo {
   id: string;
   weight: number;
 }
+
+export interface TooltipUserTrain {
+  driverName: string;
+  trainNo: number;
+}
+
+export interface TooltipTrainInfo {
+  mass: number;
+  length: number;
+  speed: number;
+  signal: string;
+  distance: number;
+  connectedTrack: string;
+  trainNo: number;
+  driverName: string;
+  driverLevel: number;
+  currentStationName: string;
+  currentStationHash: string;
+  headVehicleName: string;
+  stockLength: number;
+}