@fleetbase/fleetops-engine 0.6.69 → 0.6.71

package/addon/components/widget/live-fleet.hbs

@@ -28,7 +28,8 @@
 
                 {{#if this.load.isIdle}}
                     {{! Drivers — fleetops' rotating tracking-marker matches the operational
-                         live-map's look and animates on heading changes. }}
+                         live-map's look and animates on heading changes. The popup and tooltip
+                         are the live map's own cards, fed from each marker's index-resource card. }}
                     {{#each this.drivers as |driver|}}
                         <layers.tracking-marker
                             @id={{driver.uuid}}
@@ -39,28 +40,11 @@
                             @draggable={{false}}
                             as |marker|
                         >
-                            <marker.popup @maxWidth="240" @minWidth="180">
-                                <div class="flex flex-row gap-2">
-                                    <div class="w-9 h-9 flex-shrink-0">
-                                        <img src={{or driver.avatar_url driver.vehicle_avatar}} alt={{driver.name}} class="rounded-md w-9 h-9 object-cover shadow-sm" />
-                                    </div>
-                                    <div class="flex-1 min-w-0">
-                                        <div class="text-xs font-semibold truncate">{{or driver.name "Driver"}}</div>
-                                        <div class="text-[11px]">
-                                            {{#if driver.current_order_uuid}}
-                                                <span class="text-blue-500"><FaIcon @icon="bolt" class="mr-1" />On order</span>
-                                            {{else if driver.online}}
-                                                <span class="text-green-500"><FaIcon @icon="circle" @size="2xs" class="mr-1" />Online</span>
-                                            {{else}}
-                                                <span class="text-gray-400"><FaIcon @icon="circle" @size="2xs" class="mr-1" />Offline</span>
-                                            {{/if}}
-                                        </div>
-                                        <div class="text-[10px] text-gray-400 mt-0.5 truncate">{{driver.lat}}, {{driver.lng}}</div>
-                                    </div>
-                                </div>
+                            <marker.popup @maxWidth="500" @minWidth="225">
+                                <Map::MarkerCard::Driver @driver={{or driver.card driver}} />
                             </marker.popup>
                             <marker.tooltip @permanent={{false}} @sticky={{true}} @direction="top">
-                                <div class="text-[11px] font-semibold">{{or driver.name "Driver"}}</div>
+                                <Map::MarkerCard::Driver @driver={{or driver.card driver}} @variant="tooltip" />
                             </marker.tooltip>
                         </layers.tracking-marker>
                     {{/each}}
@@ -77,27 +61,11 @@
                             @draggable={{false}}
                             as |marker|
                         >
-                            <marker.popup @maxWidth="240" @minWidth="180">
-                                <div class="flex flex-row gap-2">
-                                    <div class="w-9 h-9 flex-shrink-0">
-                                        <img src={{or vehicle.photo_url vehicle.avatar_url}} alt={{vehicle.name}} class="rounded-md w-9 h-9 object-cover shadow-sm" />
-                                    </div>
-                                    <div class="flex-1 min-w-0">
-                                        <div class="text-xs font-semibold truncate">{{or vehicle.name "Vehicle"}}</div>
-                                        {{#if vehicle.plate_number}}
-                                            <div class="text-[10px] text-gray-500 truncate">{{vehicle.plate_number}}</div>
-                                        {{/if}}
-                                        {{#if vehicle.driver_name}}
-                                            <div class="text-[11px] text-gray-600 dark:text-gray-300 truncate">
-                                                <FaIcon @icon="id-card" class="mr-1 text-gray-400" />{{vehicle.driver_name}}
-                                            </div>
-                                        {{/if}}
-                                        <div class="text-[10px] text-gray-400 mt-0.5 truncate">{{vehicle.lat}}, {{vehicle.lng}}</div>
-                                    </div>
-                                </div>
+                            <marker.popup @maxWidth="500" @minWidth="225">
+                                <Map::MarkerCard::Vehicle @vehicle={{or vehicle.card vehicle}} />
                             </marker.popup>
                             <marker.tooltip @permanent={{false}} @sticky={{true}} @direction="top">
-                                <div class="text-[11px] font-semibold">{{or vehicle.name "Vehicle"}}</div>
+                                <Map::MarkerCard::Vehicle @vehicle={{or vehicle.card vehicle}} @variant="tooltip" />
                             </marker.tooltip>
                         </layers.tracking-marker>
                     {{/each}}

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

@@ -8,7 +8,7 @@ export default class AnalyticsReportsIndexController extends Controller {
     @service intl;
 
     /** query params */
-    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'name', 'created_at'];
+    @tracked queryParams = this.reportActions.queryParamsFor(['page', 'limit', 'sort', 'query', 'public_id', 'name', 'created_at']);
     @tracked page = 1;
     @tracked limit;
     @tracked sort = '-created_at';
@@ -20,15 +20,18 @@ export default class AnalyticsReportsIndexController extends Controller {
     get actionButtons() {
         return [
             {
+                id: 'refresh',
                 icon: 'refresh',
                 onClick: this.reportActions.refresh,
                 helpText: this.intl.t('common.refresh'),
             },
             {
+                id: 'create',
                 text: this.intl.t('common.new'),
                 type: 'primary',
                 icon: 'plus',
                 onClick: this.reportActions.transition.create,
+                permission: 'iam create report',
             },
         ];
     }
@@ -36,9 +39,11 @@ export default class AnalyticsReportsIndexController extends Controller {
     get bulkActions() {
         return [
             {
+                id: 'bulk-delete',
                 label: 'Delete selected...',
                 class: 'text-red-500',
                 fn: this.reportActions.bulkDelete,
+                permission: 'iam delete report',
             },
         ];
     }
@@ -46,6 +51,7 @@ export default class AnalyticsReportsIndexController extends Controller {
     get columns() {
         return [
             {
+                id: 'title',
                 sticky: true,
                 label: 'Title',
                 valuePath: 'title',
@@ -57,6 +63,7 @@ export default class AnalyticsReportsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'public-id',
                 label: 'ID',
                 valuePath: 'public_id',
                 cellComponent: 'click-to-copy',
@@ -67,6 +74,7 @@ export default class AnalyticsReportsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -79,19 +87,25 @@ export default class AnalyticsReportsIndexController extends Controller {
                 width: 60,
                 actions: [
                     {
+                        id: 'view',
                         label: 'View report...',
                         fn: this.reportActions.transition.view,
+                        permission: 'iam view report',
                     },
                     {
+                        id: 'edit',
                         label: 'Edit report...',
                         fn: this.reportActions.transition.edit,
+                        permission: 'iam update report',
                     },
                     {
                         separator: true,
                     },
                     {
+                        id: 'delete',
                         label: 'Delete report...',
                         fn: this.reportActions.delete,
+                        permission: 'iam delete report',
                     },
                 ],
                 sortable: false,

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

@@ -39,6 +39,7 @@ export default class ConnectivityDevicesIndexDetailsController extends Controlle
                 permission: 'fleet-ops update device',
             },
             {
+                id: 'more',
                 icon: 'ellipsis-h',
                 iconPrefix: 'fas',
                 renderInPlace: true,

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

@@ -17,7 +17,7 @@ export default class ConnectivityDevicesIndexController extends Controller {
     @service trailerActions;
 
     /** query params */
-    @tracked queryParams = [
+    @tracked queryParams = this.deviceActions.queryParamsFor([
         'name',
         'status',
         'attachment_state',
@@ -36,7 +36,7 @@ export default class ConnectivityDevicesIndexController extends Controller {
         'public_id',
         'created_at',
         'updated_at',
-    ];
+    ]);
     @tracked page = 1;
     @tracked limit;
     @tracked sort = '-created_at';
@@ -56,37 +56,46 @@ export default class ConnectivityDevicesIndexController extends Controller {
     /** action buttons */
     @tracked actionButtons = [
         {
+            id: 'refresh',
             icon: 'refresh',
             onClick: this.deviceActions.refresh,
             helpText: this.intl.t('common.refresh'),
         },
         {
+            id: 'create',
             text: this.intl.t('common.new'),
             type: 'primary',
             icon: 'plus',
             onClick: this.deviceActions.transition.create,
+            permission: 'fleet-ops create device',
         },
         {
+            id: 'import',
             text: this.intl.t('common.import'),
             type: 'magic',
             icon: 'upload',
             onClick: this.deviceActions.import,
+            permission: 'fleet-ops import device',
         },
         {
+            id: 'export',
             text: this.intl.t('common.export'),
             icon: 'long-arrow-up',
             iconClass: 'rotate-icon-45',
             wrapperClass: 'hidden md:flex',
             onClick: this.deviceActions.export,
+            permission: 'fleet-ops export device',
         },
     ];
 
     /** bulk action buttons */
     @tracked bulkActions = [
         {
+            id: 'bulk-delete',
             label: 'Delete selected...',
             class: 'text-red-500',
             fn: this.deviceActions.bulkDelete,
+            permission: 'fleet-ops delete device',
         },
     ];
 
@@ -107,6 +116,7 @@ export default class ConnectivityDevicesIndexController extends Controller {
                 separator: true,
             },
             {
+                id: '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

@@ -78,7 +78,20 @@ export default class ConnectivityEventsIndexController extends Controller {
     @service telematicActions;
 
     /** query params */
-    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'telematic', 'device', 'event_type', 'severity', 'processed', 'occurred_at', 'created_at', 'updated_at'];
+    @tracked queryParams = this.deviceEventActions.queryParamsFor([
+        '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';
@@ -95,6 +108,7 @@ export default class ConnectivityEventsIndexController extends Controller {
     /** action buttons */
     @tracked actionButtons = [
         {
+            id: 'refresh',
             icon: 'refresh',
             onClick: this.deviceEventActions.refresh,
             helpText: this.intl.t('common.refresh'),
@@ -107,6 +121,7 @@ export default class ConnectivityEventsIndexController extends Controller {
     /** columns */
     @tracked columns = [
         {
+            id: 'event-type',
             sticky: true,
             label: 'Event',
             valuePath: 'event_type',
@@ -121,6 +136,7 @@ export default class ConnectivityEventsIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
+            id: 'device-display-name',
             label: 'Device',
             valuePath: 'device.displayName',
             cellComponent: 'cell/device-identity',
@@ -137,6 +153,7 @@ export default class ConnectivityEventsIndexController extends Controller {
             modelNamePath: 'displayName',
         },
         {
+            id: 'provider',
             label: 'Provider',
             valuePath: 'provider',
             cellComponent: 'cell/telematic-identity',
@@ -152,6 +169,7 @@ export default class ConnectivityEventsIndexController extends Controller {
             model: 'telematic',
         },
         {
+            id: 'severity',
             label: 'Severity',
             valuePath: 'severity',
             cellComponent: 'table/cell/status',
@@ -165,12 +183,14 @@ export default class ConnectivityEventsIndexController extends Controller {
             filterOptionValue: 'value',
         },
         {
+            id: 'message',
             label: 'Message',
             valuePath: 'message',
             resizable: true,
             sortable: false,
         },
         {
+            id: 'code',
             label: 'Code',
             valuePath: 'code',
             resizable: true,
@@ -180,6 +200,7 @@ export default class ConnectivityEventsIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
+            id: 'ident',
             label: 'IDENT',
             valuePath: 'ident',
             hidden: true,
@@ -187,6 +208,7 @@ export default class ConnectivityEventsIndexController extends Controller {
             sortable: true,
         },
         {
+            id: 'protocol',
             label: 'Protocol',
             valuePath: 'protocol',
             hidden: true,
@@ -194,6 +216,7 @@ export default class ConnectivityEventsIndexController extends Controller {
             sortable: true,
         },
         {
+            id: 'state',
             label: 'State',
             valuePath: 'state',
             hidden: true,
@@ -201,6 +224,7 @@ export default class ConnectivityEventsIndexController extends Controller {
             sortable: true,
         },
         {
+            id: 'processed-at',
             label: 'Processed',
             valuePath: 'processedAt',
             sortParam: 'processed_at',
@@ -214,6 +238,7 @@ export default class ConnectivityEventsIndexController extends Controller {
             filterOptionValue: 'value',
         },
         {
+            id: 'occurred-at',
             label: 'Occurred',
             valuePath: 'occurredAt',
             sortParam: 'occurred_at',
@@ -224,6 +249,7 @@ export default class ConnectivityEventsIndexController extends Controller {
             filterComponent: 'filter/date',
         },
         {
+            id: 'created-at',
             label: this.intl.t('column.created-at'),
             valuePath: 'createdAt',
             sortParam: 'created_at',
@@ -234,6 +260,7 @@ export default class ConnectivityEventsIndexController extends Controller {
             filterComponent: 'filter/date',
         },
         {
+            id: 'updated-at',
             label: this.intl.t('column.updated-at'),
             valuePath: 'updatedAt',
             sortParam: 'updated_at',
@@ -245,6 +272,7 @@ export default class ConnectivityEventsIndexController extends Controller {
             hidden: true,
         },
         {
+            id: 'row-actions',
             label: '',
             cellComponent: 'table/cell/dropdown',
             ddButtonText: false,
@@ -257,11 +285,13 @@ export default class ConnectivityEventsIndexController extends Controller {
             width: 60,
             actions: [
                 {
+                    id: 'view',
                     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',
                 },
                 {
+                    id: 'mark-processed',
                     label: 'Mark processed',
                     fn: this.markProcessed,
                     permission: 'fleet-ops update device-event',

package/addon/controllers/connectivity/fuel-providers/index.js

@@ -40,6 +40,7 @@ export default class ConnectivityFuelProvidersIndexController extends Controller
                 text: 'Connect Integration',
                 type: 'primary',
                 onClick: () => this.fuelIntegrationActions.transition.create(),
+                permission: 'fleet-ops create fuel-provider-connection',
             },
         ];
     }
@@ -51,6 +52,7 @@ export default class ConnectivityFuelProvidersIndexController extends Controller
             {
                 label: `Sync ${selected.length} selected`,
                 fn: () => selected.forEach((connection) => this.syncConnection(connection)),
+                permission: 'fleet-ops sync fuel-provider-connection',
             },
         ];
     }
@@ -125,11 +127,11 @@ export default class ConnectivityFuelProvidersIndexController extends Controller
                 sticky: 'right',
                 width: 60,
                 actions: [
-                    { label: 'Open Integration', fn: this.openConnection },
-                    { label: 'Edit Settings', fn: this.editConnection },
+                    { label: 'Open Integration', fn: this.openConnection, permission: 'fleet-ops view fuel-provider-connection' },
+                    { label: 'Edit Settings', fn: this.editConnection, permission: 'fleet-ops update fuel-provider-connection' },
                     { separator: true },
-                    { label: 'Test Connection', fn: this.testConnection },
-                    { label: 'Sync Transactions', fn: this.syncConnection },
+                    { label: 'Test Connection', fn: this.testConnection, permission: 'fleet-ops update fuel-provider-connection' },
+                    { label: 'Sync Transactions', fn: this.syncConnection, permission: 'fleet-ops sync fuel-provider-connection' },
                 ],
                 sortable: false,
                 filterable: false,

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

@@ -7,7 +7,7 @@ export default class ConnectivitySensorsIndexDetailsController extends Controlle
     @service hostRouter;
 
     get tabs() {
-        const registeredTabs = this.menuService.getMenuItems('fleet-ops:component:place:details');
+        const registeredTabs = this.menuService.getMenuItems('fleet-ops:component:sensor:details');
         return [
             {
                 route: 'connectivity.sensors.index.details.index',

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

@@ -65,7 +65,21 @@ export default class ConnectivitySensorsIndexController extends Controller {
     @service store;
 
     /** query params */
-    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'telematic', 'device', 'type', 'status', 'serial_number', 'imei', 'last_reading_at', 'created_at', 'updated_at'];
+    @tracked queryParams = this.sensorActions.queryParamsFor([
+        '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';
@@ -83,43 +97,53 @@ export default class ConnectivitySensorsIndexController extends Controller {
     /** action buttons */
     @tracked actionButtons = [
         {
+            id: 'refresh',
             icon: 'refresh',
             onClick: this.sensorActions.refresh,
             helpText: this.intl.t('common.refresh'),
         },
         {
+            id: 'create',
             text: this.intl.t('common.new'),
             type: 'primary',
             icon: 'plus',
             onClick: this.sensorActions.transition.create,
+            permission: 'fleet-ops create sensor',
         },
         {
+            id: 'import',
             text: this.intl.t('common.import'),
             type: 'magic',
             icon: 'upload',
             onClick: this.sensorActions.import,
+            permission: 'fleet-ops import sensor',
         },
         {
+            id: 'export',
             text: this.intl.t('common.export'),
             icon: 'long-arrow-up',
             iconClass: 'rotate-icon-45',
             wrapperClass: 'hidden md:flex',
             onClick: this.sensorActions.export,
+            permission: 'fleet-ops export sensor',
         },
     ];
 
     /** bulk action buttons */
     @tracked bulkActions = [
         {
+            id: 'bulk-delete',
             label: 'Delete selected...',
             class: 'text-red-500',
             fn: this.sensorActions.bulkDelete,
+            permission: 'fleet-ops delete sensor',
         },
     ];
 
     /** columns */
     @tracked columns = [
         {
+            id: 'display-name',
             sticky: true,
             label: this.intl.t('column.name'),
             valuePath: 'displayName',
@@ -134,6 +158,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
+            id: 'telematic-provider',
             label: 'Telematic',
             valuePath: 'telematic.provider',
             cellComponent: 'cell/telematic-identity',
@@ -149,6 +174,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             model: 'telematic',
         },
         {
+            id: 'device-display-name',
             label: 'Device',
             valuePath: 'device.displayName',
             cellComponent: 'cell/device-identity',
@@ -166,6 +192,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             query: this.telematic ? { telematic_uuid: this.telematic } : undefined,
         },
         {
+            id: 'type',
             label: 'Type',
             valuePath: 'type',
             cellComponent: 'table/cell/base',
@@ -180,18 +207,21 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterOptionValue: 'value',
         },
         {
+            id: 'last-value',
             label: 'Last Value',
             valuePath: 'last_value',
             resizable: true,
             sortable: true,
         },
         {
+            id: 'unit',
             label: 'Unit',
             valuePath: 'unit',
             resizable: true,
             sortable: true,
         },
         {
+            id: 'status',
             label: this.intl.t('column.status'),
             valuePath: 'status',
             cellComponent: 'table/cell/status',
@@ -204,6 +234,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterOptionValue: 'value',
         },
         {
+            id: 'threshold-status',
             label: 'Threshold',
             valuePath: 'threshold_status',
             cellComponent: 'table/cell/status',
@@ -211,6 +242,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             sortable: true,
         },
         {
+            id: 'serial-number',
             label: 'Serial Number',
             valuePath: 'serial_number',
             resizable: true,
@@ -220,6 +252,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
+            id: 'imei',
             label: 'IMEI',
             valuePath: 'imei',
             resizable: true,
@@ -229,6 +262,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
+            id: 'last-reading-at',
             label: 'Last Reading',
             valuePath: 'lastReadingAt',
             sortParam: 'last_reading_at',
@@ -239,6 +273,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterComponent: 'filter/date',
         },
         {
+            id: 'created-at',
             label: this.intl.t('column.created-at'),
             valuePath: 'createdAt',
             sortParam: 'created_at',
@@ -249,6 +284,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterComponent: 'filter/date',
         },
         {
+            id: 'updated-at',
             label: this.intl.t('column.updated-at'),
             valuePath: 'updatedAt',
             sortParam: 'updated_at',
@@ -260,6 +296,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterComponent: 'filter/date',
         },
         {
+            id: 'row-actions',
             label: '',
             cellComponent: 'table/cell/dropdown',
             ddButtonText: false,
@@ -272,11 +309,13 @@ export default class ConnectivitySensorsIndexController extends Controller {
             width: 60,
             actions: [
                 {
+                    id: 'view',
                     label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.sensor') }),
                     fn: this.sensorActions.transition.view,
                     permission: 'fleet-ops view sensor',
                 },
                 {
+                    id: 'edit',
                     label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.sensor') }),
                     fn: this.sensorActions.transition.edit,
                     permission: 'fleet-ops update sensor',
@@ -285,6 +324,7 @@ export default class ConnectivitySensorsIndexController extends Controller {
                     separator: true,
                 },
                 {
+                    id: '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.js

@@ -38,12 +38,14 @@ export default class ConnectivityTelematicsIndexController extends Controller {
             type: 'primary',
             icon: 'plus',
             onClick: this.telematicActions.transition.create,
+            permission: 'fleet-ops create telematic',
         },
         {
             text: this.intl.t('common.import'),
             type: 'magic',
             icon: 'upload',
             onClick: this.telematicActions.import,
+            permission: 'fleet-ops import telematic',
         },
         {
             text: this.intl.t('common.export'),
@@ -51,6 +53,7 @@ export default class ConnectivityTelematicsIndexController extends Controller {
             iconClass: 'rotate-icon-45',
             wrapperClass: 'hidden md:flex',
             onClick: this.telematicActions.export,
+            permission: 'fleet-ops export telematic',
         },
     ];
 
@@ -60,6 +63,7 @@ export default class ConnectivityTelematicsIndexController extends Controller {
             label: 'Delete selected...',
             class: 'text-red-500',
             fn: this.telematicActions.bulkDelete,
+            permission: 'fleet-ops delete telematic',
         },
     ];