The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(server): normalize deprecated IANA timezone aliases before they reach SQL (#23787)
Sanjay Mathewd3d6d39ab90c
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/__tests__/get-group-by-expression.util.spec.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/__tests__/get-group-by-expression.util.spec.tsindex a9bfce99fbe..53618e875ac 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/__tests__/get-group-by-expression.util.spec.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/__tests__/get-group-by-expression.util.spec.ts@@ -95,6 +95,69 @@ describe('getGroupByExpression', () => {});});+ describe('deprecated timezone alias normalization', () => {+ it.each([+ ['Asia/Calcutta', 'Asia/Kolkata'],+ ['Europe/Kiev', 'Europe/Kyiv'],+ ['Asia/Saigon', 'Asia/Ho_Chi_Minh'],+ ['America/Buenos_Aires', 'America/Argentina/Buenos_Aires'],+ ['US/Eastern', 'America/New_York'],+ ['Japan', 'Asia/Tokyo'],+ ])(+ 'should normalize the deprecated alias %s to %s',+ (deprecatedAlias, canonicalTimeZone) => {+ const groupByField = buildGroupByDateField({+ timeZone: deprecatedAlias,+ });++ const result = getGroupByExpression({+ groupByField,+ columnNameWithQuotes,+ });++ expect(result).toContain(`'${canonicalTimeZone}'`);+ expect(result).not.toContain(`'${deprecatedAlias}'`);+ },+ );++ it.each([+ 'Asia/Kolkata',+ 'UTC',+ 'GMT',+ 'CET',+ 'MET',+ 'WET',+ 'EET',+ 'EST5EDT',+ 'Zulu',+ ])('should leave supported timezone %s unchanged', (timeZone) => {+ const groupByField = buildGroupByDateField({ timeZone });++ const result = getGroupByExpression({+ groupByField,+ columnNameWithQuotes,+ });++ expect(result).toContain(`'${timeZone}'`);+ });++ it('should normalize both interpolations of the timezone in the WEEK expression', () => {+ const groupByField = buildGroupByDateField({+ dateGranularity: ObjectRecordGroupByDateGranularity.WEEK,+ timeZone: 'Asia/Calcutta',+ });++ const result = getGroupByExpression({+ groupByField,+ columnNameWithQuotes,+ });++ expect(result).not.toContain('Asia/Calcutta');+ expect(result).toContain("'Asia/Kolkata')");+ expect(result).toContain("AT TIME ZONE 'Asia/Kolkata'");+ });+ });+describe('missing timezone handling', () => {it('should throw when timezone is required but not provided', () => {const groupByField = buildGroupByDateField({diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-expression.util.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-expression.util.tsindex d67e3e2bccc..b8c6624061f 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-expression.util.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-expression.util.ts@@ -1,5 +1,6 @@import { isNonEmptyString } from '@sniptt/guards';import {+ DEPRECATED_IANA_TIME_ZONE_ALIASES,GROUP_BY_DATE_GRANULARITY_THAT_REQUIRE_TIME_ZONE,IANA_TIME_ZONES,} from 'twenty-shared/constants';@@ -70,12 +71,17 @@ export const getGroupByExpression = ({);}+ const normalizedTimeZone = isNonEmptyString(groupByField.timeZone)+ ? (DEPRECATED_IANA_TIME_ZONE_ALIASES[groupByField.timeZone] ??+ groupByField.timeZone)+ : groupByField.timeZone;+const timeZoneAsDateTruncParameter = shouldUseTimeZone- ? `, '${groupByField.timeZone}'`+ ? `, '${normalizedTimeZone}'`: '';const timeZoneAsToCharParameter = shouldUseTimeZone- ? ` AT TIME ZONE '${groupByField.timeZone}'`+ ? ` AT TIME ZONE '${normalizedTimeZone}'`: '';switch (dateGranularity) {diff --git a/packages/twenty-shared/src/constants/DeprecatedIanaTimeZoneAliases.ts b/packages/twenty-shared/src/constants/DeprecatedIanaTimeZoneAliases.tsnew file mode 100644index 00000000000..2b322116345--- /dev/null+++ b/packages/twenty-shared/src/constants/DeprecatedIanaTimeZoneAliases.ts@@ -0,0 +1,99 @@+export const DEPRECATED_IANA_TIME_ZONE_ALIASES: Record<string, string> = {+ 'Africa/Asmera': 'Africa/Asmara',+ 'America/Argentina/ComodRivadavia': 'America/Argentina/Catamarca',+ 'America/Buenos_Aires': 'America/Argentina/Buenos_Aires',+ 'America/Catamarca': 'America/Argentina/Catamarca',+ 'America/Cordoba': 'America/Argentina/Cordoba',+ 'America/Fort_Wayne': 'America/Indiana/Indianapolis',+ 'America/Godthab': 'America/Nuuk',+ 'America/Indianapolis': 'America/Indiana/Indianapolis',+ 'America/Jujuy': 'America/Argentina/Jujuy',+ 'America/Knox_IN': 'America/Indiana/Knox',+ 'America/Louisville': 'America/Kentucky/Louisville',+ 'America/Mendoza': 'America/Argentina/Mendoza',+ 'America/Rosario': 'America/Argentina/Cordoba',+ 'Antarctica/South_Pole': 'Antarctica/McMurdo',+ 'Asia/Ashkhabad': 'Asia/Ashgabat',+ 'Asia/Calcutta': 'Asia/Kolkata',+ 'Asia/Choibalsan': 'Asia/Ulaanbaatar',+ 'Asia/Chungking': 'Asia/Shanghai',+ 'Asia/Dacca': 'Asia/Dhaka',+ 'Asia/Katmandu': 'Asia/Kathmandu',+ 'Asia/Macao': 'Asia/Macau',+ 'Asia/Rangoon': 'Asia/Yangon',+ 'Asia/Saigon': 'Asia/Ho_Chi_Minh',+ 'Asia/Thimbu': 'Asia/Thimphu',+ 'Asia/Ujung_Pandang': 'Asia/Makassar',+ 'Asia/Ulan_Bator': 'Asia/Ulaanbaatar',+ 'Atlantic/Faeroe': 'Atlantic/Faroe',+ 'Australia/ACT': 'Australia/Sydney',+ 'Australia/LHI': 'Australia/Lord_Howe',+ 'Australia/NSW': 'Australia/Sydney',+ 'Australia/North': 'Australia/Darwin',+ 'Australia/Queensland': 'Australia/Brisbane',+ 'Australia/South': 'Australia/Adelaide',+ 'Australia/Tasmania': 'Australia/Hobart',+ 'Australia/Victoria': 'Australia/Melbourne',+ 'Australia/West': 'Australia/Perth',+ 'Brazil/Acre': 'America/Rio_Branco',+ 'Brazil/DeNoronha': 'America/Noronha',+ 'Brazil/East': 'America/Sao_Paulo',+ 'Brazil/West': 'America/Manaus',+ 'Canada/Atlantic': 'America/Halifax',+ 'Canada/Central': 'America/Winnipeg',+ 'Canada/Eastern': 'America/Toronto',+ 'Canada/Mountain': 'America/Edmonton',+ 'Canada/Newfoundland': 'America/St_Johns',+ 'Canada/Pacific': 'America/Vancouver',+ 'Canada/Saskatchewan': 'America/Regina',+ 'Canada/Yukon': 'America/Whitehorse',+ 'Chile/Continental': 'America/Santiago',+ 'Chile/EasterIsland': 'Pacific/Easter',+ Cuba: 'America/Havana',+ Egypt: 'Africa/Cairo',+ Eire: 'Europe/Dublin',+ 'Europe/Kiev': 'Europe/Kyiv',+ 'Europe/Uzhgorod': 'Europe/Kyiv',+ 'Europe/Zaporozhye': 'Europe/Kyiv',+ GB: 'Europe/London',+ 'GB-Eire': 'Europe/London',+ Greenwich: 'Etc/GMT',+ Hongkong: 'Asia/Hong_Kong',+ Iceland: 'Atlantic/Reykjavik',+ Iran: 'Asia/Tehran',+ Israel: 'Asia/Jerusalem',+ Jamaica: 'America/Jamaica',+ Japan: 'Asia/Tokyo',+ Kwajalein: 'Pacific/Kwajalein',+ Libya: 'Africa/Tripoli',+ 'Mexico/BajaNorte': 'America/Tijuana',+ 'Mexico/BajaSur': 'America/Mazatlan',+ 'Mexico/General': 'America/Mexico_City',+ NZ: 'Pacific/Auckland',+ 'NZ-CHAT': 'Pacific/Chatham',+ Navajo: 'America/Denver',+ PRC: 'Asia/Shanghai',+ 'Pacific/Enderbury': 'Pacific/Kanton',+ 'Pacific/Ponape': 'Pacific/Pohnpei',+ 'Pacific/Truk': 'Pacific/Chuuk',+ Poland: 'Europe/Warsaw',+ Portugal: 'Europe/Lisbon',+ ROC: 'Asia/Taipei',+ ROK: 'Asia/Seoul',+ Singapore: 'Asia/Singapore',+ Turkey: 'Europe/Istanbul',+ 'US/Alaska': 'America/Anchorage',+ 'US/Aleutian': 'America/Adak',+ 'US/Arizona': 'America/Phoenix',+ 'US/Central': 'America/Chicago',+ 'US/East-Indiana': 'America/Indiana/Indianapolis',+ 'US/Eastern': 'America/New_York',+ 'US/Hawaii': 'Pacific/Honolulu',+ 'US/Indiana-Starke': 'America/Indiana/Knox',+ 'US/Michigan': 'America/Detroit',+ 'US/Mountain': 'America/Denver',+ 'US/Pacific': 'America/Los_Angeles',+ 'US/Samoa': 'Pacific/Pago_Pago',+ Universal: 'Etc/UTC',+ 'W-SU': 'Europe/Moscow',+};diff --git a/packages/twenty-shared/src/constants/__tests__/DeprecatedIanaTimeZoneAliases.test.ts b/packages/twenty-shared/src/constants/__tests__/DeprecatedIanaTimeZoneAliases.test.tsnew file mode 100644index 00000000000..e49dc560cb7--- /dev/null+++ b/packages/twenty-shared/src/constants/__tests__/DeprecatedIanaTimeZoneAliases.test.ts@@ -0,0 +1,17 @@+import { DEPRECATED_IANA_TIME_ZONE_ALIASES } from '../DeprecatedIanaTimeZoneAliases';+import { IANA_TIME_ZONES } from '../IanaTimeZones';++describe('DEPRECATED_IANA_TIME_ZONE_ALIASES', () => {+ it.each(Object.entries(DEPRECATED_IANA_TIME_ZONE_ALIASES))(+ 'maps accepted alias %s to a supported terminal timezone %s',+ (alias, canonicalTimeZone) => {+ expect(IANA_TIME_ZONES).toContain(alias);+ expect(DEPRECATED_IANA_TIME_ZONE_ALIASES).not.toHaveProperty(+ canonicalTimeZone,+ );+ expect(+ () => new Intl.DateTimeFormat('en-US', { timeZone: canonicalTimeZone }),+ ).not.toThrow();+ },+ );+});diff --git a/packages/twenty-shared/src/constants/index.ts b/packages/twenty-shared/src/constants/index.tsindex 2f71e452d67..13b9823ff60 100644--- a/packages/twenty-shared/src/constants/index.ts+++ b/packages/twenty-shared/src/constants/index.ts@@ -26,6 +26,7 @@ export { DEFAULT_SELECT_OPTION_COLOR } from './DefaultSelectOptionColor';export { DEFAULT_VIEW_GROUP_LOAD_LIMIT } from './DefaultViewGroupLoadLimit';export { DEFAULT_VISIBLE_ADDRESS_SUBFIELDS } from './DefaultVisibleAddressSubfields';export { DEFAULT_WIDGET_SIZE } from './DefaultWidgetSize';+export { DEPRECATED_IANA_TIME_ZONE_ALIASES } from './DeprecatedIanaTimeZoneAliases';export { DOCUMENTATION_BASE_URL } from './DocumentationBaseUrl';export { DOCUMENTATION_DEFAULT_LANGUAGE } from './DocumentationDefaultLanguage';export { DOCUMENTATION_DEFAULT_PATH } from './DocumentationDefaultPath';