@fleetbase/fleetops-engine 0.6.53 → 0.6.55

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

@@ -3,6 +3,7 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { task } from 'ember-concurrency';
+import buildDeviceTableColumns from '../../../../utils/device-table-columns';
 import fleetOpsOptions from '../../../../utils/fleet-ops-options';
 
 export default class ConnectivityTelematicsDetailsDevicesController extends Controller {
@@ -10,10 +11,28 @@ export default class ConnectivityTelematicsDetailsDevicesController extends Cont
     @service fetch;
     @service hostRouter;
     @service intl;
+    @service mapManager;
     @service modalsManager;
     @service notifications;
-
-    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'status', 'provider', 'attachment_state', 'device_id'];
+    @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;
@@ -22,7 +41,13 @@ export default class ConnectivityTelematicsDetailsDevicesController extends Cont
     @tracked status;
     @tracked provider;
     @tracked attachment_state;
+    @tracked vehicle;
+    @tracked connection_status;
     @tracked device_id;
+    @tracked type;
+    @tracked serial_number;
+    @tracked last_online_at;
+    @tracked updated_at;
 
     get devices() {
         return Array.from(this.model ?? []);
@@ -45,7 +70,19 @@ export default class ConnectivityTelematicsDetailsDevicesController extends Cont
     }
 
     get hasActiveFilters() {
-        return Boolean(this.query || this.status || this.provider || this.attachment_state || this.device_id);
+        return Boolean(
+            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
+        );
     }
 
     get hasDevices() {
@@ -145,146 +182,60 @@ export default class ConnectivityTelematicsDetailsDevicesController extends Cont
         ];
     }
 
-    @tracked actionButtons = [
-        {
-            icon: 'refresh',
-            size: 'xs',
-            onClick: this.refresh,
-            helpText: this.intl.t('common.refresh'),
-            wrapperClass: 'fleetops-telematics-action-button',
-        },
-        {
-            icon: 'ellipsis-h',
-            prefix: 'fas',
-            text: 'Actions',
-            type: 'primary',
-            size: 'xs',
-            triggerClass: 'fleetops-telematics-action-button',
-            items: [
-                {
-                    icon: 'satellite-dish',
-                    text: 'Sync Devices',
-                    onClick: this.startDeviceSync,
-                },
-                {
-                    icon: 'link',
-                    text: 'Attach Unassigned',
-                    onClick: this.openAttachmentsForUnassigned,
-                },
-            ],
-        },
-    ];
-
-    @tracked bulkActions = [];
-
-    get columns() {
+    get actionButtons() {
         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',
+                icon: 'refresh',
+                size: 'sm',
+                onClick: this.refresh,
+                helpText: this.intl.t('common.refresh'),
+                wrapperClass: 'fleetops-telematics-action-button',
+                isLoading: this.refreshTask.isRunning,
+                disabled: this.refreshTask.isRunning,
             },
             {
-                label: 'Vehicle',
-                valuePath: 'attached_to_name',
-                resizable: true,
-                sortable: true,
-                filterable: true,
-                filterParam: 'attachment_state',
-                filterComponent: 'filter/multi-option',
-                filterOptions: [
-                    { label: 'Attached', value: 'attached' },
-                    { label: 'Unattached', value: 'unattached' },
-                ],
-            },
-            {
-                label: 'Connection',
-                valuePath: 'connection_status',
-                cellComponent: 'table/cell/status',
-                resizable: true,
-                sortable: true,
-                filterable: true,
-                filterParam: 'status',
-                filterComponent: 'filter/multi-option',
-                filterOptions: fleetOpsOptions('deviceStatuses'),
-            },
-            {
-                label: 'Last Seen',
-                valuePath: 'lastOnlineAt',
-                sortParam: 'last_online_at',
-                resizable: true,
-                sortable: true,
-            },
-            {
-                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',
-                    },
+                icon: 'ellipsis-h',
+                prefix: 'fas',
+                helpText: 'Actions',
+                type: 'primary',
+                size: 'sm',
+                triggerClass: 'fleetops-telematics-action-button',
+                items: [
                     {
-                        label: 'Attach or change vehicle',
-                        fn: this.openAttachDeviceModal,
-                        permission: 'fleet-ops update device',
+                        icon: 'satellite-dish',
+                        text: 'Sync Devices',
+                        onClick: this.startDeviceSync,
                     },
                     {
-                        label: 'Review recent events',
-                        fn: this.openDeviceEvents,
-                        permission: 'fleet-ops view device-event',
+                        icon: 'link',
+                        text: 'Attach Unassigned',
+                        onClick: this.openAttachmentsForUnassigned,
                     },
                 ],
-                sortable: false,
-                filterable: false,
-                resizable: false,
-                searchable: false,
             },
         ];
     }
 
+    @tracked bulkActions = [];
+
+    get deviceTypeOptions() {
+        return fleetOpsOptions('deviceTypes');
+    }
+
+    get deviceStatusOptions() {
+        return fleetOpsOptions('deviceStatuses');
+    }
+
+    get columns() {
+        return buildDeviceTableColumns(this, { showProvider: false, deviceActionMode: 'panel', showDeviceStatus: false });
+    }
+
     @action refresh() {
-        return this.hostRouter.refresh();
+        if (this.refreshTask.isRunning) {
+            return;
+        }
+
+        return this.refreshTask.perform();
     }
 
     @action clearFilters() {
@@ -292,7 +243,13 @@ export default class ConnectivityTelematicsDetailsDevicesController extends Cont
         this.status = null;
         this.provider = null;
         this.attachment_state = null;
+        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;
     }
 
@@ -313,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 },
@@ -356,6 +393,10 @@ export default class ConnectivityTelematicsDetailsDevicesController extends Cont
         return this.syncDevices.perform();
     }
 
+    @task *refreshTask() {
+        yield this.hostRouter.refresh();
+    }
+
     @task *syncDevices() {
         try {
             yield this.fetch.post(`telematics/${this.telematic.id}/discover`);

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

@@ -2,6 +2,15 @@ import Controller from '@ember/controller';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
+import { task } from 'ember-concurrency';
+
+const severityOptions = [
+    { label: 'Info', value: 'info' },
+    { label: 'Warning', value: 'warning' },
+    { label: 'Error', value: 'error' },
+    { label: 'Critical', value: 'critical' },
+    { label: 'High', value: 'high' },
+];
 
 export default class ConnectivityTelematicsDetailsEventsController extends Controller {
     @service deviceEventActions;
@@ -99,15 +108,19 @@ export default class ConnectivityTelematicsDetailsEventsController extends Contr
         ];
     }
 
-    @tracked actionButtons = [
-        {
-            icon: 'refresh',
-            size: 'xs',
-            onClick: this.refresh,
-            helpText: this.intl.t('common.refresh'),
-            wrapperClass: 'fleetops-telematics-action-button',
-        },
-    ];
+    get actionButtons() {
+        return [
+            {
+                icon: 'refresh',
+                size: 'sm',
+                onClick: this.refresh,
+                helpText: this.intl.t('common.refresh'),
+                wrapperClass: 'fleetops-telematics-action-button',
+                isLoading: this.refreshTask.isRunning,
+                disabled: this.refreshTask.isRunning,
+            },
+        ];
+    }
 
     @tracked bulkActions = [];
 
@@ -136,6 +149,8 @@ export default class ConnectivityTelematicsDetailsEventsController extends Contr
                 filterComponentPlaceholder: 'Select device',
                 filterParam: 'device_uuid',
                 model: 'device',
+                modelNamePath: 'displayName',
+                query: { telematic_uuid: this.telematic?.id },
             },
             {
                 label: 'Provider',
@@ -155,7 +170,10 @@ export default class ConnectivityTelematicsDetailsEventsController extends Contr
                 sortable: true,
                 filterable: true,
                 filterParam: 'severity',
-                filterComponent: 'filter/string',
+                filterComponent: 'filter/multi-option',
+                filterOptions: severityOptions,
+                filterOptionLabel: 'label',
+                filterOptionValue: 'value',
             },
             {
                 label: 'Processed',
@@ -170,6 +188,8 @@ export default class ConnectivityTelematicsDetailsEventsController extends Contr
                     { label: 'Processed', value: 'processed' },
                     { label: 'Unprocessed', value: 'unprocessed' },
                 ],
+                filterOptionLabel: 'label',
+                filterOptionValue: 'value',
             },
             {
                 label: 'Occurred',
@@ -222,7 +242,11 @@ export default class ConnectivityTelematicsDetailsEventsController extends Contr
     }
 
     @action refresh() {
-        return this.hostRouter.refresh();
+        if (this.refreshTask.isRunning) {
+            return;
+        }
+
+        return this.refreshTask.perform();
     }
 
     @action clearFilters() {
@@ -241,4 +265,8 @@ export default class ConnectivityTelematicsDetailsEventsController extends Contr
         await this.deviceEventActions.markProcessed(deviceEvent);
         await this.hostRouter.refresh();
     }
+
+    @task *refreshTask() {
+        yield this.hostRouter.refresh();
+    }
 }

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

@@ -2,6 +2,7 @@ import Controller from '@ember/controller';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
+import { task } from 'ember-concurrency';
 import fleetOpsOptions from '../../../../utils/fleet-ops-options';
 
 export default class ConnectivityTelematicsDetailsSensorsController extends Controller {
@@ -10,7 +11,7 @@ export default class ConnectivityTelematicsDetailsSensorsController extends Cont
     @service hostRouter;
     @service intl;
 
-    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'status', 'type', 'device_uuid'];
+    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'status', 'type', 'device_uuid', 'last_reading_at'];
     @tracked telematic;
     @tracked page = 1;
     @tracked limit;
@@ -19,6 +20,7 @@ export default class ConnectivityTelematicsDetailsSensorsController extends Cont
     @tracked status;
     @tracked type;
     @tracked device_uuid;
+    @tracked last_reading_at;
 
     get sensors() {
         return Array.from(this.model ?? []);
@@ -37,7 +39,7 @@ export default class ConnectivityTelematicsDetailsSensorsController extends Cont
     }
 
     get hasActiveFilters() {
-        return Boolean(this.query || this.status || this.type || this.device_uuid);
+        return Boolean(this.query || this.status || this.type || this.device_uuid || this.last_reading_at);
     }
 
     get hasSensors() {
@@ -122,22 +124,26 @@ export default class ConnectivityTelematicsDetailsSensorsController extends Cont
         ];
     }
 
-    @tracked actionButtons = [
-        {
-            icon: 'refresh',
-            size: 'xs',
-            onClick: this.refresh,
-            helpText: this.intl.t('common.refresh'),
-            wrapperClass: 'fleetops-telematics-action-button',
-        },
-        {
-            icon: 'microchip',
-            text: 'View Devices',
-            size: 'xs',
-            onClick: this.goToDevices,
-            wrapperClass: 'fleetops-telematics-action-button',
-        },
-    ];
+    get actionButtons() {
+        return [
+            {
+                icon: 'refresh',
+                size: 'sm',
+                onClick: this.refresh,
+                helpText: this.intl.t('common.refresh'),
+                wrapperClass: 'fleetops-telematics-action-button',
+                isLoading: this.refreshTask.isRunning,
+                disabled: this.refreshTask.isRunning,
+            },
+            {
+                icon: 'microchip',
+                text: 'View Devices',
+                size: 'sm',
+                onClick: this.goToDevices,
+                wrapperClass: 'fleetops-telematics-action-button',
+            },
+        ];
+    }
 
     @tracked bulkActions = [];
 
@@ -179,6 +185,8 @@ export default class ConnectivityTelematicsDetailsSensorsController extends Cont
                 filterComponentPlaceholder: 'Select device',
                 filterParam: 'device_uuid',
                 model: 'device',
+                modelNamePath: 'displayName',
+                query: { telematic_uuid: this.telematic?.id },
             },
             {
                 label: 'Value',
@@ -208,6 +216,9 @@ export default class ConnectivityTelematicsDetailsSensorsController extends Cont
                 sortParam: 'last_reading_at',
                 resizable: true,
                 sortable: true,
+                filterable: true,
+                filterParam: 'last_reading_at',
+                filterComponent: 'filter/date',
             },
             {
                 label: '',
@@ -241,7 +252,11 @@ export default class ConnectivityTelematicsDetailsSensorsController extends Cont
     }
 
     @action refresh() {
-        return this.hostRouter.refresh();
+        if (this.refreshTask.isRunning) {
+            return;
+        }
+
+        return this.refreshTask.perform();
     }
 
     @action clearFilters() {
@@ -249,6 +264,7 @@ export default class ConnectivityTelematicsDetailsSensorsController extends Cont
         this.status = null;
         this.type = null;
         this.device_uuid = null;
+        this.last_reading_at = null;
         this.page = 1;
     }
 
@@ -267,4 +283,8 @@ export default class ConnectivityTelematicsDetailsSensorsController extends Cont
             queryParams: { device_id: sensor.device_uuid },
         });
     }
+
+    @task *refreshTask() {
+        yield this.hostRouter.refresh();
+    }
 }

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,

package/addon/controllers/maintenance/work-orders/index.js

@@ -1,16 +1,18 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
+import fleetOpsOptions from '../../../utils/fleet-ops-options';
 
 export default class MaintenanceWorkOrdersIndexController extends Controller {
     @service workOrderActions;
     @service intl;
 
-    @tracked queryParams = ['status', 'priority', 'page', 'limit', 'sort', 'query', 'public_id', 'created_at', 'updated_at'];
+    @tracked queryParams = ['category', 'status', 'priority', 'page', 'limit', 'sort', 'query', 'public_id', 'created_at', 'updated_at'];
     @tracked page = 1;
     @tracked limit;
     @tracked sort = '-created_at';
     @tracked public_id;
+    @tracked category;
     @tracked status;
     @tracked priority;
 
@@ -43,6 +45,21 @@ export default class MaintenanceWorkOrdersIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             { label: this.intl.t('column.subject'), valuePath: 'subject', resizable: true, sortable: true, filterable: true, filterParam: 'subject', filterComponent: 'filter/string' },
+            {
+                label: this.intl.t('column.category'),
+                valuePath: 'category',
+                cellComponent: 'table/cell/base',
+                humanize: true,
+                resizable: true,
+                sortable: true,
+                filterable: true,
+                filterParam: 'category',
+                filterComponent: 'filter/select',
+                filterOptionLabel: 'label',
+                filterOptionValue: 'value',
+                filterOptions: fleetOpsOptions('workOrderCategories'),
+                placeholder: 'Select work order category',
+            },
             {
                 label: this.intl.t('column.status'),
                 valuePath: 'status',