From 4a96b9d146e549549ace56156ac9829af16d5c98 Mon Sep 17 00:00:00 2001
From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com>
Date: Thu, 9 Nov 2023 10:37:05 -0800
Subject: [PATCH 1/2] Minor adjustments to diaryTypes

---
 www/js/types/diaryTypes.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/js/types/diaryTypes.ts b/www/js/types/diaryTypes.ts
index cfde363d6..938b06851 100644
--- a/www/js/types/diaryTypes.ts
+++ b/www/js/types/diaryTypes.ts
@@ -3,7 +3,7 @@
  As much as possible, these types parallel the types used in the server code. */
 
 import { BaseModeKey, MotionTypeKey } from '../diary/diaryHelper';
-import { LocalDt } from './serverData';
+import { ServerData, LocalDt } from './serverData';
 
 type ObjectId = { $oid: string };
 type ConfirmedPlace = {
@@ -51,7 +51,7 @@ export type CompositeTrip = {
   confirmed_trip: ObjectId;
   distance: number;
   duration: number;
-  end_confirmed_place: ConfirmedPlace;
+  end_confirmed_place: ServerData<ConfirmedPlace>;
   end_fmt_time: string;
   end_loc: { type: string; coordinates: number[] };
   end_local_dt: LocalDt;
@@ -68,7 +68,7 @@ export type CompositeTrip = {
   raw_trip: ObjectId;
   sections: any[]; // TODO
   source: string;
-  start_confirmed_place: ConfirmedPlace;
+  start_confirmed_place: ServerData<ConfirmedPlace>;
   start_fmt_time: string;
   start_loc: { type: string; coordinates: number[] };
   start_local_dt: LocalDt;

From 361cc280f0e51c8737c8f38741154480cfb0992e Mon Sep 17 00:00:00 2001
From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com>
Date: Wed, 15 Nov 2023 13:44:39 -0800
Subject: [PATCH 2/2] Separated `labelTypes` into separate file

---
 www/js/diary/LabelTabContext.ts           |  2 +-
 www/js/diary/diaryHelper.ts               |  3 ++-
 www/js/survey/multilabel/confirmHelper.ts | 26 +----------------------
 www/js/types/labelTypes.ts                | 24 +++++++++++++++++++++
 4 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 www/js/types/labelTypes.ts

diff --git a/www/js/diary/LabelTabContext.ts b/www/js/diary/LabelTabContext.ts
index 24d7ade41..717a4980d 100644
--- a/www/js/diary/LabelTabContext.ts
+++ b/www/js/diary/LabelTabContext.ts
@@ -1,6 +1,6 @@
 import { createContext } from 'react';
 import { TimelineEntry, UserInputEntry } from '../types/diaryTypes';
-import { LabelOption } from '../survey/multilabel/confirmHelper';
+import { LabelOption } from '../types/labelTypes';
 
 export type TimelineMap = Map<string, TimelineEntry>;
 export type TimelineLabelMap = {
diff --git a/www/js/diary/diaryHelper.ts b/www/js/diary/diaryHelper.ts
index 616974b7b..2fee7eccd 100644
--- a/www/js/diary/diaryHelper.ts
+++ b/www/js/diary/diaryHelper.ts
@@ -3,8 +3,9 @@
 
 import moment from 'moment';
 import { DateTime } from 'luxon';
-import { LabelOptions, readableLabelToKey } from '../survey/multilabel/confirmHelper';
+import { readableLabelToKey } from '../survey/multilabel/confirmHelper';
 import { CompositeTrip } from '../types/diaryTypes';
+import { LabelOptions } from '../types/labelTypes';
 
 export const modeColors = {
   pink: '#c32e85', // oklch(56% 0.2 350)     // e-car
diff --git a/www/js/survey/multilabel/confirmHelper.ts b/www/js/survey/multilabel/confirmHelper.ts
index 51674b0c3..4c2be1012 100644
--- a/www/js/survey/multilabel/confirmHelper.ts
+++ b/www/js/survey/multilabel/confirmHelper.ts
@@ -4,31 +4,7 @@ import { getAngularService } from '../../angular-react-helper';
 import { fetchUrlCached } from '../../services/commHelper';
 import i18next from 'i18next';
 import { logDebug } from '../../plugin/logger';
-
-type InputDetails<T extends string> = {
-  [k in T]?: {
-    name: string;
-    labeltext: string;
-    choosetext: string;
-    key: string;
-  };
-};
-export type LabelOption = {
-  value: string;
-  baseMode: string;
-  met?: { range: any[]; mets: number };
-  met_equivalent?: string;
-  kgCo2PerKm: number;
-  text?: string;
-};
-export type MultilabelKey = 'MODE' | 'PURPOSE' | 'REPLACED_MODE';
-export type LabelOptions<T extends string = MultilabelKey> = {
-  [k in T]: LabelOption[];
-} & {
-  translations: {
-    [lang: string]: { [translationKey: string]: string };
-  };
-};
+import { LabelOption, LabelOptions, MultilabelKey, InputDetails } from '../../types/labelTypes';
 
 let appConfig;
 export let labelOptions: LabelOptions<MultilabelKey>;
diff --git a/www/js/types/labelTypes.ts b/www/js/types/labelTypes.ts
new file mode 100644
index 000000000..8ac720adc
--- /dev/null
+++ b/www/js/types/labelTypes.ts
@@ -0,0 +1,24 @@
+export type InputDetails<T extends string> = {
+  [k in T]?: {
+    name: string;
+    labeltext: string;
+    choosetext: string;
+    key: string;
+  };
+};
+export type LabelOption = {
+  value: string;
+  baseMode: string;
+  met?: { range: any[]; mets: number };
+  met_equivalent?: string;
+  kgCo2PerKm: number;
+  text?: string;
+};
+export type MultilabelKey = 'MODE' | 'PURPOSE' | 'REPLACED_MODE';
+export type LabelOptions<T extends string = MultilabelKey> = {
+  [k in T]: LabelOption[];
+} & {
+  translations: {
+    [lang: string]: { [translationKey: string]: string };
+  };
+};