Only set timezone when user setting is a valid timezone

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(),

src/core/public/integrations/moment/moment_service.test.ts

@@ -47,6 +47,30 @@ describe('MomentService', () => {
     expect(momentMock.updateLocale).toHaveBeenCalledWith('default-locale', { week: { dow: 0 } });
   });
 
+  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$);
+
+    service.start({ uiSettings });
+    await flushPromises();
+    expect(momentMock.tz.setDefault).toHaveBeenCalledWith(undefined);
+  });
+
+  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$);
+
+    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');

src/core/public/integrations/moment/moment_service.ts

@@ -19,6 +19,7 @@
 
 import moment from 'moment-timezone';
 import { merge, Subscription } from 'rxjs';
+import { get } from 'lodash';
 
 import { tap } from 'rxjs/operators';
 import { IUiSettingsClient } from '../../ui_settings';
@@ -35,7 +36,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: string | undefined = get(moment.tz.zone(tz), 'name');
+      moment.tz.setDefault(zone);
+    };
     const setStartDayOfWeek = (day: string) => {
       const dow = moment.weekdays().indexOf(day);
       moment.updateLocale(moment.locale(), { week: { dow } } as any);