@fleetbase/fleetops-engine 0.6.20 → 0.6.21

package/addon/controllers/analytics/reports/index/edit.js

@@ -22,7 +22,7 @@ export default class AnalyticsReportsIndexEditController extends Controller {
             yield report.validate();
 
             try {
-                const result = yield report.executeQuery();
+                const result = yield report.execute();
                 report.fillResult(result);
 
                 yield report.save();

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

@@ -1,3 +1,24 @@
 import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
 
-export default class ConnectivityDevicesIndexDetailsController extends Controller {}
+export default class ConnectivityDevicesIndexDetailsController extends Controller {
+    @service hostRouter;
+
+    get tabs() {
+        return [
+            {
+                route: 'connectivity.devices.index.details.index',
+                label: 'Overview',
+            },
+        ];
+    }
+
+    get actionButtons() {
+        return [
+            {
+                icon: 'pencil',
+                fn: () => this.hostRouter.transitionTo('console.fleet-ops.connectivity.devices.index.edit', this.model),
+            },
+        ];
+    }
+}

package/addon/controllers/connectivity/devices/index/edit.js

@@ -1,3 +1,68 @@
 import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
 
-export default class ConnectivityDevicesIndexEditController extends Controller {}
+export default class ConnectivityDevicesIndexEditController extends Controller {
+    @service hostRouter;
+    @service intl;
+    @service notifications;
+    @service modalsManager;
+    @tracked overlay;
+
+    get actionButtons() {
+        return [
+            {
+                icon: 'eye',
+                fn: this.view,
+            },
+        ];
+    }
+
+    @task *save(device) {
+        try {
+            yield device.save();
+            this.overlay?.close();
+
+            yield this.hostRouter.transitionTo('console.fleet-ops.connectivity.devices.index.details', device);
+            this.notifications.success(
+                this.intl.t('common.resource-updated-success', {
+                    resource: this.intl.t('resource.device'),
+                    resourceName: device.name ?? device.serial_number,
+                })
+            );
+        } catch (err) {
+            this.notifications.serverError(err);
+        }
+    }
+
+    @action cancel() {
+        if (this.model.hasDirtyAttributes) {
+            return this.#confirmContinueWithUnsavedChanges(this.model);
+        }
+
+        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.devices.index');
+    }
+
+    @action view() {
+        if (this.model.hasDirtyAttributes) {
+            return this.#confirmContinueWithUnsavedChanges(this.model);
+        }
+
+        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.devices.index.details', this.model);
+    }
+
+    #confirmContinueWithUnsavedChanges(device, options = {}) {
+        return this.modalsManager.confirm({
+            title: this.intl.t('common.continue-without-saving'),
+            body: this.intl.t('common.continue-without-saving-prompt', { resource: this.intl.t('resource.device') }),
+            acceptButtonText: this.intl.t('common.continue'),
+            confirm: async () => {
+                device.rollbackAttributes();
+                await this.hostRouter.transitionTo('console.fleet-ops.connectivity.devices.index.details', device);
+            },
+            ...options,
+        });
+    }
+}

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

@@ -1,9 +1,11 @@
 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 ConnectivityDevicesIndexController extends Controller {
     @service deviceActions;
+    @service telematicActions;
     @service intl;
 
     /** query params */
@@ -55,24 +57,64 @@ export default class ConnectivityDevicesIndexController extends Controller {
     @tracked columns = [
         {
             label: this.intl.t('column.name'),
-            valuePath: 'name',
-            width: '180px',
+            valuePath: 'displayName',
             cellComponent: 'table/cell/anchor',
-            cellClassNames: 'uppercase',
             action: this.deviceActions.transition.view,
             permission: 'fleet-ops view device',
-            hidden: true,
             resizable: true,
             sortable: true,
             filterable: true,
             filterParam: 'name',
             filterComponent: 'filter/string',
         },
+        {
+            label: 'Telematic',
+            valuePath: 'telematic.provider',
+            cellComponent: 'table/cell/anchor',
+            action: this.telematicActions.transition.view,
+            permission: 'fleet-ops view telematic',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterComponent: 'filter/model',
+            filterComponentPlaceholder: 'Select telematic',
+            filterParam: 'telematic',
+            model: 'telematic',
+        },
+        {
+            label: 'Type',
+            valuePath: 'type',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'type',
+            filterComponent: 'filter/multi-option',
+            filterOptions: fleetOpsOptions('deviceTypes'),
+        },
+        {
+            label: 'Serial Number',
+            valuePath: 'serial_number',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'serial_number',
+            filterComponent: 'filter/string',
+        },
+        {
+            label: this.intl.t('column.status'),
+            valuePath: 'status',
+            cellComponent: 'table/cell/status',
+            width: '10%',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterComponent: 'filter/multi-option',
+            filterOptions: fleetOpsOptions('deviceStatuses'),
+        },
         {
             label: this.intl.t('column.created-at'),
             valuePath: 'createdAt',
             sortParam: 'created_at',
-            width: '10%',
             resizable: true,
             sortable: true,
             filterable: true,
@@ -96,18 +138,18 @@ export default class ConnectivityDevicesIndexController extends Controller {
             ddButtonText: false,
             ddButtonIcon: 'ellipsis-h',
             ddButtonIconPrefix: 'fas',
-            ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.Device') }),
+            ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.device') }),
             cellClassNames: 'overflow-visible',
             wrapperClass: 'flex items-center justify-end mx-2',
             width: '10%',
             actions: [
                 {
-                    label: this.intl.t('column.view-details'),
+                    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('column.edit-place'),
+                    label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.device') }),
                     fn: this.deviceActions.transition.edit,
                     permission: 'fleet-ops update device',
                 },
@@ -115,7 +157,7 @@ export default class ConnectivityDevicesIndexController extends Controller {
                     separator: true,
                 },
                 {
-                    label: this.intl.t('column.delete'),
+                    label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.device') }),
                     fn: this.deviceActions.delete,
                     permission: 'fleet-ops delete device',
                 },

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

@@ -4,6 +4,7 @@ import { tracked } from '@glimmer/tracking';
 
 export default class ConnectivityEventsIndexController extends Controller {
     @service deviceEventActions;
+    @service deviceActions;
     @service intl;
 
     /** query params */
@@ -29,14 +30,12 @@ export default class ConnectivityEventsIndexController extends Controller {
     /** columns */
     @tracked columns = [
         {
-            label: this.intl.t('column.name'),
-            valuePath: 'name',
-            width: '180px',
+            label: 'Event',
+            valuePath: 'event_type',
             cellComponent: 'table/cell/anchor',
             cellClassNames: 'uppercase',
             action: this.deviceEventActions.transition.view,
             permission: 'fleet-ops view device-event',
-            hidden: true,
             resizable: true,
             sortable: true,
             filterable: true,
@@ -44,40 +43,90 @@ export default class ConnectivityEventsIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
-            label: this.intl.t('column.created-at'),
-            valuePath: 'createdAt',
-            sortParam: 'created_at',
-            width: '10%',
+            label: 'Device',
+            valuePath: 'device.displayName',
+            cellComponent: 'table/cell/anchor',
+            action: this.deviceActions.transition.view,
+            permission: 'fleet-ops view device',
             resizable: true,
             sortable: true,
             filterable: true,
-            filterComponent: 'filter/date',
+            filterComponent: 'filter/model',
+            filterComponentPlaceholder: 'Select device',
+            filterParam: 'device',
+            model: 'device',
         },
         {
-            label: this.intl.t('column.updated-at'),
-            valuePath: 'updatedAt',
-            sortParam: 'updated_at',
-            width: '10%',
+            label: 'Provider',
+            valuePath: 'provider',
             resizable: true,
             sortable: true,
+            filterable: true,
+            filterParam: 'provider',
+            filterComponent: 'filter/string',
+        },
+        {
+            label: 'Severity',
+            valuePath: 'severity',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'severity',
+            filterComponent: 'filter/string',
+        },
+        {
+            label: 'IDENT',
+            valuePath: 'ident',
+            hidden: true,
+            resizable: true,
+            sortable: true,
+        },
+        {
+            label: 'Protocol',
+            valuePath: 'protocol',
             hidden: true,
+            resizable: true,
+            sortable: true,
+        },
+        {
+            label: 'State',
+            valuePath: 'state',
+            hidden: true,
+            resizable: true,
+            sortable: true,
+        },
+        {
+            label: 'Code',
+            valuePath: 'code',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'code',
+            filterComponent: 'filter/string',
+        },
+        {
+            label: this.intl.t('column.created-at'),
+            valuePath: 'createdAt',
+            sortParam: 'created_at',
+            width: '10%',
+            resizable: true,
+            sortable: 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 Event') }),
+            ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.device-event') }),
             cellClassNames: 'overflow-visible',
             wrapperClass: 'flex items-center justify-end mx-2',
             width: '10%',
             actions: [
                 {
-                    label: this.intl.t('column.view-details'),
+                    label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.device-event') }),
                     fn: this.deviceEventActions.transition.view,
                     permission: 'fleet-ops view device-event',
                 },

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

@@ -1,3 +1,24 @@
 import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
 
-export default class ConnectivitySensorsIndexDetailsController extends Controller {}
+export default class ConnectivitySensorsIndexDetailsController extends Controller {
+    @service hostRouter;
+
+    get tabs() {
+        return [
+            {
+                route: 'connectivity.sensors.index.details.index',
+                label: 'Overview',
+            },
+        ];
+    }
+
+    get actionButtons() {
+        return [
+            {
+                icon: 'pencil',
+                fn: () => this.hostRouter.transitionTo('console.fleet-ops.connectivity.sensors.index.edit', this.model),
+            },
+        ];
+    }
+}

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

@@ -1,3 +1,68 @@
 import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
 
-export default class ConnectivitySensorsIndexEditController extends Controller {}
+export default class ConnectivitySensorsIndexEditController extends Controller {
+    @service hostRouter;
+    @service intl;
+    @service notifications;
+    @service modalsManager;
+    @tracked overlay;
+
+    get actionButtons() {
+        return [
+            {
+                icon: 'eye',
+                fn: this.view,
+            },
+        ];
+    }
+
+    @task *save(sensor) {
+        try {
+            yield sensor.save();
+            this.overlay?.close();
+
+            yield this.hostRouter.transitionTo('console.fleet-ops.connectivity.sensors.index.details', sensor);
+            this.notifications.success(
+                this.intl.t('common.resource-updated-success', {
+                    resource: this.intl.t('resource.sensor'),
+                    resourceName: sensor.name ?? sensor.serial_number,
+                })
+            );
+        } catch (err) {
+            this.notifications.serverError(err);
+        }
+    }
+
+    @action cancel() {
+        if (this.model.hasDirtyAttributes) {
+            return this.#confirmContinueWithUnsavedChanges(this.model);
+        }
+
+        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.sensors.index');
+    }
+
+    @action view() {
+        if (this.model.hasDirtyAttributes) {
+            return this.#confirmContinueWithUnsavedChanges(this.model);
+        }
+
+        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.sensors.index.details', this.model);
+    }
+
+    #confirmContinueWithUnsavedChanges(sensor, options = {}) {
+        return this.modalsManager.confirm({
+            title: this.intl.t('common.continue-without-saving'),
+            body: this.intl.t('common.continue-without-saving-prompt', { resource: this.intl.t('resource.sensor') }),
+            acceptButtonText: this.intl.t('common.continue'),
+            confirm: async () => {
+                sensor.rollbackAttributes();
+                await this.hostRouter.transitionTo('console.fleet-ops.connectivity.sensors.index.details', sensor);
+            },
+            ...options,
+        });
+    }
+}

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

@@ -1,9 +1,12 @@
 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 ConnectivitySensorsIndexController extends Controller {
     @service sensorActions;
+    @service deviceActions;
+    @service telematicActions;
     @service intl;
 
     /** query params */
@@ -55,19 +58,76 @@ export default class ConnectivitySensorsIndexController extends Controller {
     @tracked columns = [
         {
             label: this.intl.t('column.name'),
-            valuePath: 'name',
+            valuePath: 'displayName',
             width: '180px',
             cellComponent: 'table/cell/anchor',
             cellClassNames: 'uppercase',
             action: this.sensorActions.transition.view,
             permission: 'fleet-ops view sensor',
-            hidden: true,
             resizable: true,
             sortable: true,
             filterable: true,
             filterParam: 'name',
             filterComponent: 'filter/string',
         },
+        {
+            label: 'Telematic',
+            valuePath: 'telematic.provider',
+            cellComponent: 'table/cell/anchor',
+            action: this.telematicActions.transition.view,
+            permission: 'fleet-ops view telematic',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterComponent: 'filter/model',
+            filterComponentPlaceholder: 'Select telematic',
+            filterParam: 'telematic',
+            model: 'telematic',
+        },
+        {
+            label: 'Device',
+            valuePath: 'device.displayName',
+            cellComponent: 'table/cell/anchor',
+            action: this.deviceActions.transition.view,
+            permission: 'fleet-ops view device',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterComponent: 'filter/model',
+            filterComponentPlaceholder: 'Select device',
+            filterParam: 'device',
+            model: 'device',
+        },
+        {
+            label: 'Type',
+            valuePath: 'type',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'type',
+            filterComponent: 'filter/multi-option',
+            filterOptions: fleetOpsOptions('sensorTypes'),
+        },
+        {
+            label: 'Serial Number',
+            valuePath: 'serial_number',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'serial_number',
+            filterComponent: 'filter/string',
+        },
+        {
+            label: this.intl.t('column.status'),
+            valuePath: 'status',
+            cellComponent: 'table/cell/status',
+            width: '10%',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterComponent: 'filter/multi-option',
+            filterOptions: fleetOpsOptions('sensorStatuses'),
+        },
         {
             label: this.intl.t('column.created-at'),
             valuePath: 'createdAt',
@@ -96,18 +156,18 @@ export default class ConnectivitySensorsIndexController extends Controller {
             ddButtonText: false,
             ddButtonIcon: 'ellipsis-h',
             ddButtonIconPrefix: 'fas',
-            ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.Sensor') }),
+            ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.sensor') }),
             cellClassNames: 'overflow-visible',
             wrapperClass: 'flex items-center justify-end mx-2',
             width: '10%',
             actions: [
                 {
-                    label: this.intl.t('column.view-details'),
+                    label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.sensor') }),
                     fn: this.sensorActions.transition.view,
                     permission: 'fleet-ops view sensor',
                 },
                 {
-                    label: this.intl.t('column.edit-place'),
+                    label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.sensor') }),
                     fn: this.sensorActions.transition.edit,
                     permission: 'fleet-ops update sensor',
                 },
@@ -115,7 +175,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
                     separator: true,
                 },
                 {
-                    label: this.intl.t('column.delete'),
+                    label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.sensor') }),
                     fn: this.sensorActions.delete,
                     permission: 'fleet-ops delete sensor',
                 },

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

@@ -1,3 +1,24 @@
 import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
 
-export default class ConnectivityTelematicsIndexDetailsController extends Controller {}
+export default class ConnectivityTelematicsIndexDetailsController extends Controller {
+    @service hostRouter;
+
+    get tabs() {
+        return [
+            {
+                route: 'connectivity.telematics.index.details.index',
+                label: 'Overview',
+            },
+        ];
+    }
+
+    get actionButtons() {
+        return [
+            {
+                icon: 'pencil',
+                fn: () => this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index.edit', this.model),
+            },
+        ];
+    }
+}

package/addon/controllers/connectivity/telematics/index/edit.js

@@ -1,3 +1,68 @@
 import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
 
-export default class ConnectivityTelematicsIndexEditController extends Controller {}
+export default class ConnectivityTelematicsIndexEditController extends Controller {
+    @service hostRouter;
+    @service intl;
+    @service notifications;
+    @service modalsManager;
+    @tracked overlay;
+
+    get actionButtons() {
+        return [
+            {
+                icon: 'eye',
+                fn: this.view,
+            },
+        ];
+    }
+
+    @task *save(telematic) {
+        try {
+            yield telematic.save();
+            this.overlay?.close();
+
+            yield this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index.details', telematic);
+            this.notifications.success(
+                this.intl.t('common.resource-updated-success', {
+                    resource: this.intl.t('resource.telematic'),
+                    resourceName: telematic.name ?? telematic.provider,
+                })
+            );
+        } catch (err) {
+            this.notifications.serverError(err);
+        }
+    }
+
+    @action cancel() {
+        if (this.model.hasDirtyAttributes) {
+            return this.#confirmContinueWithUnsavedChanges(this.model);
+        }
+
+        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index');
+    }
+
+    @action view() {
+        if (this.model.hasDirtyAttributes) {
+            return this.#confirmContinueWithUnsavedChanges(this.model);
+        }
+
+        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index.details', this.model);
+    }
+
+    #confirmContinueWithUnsavedChanges(telematic, options = {}) {
+        return this.modalsManager.confirm({
+            title: this.intl.t('common.continue-without-saving'),
+            body: this.intl.t('common.continue-without-saving-prompt', { resource: this.intl.t('resource.telematic') }),
+            acceptButtonText: this.intl.t('common.continue'),
+            confirm: async () => {
+                telematic.rollbackAttributes();
+                await this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index.details', telematic);
+            },
+            ...options,
+        });
+    }
+}