From 60f76e3f147e3b4812c9a46899b03f3d475ee94d Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Tue, 3 Mar 2020 11:43:01 -0600 Subject: [PATCH 1/4] Update src/core/public/integrations/moment/moment_service.ts Co-Authored-By: Mikhail Shustov --- src/core/public/integrations/moment/moment_service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/public/integrations/moment/moment_service.ts b/src/core/public/integrations/moment/moment_service.ts index e2cbee288c68f9..c77b999813254d 100644 --- a/src/core/public/integrations/moment/moment_service.ts +++ b/src/core/public/integrations/moment/moment_service.ts @@ -37,8 +37,8 @@ export class MomentService implements CoreService { public async start({ uiSettings }: StartDeps) { const setDefaultTimezone = (tz: string) => { - const zone: string | undefined = get(moment.tz.zone(tz), 'name'); - if (zone) moment.tz.setDefault(zone); + const zone = moment.tz.zone(tz); + if (zone) moment.tz.setDefault(zone.name); }; const setStartDayOfWeek = (day: string) => { const dow = moment.weekdays().indexOf(day); From 84c655b7d4c7cbe3242cebf8787969cdd0bb7baf Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Tue, 3 Mar 2020 11:43:15 -0600 Subject: [PATCH 2/4] Update src/core/public/integrations/moment/moment_service.ts Co-Authored-By: Mikhail Shustov --- src/core/public/integrations/moment/moment_service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/public/integrations/moment/moment_service.ts b/src/core/public/integrations/moment/moment_service.ts index c77b999813254d..69cc29231d6e4b 100644 --- a/src/core/public/integrations/moment/moment_service.ts +++ b/src/core/public/integrations/moment/moment_service.ts @@ -19,7 +19,6 @@ import moment from 'moment-timezone'; import { merge, Subscription } from 'rxjs'; -import { get } from 'lodash'; import { tap } from 'rxjs/operators'; import { IUiSettingsClient } from '../../ui_settings'; From c23333ba00c229cab114bf076caa72dd12c8b35f Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Tue, 3 Mar 2020 11:43:23 -0600 Subject: [PATCH 3/4] Update src/core/public/integrations/moment/moment_service.test.ts Co-Authored-By: Mikhail Shustov --- src/core/public/integrations/moment/moment_service.test.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core/public/integrations/moment/moment_service.test.ts b/src/core/public/integrations/moment/moment_service.test.ts index 0884a59afba9ca..db77c849ad3806 100644 --- a/src/core/public/integrations/moment/moment_service.test.ts +++ b/src/core/public/integrations/moment/moment_service.test.ts @@ -61,10 +61,8 @@ describe('MomentService', () => { it('sets timezone when a zone is defined', async () => { const tz$ = new BehaviorSubject('tz3'); - const dow$ = new BehaviorSubject('dow1'); - const uiSettings = uiSettingsServiceMock.createSetupContract(); - uiSettings.get$.mockReturnValueOnce(tz$).mockReturnValueOnce(dow$); + uiSettings.get$.mockReturnValueOnce(tz$); service.start({ uiSettings }); await flushPromises(); From c7e412d5193aaa4953dba9ebfa88f0c3f9d1c67c Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Tue, 3 Mar 2020 11:43:40 -0600 Subject: [PATCH 4/4] Update src/core/public/integrations/moment/moment_service.test.ts Co-Authored-By: Mikhail Shustov --- src/core/public/integrations/moment/moment_service.test.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core/public/integrations/moment/moment_service.test.ts b/src/core/public/integrations/moment/moment_service.test.ts index db77c849ad3806..95d05bfd580191 100644 --- a/src/core/public/integrations/moment/moment_service.test.ts +++ b/src/core/public/integrations/moment/moment_service.test.ts @@ -49,10 +49,8 @@ describe('MomentService', () => { it('uses the default timezone when a zone is not defined', async () => { const tz$ = new BehaviorSubject('timezone/undefined'); - const dow$ = new BehaviorSubject('dow1'); - const uiSettings = uiSettingsServiceMock.createSetupContract(); - uiSettings.get$.mockReturnValueOnce(tz$).mockReturnValueOnce(dow$); + uiSettings.get$.mockReturnValueOnce(tz$); service.start({ uiSettings }); await flushPromises();