@fleetbase/fleetops-engine 0.6.70 → 0.6.72

package/addon/extension.js

@@ -117,12 +117,34 @@ export default {
                     icon: 'satellite-dish',
                     component: new ExtensionComponent('@fleetbase/fleetops-engine', 'admin/telematics-settings'),
                 }),
+                new MenuItem({
+                    title: 'Tracking Page',
+                    icon: 'magnifying-glass-location',
+                    component: new ExtensionComponent('@fleetbase/fleetops-engine', 'admin/tracking-page-settings'),
+                }),
             ],
             {
                 slug: 'fleet-ops',
             }
         );
 
+        // Links printed or emailed without the public `~/` prefix (/track-order?order=...) land
+        // inside the console. Signed-out visitors are sent on to the public route after login;
+        // registering the page in the console too shows it to signed-in staff instead of an
+        // empty console page.
+        for (const slug of ['track', 'track-order']) {
+            menuService.registerMenuItem(
+                'console',
+                new MenuItem({
+                    title: 'Track Order',
+                    slug,
+                    section: null,
+                    view: null,
+                    component: new ExtensionComponent('@fleetbase/fleetops-engine', 'tracking-page'),
+                })
+            );
+        }
+
         // Register track order button
         menuService.registerMenuItem(
             'auth:login',
@@ -135,7 +157,39 @@ export default {
                 // btn-auth (ember-ui): the sign-in page's neutral button, matching the
                 // console's "Continue with ..." provider buttons, hover included.
                 wrapperClass: 'btn-block btn-auth',
-                component: new ExtensionComponent('@fleetbase/fleetops-engine', 'order-tracking-lookup'),
+                component: new ExtensionComponent('@fleetbase/fleetops-engine', 'tracking-page'),
+                onClick: (menuItem) => {
+                    universe.transitionMenuItem('virtual', menuItem);
+                },
+            })
+        );
+
+        // The customer tracking page: /~/track/{number} is the shared page.
+        menuService.registerMenuItem(
+            'auth:login',
+            new MenuItem({
+                title: 'Track',
+                route: 'virtual',
+                slug: 'track',
+                type: 'link',
+                wrapperClass: 'hidden',
+                component: new ExtensionComponent('@fleetbase/fleetops-engine', 'tracking-page'),
+                onClick: (menuItem) => {
+                    universe.transitionMenuItem('virtual', menuItem);
+                },
+            })
+        );
+
+        // A company's own tracking page: /~/t/{slug}/{number}.
+        menuService.registerMenuItem(
+            'auth:login',
+            new MenuItem({
+                title: 'Company tracking',
+                route: 'virtual',
+                slug: 't',
+                type: 'link',
+                wrapperClass: 'hidden',
+                component: new ExtensionComponent('@fleetbase/fleetops-engine', 'tracking-page'),
                 onClick: (menuItem) => {
                     universe.transitionMenuItem('virtual', menuItem);
                 },
@@ -162,6 +216,38 @@ export default {
 
         // Create registries
         this.createRegistries(registryService);
+
+        // Declare the registries extensions can add table columns, actions and
+        // buttons to, e.g. `fleet-ops:driver:table:columns` or `fleet-ops:order:details:menu`.
+        universe
+            .getService('universe/resource-view-service')
+            ?.declare('fleet-ops', [
+                'contact',
+                'customer',
+                'device',
+                'device-event',
+                'driver',
+                'equipment',
+                'fleet',
+                'fuel-report',
+                'fuel-transaction',
+                'inspection-form',
+                'inspection-submission',
+                'integrated-vendor',
+                'issue',
+                'maintenance',
+                'order',
+                'part',
+                'place',
+                'report',
+                'schedule',
+                'sensor',
+                'service-rate',
+                'trailer',
+                'vehicle',
+                'vendor',
+                'work-order',
+            ]);
         registryService.registerRenderableComponent('ai:action-preview:fleet-ops.create_order', new ExtensionComponent('@fleetbase/fleetops-engine', 'ai/create-order-preview'));
 
         // // Register console home guidance
@@ -381,6 +467,16 @@ export default {
                 order: 80,
                 default: true,
             }),
+            new Widget({
+                id: 'fleet-ops-proof-of-delivery-widget',
+                name: 'Proof of Delivery',
+                description: 'The latest proof of delivery photos, each linking to its order.',
+                icon: 'camera',
+                component: new ExtensionComponent('@fleetbase/fleetops-engine', 'widget/proof-of-delivery'),
+                grid_options: { w: 4, h: 9, minW: 3, minH: 6 },
+                category: 'Operations',
+                default: false,
+            }),
             new Widget({
                 id: 'fleet-ops-geofence-violations-widget',
                 name: 'Geofence Violations',

package/addon/helpers/parcel-box-image.js

@@ -0,0 +1,16 @@
+import { helper } from '@ember/component/helper';
+
+// Each URL is written out in full so a production build's fingerprinting
+// (broccoli-asset-rev) rewrites it to the hashed file name. An interpolated
+// path such as `boxes/${size}.png` is never rewritten, so it misses the
+// fingerprinted file and the server answers with the console's index.html.
+const PARCEL_BOX_IMAGES = {
+    small: '/engines-dist/images/boxes/small.png',
+    medium: '/engines-dist/images/boxes/medium.png',
+    large: '/engines-dist/images/boxes/large.png',
+    'x-large': '/engines-dist/images/boxes/x-large.png',
+};
+
+export default helper(function parcelBoxImage([size]) {
+    return PARCEL_BOX_IMAGES[size] ?? PARCEL_BOX_IMAGES.medium;
+});

package/addon/routes/operations/orders/index/details.js

@@ -60,6 +60,7 @@ export default class OperationsOrdersIndexDetailsRoute extends Route {
             with: [
                 'payload',
                 'driverAssigned',
+                'vehicleAssigned',
                 'orderConfig',
                 'customer',
                 'facilitator',

package/addon/routes/operations/orders/index/new.js

@@ -1,6 +1,5 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
 
 export default class OperationsOrdersIndexNewRoute extends Route {
     @service notifications;
@@ -9,9 +8,11 @@ export default class OperationsOrdersIndexNewRoute extends Route {
     @service intl;
     @service sidebar;
 
-    @action willTransition() {
-        if (this.controller) {
-            this.controller.reset();
+    // Reset the draft only when leaving the route. A refresh of this route (e.g. after saving
+    // a place or customer from a modal) also transitions, and must keep what was entered.
+    resetController(controller, isExiting) {
+        if (isExiting) {
+            controller.reset();
         }
     }
 

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

@@ -61,7 +61,7 @@ export default class OperationsSchedulerIndexRoute extends Route {
     }
 
     resetController(controller) {
-        // Close all socket channels when the dispatcher navigates away
+        // Close the board's own socket channels when the dispatcher navigates away
         // to prevent memory leaks and stale event handlers.
         controller.unsubscribeFromRealTimeUpdates();
     }

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

@@ -0,0 +1,31 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class SettingsTrackingPageRoute extends Route {
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+    @service fetch;
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops view tracking-page-settings')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops');
+        }
+    }
+
+    async model() {
+        try {
+            return await this.fetch.get('fleet-ops/settings/tracking-page-settings');
+        } catch (error) {
+            this.notifications.serverError(error);
+            return null;
+        }
+    }
+
+    setupController(controller, model) {
+        super.setupController(controller, model);
+        controller.load(model);
+    }
+}

package/addon/routes.js

@@ -323,6 +323,7 @@ export default buildRoutes(function () {
         this.route('map');
         this.route('orchestrator');
         this.route('scheduling');
+        this.route('tracking-page');
         this.route('telematics');
         this.route('payments', function () {
             this.route('index', { path: '/' });

package/addon/services/contact-actions.js

@@ -48,6 +48,7 @@ export default class ContactActionsService extends ResourceActionService {
         },
         view: (contact, options = {}) => {
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 contact,
                 title: contact?.name,
                 header: 'contact/panel-header',

package/addon/services/customer-actions.js

@@ -4,7 +4,7 @@ import { PANEL_DEFAULTS, registeredPanelTabs } from '../utils/context-panel';
 export default class CustomerActionsService extends ContactActionsService {
     constructor() {
         super(...arguments);
-        this.initialize('contact', { defaultAttributes: { type: 'customer', status: 'active' } });
+        this.initialize('contact', { defaultAttributes: { type: 'customer', status: 'active' }, registryResource: 'customer' });
     }
 
     transition = {
@@ -38,6 +38,7 @@ export default class CustomerActionsService extends ContactActionsService {
         },
         view: (customer, options = {}) => {
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 customer,
                 title: customer?.name,
                 header: 'contact/panel-header',

package/addon/services/device-actions.js

@@ -48,6 +48,7 @@ export default class DeviceActionsService extends ResourceActionService {
             const service = this;
 
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 device,
                 header: 'device/panel-header',
                 title: device.name ?? device.serial_number,

package/addon/services/device-event-actions.js

@@ -17,6 +17,7 @@ export default class DeviceEventActionsService extends ResourceActionService {
     panel = {
         view: (deviceEvent) => {
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 deviceEvent,
                 tabs: [
                     {

package/addon/services/driver-actions.js

@@ -2,9 +2,7 @@ import ResourceActionService, { inject as service } from '@fleetbase/ember-core/
 import leafletIcon from '@fleetbase/ember-core/utils/leaflet-icon';
 import config from 'ember-get-config';
 import { action } from '@ember/object';
-import { isArray } from '@ember/array';
-import { dasherize } from '@ember/string';
-import { PANEL_DEFAULTS, closePanelsThen } from '../utils/context-panel';
+import { PANEL_DEFAULTS, closePanelsThen, registeredPanelTabs } from '../utils/context-panel';
 import { confirmLoginAction, hasInactiveLogin, hasManagedLogin } from '../utils/profile-login-actions';
 
 export default class DriverActionsService extends ResourceActionService {
@@ -13,16 +11,8 @@ export default class DriverActionsService extends ResourceActionService {
     @service issueActions;
 
     get registeredTabs() {
-        const registeredTabs = this.menuService.getMenuItems('fleet-ops:component:driver:details');
-        return (isArray(registeredTabs) ? registeredTabs : [])
-            .map((tab) => {
-                delete tab.route;
-                if (!tab.key) {
-                    tab.key = tab.id ?? dasherize(tab.label ?? tab.title);
-                }
-                return tab;
-            })
-            .filter((tab) => !tab.component);
+        // Copies, so the shared registry items keep the \`route\` their routed details view needs.
+        return registeredPanelTabs(this.menuService, 'fleet-ops:component:driver:details');
     }
 
     get panelTabs() {
@@ -125,6 +115,7 @@ export default class DriverActionsService extends ResourceActionService {
             const service = this;
 
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 driver,
                 header: 'driver/panel-header',
                 actionButtons: [

package/addon/services/equipment-actions.js

@@ -47,6 +47,7 @@ export default class EquipmentActionsService extends ResourceActionService {
         },
         view: (equipment, options = {}) => {
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 equipment,
                 title: equipment?.name,
                 header: 'equipment/panel-header',

package/addon/services/fleet-actions.js

@@ -42,6 +42,7 @@ export default class FleetActionsService extends ResourceActionService {
         },
         view: (fleet, options = {}) => {
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 fleet,
                 title: fleet?.name,
                 actionButtons: [

package/addon/services/fuel-report-actions.js

@@ -43,6 +43,7 @@ export default class FuelReportActionsService extends ResourceActionService {
         },
         view: (fuelReport, options = {}) => {
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 fuelReport,
                 title: fuelReport?.name ?? `Fuel reported on ${fuelReport?.createdAt ?? ''}`.trim(),
                 actionButtons: [{ icon: 'pencil', permission: 'fleet-ops update fuel-report', fn: () => closePanelsThen(this.resourceContextPanel, () => this.panel.edit(fuelReport)) }],

package/addon/services/inspection-form-actions.js

@@ -59,6 +59,7 @@ export default class InspectionFormActionsService extends ResourceActionService
             const service = this;
 
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 form,
                 title: form?.name,
                 get actionButtons() {

package/addon/services/inspection-submission-actions.js

@@ -32,6 +32,7 @@ export default class InspectionSubmissionActionsService extends ResourceActionSe
             const service = this;
 
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 submission,
                 title: this.panelTitle(submission),
                 actionButtons: [

package/addon/services/integrated-vendor-actions.js

@@ -37,6 +37,7 @@ export default class IntegratedVendorActionsService extends ResourceActionServic
         },
         view: (integratedVendor, options = {}) => {
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 integratedVendor,
                 tabs: [
                     {

package/addon/services/issue-actions.js

@@ -50,6 +50,7 @@ export default class IssueActionsService extends ResourceActionService {
         },
         view: (issue, options = {}) => {
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 issue,
                 header: 'issue/panel-header',
                 width: '800px',

package/addon/services/location.js

@@ -4,7 +4,7 @@ import { isBlank } from '@ember/utils';
 import { isArray } from '@ember/array';
 import { later } from '@ember/runloop';
 import { debug } from '@ember/debug';
-import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
+import { isLatitude, isLongitude, isZoom } from '../utils/map-default-view';
 
 /**
  * Service for managing and retrieving user location data.
@@ -46,17 +46,30 @@ export default class LocationService extends Service {
      */
     @service fetch;
 
+    /**
+     * Company map settings, which carry the default map view.
+     * @type {MapSettingsService}
+     */
+    @service mapSettings;
+
     /**
      * Current latitude of the user.
      * @type {number}
      */
-    @tracked latitude = this.DEFAULT_LATITUDE;
+    @tracked latitude = LocationService.DEFAULT_LATITUDE;
 
     /**
      * Current longitude of the user.
      * @type {number}
      */
-    @tracked longitude = this.DEFAULT_LONGITUDE;
+    @tracked longitude = LocationService.DEFAULT_LONGITUDE;
+
+    /**
+     * Zoom suggested by the source of the location (a company default view or
+     * a country centre), or null to let the map use its own default.
+     * @type {number|null}
+     */
+    @tracked zoom = null;
 
     /**
      * Flag indicating whether the user's location has been located.
@@ -73,7 +86,7 @@ export default class LocationService extends Service {
         if (typeof this.latitude === 'number' && !isNaN(this.latitude) && this.latitude >= -90 && this.latitude <= 90) {
             return this.latitude;
         }
-        return this.constructor.DEFAULT_LATITUDE;
+        return LocationService.DEFAULT_LATITUDE;
     }
 
     /**
@@ -85,14 +98,23 @@ export default class LocationService extends Service {
         if (typeof this.longitude === 'number' && !isNaN(this.longitude) && this.longitude >= -180 && this.longitude <= 180) {
             return this.longitude;
         }
-        return this.constructor.DEFAULT_LONGITUDE;
+        return LocationService.DEFAULT_LONGITUDE;
+    }
+
+    /**
+     * Retrieves the zoom suggested by the current location source, or null.
+     * @returns {number|null}
+     */
+    getZoom() {
+        return isZoom(this.zoom) ? this.zoom : null;
     }
 
     /**
-     * Attempts to fetch the user's location from various sources including cached data,
-     * navigator geolocation, or WHOIS data. It first tries to get the cached coordinates.
-     * If not available or outdated, it tries the browser's geolocation API.
-     * As a fallback, it uses WHOIS data associated with the user's account.
+     * Resolves where maps should open. A company-configured default centre
+     * (Settings > Map) wins outright. Otherwise it tries the active order
+     * destinations, then the browser's geolocation API, then the IP lookup,
+     * then the centre of the company's country, then the hardcoded default.
+     * See utils/map-default-view for the full precedence.
      *
      * @returns {Promise<Object>} A promise that resolves to an object containing latitude and longitude.
      */
@@ -102,6 +124,14 @@ export default class LocationService extends Service {
             return { latitude: this.latitude, longitude: this.longitude };
         }
 
+        // The company's chosen starting point beats any guess about the user.
+        await this.mapSettings.load();
+        const defaultCenter = this.mapSettings.defaultMapCenter;
+        if (defaultCenter) {
+            this.updateLocation(defaultCenter);
+            return { latitude: defaultCenter.latitude, longitude: defaultCenter.longitude };
+        }
+
         try {
             const coordinates = await this.fetch.cachedGet('fleet-ops/live/coordinates', {}, { expirationInterval: 1, expirationIntervalUnit: 'hour' });
 
@@ -184,33 +214,51 @@ export default class LocationService extends Service {
         }
     }
 
+    /**
+     * Discards the resolved location and resolves it again, e.g. after the
+     * company's default map view changed. Listeners of `user.located` (the
+     * live map) move to the new location.
+     *
+     * @returns {Promise<Object>} The newly resolved coordinates.
+     */
+    async relocate() {
+        this.located = false;
+        return this.getUserLocation();
+    }
+
     /**
      * Retrieves the user's location based on WHOIS data associated with their account.
-     * Defaults to predefined coordinates if WHOIS data is not available.
+     * When the IP lookup failed it falls back to the centre of the company's
+     * country, and only then to the predefined coordinates.
      *
      * @returns {Object} An object containing latitude and longitude from WHOIS data or default values.
      */
     getUserLocationFromWhois() {
-        const whois = this.currentUser.getOption('whois', {});
-        const coordinates = {
-            latitude: getWithDefault(whois, 'latitude', this.DEFAULT_LATITUDE),
-            longitude: getWithDefault(whois, 'longitude', this.DEFAULT_LONGITUDE),
-        };
-
-        this.updateLocation(coordinates);
-        return coordinates;
+        const whois = this.currentUser.getOption('whois', {}) ?? {};
+        const latitude = Number(whois.latitude);
+        const longitude = Number(whois.longitude);
+        // The IP lookup's fallback reports null coordinates, which Number() turns into Null Island.
+        const hasWhoisCoordinates = whois.latitude != null && whois.longitude != null && isLatitude(latitude) && isLongitude(longitude);
+
+        const location = hasWhoisCoordinates
+            ? { latitude, longitude }
+            : (this.mapSettings.companyCountryCenter ?? { latitude: LocationService.DEFAULT_LATITUDE, longitude: LocationService.DEFAULT_LONGITUDE });
+
+        this.updateLocation(location);
+        return { latitude: location.latitude, longitude: location.longitude };
     }
 
     /**
      * Updates the service's tracked properties with the new location data.
      * Triggers an event to notify other parts of the application that the user's location has been updated.
      *
-     * @param {Object} coordinates - An object containing the latitude and longitude to be set.
+     * @param {Object} coordinates - An object containing the latitude and longitude to be set, and optionally a suggested zoom.
      */
-    updateLocation({ latitude, longitude }) {
+    updateLocation({ latitude, longitude, zoom = null }) {
         this.latitude = latitude;
         this.longitude = longitude;
+        this.zoom = isZoom(zoom) ? zoom : null;
         this.located = true;
-        this.universe.trigger('user.located', { latitude, longitude });
+        this.universe.trigger('user.located', { latitude, longitude, zoom: this.zoom });
     }
 }

package/addon/services/maintenance-actions.js

@@ -44,6 +44,7 @@ export default class MaintenanceActionsService extends ResourceActionService {
         },
         view: (maintenance, options = {}) => {
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 maintenance,
                 title: maintenance?.summary,
                 header: 'maintenance/panel-header',

package/addon/services/maintenance-schedule-actions.js

@@ -11,7 +11,7 @@ export default class MaintenanceScheduleActionsService extends ResourceActionSer
 
     constructor() {
         super(...arguments);
-        this.initialize('maintenance-schedule');
+        this.initialize('maintenance-schedule', { registryResource: 'schedule' });
     }
 
     transition = {
@@ -43,6 +43,7 @@ export default class MaintenanceScheduleActionsService extends ResourceActionSer
         },
         view: (schedule, options = {}) => {
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 schedule,
                 title: schedule?.name,
                 actionButtons: this.panelActionButtons(schedule, { onDeleted: () => this.resourceContextPanel.closeAll() }),

package/addon/services/map-settings.js

@@ -2,6 +2,7 @@ import Service from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { getLeafletTileUrl } from '../utils/leaflet-tile-url';
+import { defaultMapCenter, companyCountryCenter } from '../utils/map-default-view';
 
 const DEFAULT_SETTINGS = {
     mapProvider: 'leaflet',
@@ -12,6 +13,11 @@ const DEFAULT_SETTINGS = {
     googleMapsMapType: 'roadmap',
     showGoogleMapsTrafficLayer: false,
     showGoogleMapsTransitLayer: false,
+    defaultMapLatitude: null,
+    defaultMapLongitude: null,
+    defaultMapZoom: null,
+    fitMapToVehicles: false,
+    companyMapCenter: null,
 };
 
 export default class MapSettingsService extends Service {
@@ -47,6 +53,28 @@ export default class MapSettingsService extends Service {
         return Boolean(this.settings.showGoogleMapsTransitLayer);
     }
 
+    /**
+     * The company's configured default centre for the live map, or null.
+     *
+     * @return {{latitude: Number, longitude: Number, zoom: Number}|null}
+     */
+    get defaultMapCenter() {
+        return defaultMapCenter(this.settings);
+    }
+
+    /**
+     * The centre of the company's country, used when nothing better is known.
+     *
+     * @return {{latitude: Number, longitude: Number, zoom: Number}|null}
+     */
+    get companyCountryCenter() {
+        return companyCountryCenter(this.settings);
+    }
+
+    get fitMapToVehicles() {
+        return Boolean(this.settings.fitMapToVehicles);
+    }
+
     get isGoogleMaps() {
         return this.mapProvider === 'google';
     }

package/addon/services/order-actions.js

@@ -6,6 +6,7 @@ import { task } from 'ember-concurrency';
 
 export default class OrderActionsService extends ResourceActionService {
     @service store;
+    @service orderPresentation;
     modelNamePath = 'tracking';
 
     constructor() {
@@ -54,6 +55,7 @@ export default class OrderActionsService extends ResourceActionService {
         },
         view: (order, options = {}) => {
             return this.resourceContextPanel.open({
+                registry: this.detailsRegistry,
                 order,
                 tabs: [
                     {
@@ -313,6 +315,11 @@ export default class OrderActionsService extends ResourceActionService {
     @action editOrderDetails(order, options = {}) {
         options = options === null ? {} : options;
 
+        // Orders with a presentation profile are edited in the profiled order form, not the fixed modal.
+        if (this.orderPresentation.profileFor(order)) {
+            return this.panel.edit(order, options);
+        }
+
         this.modalsManager.show('modals/order-form', {
             title: this.intl.t('order.actions.edit-order-details'),
             acceptButtonText: this.intl.t('common.save-changes'),

package/addon/services/order-allocation.js

@@ -35,7 +35,7 @@ export default class OrderAllocationService extends Service {
     @task *loadSettings() {
         try {
             const settings = yield this.fetch.get('fleet-ops/settings/orchestrator-settings');
-            this.activeEngineId = settings.orchestrator_engine ?? 'greedy';
+            this.activeEngineId = settings.allocation_engine ?? 'greedy';
             return settings;
         } catch (error) {
             this.notifications.serverError(error);