@capillarytech/cap-ui-utils 3.0.7-alpha.2 → 3.0.7-alpha.4

package/package.json

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

package/utils/timezone.js

@@ -9,9 +9,9 @@ export const DATE_FORMAT = "DD MMM YYYY h:mm A";
  *
  * - ISO input:
  *    - orgTZ=false → keep ISO timezone info
- *    - orgTZ=true  → convert to org timezone (serverTZ)
+ *    - orgTZ=true  → convert to org timezone 
  * - Epoch input:
- *    - Always converts to org timezone (serverTZ)
+ *    - Always converts to org timezone 
  *
  * @param {string|number|Date} date - ISO string, epoch (sec/ms), or Date object.
  * @param {boolean} orgTZ - Whether to force conversion into org timezone.
@@ -21,7 +21,7 @@ export const formatDateWithTimezone = (date, orgTZ = false) => {
   if (!date) return "-";
 
   let momentDate;
-  const orgTimezone = utilsLocalStorageApi.loadItem("serverTZ") || "Asia/Kolkata";
+  const orgTimezone = utilsLocalStorageApi.loadItem("orgTZ") || "Asia/Kolkata";
 
   // Epoch (number or numeric string)
   if (typeof date === "number" || (typeof date === "string" && /^\d+$/.test(date))) {
@@ -53,39 +53,36 @@ export const formatDateWithTimezone = (date, orgTZ = false) => {
  * Returns a tooltip string with the timezone and offset for a given date.
  * 
  * - Epoch input:
- *    - Always uses serverTZ
+ *    - Always uses orgTZ
  * - ISO input:
  *    - orgTZ=false → keep ISO timezone info
- *    - orgTZ=true  → convert to org timezone (serverTZ)
+ *    - orgTZ=true  → convert to org timezone (orgTZ)
  *
  * @param {string|number|Date} date - ISO string, epoch (sec/ms), or Date object.
  * @param {boolean} orgTZ - Whether to force conversion into org timezone.
  * @returns {string} Tooltip string with timezone and offset.
  */
 export const getTimezoneTooltip = (date, orgTZ = false) => {
-  const serverTZ = utilsLocalStorageApi.loadItem("serverTZ") || "Asia/Kolkata";
+  const orgTimezone = utilsLocalStorageApi.loadItem("orgTZ") || "Asia/Kolkata";
 
-  // Case 1: Epoch number or numeric string
-  if (typeof date === "number" || (typeof date === "string" && /^\d+$/.test(date))) {
-    return `Timezone: ${serverTZ} (UTC${moment.tz(serverTZ).format("Z")})`;
-  }
-
-  // Case 2: orgTZ = true → always use serverTZ
-  if (orgTZ) {
-    return `Timezone: ${serverTZ} (UTC${moment.tz(serverTZ).format("Z")})`;
-  }
-
-  // Case 3: Try parsing ISO or custom string
-  let m = moment.parseZone(date); // handles ISO strings like 2025-08-12T23:59:59.000Z
-
-  if (!m.isValid()) {
-    m = moment.tz(date, "DD MMM YYYY h:mm A z");
+  if(orgTZ){
+    return `Timezone: ${orgTimezone} (UTC${moment.tz(orgTimezone).format("Z")})`;
   }
-
-  // If still invalid → fallback to serverTZ
-  if (!m.isValid()) {
-    return `Timezone: ${serverTZ} (UTC${moment.tz(serverTZ).format("Z")})`;
+  else{
+    // case 1: epoch number or numeric string
+    if(typeof date === "number" || (typeof date === "string" && /^\d+$/.test(date))){
+      return `Timezone: ${orgTimezone} (UTC${moment.tz(orgTimezone).format("Z")})`;
+    }
+    // case 2: ISO string or Date object
+    else{
+      let m = moment.parseZone(date); // handles ISO strings like 2025-08-12T23:59:59.000Z or 2025-08-12T23:59:59+05:30
+      if(!m.isValid()){
+        m = moment.tz(date, "DD MMM YYYY h:mm A z"); // handles strings like 17 Sep 2025 6:00 AM EDT
+      }
+      if(!m.isValid()){
+        return `Timezone: ${orgTimezone} (UTC${moment.tz(orgTimezone).format("Z")})`; // fallback to orgTZ
+      }
+      return `Timezone: ${m.tz() || orgTimezone} (UTC${m.format("Z")})`; // return the timezone and offset
+    }
   }
-
-  return `Timezone: ${m.tz() || serverTZ} (UTC${m.format("Z")})`;
 };