@fleetbase/fleetops-engine 0.6.54 → 0.6.56

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

@@ -1,19 +1,96 @@
 import Controller from '@ember/controller';
+import { action, get } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
+const severityOptions = [
+    { label: 'Info', value: 'info' },
+    { label: 'Warning', value: 'warning' },
+    { label: 'Error', value: 'error' },
+    { label: 'Critical', value: 'critical' },
+    { label: 'High', value: 'high' },
+];
+
+const processedOptions = [
+    { label: 'Processed', value: 'processed' },
+    { label: 'Unprocessed', value: 'unprocessed' },
+];
+
+function eventDevice(event) {
+    const device = get(event, 'device');
+
+    if (device) {
+        return device;
+    }
+
+    const id = get(event, 'device_uuid');
+    const deviceId = get(event, 'device_id') ?? get(event, 'provider_device_id') ?? get(event, 'ident');
+    const name = get(event, 'device_name') ?? deviceId;
+    const imei = get(event, 'device_imei') ?? get(event, 'imei') ?? get(event, 'ident');
+
+    if (!id && !name && !imei && !deviceId) {
+        return null;
+    }
+
+    return {
+        id,
+        displayName: name,
+        name,
+        imei,
+        device_id: deviceId,
+        ident: get(event, 'ident'),
+        serial_number: get(event, 'device_serial_number'),
+        connection_status: get(event, 'device_connection_status'),
+        status: get(event, 'device_status'),
+        photo_url: get(event, 'device_photo_url') ?? get(event, 'photo_url'),
+    };
+}
+
+function eventTelematic(event) {
+    const telematic = get(event, 'device.telematic') ?? get(event, 'telematic');
+
+    if (telematic) {
+        return telematic;
+    }
+
+    const id = get(event, 'telematic_uuid');
+    const name = get(event, 'telematic_name');
+    const provider = get(event, 'provider');
+
+    if (!id && !name && !provider) {
+        return null;
+    }
+
+    return {
+        id,
+        name: name ?? provider,
+        provider,
+        provider_descriptor: get(event, 'provider_descriptor'),
+    };
+}
+
 export default class ConnectivityEventsIndexController extends Controller {
     @service deviceEventActions;
     @service deviceActions;
+    @service hostRouter;
     @service intl;
+    @service store;
+    @service telematicActions;
 
     /** query params */
-    @tracked queryParams = ['name', 'page', 'limit', 'sort', 'query', 'public_id', 'created_at', 'updated_at'];
+    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'telematic', 'device', 'event_type', 'severity', 'processed', 'occurred_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 event_type;
+    @tracked severity;
+    @tracked processed;
+    @tracked occurred_at;
+    @tracked created_at;
+    @tracked updated_at;
 
     /** action buttons */
     @tracked actionButtons = [
@@ -40,13 +117,17 @@ export default class ConnectivityEventsIndexController extends Controller {
             resizable: true,
             sortable: true,
             filterable: true,
+            filterParam: 'event_type',
             filterComponent: 'filter/string',
         },
         {
             label: 'Device',
             valuePath: 'device.displayName',
-            cellComponent: 'table/cell/anchor',
-            action: this.deviceActions.transition.view,
+            cellComponent: 'cell/device-identity',
+            resourcePath: eventDevice,
+            compact: true,
+            showStatus: false,
+            action: this.openDevice,
             permission: 'fleet-ops view device',
             resizable: true,
             sortable: true,
@@ -55,23 +136,50 @@ export default class ConnectivityEventsIndexController extends Controller {
             filterComponentPlaceholder: 'Select device',
             filterParam: 'device',
             model: 'device',
+            modelNamePath: 'displayName',
         },
         {
             label: 'Provider',
             valuePath: 'provider',
+            cellComponent: 'cell/telematic-provider',
+            resourcePath: eventTelematic,
+            compact: true,
+            action: this.openTelematic,
+            permission: 'fleet-ops view telematic',
             resizable: true,
             sortable: true,
             filterable: true,
-            filterParam: 'provider',
-            filterComponent: 'filter/string',
+            filterParam: 'telematic',
+            filterComponent: 'filter/model',
+            filterComponentPlaceholder: 'Select telematic',
+            model: 'telematic',
         },
         {
             label: 'Severity',
             valuePath: 'severity',
+            cellComponent: 'table/cell/status',
             resizable: true,
             sortable: true,
             filterable: true,
             filterParam: 'severity',
+            filterComponent: 'filter/multi-option',
+            filterOptions: severityOptions,
+            filterOptionLabel: 'label',
+            filterOptionValue: 'value',
+        },
+        {
+            label: 'Message',
+            valuePath: 'message',
+            resizable: true,
+            sortable: false,
+        },
+        {
+            label: 'Code',
+            valuePath: 'code',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'code',
             filterComponent: 'filter/string',
         },
         {
@@ -96,13 +204,27 @@ export default class ConnectivityEventsIndexController extends Controller {
             sortable: true,
         },
         {
-            label: 'Code',
-            valuePath: 'code',
+            label: 'Processed',
+            valuePath: 'processedAt',
+            sortParam: 'processed_at',
             resizable: true,
             sortable: true,
             filterable: true,
-            filterParam: 'code',
-            filterComponent: 'filter/string',
+            filterParam: 'processed',
+            filterComponent: 'filter/multi-option',
+            filterOptions: processedOptions,
+            filterOptionLabel: 'label',
+            filterOptionValue: 'value',
+        },
+        {
+            label: 'Occurred',
+            valuePath: 'occurredAt',
+            sortParam: 'occurred_at',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'occurred_at',
+            filterComponent: 'filter/date',
         },
         {
             label: this.intl.t('column.created-at'),
@@ -111,7 +233,19 @@ export default class ConnectivityEventsIndexController extends Controller {
             resizable: true,
             sortable: true,
             filterable: true,
+            filterParam: 'created_at',
+            filterComponent: 'filter/date',
+        },
+        {
+            label: this.intl.t('column.updated-at'),
+            valuePath: 'updatedAt',
+            sortParam: 'updated_at',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'updated_at',
             filterComponent: 'filter/date',
+            hidden: true,
         },
         {
             label: '',
@@ -130,6 +264,11 @@ export default class ConnectivityEventsIndexController extends Controller {
                     fn: this.deviceEventActions.transition.view,
                     permission: 'fleet-ops view device-event',
                 },
+                {
+                    label: 'Mark processed',
+                    fn: this.markProcessed,
+                    permission: 'fleet-ops update device-event',
+                },
             ],
             sortable: false,
             filterable: false,
@@ -137,4 +276,41 @@ export default class ConnectivityEventsIndexController 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);
+        }
+    }
+
+    @action async markProcessed(deviceEvent) {
+        await this.deviceEventActions.markProcessed(deviceEvent);
+        await this.hostRouter.refresh();
+    }
 }

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,25 +164,34 @@ 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,
             filterParam: 'type',
             filterComponent: 'filter/multi-option',
             filterOptions: fleetOpsOptions('sensorTypes'),
+            filterOptionLabel: 'label',
+            filterOptionValue: 'value',
         },
         {
-            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'),
@@ -126,6 +202,43 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterable: true,
             filterComponent: 'filter/multi-option',
             filterOptions: fleetOpsOptions('sensorStatuses'),
+            filterOptionLabel: 'label',
+            filterOptionValue: 'value',
+        },
+        {
+            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'),
@@ -134,6 +247,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             resizable: true,
             sortable: true,
             filterable: true,
+            filterParam: 'created_at',
             filterComponent: 'filter/date',
         },
         {
@@ -144,9 +258,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 +298,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);
+        }
+    }
 }