@fleetbase/fleetops-engine 0.6.54 → 0.6.55

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

@@ -1,21 +1,84 @@
 import Controller from '@ember/controller';
+import { action, get } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import fleetOpsOptions from '../../../utils/fleet-ops-options';
 
+function sensorTelematic(sensor) {
+    const telematic = get(sensor, 'telematic');
+
+    if (telematic) {
+        return telematic;
+    }
+
+    const id = get(sensor, 'telematic_uuid');
+    const name = get(sensor, 'telematic_name');
+    const provider = get(sensor, 'provider');
+
+    if (!id && !name && !provider) {
+        return null;
+    }
+
+    return {
+        id,
+        name: name ?? provider,
+        provider,
+        provider_descriptor: get(sensor, 'provider_descriptor'),
+    };
+}
+
+function sensorDevice(sensor) {
+    const device = get(sensor, 'device');
+
+    if (device) {
+        return device;
+    }
+
+    const id = get(sensor, 'device_uuid');
+    const deviceId = get(sensor, 'device_id') ?? get(sensor, 'provider_device_id') ?? get(sensor, 'ident');
+    const name = get(sensor, 'device_name') ?? deviceId;
+    const imei = get(sensor, 'device_imei') ?? get(sensor, 'imei') ?? get(sensor, 'ident');
+
+    if (!id && !name && !imei && !deviceId) {
+        return null;
+    }
+
+    return {
+        id,
+        displayName: name,
+        name,
+        imei,
+        device_id: deviceId,
+        ident: get(sensor, 'ident'),
+        serial_number: get(sensor, 'device_serial_number'),
+        connection_status: get(sensor, 'device_connection_status'),
+        status: get(sensor, 'device_status'),
+        photo_url: get(sensor, 'device_photo_url') ?? get(sensor, 'photo_url'),
+    };
+}
+
 export default class ConnectivitySensorsIndexController extends Controller {
     @service sensorActions;
     @service deviceActions;
     @service telematicActions;
     @service intl;
+    @service store;
 
     /** query params */
-    @tracked queryParams = ['name', 'page', 'limit', 'sort', 'query', 'public_id', 'created_at', 'updated_at'];
+    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'telematic', 'device', 'type', 'status', 'serial_number', 'imei', 'last_reading_at', 'created_at', 'updated_at'];
     @tracked page = 1;
     @tracked limit;
     @tracked sort = '-created_at';
-    @tracked public_id;
-    @tracked name;
+    @tracked query;
+    @tracked telematic;
+    @tracked device;
+    @tracked type;
+    @tracked status;
+    @tracked serial_number;
+    @tracked imei;
+    @tracked last_reading_at;
+    @tracked created_at;
+    @tracked updated_at;
 
     /** action buttons */
     @tracked actionButtons = [
@@ -67,14 +130,16 @@ export default class ConnectivitySensorsIndexController extends Controller {
             resizable: true,
             sortable: true,
             filterable: true,
-            filterParam: 'name',
+            filterParam: 'query',
             filterComponent: 'filter/string',
         },
         {
             label: 'Telematic',
             valuePath: 'telematic.provider',
-            cellComponent: 'table/cell/anchor',
-            action: this.telematicActions.transition.view,
+            cellComponent: 'cell/telematic-provider',
+            resourcePath: sensorTelematic,
+            compact: true,
+            action: this.openTelematic,
             permission: 'fleet-ops view telematic',
             resizable: true,
             sortable: true,
@@ -87,8 +152,10 @@ export default class ConnectivitySensorsIndexController extends Controller {
         {
             label: 'Device',
             valuePath: 'device.displayName',
-            cellComponent: 'table/cell/anchor',
-            action: this.deviceActions.transition.view,
+            cellComponent: 'cell/device-identity',
+            resourcePath: sensorDevice,
+            showStatus: false,
+            action: this.openDevice,
             permission: 'fleet-ops view device',
             resizable: true,
             sortable: true,
@@ -97,10 +164,14 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterComponentPlaceholder: 'Select device',
             filterParam: 'device',
             model: 'device',
+            modelNamePath: 'displayName',
+            query: this.telematic ? { telematic_uuid: this.telematic } : undefined,
         },
         {
             label: 'Type',
             valuePath: 'type',
+            cellComponent: 'table/cell/base',
+            humanize: true,
             resizable: true,
             sortable: true,
             filterable: true,
@@ -109,13 +180,16 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterOptions: fleetOpsOptions('sensorTypes'),
         },
         {
-            label: 'Serial Number',
-            valuePath: 'serial_number',
+            label: 'Last Value',
+            valuePath: 'last_value',
+            resizable: true,
+            sortable: true,
+        },
+        {
+            label: 'Unit',
+            valuePath: 'unit',
             resizable: true,
             sortable: true,
-            filterable: true,
-            filterParam: 'serial_number',
-            filterComponent: 'filter/string',
         },
         {
             label: this.intl.t('column.status'),
@@ -127,6 +201,41 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterComponent: 'filter/multi-option',
             filterOptions: fleetOpsOptions('sensorStatuses'),
         },
+        {
+            label: 'Threshold',
+            valuePath: 'threshold_status',
+            cellComponent: 'table/cell/status',
+            resizable: true,
+            sortable: true,
+        },
+        {
+            label: 'Serial Number',
+            valuePath: 'serial_number',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'serial_number',
+            filterComponent: 'filter/string',
+        },
+        {
+            label: 'IMEI',
+            valuePath: 'imei',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'imei',
+            filterComponent: 'filter/string',
+        },
+        {
+            label: 'Last Reading',
+            valuePath: 'lastReadingAt',
+            sortParam: 'last_reading_at',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'last_reading_at',
+            filterComponent: 'filter/date',
+        },
         {
             label: this.intl.t('column.created-at'),
             valuePath: 'createdAt',
@@ -134,6 +243,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             resizable: true,
             sortable: true,
             filterable: true,
+            filterParam: 'created_at',
             filterComponent: 'filter/date',
         },
         {
@@ -144,9 +254,9 @@ export default class ConnectivitySensorsIndexController extends Controller {
             sortable: true,
             hidden: true,
             filterable: true,
+            filterParam: 'updated_at',
             filterComponent: 'filter/date',
         },
-
         {
             label: '',
             cellComponent: 'table/cell/dropdown',
@@ -184,4 +294,36 @@ export default class ConnectivitySensorsIndexController extends Controller {
             searchable: false,
         },
     ];
+
+    async resolveDevice(device) {
+        if (!device?.id) {
+            return null;
+        }
+
+        const cachedDevice = this.store.peekRecord('device', device.id);
+
+        if (cachedDevice) {
+            return cachedDevice;
+        }
+
+        try {
+            return await this.store.findRecord('device', device.id);
+        } catch (_) {
+            return device;
+        }
+    }
+
+    @action async openDevice(device) {
+        const resolvedDevice = await this.resolveDevice(device);
+
+        if (resolvedDevice?.id) {
+            return this.deviceActions.panel.view(resolvedDevice);
+        }
+    }
+
+    @action openTelematic(telematic) {
+        if (telematic?.id) {
+            return this.telematicActions.transition.view(telematic);
+        }
+    }
 }

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

@@ -3,24 +3,36 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { task } from 'ember-concurrency';
-
-const connectionStatusOptions = [
-    { label: 'Online', value: 'online' },
-    { label: 'Recently Offline', value: 'recently_offline' },
-    { label: 'Offline', value: 'offline' },
-    { label: 'Long Offline', value: 'long_offline' },
-    { label: 'Never Connected', value: 'never_connected' },
-];
+import buildDeviceTableColumns from '../../../../utils/device-table-columns';
+import fleetOpsOptions from '../../../../utils/fleet-ops-options';
 
 export default class ConnectivityTelematicsDetailsDevicesController extends Controller {
     @service deviceActions;
     @service fetch;
     @service hostRouter;
     @service intl;
+    @service mapManager;
     @service modalsManager;
     @service notifications;
-
-    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'status', 'provider', 'attachment_state', 'vehicle', 'connection_status', 'device_id', 'last_online_at', 'updated_at'];
+    @service store;
+    @service vehicleActions;
+
+    @tracked queryParams = [
+        'page',
+        'limit',
+        'sort',
+        'query',
+        'status',
+        'provider',
+        'attachment_state',
+        'vehicle',
+        'connection_status',
+        'device_id',
+        'type',
+        'serial_number',
+        'last_online_at',
+        'updated_at',
+    ];
     @tracked telematic;
     @tracked page = 1;
     @tracked limit;
@@ -32,6 +44,8 @@ export default class ConnectivityTelematicsDetailsDevicesController extends Cont
     @tracked vehicle;
     @tracked connection_status;
     @tracked device_id;
+    @tracked type;
+    @tracked serial_number;
     @tracked last_online_at;
     @tracked updated_at;
 
@@ -57,7 +71,17 @@ export default class ConnectivityTelematicsDetailsDevicesController extends Cont
 
     get hasActiveFilters() {
         return Boolean(
-            this.query || this.status || this.provider || this.attachment_state || this.vehicle || this.connection_status || this.device_id || this.last_online_at || this.updated_at
+            this.query ||
+            this.status ||
+            this.provider ||
+            this.attachment_state ||
+            this.vehicle ||
+            this.connection_status ||
+            this.device_id ||
+            this.type ||
+            this.serial_number ||
+            this.last_online_at ||
+            this.updated_at
         );
     }
 
@@ -194,130 +218,16 @@ export default class ConnectivityTelematicsDetailsDevicesController extends Cont
 
     @tracked bulkActions = [];
 
+    get deviceTypeOptions() {
+        return fleetOpsOptions('deviceTypes');
+    }
+
+    get deviceStatusOptions() {
+        return fleetOpsOptions('deviceStatuses');
+    }
+
     get columns() {
-        return [
-            {
-                sticky: true,
-                label: this.intl.t('column.name'),
-                valuePath: 'displayName',
-                cellComponent: 'table/cell/anchor',
-                action: this.deviceActions.transition.view,
-                permission: 'fleet-ops view device',
-                resizable: true,
-                sortable: true,
-                filterable: true,
-                filterParam: 'query',
-                filterComponent: 'filter/string',
-            },
-            {
-                label: 'Provider ID',
-                valuePath: 'device_id',
-                resizable: true,
-                sortable: true,
-                filterable: true,
-                filterParam: 'device_id',
-                filterComponent: 'filter/string',
-            },
-            {
-                label: 'Vehicle',
-                valuePath: 'attached_to_name',
-                resizable: true,
-                sortable: true,
-                filterable: true,
-                filterParam: 'vehicle',
-                filterComponent: 'filter/model',
-                filterComponentPlaceholder: 'Select vehicle',
-                model: 'vehicle',
-                modelNamePath: 'displayName',
-            },
-            {
-                label: 'Connection',
-                valuePath: 'connection_status',
-                cellComponent: 'table/cell/status',
-                resizable: true,
-                sortable: true,
-                filterable: true,
-                filterParam: 'connection_status',
-                filterComponent: 'filter/multi-option',
-                filterOptions: connectionStatusOptions,
-                filterOptionLabel: 'label',
-                filterOptionValue: 'value',
-            },
-            {
-                label: 'Last Seen',
-                valuePath: 'lastOnlineAt',
-                sortParam: 'last_online_at',
-                resizable: true,
-                sortable: true,
-                filterable: true,
-                filterParam: 'last_online_at',
-                filterComponent: 'filter/date',
-            },
-            {
-                label: 'Attachment',
-                valuePath: 'attachable_uuid',
-                hidden: true,
-                resizable: true,
-                sortable: false,
-                filterable: true,
-                filterParam: 'attachment_state',
-                filterComponent: 'filter/select',
-                filterOptions: [
-                    { label: 'Attached', value: 'attached' },
-                    { label: 'Unattached', value: 'unattached' },
-                ],
-                filterOptionLabel: 'label',
-                filterOptionValue: 'value',
-            },
-            {
-                label: this.intl.t('column.updated-at'),
-                valuePath: 'updatedAt',
-                sortParam: 'updated_at',
-                resizable: true,
-                sortable: true,
-                hidden: true,
-                filterable: true,
-                filterComponent: 'filter/date',
-            },
-            {
-                label: '',
-                cellComponent: 'table/cell/dropdown',
-                ddButtonText: false,
-                ddButtonIcon: 'ellipsis-h',
-                ddButtonIconPrefix: 'fas',
-                ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.device') }),
-                cellClassNames: 'overflow-visible align-middle',
-                wrapperClass: 'flex items-center justify-end mx-2',
-                sticky: 'right',
-                width: 60,
-                actions: [
-                    {
-                        label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.device') }),
-                        fn: this.deviceActions.transition.view,
-                        permission: 'fleet-ops view device',
-                    },
-                    {
-                        label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.device') }),
-                        fn: this.deviceActions.transition.edit,
-                        permission: 'fleet-ops update device',
-                    },
-                    {
-                        label: 'Attach or change vehicle',
-                        fn: this.openAttachDeviceModal,
-                        permission: 'fleet-ops update device',
-                    },
-                    {
-                        label: 'Review recent events',
-                        fn: this.openDeviceEvents,
-                        permission: 'fleet-ops view device-event',
-                    },
-                ],
-                sortable: false,
-                filterable: false,
-                resizable: false,
-                searchable: false,
-            },
-        ];
+        return buildDeviceTableColumns(this, { showProvider: false, deviceActionMode: 'panel', showDeviceStatus: false });
     }
 
     @action refresh() {
@@ -336,6 +246,8 @@ export default class ConnectivityTelematicsDetailsDevicesController extends Cont
         this.vehicle = null;
         this.connection_status = null;
         this.device_id = null;
+        this.type = null;
+        this.serial_number = null;
         this.last_online_at = null;
         this.updated_at = null;
         this.page = 1;
@@ -358,6 +270,86 @@ export default class ConnectivityTelematicsDetailsDevicesController extends Cont
         });
     }
 
+    @action hasAttachedVehicle(device) {
+        return Boolean(device?.attachable_uuid && this.isVehicleAttachment(device));
+    }
+
+    @action async viewAttachedVehicle(device) {
+        const vehicle = await this.resolveAttachedVehicle(device);
+
+        if (!vehicle) {
+            return;
+        }
+
+        return this.vehicleActions.panel.view(vehicle);
+    }
+
+    @action async locateAttachedVehicle(device) {
+        const vehicle = await this.resolveAttachedVehicle(device);
+
+        if (!vehicle) {
+            return;
+        }
+
+        await this.transitionToLiveMap();
+        await this.mapManager.waitForMap({ timeoutMs: 8000 });
+
+        this.mapManager.focusResource(vehicle, 16, {
+            paddingBottomRight: [300, 200],
+            moveend: () => {
+                this.vehicleActions.panel.view(vehicle, { closeOnTransition: true });
+            },
+        });
+    }
+
+    async transitionToLiveMap() {
+        try {
+            await this.hostRouter.transitionTo('console.fleet-ops.operations.orders.index', { queryParams: { layout: 'map' } });
+        } catch (_) {
+            // Keep locate actions usable even if the current transition is already in-flight.
+        }
+    }
+
+    isVehicleAttachment(device) {
+        const attachableType = `${device?.attachable_type ?? ''}`.toLowerCase();
+
+        return !attachableType || attachableType.includes('vehicle');
+    }
+
+    async resolveAttachedVehicle(device) {
+        if (!device?.attachable_uuid) {
+            return null;
+        }
+
+        if (!this.isVehicleAttachment(device)) {
+            return null;
+        }
+
+        const attachable = device.attachable;
+
+        if (attachable && typeof attachable.then !== 'function') {
+            return attachable;
+        }
+
+        if (attachable && typeof attachable.then === 'function') {
+            return await attachable;
+        }
+
+        const cachedVehicle = this.store.peekRecord('vehicle', device.attachable_uuid);
+
+        if (cachedVehicle) {
+            return cachedVehicle;
+        }
+
+        try {
+            return await this.store.findRecord('vehicle', device.attachable_uuid);
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+
+        return null;
+    }
+
     @action openDeviceEvents(device) {
         return this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.details.events', this.telematic, {
             queryParams: { device_uuid: device.id },

package/addon/controllers/maintenance/equipment/index.js

@@ -61,8 +61,7 @@ export default class MaintenanceEquipmentIndexController extends Controller {
             {
                 label: this.intl.t('column.name'),
                 valuePath: 'name',
-                cellComponent: 'table/cell/anchor',
-                cellClassNames: 'uppercase',
+                cellComponent: 'cell/equipment-identity',
                 action: this.equipmentActions.transition.view,
                 permission: 'fleet-ops view equipment',
                 resizable: true,

package/addon/controllers/maintenance/parts/index.js

@@ -61,8 +61,7 @@ export default class MaintenancePartsIndexController extends Controller {
             {
                 label: this.intl.t('column.name'),
                 valuePath: 'name',
-                cellComponent: 'table/cell/anchor',
-                cellClassNames: 'uppercase',
+                cellComponent: 'cell/part-identity',
                 action: this.partActions.transition.view,
                 permission: 'fleet-ops view part',
                 resizable: true,