@fleetbase/fleetops-engine 0.6.70 → 0.6.72

package/addon/controllers/operations/scheduler/index.js

@@ -4,6 +4,7 @@ import { inject as service } from '@ember/service';
 import { action, computed } from '@ember/object';
 import { isNone } from '@ember/utils';
 import { isValid as isValidDate } from 'date-fns';
+import { later } from '@ember/runloop';
 import { task } from 'ember-concurrency';
 import isObject from '@fleetbase/ember-core/utils/is-object';
 import isJson from '@fleetbase/ember-core/utils/is-json';
@@ -11,6 +12,9 @@ import createFullCalendarEventFromOrder from '../../../utils/create-full-calenda
 import createFullCalendarEventFromScheduleItem from '../../../utils/create-full-calendar-event-from-schedule-item';
 import toCalendarDate from '../../../utils/to-calendar-date';
 
+// The ember-core socket service subscribes ~300 ms after listen() is called.
+const SOCKET_SUBSCRIBE_SETTLE_MS = 500;
+
 /**
  * OperationsSchedulerIndexController
  *
@@ -722,28 +726,55 @@ export default class OperationsSchedulerIndexController extends Controller {
     // Real-Time Socket Subscriptions
     // -------------------------------------------------------------------------
 
+    // Names of the socket channels this board opened, so teardown closes only those
+    // and leaves every other subscription (chat, notifications, ...) alone.
+    _socketChannelNames = new Set();
+
     @action async subscribeToRealTimeUpdates() {
-        const orgId = this.currentUser?.companyId ?? this.currentUser?.company?.id;
-        if (!orgId) return;
-        await this.socket.listen(`company.${orgId}.orders`, (payload) => this._handleOrderSocketEvent(payload));
-        this.drivers.forEach(async (driver) => {
-            await this.socket.listen(`driver.${driver.id}`, (payload) => this._handleDriverSocketEvent(payload));
-        });
+        const drivers = this.drivers ?? [];
+        await Promise.all(
+            drivers.map((driver) => {
+                if (!driver?.id) return;
+                const channelName = `driver.${driver.id}`;
+                if (this._socketChannelNames.has(channelName)) return;
+                this._socketChannelNames.add(channelName);
+                return this.socket.listen(channelName, (payload) => this._handleDriverSocketEvent(payload));
+            })
+        );
     }
 
     @action unsubscribeFromRealTimeUpdates() {
-        if (this.socket && typeof this.socket.closeChannels === 'function') {
-            this.socket.closeChannels();
+        const names = this._socketChannelNames;
+        this._socketChannelNames = new Set();
+        if (!this.socket || names.size === 0) return;
+
+        if (typeof this.socket.closeChannel === 'function') {
+            names.forEach((name) => this.socket.closeChannel(name));
+            return;
         }
+
+        const remaining = this._closeOpenedChannels(names);
+        if (remaining.size === 0) return;
+
+        // The socket service subscribes after a short delay, so a channel requested just before
+        // teardown may not exist yet: sweep once more after that delay.
+        later(this, () => this._closeOpenedChannels(remaining), SOCKET_SUBSCRIBE_SETTLE_MS);
     }
 
-    _handleOrderSocketEvent({ data } = {}) {
-        if (!data?.id) return;
-        try {
-            this.store.pushPayload('order', { order: data });
-        } catch {
-            /* ignore */
+    /**
+     * Close the socket's channels with the given names, except any the board has opened again
+     * since. Returns the names that had no channel yet.
+     */
+    _closeOpenedChannels(names) {
+        const remaining = new Set([...names].filter((name) => !this._socketChannelNames.has(name)));
+        const channels = Array.isArray(this.socket.channels) ? this.socket.channels : [];
+        for (const channel of channels) {
+            if (!names.has(channel?.name) || this._socketChannelNames.has(channel.name)) continue;
+            remaining.delete(channel.name);
+            channel.close();
         }
+
+        return remaining;
     }
 
     _handleDriverSocketEvent({ event, data } = {}) {

package/addon/controllers/operations/service-rates/index.js

@@ -10,7 +10,7 @@ export default class OperationsServiceRatesIndexController extends Controller {
     @service intl;
 
     /** query params */
-    @tracked queryParams = ['page', 'query', 'limit', 'sort', 'zone', 'service_area'];
+    @tracked queryParams = this.serviceRateActions.queryParamsFor(['page', 'query', 'limit', 'sort', 'zone', 'service_area']);
     @tracked page = 1;
     @tracked limit;
     @tracked query;
@@ -20,11 +20,13 @@ export default class OperationsServiceRatesIndexController extends Controller {
     get actionButtons() {
         return [
             {
+                id: 'refresh',
                 icon: 'refresh',
                 onClick: this.serviceRateActions.refresh,
                 helpText: this.intl.t('common.refresh'),
             },
             {
+                id: 'create',
                 text: this.intl.t('common.new'),
                 type: 'primary',
                 icon: 'plus',
@@ -32,6 +34,7 @@ export default class OperationsServiceRatesIndexController extends Controller {
                 permission: 'fleet-ops create service-rate',
             },
             {
+                id: 'export',
                 text: this.intl.t('common.export'),
                 icon: 'long-arrow-up',
                 iconClass: 'rotate-icon-45',
@@ -46,6 +49,7 @@ export default class OperationsServiceRatesIndexController extends Controller {
     get bulkActions() {
         return [
             {
+                id: 'bulk-delete',
                 label: 'Delete selected...',
                 class: 'text-red-500',
                 fn: this.serviceRateActions.bulkDelete,
@@ -58,6 +62,7 @@ export default class OperationsServiceRatesIndexController extends Controller {
     get columns() {
         return [
             {
+                id: 'public-id',
                 sticky: true,
                 label: this.intl.t('column.id'),
                 valuePath: 'public_id',
@@ -70,6 +75,7 @@ export default class OperationsServiceRatesIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'service-name',
                 label: this.intl.t('column.service'),
                 valuePath: 'service_name',
                 cellComponent: 'table/cell/base',
@@ -78,6 +84,7 @@ export default class OperationsServiceRatesIndexController extends Controller {
                 filterable: false,
             },
             {
+                id: 'service-area-name',
                 label: this.intl.t('column.service-area'),
                 valuePath: 'service_area.name',
                 cellComponent: 'cell/service-area-identity',
@@ -93,6 +100,7 @@ export default class OperationsServiceRatesIndexController extends Controller {
                 model: 'service-area',
             },
             {
+                id: 'zone-name',
                 label: this.intl.t('column.zone'),
                 valuePath: 'zone.name',
                 cellComponent: 'cell/zone-identity',
@@ -107,6 +115,7 @@ export default class OperationsServiceRatesIndexController extends Controller {
                 model: 'zone',
             },
             {
+                id: 'created-at',
                 label: this.intl.t('column.created-at'),
                 valuePath: 'createdAt',
                 sortParam: 'created_at',
@@ -116,6 +125,7 @@ export default class OperationsServiceRatesIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'updated-at',
                 label: this.intl.t('column.updated-at'),
                 valuePath: 'updatedAt',
                 sortParam: 'updated_at',
@@ -126,6 +136,7 @@ export default class OperationsServiceRatesIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -137,18 +148,21 @@ export default class OperationsServiceRatesIndexController extends Controller {
                 width: 60,
                 actions: [
                     {
+                        id: 'view',
                         label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.service-rate') }),
                         icon: 'eye',
                         fn: this.serviceRateActions.transition.view,
                         permission: 'fleet-ops view service-rate',
                     },
                     {
+                        id: 'edit',
                         label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.service-rate') }),
                         icon: 'pencil',
                         fn: this.serviceRateActions.transition.edit,
                         permission: 'fleet-ops view service-rate',
                     },
                     {
+                        id: 'delete',
                         label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.service-rate') }),
                         icon: 'trash',
                         fn: this.serviceRateActions.delete,

package/addon/controllers/settings/index.js

@@ -28,6 +28,12 @@ export default class SettingsIndexController extends Controller {
             description: 'Keep commerce, metadata, and visual conventions aligned.',
             links: [
                 { label: 'Payments', route: 'settings.payments', icon: 'cash-register', description: 'Payment setup for operational commerce workflows.' },
+                {
+                    label: 'Tracking Page',
+                    route: 'settings.tracking-page',
+                    icon: 'magnifying-glass-location',
+                    description: 'The page your customers use to follow deliveries: address, branding and how they verify.',
+                },
                 {
                     label: 'Telematics',
                     route: 'settings.telematics',

package/addon/controllers/settings/map.js

@@ -4,6 +4,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 import MAP_PROVIDER_OPTIONS from '../../utils/map-provider-options';
+import { isLatitude, isLongitude, isZoom, toCoordinate } from '../../utils/map-default-view';
 
 export default class SettingsMapController extends Controller {
     @service fetch;
@@ -11,6 +12,7 @@ export default class SettingsMapController extends Controller {
     @service intl;
     @service mapManager;
     @service mapSettings;
+    @service location;
 
     /**
      * Available map provider options for the provider selector.
@@ -39,6 +41,21 @@ export default class SettingsMapController extends Controller {
     @tracked showGoogleMapsTrafficLayer = false;
     @tracked showGoogleMapsTransitLayer = false;
 
+    /**
+     * The company's default live map view. Latitude and longitude are both
+     * set or both null; zoom is optional.
+     */
+    @tracked defaultMapLatitude = null;
+    @tracked defaultMapLongitude = null;
+    @tracked defaultMapZoom = null;
+    @tracked fitMapToVehicles = false;
+
+    /**
+     * Bumped to re-create the coordinates input, which only reads its value
+     * when it is constructed (e.g. after clearing the default center).
+     */
+    @tracked defaultCenterInputKey = 0;
+
     /**
      * Whether settings have been loaded from the server.
      *
@@ -74,6 +91,36 @@ export default class SettingsMapController extends Controller {
         return this.mapProvider === 'leaflet';
     }
 
+    /**
+     * The default center as a GeoJSON point for the coordinates input, or null.
+     *
+     * @memberof SettingsMapController
+     * @return {Object|null}
+     */
+    get defaultMapCenterPoint() {
+        // Not null: CoordinatesInput#isPoint reads `.type` on any object, and typeof null is "object".
+        if (!this.hasDefaultMapCenter) {
+            return undefined;
+        }
+
+        return { type: 'Point', coordinates: [this.defaultMapLongitude, this.defaultMapLatitude] };
+    }
+
+    get hasDefaultMapCenter() {
+        return isLatitude(this.defaultMapLatitude) && isLongitude(this.defaultMapLongitude);
+    }
+
+    /**
+     * The zoom to save: a whole number from 1 to 20, else null.
+     *
+     * @memberof SettingsMapController
+     * @return {Number|null}
+     */
+    get normalizedDefaultMapZoom() {
+        const zoom = toCoordinate(this.defaultMapZoom);
+        return isZoom(zoom) ? zoom : null;
+    }
+
     // ─── Actions ───────────────────────────────────────────────────────────────
 
     /**
@@ -86,6 +133,24 @@ export default class SettingsMapController extends Controller {
         this.mapProvider = option?.value ?? option ?? 'leaflet';
     }
 
+    /**
+     * Receives coordinates typed into, or picked on the map of, the default
+     * center input.
+     *
+     * @param {{latitude: *, longitude: *}} coordinates
+     * @memberof SettingsMapController
+     */
+    @action setDefaultMapCenter({ latitude, longitude } = {}) {
+        this.defaultMapLatitude = toCoordinate(latitude);
+        this.defaultMapLongitude = toCoordinate(longitude);
+    }
+
+    @action clearDefaultMapCenter() {
+        this.defaultMapLatitude = null;
+        this.defaultMapLongitude = null;
+        this.defaultCenterInputKey++;
+    }
+
     @task *saveSettings() {
         const settings = {
             mapProvider: this.mapProvider,
@@ -94,12 +159,19 @@ export default class SettingsMapController extends Controller {
             googleMapsMapType: this.googleMapsMapType,
             showGoogleMapsTrafficLayer: this.showGoogleMapsTrafficLayer,
             showGoogleMapsTransitLayer: this.showGoogleMapsTransitLayer,
+            defaultMapLatitude: this.hasDefaultMapCenter ? this.defaultMapLatitude : null,
+            defaultMapLongitude: this.hasDefaultMapCenter ? this.defaultMapLongitude : null,
+            defaultMapZoom: this.normalizedDefaultMapZoom,
+            fitMapToVehicles: this.fitMapToVehicles,
         };
 
         try {
             const response = yield this.fetch.post('fleet-ops/settings/map', { settings });
             this.mapSettings.applySettings(response);
 
+            // Re-resolve where maps open so an open live map moves to the new default.
+            this.location.relocate();
+
             if (this.mapManager && typeof this.mapManager.setActiveProvider === 'function') {
                 this.mapManager.setActiveProvider(this.mapProvider);
             }
@@ -124,6 +196,9 @@ export default class SettingsMapController extends Controller {
             this.googleMapsMapType = response?.googleMapsMapType ?? 'roadmap';
             this.showGoogleMapsTrafficLayer = Boolean(response?.showGoogleMapsTrafficLayer);
             this.showGoogleMapsTransitLayer = Boolean(response?.showGoogleMapsTransitLayer);
+            this.setDefaultMapCenter({ latitude: response?.defaultMapLatitude, longitude: response?.defaultMapLongitude });
+            this.defaultMapZoom = response?.defaultMapZoom ?? null;
+            this.fitMapToVehicles = Boolean(response?.fitMapToVehicles);
             this.settingsLoaded = true;
         } catch (error) {
             this.notifications.serverError(error);

package/addon/controllers/settings/orchestrator.js

@@ -17,7 +17,8 @@ export default class SettingsOrchestratorController extends Controller {
     @service intl;
     @service('orchestration-engine') engineRegistry;
 
-    @tracked allocationEngine = 'vroom';
+    @tracked allocationEngine = 'greedy';
+    @tracked serverEngines = null;
     @tracked autoAllocateOnCreate = false;
     @tracked autoReallocateOnComplete = false;
     @tracked maxTravelTimeSeconds = 3600;
@@ -26,18 +27,19 @@ export default class SettingsOrchestratorController extends Controller {
 
     /**
      * Engine options for the selector dropdown.
-     * Populated from the allocation-engine registry so new engines appear
-     * automatically without modifying this controller.
+     * Populated from the engines registered on the server (the ones a run can
+     * actually use), falling back to the frontend allocation-engine registry.
      */
     get engineOptions() {
-        return this.engineRegistry.availableEngines;
+        return this.serverEngines ?? this.engineRegistry.availableEngines;
     }
 
     @task *loadSettings() {
         this.isLoading = true;
         try {
-            const settings = yield this.fetch.get('fleet-ops/settings/orchestrator-settings');
-            this.allocationEngine = settings.allocation_engine ?? 'vroom';
+            const [settings, engines] = yield Promise.all([this.fetch.get('fleet-ops/settings/orchestrator-settings'), this.fetch.get('fleet-ops/orchestrator/engines').catch(() => null)]);
+            this.serverEngines = engines?.engines ?? null;
+            this.allocationEngine = settings.allocation_engine ?? 'greedy';
             this.autoAllocateOnCreate = settings.auto_allocate_on_create ?? false;
             this.autoReallocateOnComplete = settings.auto_reallocate_on_complete ?? false;
             this.maxTravelTimeSeconds = settings.max_travel_time_seconds ?? 3600;

package/addon/controllers/settings/tracking-page.js

@@ -0,0 +1,212 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { task, timeout } from 'ember-concurrency';
+import trackingPageTheme, { contrastRatio, inkFor, normalizeHex, DEFAULT_ACCENT } from '../../utils/tracking-page-theme';
+
+/**
+ * The locales a tracking page can be shown in, labelled in their own language.
+ */
+export const TRACKING_PAGE_LOCALES = [
+    { code: 'en-us', label: 'English' },
+    { code: 'ar-ae', label: 'العربية' },
+    { code: 'bg-bg', label: 'Български' },
+    { code: 'es-pa', label: 'Español' },
+    { code: 'fr-fr', label: 'Français' },
+    { code: 'mn-mn', label: 'Монгол' },
+    { code: 'pt-br', label: 'Português' },
+    { code: 'ru-ru', label: 'Русский' },
+    { code: 'uk-ua', label: 'Українська' },
+    { code: 'vi-vn', label: 'Tiếng Việt' },
+];
+
+/**
+ * Keys the server adds to the saved config when it reads it back. They are facts about
+ * the instance, not settings, so they are kept apart and never sent back on save.
+ */
+const READ_ONLY_KEYS = ['slug_validation', 'accent_ink', 'accent_contrast', 'sms_available', 'customer_portal_installed', 'admin'];
+
+/**
+ * Settings::TrackingPageController
+ *
+ * The company's customer tracking page: which pages are on and at what address, branding,
+ * how customers prove who they are, and what verified customers see.
+ */
+export default class SettingsTrackingPageController extends Controller {
+    @service fetch;
+    @service notifications;
+    @service intl;
+    @service currentUser;
+
+    @tracked config = null;
+    @tracked slugValidation = null;
+    @tracked smsAvailable = false;
+    @tracked customerPortalInstalled = false;
+    @tracked loadFailed = false;
+
+    /**
+     * Take the settings as the server returns them.
+     */
+    load(settings) {
+        if (!settings) {
+            this.loadFailed = true;
+            return;
+        }
+
+        const config = { ...settings };
+        READ_ONLY_KEYS.forEach((key) => delete config[key]);
+
+        this.config = config;
+        this.slugValidation = settings.slug_validation ?? null;
+        this.smsAvailable = settings.sms_available === true;
+        this.customerPortalInstalled = settings.customer_portal_installed === true;
+        this.loadFailed = false;
+    }
+
+    get accent() {
+        return normalizeHex(this.config?.branding?.accent) ?? DEFAULT_ACCENT;
+    }
+
+    get accentInk() {
+        return inkFor(this.accent);
+    }
+
+    get accentContrast() {
+        return contrastRatio(this.accent, this.accentInk);
+    }
+
+    get accentReadable() {
+        return this.accentContrast >= 4.5;
+    }
+
+    get previewLightStyle() {
+        return trackingPageTheme(this.config?.branding, false);
+    }
+
+    get previewDarkStyle() {
+        return trackingPageTheme(this.config?.branding, true);
+    }
+
+    get companyName() {
+        return this.currentUser.companyName ?? '';
+    }
+
+    get displayName() {
+        return this.config?.branding?.display_name || this.companyName;
+    }
+
+    get orgPageBase() {
+        return `${window.location.origin}/~/t/`;
+    }
+
+    get orgPageUrl() {
+        return `${window.location.origin}/~/t/${encodeURIComponent(this.config?.org_page?.slug ?? '')}`;
+    }
+
+    get genericPageUrl() {
+        return `${window.location.origin}/~/track`;
+    }
+
+    get slugIsValid() {
+        return this.slugValidation?.valid === true;
+    }
+
+    get localeOptions() {
+        const enabled = this.config?.branding?.locales ?? [];
+        const defaultLocale = this.config?.branding?.default_locale;
+
+        return TRACKING_PAGE_LOCALES.map((locale) => ({
+            ...locale,
+            enabled: enabled.includes(locale.code),
+            isDefault: locale.code === defaultLocale,
+        }));
+    }
+
+    get linkTargetOptions() {
+        return ['auto', 'org', 'generic'].map((value) => ({ value, label: this.intl.t(`tracking-page.settings.links-target-${value}`) }));
+    }
+
+    get themeOptions() {
+        return ['system', 'light'].map((value) => ({ value, label: this.intl.t(`tracking-page.settings.theme-${value}`) }));
+    }
+
+    get driverContactOptions() {
+        return ['company', 'driver'].map((value) => ({ value, label: this.intl.t(`tracking-page.settings.driver-contact-${value}`) }));
+    }
+
+    /**
+     * Set one value by its dotted path, replacing the config so the form and preview update.
+     */
+    @action update(path, value) {
+        const config = JSON.parse(JSON.stringify(this.config));
+        const keys = path.split('.');
+        const last = keys.pop();
+        let target = config;
+        for (const key of keys) {
+            target = target[key];
+        }
+
+        target[last] = value;
+        this.config = config;
+    }
+
+    @action updateFromEvent(path, event) {
+        this.update(path, event.target.value);
+    }
+
+    @action updateNumber(path, event) {
+        this.update(path, parseInt(event.target.value, 10));
+    }
+
+    @action selectOption(path, option) {
+        this.update(path, option?.value ?? option);
+    }
+
+    @action updateSlug(event) {
+        const slug = event.target.value.toLowerCase().replace(/\s+/g, '-');
+        this.update('org_page.slug', slug);
+        this.validateSlug.perform(slug);
+    }
+
+    @action toggleLocale(code) {
+        const locales = this.config.branding.locales ?? [];
+        if (code === this.config.branding.default_locale) {
+            return;
+        }
+
+        this.update('branding.locales', locales.includes(code) ? locales.filter((locale) => locale !== code) : [...locales, code]);
+    }
+
+    @action setDefaultLocale(option) {
+        const code = option?.value ?? option;
+        const locales = this.config.branding.locales ?? [];
+        this.update('branding.default_locale', code);
+        if (!locales.includes(code)) {
+            this.update('branding.locales', [...locales, code]);
+        }
+    }
+
+    get defaultLocaleOptions() {
+        return TRACKING_PAGE_LOCALES.map((locale) => ({ value: locale.code, label: locale.label }));
+    }
+
+    @task({ restartable: true }) *validateSlug(slug) {
+        yield timeout(350);
+        try {
+            this.slugValidation = yield this.fetch.post('fleet-ops/settings/tracking-page-settings/validate-slug', { slug });
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task *saveSettings() {
+        try {
+            const settings = yield this.fetch.post('fleet-ops/settings/tracking-page-settings', { trackingPage: this.config });
+            this.load(settings);
+            this.notifications.success(this.intl.t('tracking-page.settings.saved'));
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+}