Skip to content

Commit

Permalink
Update and stick to using moment-timezone to fix DST (#8853)
Browse files Browse the repository at this point in the history
* Update moment-timezone to the latest

* Stick to using moment-timezone to fix DST (#8690)

---------

Co-authored-by: cweitat <cweitat@gmail.com>
  • Loading branch information
Leslie-Wong-H and cweitat committed Jun 28, 2023
1 parent c47c49f commit 9ad5e98
Show file tree
Hide file tree
Showing 61 changed files with 73 additions and 75 deletions.
2 changes: 1 addition & 1 deletion app/components/event-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { classNames } from '@ember-decorators/component';
import { action, computed } from '@ember/object';
import Component from '@ember/component';
import { forOwn } from 'lodash-es';
import moment from 'moment';
import moment from 'moment-timezone';
import { pascalCase } from 'open-event-frontend/utils/string';

@classic
Expand Down
2 changes: 1 addition & 1 deletion app/components/explore/side-bar.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import Component from '@ember/component';
import moment from 'moment';
import moment from 'moment-timezone';
import { computed, action } from '@ember/object';
import { not } from '@ember/object/computed';
import { getDateRanges } from 'open-event-frontend/utils/dictionary/filters';
Expand Down
2 changes: 1 addition & 1 deletion app/components/forms/form.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import { action } from '@ember/object';
import $ from 'jquery';
import moment from 'moment';
import moment from 'moment-timezone';
import { debounce } from '@ember/runloop';
import { FORM_DATE_FORMAT } from 'open-event-frontend/utils/dictionary/date-time';
import { merge } from 'lodash-es';
Expand Down
2 changes: 1 addition & 1 deletion app/components/forms/group/group-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Component from '@ember/component';
import { computed, action } from '@ember/object';
import classic from 'ember-classic-decorator';
import FormMixin from 'open-event-frontend/mixins/form';
import moment from 'moment';
import moment from 'moment-timezone';
import { sortBy } from 'lodash-es';
import { inject as service } from '@ember/service';

Expand Down
2 changes: 1 addition & 1 deletion app/components/forms/orders/order-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { readOnly, oneWay } from '@ember/object/computed';
import { run } from '@ember/runloop';
import { inject as service } from '@ember/service';
import FormMixin from 'open-event-frontend/mixins/form';
import moment from 'moment';
import moment from 'moment-timezone';
import { groupBy, orderBy } from 'lodash-es';
import {
compulsoryProtocolValidUrlPattern, validTwitterProfileUrlPattern, validFacebookProfileUrlPattern,
Expand Down
2 changes: 1 addition & 1 deletion app/components/forms/wizard/basic-details-step.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Component from '@ember/component';
import { later } from '@ember/runloop';
import { observer, computed } from '@ember/object';
import moment from 'moment';
import moment from 'moment-timezone';
import { orderBy, filter, find, difference } from 'lodash-es';
import { timezones } from 'open-event-frontend/utils/dictionary/date-time';
import { paymentCountries, paymentCurrencies } from 'open-event-frontend/utils/dictionary/payment';
Expand Down
2 changes: 1 addition & 1 deletion app/components/forms/wizard/other-details-step.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Component from '@ember/component';
import { computed } from '@ember/object';
import moment from 'moment';
import moment from 'moment-timezone';
import { orderBy, find } from 'lodash-es';
import { licenses } from 'open-event-frontend/utils/dictionary/licenses';
import { timezones } from 'open-event-frontend/utils/dictionary/date-time';
Expand Down
2 changes: 1 addition & 1 deletion app/components/forms/wizard/sessions-speakers-step.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
import { groupBy, sortBy } from 'lodash-es';
import { sortCustomFormFields } from 'open-event-frontend/utils/sort';
import { SPEAKER_FORM_ORDER, SESSION_FORM_ORDER } from 'open-event-frontend/models/custom-form';
import moment from 'moment';
import moment from 'moment-timezone';
import $ from 'jquery';

export default Component.extend(EventWizardMixin, FormMixin, {
Expand Down
6 changes: 3 additions & 3 deletions app/components/public/add-to-calender.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@glimmer/component';
import moment, { Moment } from 'moment';
import moment from 'moment-timezone';
import Event from 'open-event-frontend/models/event';
import { inject as service } from '@ember/service';
import { tracked } from '@glimmer/tracking';
Expand Down Expand Up @@ -52,12 +52,12 @@ export default class AddToCalender extends Component<Args> {
this.showSessions = this.showSessions ?? await hasSessions(this.loader, event);
}

get startsAt(): Moment {
get startsAt(): moment.Moment {
const { event } = this.args;
return moment(event.startsAt).tz(event.timezone);
}

get endsAt(): Moment {
get endsAt(): moment.Moment {
const { event } = this.args;
return moment(event.endsAt).tz(event.timezone);
}
Expand Down
2 changes: 1 addition & 1 deletion app/components/public/session-item.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { action } from '@ember/object';
import Component from '@glimmer/component';
import moment from 'moment';
import moment from 'moment-timezone';
import { inject as service } from '@ember/service';
import { tracked } from '@glimmer/tracking';
import { extractYoutubeUrl } from 'open-event-frontend/utils/url';
Expand Down
2 changes: 1 addition & 1 deletion app/components/schedule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Event from 'open-event-frontend/models/event';
import Session from 'open-event-frontend/models/session';
import Microlocation from 'open-event-frontend/models/microlocation';
import Speaker from 'open-event-frontend/models/speaker';
import moment from 'moment';
import moment from 'moment-timezone';
import $ from 'jquery';
import { isTesting } from 'open-event-frontend/utils/testing';
import { getTextColor } from 'open-event-frontend/utils/color';
Expand Down
2 changes: 1 addition & 1 deletion app/components/ui-table/cell/cell-duration.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classic from 'ember-classic-decorator';
import Component from '@ember/component';
import { computed } from '@ember/object';
import moment from 'moment';
import moment from 'moment-timezone';

@classic
export default class CellButtons extends Component {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import classic from 'ember-classic-decorator';
import Component from '@ember/component';
import moment from 'moment';
import moment from 'moment-timezone';
@classic
export default class CellAction extends Component {
currentlyCheckedin = [];
Expand Down
2 changes: 1 addition & 1 deletion app/components/widgets/forms/date-picker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import $ from 'jquery';
import Component from '@ember/component';
import { merge } from 'lodash-es';
import moment from 'moment';
import moment from 'moment-timezone';
import { FORM_DATE_FORMAT } from 'open-event-frontend/utils/dictionary/date-time';
import FormMixin from 'open-event-frontend/mixins/form';

Expand Down
2 changes: 1 addition & 1 deletion app/components/widgets/forms/time-picker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import $ from 'jquery';
import Component from '@ember/component';
import { merge } from 'lodash-es';
import moment from 'moment';
import moment from 'moment-timezone';
import { FORM_TIME_FORMAT } from 'open-event-frontend/utils/dictionary/date-time';

export default Component.extend({
Expand Down
3 changes: 1 addition & 2 deletions app/components/widgets/time-zone-picker.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Component from '@glimmer/component';
import moment from 'moment';
import 'moment-timezone';
import moment from 'moment-timezone';
import { timezones } from 'open-event-frontend/utils/dictionary/date-time';

interface Args {
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { computed, action } from '@ember/object';
import { inject as service } from '@ember/service';
import { filterBy } from '@ember/object/computed';
import Controller from '@ember/controller';
import moment from 'moment';
import moment from 'moment-timezone';
import { tracked } from '@glimmer/tracking';


Expand Down
2 changes: 1 addition & 1 deletion app/controllers/events/view/scheduler.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Controller from '@ember/controller';
import { computed, action } from '@ember/object';
import moment from 'moment';
import moment from 'moment-timezone';
import { tracked } from '@glimmer/tracking';
import { matchPropertyIn } from 'open-event-frontend/utils/text';
import $ from 'jquery';
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/events/view/tickets/attendees/list.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Controller from '@ember/controller';
import { action } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
import moment from 'moment';
import moment from 'moment-timezone';


export default class extends Controller.extend(EmberTableControllerMixin) {
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classic from 'ember-classic-decorator';
import { action, computed } from '@ember/object';
import Controller from '@ember/controller';
import moment from 'moment';
import moment from 'moment-timezone';

@classic
export default class IndexController extends Controller {
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/public.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import classic from 'ember-classic-decorator';
import { orderBy } from 'lodash-es';
import { computed, action } from '@ember/object';
import Controller from '@ember/controller';
import moment from 'moment';
import moment from 'moment-timezone';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';
import { levels } from 'open-event-frontend/utils/dictionary/levels';
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/public/sessions.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classic from 'ember-classic-decorator';
import { computed, action } from '@ember/object';
import Controller from '@ember/controller';
import moment from 'moment';
import moment from 'moment-timezone';
import { groupBy } from 'lodash-es';

@classic
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/general-date.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Helper from '@ember/component/helper';
import moment from 'moment';
import moment from 'moment-timezone';
import { tzAbbr } from 'open-event-frontend/utils/dictionary/tzAbbr';

const dateFormats = {
Expand Down
2 changes: 1 addition & 1 deletion app/mixins/form.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import $ from 'jquery';
import Mixin from '@ember/object/mixin';
import { merge } from 'lodash-es';
import { debounce } from '@ember/runloop';
import moment from 'moment';
import moment from 'moment-timezone';
import { FORM_DATE_FORMAT } from 'open-event-frontend/utils/dictionary/date-time';

export default Mixin.create({
Expand Down
2 changes: 1 addition & 1 deletion app/models/activity.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import attr from 'ember-data/attr';
import moment from 'moment';
import moment from 'moment-timezone';
import ModelBase from 'open-event-frontend/models/base';

const detectedTimezone = moment.tz.guess();
Expand Down
2 changes: 1 addition & 1 deletion app/models/discount-code.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import attr from 'ember-data/attr';
import { computed } from '@ember/object';
import ModelBase from 'open-event-frontend/models/base';
import moment from 'moment';
import moment from 'moment-timezone';
import { hasMany, belongsTo } from 'ember-data/relationships';
import { computedDateTimeSplit } from 'open-event-frontend/utils/computed-helpers';

Expand Down
2 changes: 1 addition & 1 deletion app/models/event.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { computed } from '@ember/object';
import { inject as service } from '@ember/service';
import moment from 'moment';
import moment from 'moment-timezone';
import attr from 'ember-data/attr';
import ModelBase from 'open-event-frontend/models/base';
import { hasMany, belongsTo } from 'ember-data/relationships';
Expand Down
2 changes: 1 addition & 1 deletion app/models/role-invite.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import attr from 'ember-data/attr';
import ModelBase from 'open-event-frontend/models/base';
import moment from 'moment';
import moment from 'moment-timezone';
import { belongsTo } from 'ember-data/relationships';

const detectedTimezone = moment.tz.guess();
Expand Down
2 changes: 1 addition & 1 deletion app/models/session.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import attr from 'ember-data/attr';
import moment from 'moment';
import moment from 'moment-timezone';
import ModelBase from 'open-event-frontend/models/base';
import { belongsTo, hasMany } from 'ember-data/relationships';
import { computedDateTimeSplit } from 'open-event-frontend/utils/computed-helpers';
Expand Down
2 changes: 1 addition & 1 deletion app/models/speaker-invite.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import attr from 'ember-data/attr';
import ModelBase from 'open-event-frontend/models/base';
import moment from 'moment';
import moment from 'moment-timezone';
import { belongsTo } from 'ember-data/relationships';

const detectedTimezone = moment.tz.guess();
Expand Down
2 changes: 1 addition & 1 deletion app/models/speakers-call.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ModelBase from 'open-event-frontend/models/base';
import { belongsTo } from 'ember-data/relationships';
import { v4 } from 'ember-uuid';
import { computedDateTimeSplit } from 'open-event-frontend/utils/computed-helpers';
import moment from 'moment';
import moment from 'moment-timezone';

const detectedTimezone = moment.tz.guess();

Expand Down
2 changes: 1 addition & 1 deletion app/models/ticket.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { computed } from '@ember/object';
import attr from 'ember-data/attr';
import ModelBase from 'open-event-frontend/models/base';
import moment from 'moment';
import moment from 'moment-timezone';
import { computedDateTimeSplit } from 'open-event-frontend/utils/computed-helpers';
import { belongsTo, hasMany } from 'ember-data/relationships';

Expand Down
2 changes: 1 addition & 1 deletion app/models/user-follow-group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { attr, belongsTo } from '@ember-data/model';
import ModelBase from 'open-event-frontend/models/base';
import Group from './group';
import User from './user';
import moment from 'moment';
import moment from 'moment-timezone';
export default class UserFollowGroup extends ModelBase.extend() {
@belongsTo('group') group!: Group;
@belongsTo('user') user!: User;
Expand Down
2 changes: 1 addition & 1 deletion app/models/video-recording.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { attr, belongsTo } from '@ember-data/model';
import ModelBase from 'open-event-frontend/models/base';
import VideoStream from './video-stream';
import moment from 'moment';
import moment from 'moment-timezone';


export default class VideoRecording extends ModelBase.extend() {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/account/danger-zone.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classic from 'ember-classic-decorator';
import Route from '@ember/routing/route';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
import moment from 'moment';
import moment from 'moment-timezone';

@classic
export default class DangerZoneRoute extends Route.extend(AuthenticatedRouteMixin) {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/admin/events/list.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Route from '@ember/routing/route';
import { action } from '@ember/object';
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
import moment from 'moment';
import moment from 'moment-timezone';

export default class extends Route.extend(EmberTableRouteMixin) {

Expand Down
2 changes: 1 addition & 1 deletion app/routes/admin/sales/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import classic from 'ember-classic-decorator';
import Route from '@ember/routing/route';
import { action } from '@ember/object';
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
import moment from 'moment';
import moment from 'moment-timezone';

@classic
export default class IndexRoute extends Route.extend(EmberTableRouteMixin) {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/admin/users/list.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Route from '@ember/routing/route';
import { action } from '@ember/object';
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
import moment from 'moment';
import moment from 'moment-timezone';

export default class extends Route.extend(EmberTableRouteMixin) {

Expand Down
2 changes: 1 addition & 1 deletion app/routes/admin/users/view/events/list.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
import moment from 'moment';
import moment from 'moment-timezone';
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';

export default class extends Route.extend(EmberTableRouteMixin) {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/admin/users/view/sessions/list.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import classic from 'ember-classic-decorator';
import Route from '@ember/routing/route';
import moment from 'moment';
import moment from 'moment-timezone';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';

@classic
Expand Down
2 changes: 1 addition & 1 deletion app/routes/admin/users/view/tickets/list.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classic from 'ember-classic-decorator';
import Route from '@ember/routing/route';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
import moment from 'moment';
import moment from 'moment-timezone';

@classic
export default class ListRoute extends Route.extend(AuthenticatedRouteMixin) {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/events/list.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Route from '@ember/routing/route';
import { action } from '@ember/object';
import moment from 'moment';
import moment from 'moment-timezone';
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
export default class extends Route.extend(EmberTableRouteMixin) {

Expand Down
2 changes: 1 addition & 1 deletion app/routes/events/view/tickets/access-codes/create.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import classic from 'ember-classic-decorator';
import Route from '@ember/routing/route';
import moment from 'moment';
import moment from 'moment-timezone';
import RSVP from 'rsvp';

@classic
Expand Down
2 changes: 1 addition & 1 deletion app/routes/events/view/tickets/access-codes/list.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Route from '@ember/routing/route';
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
import moment from 'moment';
import moment from 'moment-timezone';

export default class extends Route.extend(EmberTableRouteMixin) {
titleToken() {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/events/view/tickets/discount-codes/list.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Route from '@ember/routing/route';
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
import moment from 'moment';
import moment from 'moment-timezone';

export default class extends Route.extend(EmberTableRouteMixin) {
titleToken() {
Expand Down

1 comment on commit 9ad5e98

@vercel
Copy link

@vercel vercel bot commented on 9ad5e98 Jun 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.