Merge branch 'service_rewrite_2023' of https://github.com/e-mission/e…

…-mission-phone into migration-wrapup
e-mission · Jan 25, 2024 · d5fe4b4 · d5fe4b4
1 parent 316d4e9
commit d5fe4b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/www/__mocks__/timelineHelperMocks.ts b/www/__mocks__/timelineHelperMocks.ts
@@ -75,7 +75,7 @@ export const mockUnprocessedTrip: UnprocessedTrip = {
   user_input: null,
 };
 
-export const mockCompData = {
+export const mockCompData: ServerResponse<CompositeTrip> = {
   phone_data: [
     {
       data: {

diff --git a/www/__tests__/notifScheduler.test.ts b/www/__tests__/notifScheduler.test.ts
@@ -63,6 +63,10 @@ const exampleReminderSchemes = {
 mockLogger();
 mockReminders();
 
+jest.mock('i18next', () => ({
+  resolvedLanguage: 'en',
+}));
+
 jest.mock('../js/services/commHelper', () => ({
   ...jest.requireActual('../js/services/commHelper'),
   getUser: jest.fn(() =>

diff --git a/www/js/diary/timelineHelper.ts b/www/js/diary/timelineHelper.ts
@@ -13,6 +13,7 @@ import {
   FilteredLocation,
   TimestampRange,
   CompositeTrip,
+  UnprocessedTrip,
 } from '../types/diaryTypes';
 import { getLabelInputDetails, getLabelInputs } from '../survey/multilabel/confirmHelper';
 import { LabelOptions } from '../types/labelTypes';
@@ -461,9 +462,9 @@ const isEndingTransition = function (transWrapper: BEMData<TripTransition>) {
  *
  * Let's abstract this out into our own minor state machine.
  */
-const transitions2Trips = function (transitionList: Array<ServerData<TripTransition>>) {
+const transitions2Trips = function (transitionList: Array<BEMData<TripTransition>>) {
   let inTrip = false;
-  const tripList: [ServerData<TripTransition>, ServerData<TripTransition>][] = [];
+  const tripList: [BEMData<TripTransition>, BEMData<TripTransition>][] = [];
   let currStartTransitionIndex = -1;
   let currEndTransitionIndex = -1;
   let processedUntil = 0;