@fleetbase/fleetops-engine 0.6.54 → 0.6.56

package/addon/controllers/management/issues/index.js

@@ -1,4 +1,5 @@
 import Controller from '@ember/controller';
+import { get } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import fleetOpsOptions from '../../../utils/fleet-ops-options';
@@ -162,9 +163,37 @@ export default class ManagementIssuesIndexController extends Controller {
             {
                 label: this.intl.t('column.driver'),
                 valuePath: 'driver_name',
-                cellComponent: 'table/cell/anchor',
+                cellComponent: 'cell/driver-identity',
                 permission: 'fleet-ops view driver',
-                onClick: this.issueActions.viewDriver,
+                action: async (driver) => {
+                    const resolvedDriver = driver?.loadResource ? await driver.loadResource() : driver;
+
+                    if (resolvedDriver) {
+                        this.issueActions.driverActions.panel.view(resolvedDriver);
+                    }
+                },
+                emptyText: '-',
+                showStatusBadge: true,
+                resourcePath: (issue) => {
+                    const driver = get(issue, 'driver');
+
+                    if (driver) {
+                        return driver;
+                    }
+
+                    const driverName = get(issue, 'driver_name');
+
+                    if (driverName) {
+                        return {
+                            id: get(issue, 'driver_uuid'),
+                            name: driverName,
+                            display_name: driverName,
+                            loadResource: () => issue.loadDriver?.(),
+                        };
+                    }
+
+                    return null;
+                },
                 resizable: true,
                 sortable: true,
                 filterable: true,
@@ -176,9 +205,39 @@ export default class ManagementIssuesIndexController extends Controller {
             {
                 label: this.intl.t('column.vehicle'),
                 valuePath: 'vehicle_name',
-                cellComponent: 'table/cell/anchor',
+                cellComponent: 'cell/vehicle-identity',
                 permission: 'fleet-ops view vehicle',
-                onClick: this.issueActions.viewVehicle,
+                action: async (vehicle) => {
+                    const resolvedVehicle = vehicle?.loadResource ? await vehicle.loadResource() : vehicle;
+
+                    if (resolvedVehicle) {
+                        this.issueActions.vehicleActions.panel.view(resolvedVehicle);
+                    }
+                },
+                emptyText: '-',
+                showStatusBadge: true,
+                resourcePath: (issue) => {
+                    const vehicle = get(issue, 'vehicle');
+
+                    if (vehicle) {
+                        return vehicle;
+                    }
+
+                    const vehicleName = get(issue, 'vehicle_name');
+
+                    if (vehicleName) {
+                        return {
+                            id: get(issue, 'vehicle_uuid'),
+                            displayName: vehicleName,
+                            display_name: vehicleName,
+                            name: vehicleName,
+                            vehicle_number: get(issue, 'vehicle_uuid'),
+                            loadResource: () => issue.loadVehicle?.(),
+                        };
+                    }
+
+                    return null;
+                },
                 resizable: true,
                 sortable: true,
                 filterable: true,

package/addon/controllers/management/vehicles/index.js

@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import { action } from '@ember/object';
+import { action, get } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
@@ -126,7 +126,8 @@ export default class ManagementVehiclesIndexController extends Controller {
                 label: this.intl.t('column.name'),
                 valuePath: 'displayName',
                 photoPath: 'avatar_url',
-                cellComponent: 'table/cell/vehicle-name',
+                cellComponent: 'cell/vehicle-identity',
+                compact: true,
                 permission: 'fleet-ops view vehicle',
                 action: this.vehicleActions.transition.view,
                 resizable: true,
@@ -135,6 +136,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterComponent: 'filter/string',
                 filterParam: 'name',
                 showOnlineIndicator: true,
+                showStatus: false,
             },
             {
                 label: this.intl.t('column.plate-number'),
@@ -160,14 +162,39 @@ export default class ManagementVehiclesIndexController extends Controller {
             },
             {
                 label: this.intl.t('column.driver-assigned'),
-                cellComponent: 'table/cell/anchor',
+                cellComponent: 'cell/driver-identity',
+                compact: true,
+                assignedVehicleLabel: (_driver, vehicle) => get(vehicle, 'displayName') ?? get(vehicle, 'display_name') ?? get(vehicle, 'name'),
                 permission: 'fleet-ops view driver',
-                action: async (vehicle) => {
-                    const driver = await vehicle.loadDriver();
+                action: async (driver) => {
+                    const resolvedDriver = get(driver, 'id') ? driver : await driver?.loadResource?.();
 
-                    return this.driverActions.panel.view(driver);
+                    if (resolvedDriver) {
+                        return this.driverActions.panel.view(resolvedDriver);
+                    }
                 },
                 valuePath: 'driver_name',
+                emptyText: '-',
+                resourcePath: (vehicle) => {
+                    const driver = get(vehicle, 'driver');
+
+                    if (driver) {
+                        return driver;
+                    }
+
+                    const driverName = get(vehicle, 'driver_name');
+
+                    if (driverName) {
+                        return {
+                            name: driverName,
+                            display_name: driverName,
+                            status: 'assigned',
+                            loadResource: () => vehicle.loadDriver?.(),
+                        };
+                    }
+
+                    return null;
+                },
                 resizable: true,
                 filterable: true,
                 filterComponent: 'filter/model',

package/addon/controllers/settings/map.js

@@ -19,6 +19,12 @@ export default class SettingsMapController extends Controller {
      * @var {Array}
      */
     @tracked mapProviderOptions = MAP_PROVIDER_OPTIONS;
+    @tracked googleMapsMapTypeOptions = [
+        { label: 'Roadmap', value: 'roadmap' },
+        { label: 'Satellite', value: 'satellite' },
+        { label: 'Hybrid', value: 'hybrid' },
+        { label: 'Terrain', value: 'terrain' },
+    ];
 
     /**
      * The currently-selected map provider key (e.g. 'leaflet' or 'google').
@@ -27,6 +33,9 @@ export default class SettingsMapController extends Controller {
      * @var {String}
      */
     @tracked mapProvider = 'leaflet';
+    @tracked googleMapsMapType = 'roadmap';
+    @tracked showGoogleMapsTrafficLayer = false;
+    @tracked showGoogleMapsTransitLayer = false;
 
     /**
      * Whether settings have been loaded from the server.
@@ -68,6 +77,9 @@ export default class SettingsMapController extends Controller {
     @task *saveSettings() {
         const settings = {
             mapProvider: this.mapProvider,
+            googleMapsMapType: this.googleMapsMapType,
+            showGoogleMapsTrafficLayer: this.showGoogleMapsTrafficLayer,
+            showGoogleMapsTransitLayer: this.showGoogleMapsTransitLayer,
         };
 
         try {
@@ -89,6 +101,9 @@ export default class SettingsMapController extends Controller {
             const response = yield this.mapSettings.load({ force: true });
 
             this.mapProvider = response?.mapProvider ?? 'leaflet';
+            this.googleMapsMapType = response?.googleMapsMapType ?? 'roadmap';
+            this.showGoogleMapsTrafficLayer = Boolean(response?.showGoogleMapsTrafficLayer);
+            this.showGoogleMapsTransitLayer = Boolean(response?.showGoogleMapsTransitLayer);
             this.settingsLoaded = true;
         } catch (error) {
             this.notifications.serverError(error);

package/addon/instance-initializers/register-vroom-allocation.js

@@ -10,7 +10,7 @@
  * Third-party orchestration engines follow the same pattern:
  *   1. Create a service extending OrchestrationEngineInterfaceService
  *   2. Create an instance initializer that calls orchestrationEngine.register()
- *   3. The engine will appear in the FleetOps orchestrator settings dropdown
+ *   3. The engine will appear in the Fleet-Ops orchestrator settings dropdown
  */
 export function initialize(appInstance) {
     const orchestrationEngine = appInstance.lookup('service:orchestration-engine');

package/addon/routes/connectivity/devices/index/details/vehicle.js

@@ -1,7 +1,29 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
 export default class ConnectivityDevicesIndexDetailsVehicleRoute extends Route {
-    model() {
-        return this.modelFor('connectivity.devices.index.details');
+    @service store;
+
+    async model() {
+        const device = this.modelFor('connectivity.devices.index.details');
+        const vehicle = await Promise.resolve(device?.attachable);
+
+        if (!vehicle?.id) {
+            return { device, positions: [] };
+        }
+
+        let positions = [];
+
+        try {
+            positions = await this.store.query('position', {
+                subject_uuid: vehicle.id,
+                sort: '-created_at',
+                limit: 5,
+            });
+        } catch (_) {
+            positions = [];
+        }
+
+        return { device, positions };
     }
 }

package/addon/routes/connectivity/devices/index.js

@@ -14,6 +14,13 @@ export default class ConnectivityDevicesIndexRoute extends Route {
         status: { refreshModel: true },
         attachment_state: { refreshModel: true },
         telematic: { refreshModel: true },
+        provider: { refreshModel: true },
+        vehicle: { refreshModel: true },
+        connection_status: { refreshModel: true },
+        device_id: { refreshModel: true },
+        type: { refreshModel: true },
+        serial_number: { refreshModel: true },
+        last_online_at: { refreshModel: true },
         created_at: { refreshModel: true },
         updated_at: { refreshModel: true },
     };

package/addon/routes/connectivity/events/details.js

@@ -0,0 +1,28 @@
+import Route from '@ember/routing/route';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+
+export default class ConnectivityEventsDetailsRoute extends Route {
+    @service abilities;
+    @service hostRouter;
+    @service intl;
+    @service notifications;
+    @service store;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+
+        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.events.index');
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops view device-event')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.events.index');
+        }
+    }
+
+    model({ public_id }) {
+        return this.store.findRecord('device-event', public_id);
+    }
+}

package/addon/routes/connectivity/events/index.js

@@ -9,8 +9,12 @@ export default class ConnectivityEventsIndexRoute extends Route {
         limit: { refreshModel: true },
         sort: { refreshModel: true },
         query: { refreshModel: true },
-        name: { refreshModel: true },
-        public_id: { refreshModel: true },
+        telematic: { refreshModel: true },
+        device: { refreshModel: true },
+        event_type: { refreshModel: true },
+        severity: { refreshModel: true },
+        processed: { refreshModel: true },
+        occurred_at: { refreshModel: true },
         created_at: { refreshModel: true },
         updated_at: { refreshModel: true },
     };

package/addon/routes/connectivity/sensors/index.js

@@ -9,8 +9,13 @@ export default class ConnectivitySensorsIndexRoute extends Route {
         limit: { refreshModel: true },
         sort: { refreshModel: true },
         query: { refreshModel: true },
-        name: { refreshModel: true },
-        public_id: { refreshModel: true },
+        telematic: { refreshModel: true },
+        device: { refreshModel: true },
+        type: { refreshModel: true },
+        status: { refreshModel: true },
+        serial_number: { refreshModel: true },
+        imei: { refreshModel: true },
+        last_reading_at: { refreshModel: true },
         created_at: { refreshModel: true },
         updated_at: { refreshModel: true },
     };

package/addon/routes/connectivity/telematics/details/devices.js

@@ -15,6 +15,8 @@ export default class ConnectivityTelematicsDetailsDevicesRoute extends Route {
         vehicle: { refreshModel: true },
         connection_status: { refreshModel: true },
         device_id: { refreshModel: true },
+        type: { refreshModel: true },
+        serial_number: { refreshModel: true },
         last_online_at: { refreshModel: true },
         updated_at: { refreshModel: true },
     };

package/addon/routes/management/vehicles/index/details.js

@@ -28,6 +28,8 @@ export default class ManagementVehiclesIndexDetailsRoute extends Route {
     }
 
     afterModel(model) {
-        model.loadDriver();
+        if (model && typeof model.loadDriver === 'function') {
+            model.loadDriver();
+        }
     }
 }

package/addon/services/device-actions.js

@@ -1,8 +1,10 @@
 import ResourceActionService, { inject as service } from '@fleetbase/ember-core/services/resource-action';
 import { action } from '@ember/object';
+import { isArray } from '@ember/array';
 
 export default class DeviceActionsService extends ResourceActionService {
     @service fetch;
+    @service('universe/menu-service') menuService;
 
     constructor() {
         super(...arguments);
@@ -37,13 +39,41 @@ export default class DeviceActionsService extends ResourceActionService {
             });
         },
         view: (device) => {
+            if (!device?.id) {
+                return this.notifications?.warning?.(this.intl.t('common.invalid-resource'));
+            }
+
+            const registeredTabs = this.menuService?.getMenuItems?.('fleet-ops:component:device:details');
+
             return this.resourceContextPanel.open({
                 device,
+                header: 'device/panel-header',
                 tabs: [
                     {
+                        key: 'overview',
+                        id: 'overview',
                         label: this.intl.t('common.overview'),
                         component: 'device/details',
                     },
+                    {
+                        key: 'vehicle',
+                        id: 'vehicle',
+                        label: this.intl.t('resource.vehicle'),
+                        component: 'device/panel-tabs/vehicle',
+                    },
+                    {
+                        key: 'sensors',
+                        id: 'sensors',
+                        label: this.intl.t('resource.sensors'),
+                        component: 'device/panel-tabs/sensors',
+                    },
+                    {
+                        key: 'events',
+                        id: 'events',
+                        label: this.intl.t('resource.device-events'),
+                        component: 'device/panel-tabs/events',
+                    },
+                    ...(isArray(registeredTabs) ? registeredTabs.filter((tab) => tab.component || tab.render) : []),
                 ],
             });
         },

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

@@ -11,7 +11,7 @@ export default class DeviceEventActionsService extends ResourceActionService {
     }
 
     transition = {
-        view: (deviceEvent) => this.transitionTo('connectivity.events.index.details', deviceEvent),
+        view: (deviceEvent) => this.transitionTo('connectivity.events.details', deviceEvent),
     };
 
     panel = {

package/addon/services/equipment-actions.js

@@ -9,6 +9,7 @@ export default class EquipmentActionsService extends ResourceActionService {
         super(...arguments);
         this.initialize('equipment', {
             defaultAttributes: {
+                status: 'available',
                 currency: this.defaultCurrency,
             },
         });

package/addon/services/map-adapter/google.js

@@ -108,6 +108,12 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
     /** @type {google.maps.ImageMapType|null} */
     _customTileLayer = null;
 
+    /** @type {google.maps.TrafficLayer|null} */
+    _trafficLayer = null;
+
+    /** @type {google.maps.TransitLayer|null} */
+    _transitLayer = null;
+
     /** @type {Map<string, Function[]>} Normalized event name → array of [handler, gmListener] pairs */
     _eventListeners = new Map();
 
@@ -176,6 +182,7 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
             styles: mergedMapStyles,
         });
 
+        this.#syncGoogleLayers(options);
         await this.#initDrawingManager();
 
         debug('[GoogleMapsAdapter] Map initialized');
@@ -231,6 +238,10 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
         this._tooltipOverlayView?.setMap?.(null);
         this._tooltipOverlayView = null;
         this._supportsAdvancedMarkers = false;
+        this._trafficLayer?.setMap(null);
+        this._trafficLayer = null;
+        this._transitLayer?.setMap(null);
+        this._transitLayer = null;
 
         this._map = null;
         debug('[GoogleMapsAdapter] Map destroyed');
@@ -1184,6 +1195,20 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
         }
     }
 
+    #syncGoogleLayers(options = {}) {
+        if (!this._map) return;
+
+        if (options.showTrafficLayer) {
+            this._trafficLayer = new google.maps.TrafficLayer();
+            this._trafficLayer.setMap(this._map);
+        }
+
+        if (options.showTransitLayer) {
+            this._transitLayer = new google.maps.TransitLayer();
+            this._transitLayer.setMap(this._map);
+        }
+    }
+
     #ensureDrawToolbar() {
         if (this._drawControlEl || !this._map) return;
 

package/addon/services/map-adapter/leaflet.js

@@ -3,7 +3,7 @@
  *
  * Implements the MapAdapterInterface using the Leaflet library (via ember-leaflet).
  * This adapter wraps all existing Leaflet-specific logic, preserving 100% of
- * the original FleetOps map functionality while conforming to the provider-agnostic
+ * the original Fleet-Ops map functionality while conforming to the provider-agnostic
  * interface.
  *
  * All Leaflet-specific plugins are supported:

package/addon/services/map-adapter-interface.js

@@ -2,7 +2,7 @@
  * MapAdapterInterface
  *
  * Abstract base class that defines the standardized contract all map provider
- * adapters must implement. This enables FleetOps to support multiple map
+ * adapters must implement. This enables Fleet-Ops to support multiple map
  * providers (Leaflet, Google Maps, Mapbox, etc.) without changing any
  * application-level business logic.
  *

package/addon/services/map-manager.js

@@ -1,7 +1,7 @@
 /**
  * MapManagerService
  *
- * Provider-agnostic central map service for FleetOps. Replaces the
+ * Provider-agnostic central map service for Fleet-Ops. Replaces the
  * Leaflet-specific `leaflet-map-manager` as the single point of contact
  * for all map operations across the application.
  *
@@ -139,6 +139,9 @@ export default class MapManagerService extends Service {
             ...options,
             apiKey: options.apiKey ?? this.mapSettings.googleMapsApiKey,
             mapId: options.mapId ?? this.mapSettings.googleMapsMapId,
+            mapTypeId: options.mapTypeId ?? this.mapSettings.googleMapsMapType,
+            showTrafficLayer: options.showTrafficLayer ?? this.mapSettings.showGoogleMapsTrafficLayer,
+            showTransitLayer: options.showTransitLayer ?? this.mapSettings.showGoogleMapsTransitLayer,
         });
 
         return Promise.resolve(map).then((nativeMap) => {

package/addon/services/map-settings.js

@@ -6,6 +6,9 @@ const DEFAULT_SETTINGS = {
     mapProvider: 'leaflet',
     googleMapsApiKey: '',
     googleMapsMapId: '',
+    googleMapsMapType: 'roadmap',
+    showGoogleMapsTrafficLayer: false,
+    showGoogleMapsTransitLayer: false,
 };
 
 export default class MapSettingsService extends Service {
@@ -26,6 +29,18 @@ export default class MapSettingsService extends Service {
         return this.settings.googleMapsMapId ?? '';
     }
 
+    get googleMapsMapType() {
+        return this.settings.googleMapsMapType ?? 'roadmap';
+    }
+
+    get showGoogleMapsTrafficLayer() {
+        return Boolean(this.settings.showGoogleMapsTrafficLayer);
+    }
+
+    get showGoogleMapsTransitLayer() {
+        return Boolean(this.settings.showGoogleMapsTransitLayer);
+    }
+
     get isGoogleMaps() {
         return this.mapProvider === 'google';
     }

package/addon/services/sensor-actions.js

@@ -36,8 +36,11 @@ export default class SensorActionsService extends ResourceActionService {
         view: (sensor) => {
             return this.resourceContextPanel.open({
                 sensor,
+                header: 'sensor/panel-header',
                 tabs: [
                     {
+                        key: 'overview',
+                        id: 'overview',
                         label: this.intl.t('common.overview'),
                         component: 'sensor/details',
                     },

package/addon/services/service-rate-actions.js

@@ -96,8 +96,15 @@ export default class ServiceRateActionsService extends ResourceActionService {
     };
 
     @task *queryServiceRatesForOrder(order, params = {}) {
+        const payloadCoordinates = order.payload?.payloadCoordinates ?? [];
+        const routeCoordinates = payloadCoordinates.map((coordinate) => this.#serializeRouteCoordinate(coordinate)).filter(Boolean);
+
+        if (routeCoordinates.length < 2) {
+            return [];
+        }
+
         const queryParams = {
-            coordinates: order.payload.payloadCoordinates.join(';'),
+            coordinates: routeCoordinates.join(';'),
             facilitator: order.facilitator?.get('isIntegratedVendor') ? order.facilitator.get('public_id') : null,
             service_type: order.order_config?.get('key'),
             ...params,
@@ -117,6 +124,37 @@ export default class ServiceRateActionsService extends ResourceActionService {
         }
     }
 
+    #serializeRouteCoordinate(coordinate) {
+        if (Array.isArray(coordinate)) {
+            const [longitude, latitude] = coordinate;
+
+            if (!this.#isValidCoordinate(latitude) || !this.#isValidCoordinate(longitude)) {
+                return null;
+            }
+
+            return `${latitude},${longitude}`;
+        }
+
+        if (typeof coordinate === 'string') {
+            const parts = coordinate
+                .split(',')
+                .map((part) => part.trim())
+                .filter(Boolean);
+
+            if (parts.length !== 2 || !parts.every((part) => this.#isValidCoordinate(part))) {
+                return null;
+            }
+
+            return parts.join(',');
+        }
+
+        return null;
+    }
+
+    #isValidCoordinate(value) {
+        return value !== null && value !== undefined && value !== '' && Number.isFinite(Number(value));
+    }
+
     @task *getServiceQuotes(serviceRate, order) {
         if (order.payload.payloadCoordinates.length < 2) return;