@fleetbase/fleetops-engine 0.6.54 → 0.6.55

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

@@ -1,7 +1,7 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
+import { action, get } from '@ember/object';
 
 export default class ManagementDriversIndexController extends Controller {
     @service driverActions;
@@ -52,6 +52,22 @@ export default class ManagementDriversIndexController extends Controller {
         return Boolean(driver?.vehicle_uuid || driver?.vehicle?.id || driver?.vehicle?.uuid || driver?.vehicle_name);
     }
 
+    async resolveAssignedVehicle(vehicle) {
+        if (!vehicle) {
+            return null;
+        }
+
+        if (typeof vehicle.then === 'function') {
+            return await vehicle;
+        }
+
+        if (typeof vehicle.loadResource === 'function') {
+            return (await vehicle.loadResource()) ?? vehicle;
+        }
+
+        return vehicle;
+    }
+
     /** action buttons */
     get actionButtons() {
         return [
@@ -102,7 +118,8 @@ export default class ManagementDriversIndexController extends Controller {
                 sticky: true,
                 label: this.intl.t('column.name'),
                 valuePath: 'name',
-                cellComponent: 'table/cell/driver-name',
+                cellComponent: 'cell/driver-identity',
+                compact: true,
                 permission: 'fleet-ops view driver',
                 action: this.driverActions.transition.view,
                 resizable: true,
@@ -120,6 +137,69 @@ export default class ManagementDriversIndexController extends Controller {
                 hidden: false,
                 filterComponent: 'filter/string',
             },
+            {
+                label: this.intl.t('column.phone'),
+                valuePath: 'phone',
+                cellComponent: 'table/cell/base',
+                resizable: true,
+                sortable: true,
+                filterable: true,
+                filterParam: 'phone',
+                filterComponent: 'filter/string',
+            },
+            {
+                label: this.intl.t('column.license'),
+                valuePath: 'drivers_license_number',
+                cellComponent: 'table/cell/base',
+                resizable: true,
+                sortable: true,
+                filterable: true,
+                filterComponent: 'filter/string',
+            },
+            {
+                label: this.intl.t('column.vehicle'),
+                cellComponent: 'cell/vehicle-identity',
+                compact: true,
+                permission: 'fleet-ops view vehicle',
+                action: async (vehicle) => {
+                    try {
+                        const resolvedVehicle = await this.resolveAssignedVehicle(vehicle);
+                        if (resolvedVehicle) this.vehicleActions.panel.view(resolvedVehicle);
+                    } catch (err) {
+                        this.notifications.serverError(err);
+                    }
+                },
+                valuePath: 'vehicle.display_name',
+                emptyText: '-',
+                showStatusBadge: true,
+                resourcePath: (driver) => {
+                    const vehicle = get(driver, 'vehicle_assigned') ?? get(driver, 'vehicle');
+
+                    if (vehicle) {
+                        return vehicle;
+                    }
+
+                    const vehicleName = get(driver, 'vehicle_name');
+
+                    if (vehicleName) {
+                        return {
+                            display_name: vehicleName,
+                            name: vehicleName,
+                            status: 'assigned',
+                            loadResource: () => driver.loadVehicle?.(),
+                        };
+                    }
+
+                    return null;
+                },
+                modelNamePath: 'display_name',
+                resizable: true,
+                filterable: true,
+                filterComponent: 'filter/model',
+                filterComponentPlaceholder: 'Select vehicle to filter by',
+                filterParam: 'vehicle',
+                model: 'vehicle',
+            },
             {
                 label: this.intl.t('column.internal-id'),
                 valuePath: 'internal_id',
@@ -150,27 +230,6 @@ export default class ManagementDriversIndexController extends Controller {
                 filterParam: 'vendor',
                 model: 'vendor',
             },
-            {
-                label: this.intl.t('column.vehicle'),
-                cellComponent: 'table/cell/anchor',
-                permission: 'fleet-ops view vehicle',
-                onClick: async (driver) => {
-                    try {
-                        const vehicle = await driver.loadVehicle();
-                        if (vehicle) this.vehicleActions.panel.view(vehicle);
-                    } catch (err) {
-                        this.notifications.serverError(err);
-                    }
-                },
-                valuePath: 'vehicle.display_name',
-                modelNamePath: 'display_name',
-                resizable: true,
-                filterable: true,
-                filterComponent: 'filter/model',
-                filterComponentPlaceholder: 'Select vehicle to filter by',
-                filterParam: 'vehicle',
-                model: 'vehicle',
-            },
             {
                 label: this.intl.t('column.fleet'),
                 cellComponent: 'table/cell/link-list',
@@ -185,25 +244,6 @@ export default class ManagementDriversIndexController extends Controller {
                 filterParam: 'fleet',
                 model: 'fleet',
             },
-            {
-                label: this.intl.t('column.license'),
-                valuePath: 'drivers_license_number',
-                cellComponent: 'table/cell/base',
-                resizable: true,
-                sortable: true,
-                filterable: true,
-                filterComponent: 'filter/string',
-            },
-            {
-                label: this.intl.t('column.phone'),
-                valuePath: 'phone',
-                cellComponent: 'table/cell/base',
-                resizable: true,
-                sortable: true,
-                filterable: true,
-                filterParam: 'phone',
-                filterComponent: 'filter/string',
-            },
             {
                 label: this.intl.t('column.country'),
                 valuePath: 'country',

package/addon/controllers/management/fuel-reports/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';
 
@@ -113,9 +114,37 @@ export default class ManagementFuelReportsIndexController 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.fuelReportActions.viewDriver,
+                action: async (driver) => {
+                    const resolvedDriver = driver?.loadResource ? await driver.loadResource() : driver;
+
+                    if (resolvedDriver) {
+                        this.fuelReportActions.driverActions.panel.view(resolvedDriver);
+                    }
+                },
+                emptyText: '-',
+                showStatusBadge: true,
+                resourcePath: (fuelReport) => {
+                    const driver = get(fuelReport, 'driver');
+
+                    if (driver) {
+                        return driver;
+                    }
+
+                    const driverName = get(fuelReport, 'driver_name');
+
+                    if (driverName) {
+                        return {
+                            id: get(fuelReport, 'driver_uuid'),
+                            name: driverName,
+                            display_name: driverName,
+                            loadResource: () => fuelReport.loadDriver?.(),
+                        };
+                    }
+
+                    return null;
+                },
                 resizable: true,
                 sortable: true,
                 filterable: true,
@@ -127,9 +156,39 @@ export default class ManagementFuelReportsIndexController 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.fuelReportActions.viewVehicle,
+                action: async (vehicle) => {
+                    const resolvedVehicle = vehicle?.loadResource ? await vehicle.loadResource() : vehicle;
+
+                    if (resolvedVehicle) {
+                        this.fuelReportActions.vehicleActions.panel.view(resolvedVehicle);
+                    }
+                },
+                emptyText: '-',
+                showStatusBadge: true,
+                resourcePath: (fuelReport) => {
+                    const vehicle = get(fuelReport, 'vehicle');
+
+                    if (vehicle) {
+                        return vehicle;
+                    }
+
+                    const vehicleName = get(fuelReport, 'vehicle_name');
+
+                    if (vehicleName) {
+                        return {
+                            id: get(fuelReport, 'vehicle_uuid'),
+                            displayName: vehicleName,
+                            display_name: vehicleName,
+                            name: vehicleName,
+                            vehicle_number: get(fuelReport, 'vehicle_uuid'),
+                            loadResource: () => fuelReport.loadVehicle?.(),
+                        };
+                    }
+
+                    return null;
+                },
                 resizable: true,
                 sortable: true,
                 filterable: true,

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/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,3 @@
+import Route from '@ember/routing/route';
+
+export default class ConnectivityEventsDetailsRoute extends Route {}

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/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/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;