Only set timezone when user setting is a valid timezone (elastic#57850)

* Only set timezone when user setting is a valid timezone Currently we set the global browser timezone based on the user's advanced settings. This setting includes a list of timezones and a non-standard 'Browser' option which can be translated as set the timezone to my current. In order to avoid warnings and possible future errors we only set timezone if it exists in moments list of installed timezones Closes elastic#38515 * feedback * only set timezone if defined * Update src/core/public/integrations/moment/moment_service.ts Co-Authored-By: Mikhail Shustov <[email protected]> * Update src/core/public/integrations/moment/moment_service.ts Co-Authored-By: Mikhail Shustov <[email protected]> * Update src/core/public/integrations/moment/moment_service.test.ts Co-Authored-By: Mikhail Shustov <[email protected]> * Update src/core/public/integrations/moment/moment_service.test.ts Co-Authored-By: Mikhail Shustov <[email protected]> * update test name Co-authored-by: Mikhail Shustov <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
gmmorris · Mar 20, 2020 · 854f242 · 854f242
1 parent 1a1e2e7
commit 854f242
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/src/core/public/integrations/moment/moment_service.test.mocks.ts b/src/core/public/integrations/moment/moment_service.test.mocks.ts
@@ -21,6 +21,9 @@ export const momentMock = {
   locale: jest.fn(() => 'default-locale'),
   tz: {
     setDefault: jest.fn(),
+    zone: jest.fn(
+      z => [{ name: 'tz1' }, { name: 'tz2' }, { name: 'tz3' }].find(f => z === f.name) || null
+    ),
   },
   weekdays: jest.fn(() => ['dow1', 'dow2', 'dow3']),
   updateLocale: jest.fn(),

diff --git a/src/core/public/integrations/moment/moment_service.test.ts b/src/core/public/integrations/moment/moment_service.test.ts
@@ -47,6 +47,26 @@ describe('MomentService', () => {
     expect(momentMock.updateLocale).toHaveBeenCalledWith('default-locale', { week: { dow: 0 } });
   });
 
+  it('does not set unknkown zone', async () => {
+    const tz$ = new BehaviorSubject('timezone/undefined');
+    const uiSettings = uiSettingsServiceMock.createSetupContract();
+    uiSettings.get$.mockReturnValueOnce(tz$);
+
+    service.start({ uiSettings });
+    await flushPromises();
+    expect(momentMock.tz.setDefault).not.toHaveBeenCalled();
+  });
+
+  it('sets timezone when a zone is defined', async () => {
+    const tz$ = new BehaviorSubject('tz3');
+    const uiSettings = uiSettingsServiceMock.createSetupContract();
+    uiSettings.get$.mockReturnValueOnce(tz$);
+
+    service.start({ uiSettings });
+    await flushPromises();
+    expect(momentMock.tz.setDefault).toHaveBeenCalledWith('tz3');
+  });
+
   test('updates moment config', async () => {
     const tz$ = new BehaviorSubject('tz1');
     const dow$ = new BehaviorSubject('dow1');

diff --git a/src/core/public/integrations/moment/moment_service.ts b/src/core/public/integrations/moment/moment_service.ts
@@ -35,7 +35,10 @@ export class MomentService implements CoreService {
   public async setup() {}
 
   public async start({ uiSettings }: StartDeps) {
-    const setDefaultTimezone = (tz: string) => moment.tz.setDefault(tz);
+    const setDefaultTimezone = (tz: string) => {
+      const zone = moment.tz.zone(tz);
+      if (zone) moment.tz.setDefault(zone.name);
+    };
     const setStartDayOfWeek = (day: string) => {
       const dow = moment.weekdays().indexOf(day);
       moment.updateLocale(moment.locale(), { week: { dow } } as any);