@capillarytech/cap-ui-utils 3.0.9-alpha.4 → 3.0.9-alpha.6

package/package.json

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

package/utils/timezone.js

@@ -3,6 +3,43 @@ import * as utilsLocalStorageApi from "./utilsLocalStorageApi";
 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.
+ */
+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",
+
+};
+
 const getTimezoneFormattedDate = (date,orgTZ = false,serverTZ = false,customTZ = null) => {
   const orgTimezone = utilsLocalStorageApi.loadItem("orgTZ") || "Asia/Kolkata";
   const serverTimezone = utilsLocalStorageApi.loadItem("serverTZ") || "Asia/Kolkata";
@@ -73,15 +110,20 @@ const getTimezoneFormattedDate = (date,orgTZ = false,serverTZ = false,customTZ =
  * @param {string|null} customTZ - Custom timezone override (e.g., "Asia/Kolkata").
  * @returns {string} Formatted date string with timezone abbreviation or '-'.
  */
-export const formatDateWithTimezone = (date, orgTZ = false, serverTZ = false, customTZ = null) => {
+export const formatDateWithTimezone = (date, tzAbbr = true,orgTZ = false, serverTZ = false, customTZ = null) => {
   try {
     if (!date) return "-";
 
     const momentDate = getTimezoneFormattedDate(date,orgTZ,serverTZ,customTZ);
     if (!momentDate.isValid()) return "-";
-
-    const tzAbbr = momentDate.format("z"); // e.g., IST, PST
-    return `${momentDate.format(DATE_FORMAT)} ${tzAbbr}`;
+    
+    if(tzAbbr) {  
+      let tzAbbr = momentDate.format("z");
+      tzAbbr = DST_NEUTRAL_TZ_MAP[tzAbbr] || tzAbbr;
+      return `${momentDate.format(DATE_FORMAT)} ${tzAbbr}`;
+    } else {
+      return momentDate.format(DATE_FORMAT);
+    }
   } catch (error) {
     console.error(error);
     return "-";
@@ -126,7 +168,8 @@ export const getTimezoneTooltip = (date, orgTZ = false, serverTZ = false, custom
     const momentDate = getTimezoneFormattedDate(date,orgTZ,serverTZ,customTZ);
     if (!momentDate.isValid()) return "-";
 
-    const tzAbbr = momentDate.format("z"); // e.g., IST, PST, EDT
+    let tzAbbr = momentDate.format("z");
+    tzAbbr = DST_NEUTRAL_TZ_MAP[tzAbbr] || tzAbbr;
     const utcOffset = momentDate.format("Z"); // e.g., +05:30, -04:00
     return `${targetTimezone} (${tzAbbr},UTC${utcOffset})`;
   } catch (error) {