Fix browser timezone capture in whois

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]  # Build on Node.js 18
+        node-version: [22.x]  # Build on Node.js 22
 
     steps:
     - uses: actions/checkout@v2

.prettierrc.js

@@ -8,7 +8,7 @@ module.exports = {
     printWidth: 190,
     overrides: [
         {
-            files: '*.{hbs,js,ts}',
+            files: '*.hbs',
             options: {
                 singleQuote: false,
             },

addon/library/subject-custom-fields.js

@@ -64,7 +64,7 @@ export default class SubjectCustomFields {
         this.setFieldValue(value, customField);
 
         const fieldId = typeof customField === 'string' ? customField : customField?.id;
-        const valueType = typeof customField === 'string' ? null : customField?.valueType ?? customField?.value_type ?? null;
+        const valueType = typeof customField === 'string' ? null : (customField?.valueType ?? customField?.value_type ?? null);
         if (!fieldId || !resource) return;
 
         let rec = this.#getLocalValueRecord(resource, fieldId);
@@ -91,7 +91,7 @@ export default class SubjectCustomFields {
             let { value_type } = entry;
             if (!value_type) {
                 const cf = this.store.peekRecord?.('custom-field', fieldId);
-                value_type = cf ? cf.valueType ?? cf.value_type ?? null : null;
+                value_type = cf ? (cf.valueType ?? cf.value_type ?? null) : null;
             }
             next[fieldId] = { value, value_type };
         }
@@ -253,7 +253,7 @@ export default class SubjectCustomFields {
         }
 
         // Normalize to array
-        const existing = isArray(existingMany) ? existingMany : existingMany?.toArray?.() ?? [];
+        const existing = isArray(existingMany) ? existingMany : (existingMany?.toArray?.() ?? []);
 
         const byFieldId = new Map();
         for (let i = 0; i < existing.length; i++) {

addon/services/current-user.js

@@ -8,7 +8,7 @@ import { isBlank } from '@ember/utils';
 import { alias } from '@ember/object/computed';
 import { storageFor } from 'ember-local-storage';
 import { debug } from '@ember/debug';
-import lookupUserIp from '../utils/lookup-user-ip';
+import lookupUserIp, { getBrowserTimezone } from '../utils/lookup-user-ip';
 
 /**
  * CurrentUserService
@@ -84,6 +84,10 @@ export default class CurrentUserService extends Service.extend(Evented) {
         return this.whois('country_code');
     }
 
+    get timezone() {
+        return this.whois('timezone') || getBrowserTimezone();
+    }
+
     async load() {
         if (this.session.isAuthenticated) {
             const user = await this.store.findRecord('user', 'me');
@@ -180,7 +184,7 @@ export default class CurrentUserService extends Service.extend(Evented) {
             const fallback = {
                 city: null,
                 country_code: null,
-                timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+                timezone: getBrowserTimezone(),
                 _source: 'fallback',
             };
 

addon/utils/load-installed-extensions.js

@@ -11,6 +11,8 @@ export default async function loadInstalledExtensions(additionalCoreEngines = []
         '@fleetbase/iam-engine',
         '@fleetbase/ledger-engine',
         '@fleetbase/pallet-engine',
+        '@fleetbase/vroom-engine',
+        '@fleetbase/valhalla-engine',
         ...additionalCoreEngines,
     ];
     const INDEXED_ENGINES = await loadExtensions();

addon/utils/lookup-user-ip.js

@@ -59,13 +59,14 @@ export default async function lookupUserIp(options = {}) {
 
             const data = await response.json();
             const normalized = api.normalize(data);
+            const normalizedWithTimezone = ensureWhoisTimezone(normalized);
 
             // Cache the result if enabled
             if (cache) {
-                cacheWhois(normalized);
+                cacheWhois(normalizedWithTimezone);
             }
 
-            return normalized;
+            return normalizedWithTimezone;
         } catch (error) {
             console.warn(`[lookupUserIp] ${api.url} failed:`, error.message);
             // Continue to next API
@@ -92,7 +93,7 @@ function normalizeGeoIPLookup(data) {
         latitude: data.latitude,
         longitude: data.longitude,
         postal_code: data.postal_code,
-        timezone: data.timezone_name,
+        timezone: data.timezone_name || getBrowserTimezone(),
         currency: {
             code: data.currency_code,
             name: data.currency_name,
@@ -128,7 +129,7 @@ function normalizeIPApi(data) {
         latitude: data.latitude,
         longitude: data.longitude,
         postal_code: data.postal,
-        timezone: data.timezone,
+        timezone: data.timezone || getBrowserTimezone(),
         currency: {
             code: data.currency,
             name: data.currency_name,
@@ -163,7 +164,12 @@ function getCachedWhois() {
             return null;
         }
 
-        return data;
+        const normalized = ensureWhoisTimezone(data);
+        if (normalized.timezone !== data.timezone) {
+            cacheWhois(normalized);
+        }
+
+        return normalized;
     } catch (error) {
         console.error('[getCachedWhois] Error reading cache:', error);
         return null;
@@ -187,7 +193,7 @@ function cacheWhois(data) {
 function getFallbackWhois() {
     // Try to get browser language and timezone as fallback
     const browserLang = navigator.language || 'en-US';
-    const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    const timezone = getBrowserTimezone();
 
     return {
         ip: null,
@@ -219,3 +225,20 @@ function getFallbackWhois() {
         _timestamp: Date.now(),
     };
 }
+
+export function getBrowserTimezone() {
+    try {
+        return Intl.DateTimeFormat().resolvedOptions().timeZone || null;
+    } catch (error) {
+        return null;
+    }
+}
+
+export function ensureWhoisTimezone(whois = {}) {
+    whois = whois || {};
+
+    return {
+        ...whois,
+        timezone: whois.timezone || getBrowserTimezone(),
+    };
+}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/ember-core",
-    "version": "0.3.18",
+    "version": "0.3.19",
     "description": "Provides all the core services, decorators and utilities for building a Fleetbase extension for the Console.",
     "keywords": [
         "fleetbase-core",