@capillarytech/cap-ui-utils 3.0.9-alpha.8 → 3.0.10-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capillarytech/cap-ui-utils",
-  "version": "3.0.9-alpha.8",
+  "version": "3.0.10-alpha.0",
   "description": "Utility functions shared accross all the modules",
   "main": "index.js",
   "scripts": {

package/utils/timezone.js

@@ -4,40 +4,17 @@ import { DATE_FORMAT,TIMEZONE_ENABLED } from "./constants";
 import hasFeatureAccess from "../auth/hasFeatureAccess";
 
 /**
- * Map of timezone abbreviations to DST-neutral abbreviations
- * @type {Object}
- * @description This map is used to convert timezone abbreviations to DST-neutral abbreviations.
- * @example
- * EST -> ET
- * EDT -> ET
- * Please add any additional DST-observing regions as needed.
+ * Get the timezone abbreviation for a given timezone
+ * @param {string} timezone - The timezone to get the abbreviation for
+ * @returns {string} The timezone abbreviation for the given IANA timezone
+ * If Abbreviation is not found then return UTC+X:XX format
  */
-const DST_NEUTRAL_TZ_MAP = {
-  // North America
-  EST: "ET", EDT: "ET",
-  CST: "CT", CDT: "CT",
-  MST: "MT", MDT: "MT",
-  PST: "PT", PDT: "PT",
-  AKST: "AKT", AKDT: "AKT",
-  HST: "HT", HDT: "HT",
-
-  // Europe
-  GMT: "GMT", BST: "GMT",   
-  CET: "CET", CEST: "CET",  
-  EET: "EET", EEST: "EET",  
-  WEST: "WET", WET: "WET",  
-  WEDT: "WET",                
-
-  // Australia / New Zealand
-  AEST: "AET", AEDT: "AET",
-  ACST: "ACT", ACDT: "ACT",
-  AWST: "AWT",              
-  NZST: "NZT", NZDT: "NZT",
-
-  // South America
-  BRT: "BRT", BRST: "BRT",
-  ART: "ART", ARST: "ART",
-
+export const getTimezoneAbbreviation = timezone => {
+  const tzAbbr = moment.tz(timezone).format('z');
+  if(tzAbbr.startsWith('+') || tzAbbr.startsWith('-')) {
+    return `UTC${moment.utcOffset(tzAbbr)}`;
+  }
+  return tzAbbr;
 };
 
 const getTimezoneFormattedDate = (date,orgTZ = false,customTZ = null) => {
@@ -113,9 +90,9 @@ export const formatDateWithTimezone = (date, orgTZ = true, customTZ = null) => {
 
     const momentDate = getTimezoneFormattedDate(date,orgTZ,customTZ);
     if (!momentDate.isValid()) return "-";
-    
-    let tzAbbr = momentDate.format("z");
-    tzAbbr = DST_NEUTRAL_TZ_MAP[tzAbbr] || tzAbbr;
+    const orgTimezone = utilsLocalStorageApi.loadItem("orgTZ") || "Asia/Kolkata";
+    let targetTimezone = orgTZ ? orgTimezone : customTZ ? customTZ : orgTimezone;
+    let tzAbbr = getTimezoneAbbreviation(targetTimezone);
     return `${momentDate.format(DATE_FORMAT)} ${tzAbbr}`;
   } catch (error) {
     console.error(error);