@fleetbase/fleetops-engine 0.6.65 → 0.6.66

package/addon/controllers/management/issues/index/details.js

@@ -13,39 +13,7 @@ export default class ManagementIssuesIndexDetailsController extends Controller {
         },
     ];
 
-    get isClosed() {
-        return ['closed', 'resolved', 'completed'].includes(this.model?.status);
-    }
-
     get actionButtons() {
-        const workflowItems = [
-            {
-                label: 'Change Status',
-                icon: 'arrows-rotate',
-                fn: () => this.issueActions.openStatusModal(this.model, { onSaved: () => this.refreshIssue() }),
-            },
-            {
-                label: 'Assign Issue',
-                icon: 'user-check',
-                fn: () => this.issueActions.openAssignModal(this.model, { onSaved: () => this.refreshIssue() }),
-            },
-        ];
-
-        if (this.isClosed) {
-            workflowItems.push({
-                label: 'Re-open Issue',
-                icon: 'rotate-left',
-                fn: () => this.issueActions.confirmReopenIssue(this.model, { onSaved: () => this.refreshIssue() }),
-            });
-        } else {
-            workflowItems.push({
-                label: 'Close Issue',
-                icon: 'circle-check',
-                class: 'text-green-600 dark:text-green-400',
-                fn: () => this.issueActions.openCloseIssueModal(this.model, { onSaved: () => this.refreshIssue() }),
-            });
-        }
-
         return [
             {
                 icon: 'pencil',
@@ -54,7 +22,7 @@ export default class ManagementIssuesIndexDetailsController extends Controller {
             {
                 icon: 'ellipsis',
                 type: 'default',
-                items: workflowItems,
+                items: this.issueActions.workflowItems(this.model, () => this.refreshIssue()),
             },
         ];
     }

package/addon/controllers/management/issues/index.js

@@ -1,5 +1,6 @@
 import Controller from '@ember/controller';
-import { get } from '@ember/object';
+import { buildIdentityStub } from '../../../utils/identity-cell-resource';
+import relationValue from '../../../utils/relation-value';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import fleetOpsOptions from '../../../utils/fleet-ops-options';
@@ -137,6 +138,8 @@ export default class ManagementIssuesIndexController extends Controller {
             {
                 label: this.intl.t('column.reporter'),
                 valuePath: 'reporter_name',
+                cellComponent: 'table/cell/user-identity',
+                resourcePath: (issue) => relationValue(issue, 'reporter') ?? buildIdentityStub(issue, { type: 'user', nameKey: 'reporter_name' }),
                 permission: 'iam view user',
                 resizable: true,
                 sortable: true,
@@ -150,6 +153,8 @@ export default class ManagementIssuesIndexController extends Controller {
             {
                 label: this.intl.t('column.assignee'),
                 valuePath: 'assignee_name',
+                cellComponent: 'table/cell/user-identity',
+                resourcePath: (issue) => relationValue(issue, 'assignee') ?? buildIdentityStub(issue, { type: 'user', nameKey: 'assignee_name' }),
                 permission: 'iam view user',
                 hidden: true,
                 resizable: true,
@@ -165,35 +170,9 @@ export default class ManagementIssuesIndexController extends Controller {
                 valuePath: 'driver_name',
                 cellComponent: 'cell/driver-identity',
                 permission: 'fleet-ops view driver',
-                action: async (driver) => {
-                    const resolvedDriver = driver?.loadResource ? await driver.loadResource() : driver;
-
-                    if (resolvedDriver) {
-                        this.issueActions.driverActions.panel.view(resolvedDriver);
-                    }
-                },
+                action: this.issueActions.driverActions.panel.view,
                 emptyText: '-',
-                showStatusBadge: true,
-                resourcePath: (issue) => {
-                    const driver = get(issue, 'driver');
-
-                    if (driver) {
-                        return driver;
-                    }
-
-                    const driverName = get(issue, 'driver_name');
-
-                    if (driverName) {
-                        return {
-                            id: get(issue, 'driver_uuid'),
-                            name: driverName,
-                            display_name: driverName,
-                            loadResource: () => issue.loadDriver?.(),
-                        };
-                    }
-
-                    return null;
-                },
+                resourcePath: (issue) => relationValue(issue, 'driver') ?? buildIdentityStub(issue, { type: 'driver', load: () => issue.loadDriver?.() }),
                 resizable: true,
                 sortable: true,
                 filterable: true,
@@ -207,37 +186,9 @@ export default class ManagementIssuesIndexController extends Controller {
                 valuePath: 'vehicle_name',
                 cellComponent: 'cell/vehicle-identity',
                 permission: 'fleet-ops view vehicle',
-                action: async (vehicle) => {
-                    const resolvedVehicle = vehicle?.loadResource ? await vehicle.loadResource() : vehicle;
-
-                    if (resolvedVehicle) {
-                        this.issueActions.vehicleActions.panel.view(resolvedVehicle);
-                    }
-                },
+                action: this.issueActions.vehicleActions.panel.view,
                 emptyText: '-',
-                showStatusBadge: true,
-                resourcePath: (issue) => {
-                    const vehicle = get(issue, 'vehicle');
-
-                    if (vehicle) {
-                        return vehicle;
-                    }
-
-                    const vehicleName = get(issue, 'vehicle_name');
-
-                    if (vehicleName) {
-                        return {
-                            id: get(issue, 'vehicle_uuid'),
-                            displayName: vehicleName,
-                            display_name: vehicleName,
-                            name: vehicleName,
-                            vehicle_number: get(issue, 'vehicle_uuid'),
-                            loadResource: () => issue.loadVehicle?.(),
-                        };
-                    }
-
-                    return null;
-                },
+                resourcePath: (issue) => relationValue(issue, 'vehicle') ?? buildIdentityStub(issue, { type: 'vehicle', load: () => issue.loadVehicle?.() }),
                 resizable: true,
                 sortable: true,
                 filterable: true,

package/addon/controllers/management/trailers/index/details.js

@@ -24,10 +24,6 @@ export default class ManagementTrailersIndexDetailsController extends Controller
         ];
     }
 
-    get isAttached() {
-        return this.model?.isAttached ?? this.model?.attachment_state === 'attached';
-    }
-
     get actionButtons() {
         return [
             {
@@ -36,83 +32,13 @@ export default class ManagementTrailersIndexDetailsController extends Controller
                 permission: 'fleet-ops update trailer',
             },
             {
-                // Actions dropdown — mirrors the row-level actions from the trailers index table
+                // Actions dropdown — shared with the trailer context panel
                 icon: 'ellipsis-h',
                 iconPrefix: 'fas',
                 renderInPlace: true,
-                items: [
-                    {
-                        text: this.intl.t('trailer.actions.locate'),
-                        icon: 'location-dot',
-                        fn: () => this.trailerActions.locate(this.model),
-                        permission: 'fleet-ops view trailer',
-                    },
-                    ...(this.isAttached
-                        ? [
-                              {
-                                  text: this.intl.t('trailer.actions.detach-vehicle'),
-                                  icon: 'unlink',
-                                  fn: () => this.trailerActions.detachVehicle(this.model),
-                                  permission: 'fleet-ops detach-vehicle-for trailer',
-                              },
-                          ]
-                        : [
-                              {
-                                  text: this.intl.t('trailer.actions.attach-vehicle'),
-                                  icon: 'link',
-                                  fn: () => this.trailerActions.attachVehicle(this.model),
-                                  permission: 'fleet-ops attach-vehicle-for trailer',
-                              },
-                          ]),
-                    {
-                        text: this.intl.t('trailer.actions.attach-device'),
-                        icon: 'microchip',
-                        fn: () => this.trailerActions.attachDevice(this.model),
-                        permission: 'fleet-ops attach-device-for trailer',
-                    },
-                    {
-                        text: this.intl.t('trailer.actions.attach-equipment'),
-                        icon: 'toolbox',
-                        fn: () => this.trailerActions.attachEquipment(this.model),
-                        permission: 'fleet-ops attach-equipment-for trailer',
-                    },
-                    {
-                        separator: true,
-                    },
-                    {
-                        text: this.intl.t('trailer.actions.schedule-maintenance'),
-                        icon: 'calendar-check',
-                        fn: () => this.trailerActions.scheduleMaintenance(this.model),
-                        permission: 'fleet-ops create maintenance-schedule',
-                    },
-                    {
-                        text: this.intl.t('trailer.actions.create-work-order'),
-                        icon: 'clipboard-list',
-                        fn: () => this.trailerActions.createWorkOrder(this.model),
-                        permission: 'fleet-ops create work-order',
-                    },
-                    {
-                        text: this.intl.t('trailer.actions.log-maintenance'),
-                        icon: 'wrench',
-                        fn: () => this.trailerActions.logMaintenance(this.model),
-                        permission: 'fleet-ops create maintenance',
-                    },
-                    {
-                        separator: true,
-                    },
-                    {
-                        text: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.trailer') }),
-                        icon: 'trash',
-                        fn: () =>
-                            this.trailerActions.delete(this.model, {
-                                onConfirm: () => {
-                                    this.hostRouter.transitionTo('console.fleet-ops.management.trailers.index');
-                                },
-                            }),
-                        permission: 'fleet-ops delete trailer',
-                        class: 'text-red-500 hover:text-red-600',
-                    },
-                ],
+                items: this.trailerActions.detailsMenuItems(this.model, {
+                    onDeleted: () => this.hostRouter.transitionTo('console.fleet-ops.management.trailers.index'),
+                }),
             },
         ];
     }

package/addon/controllers/management/trailers/index.js

@@ -1,5 +1,7 @@
 import Controller from '@ember/controller';
 import { action } from '@ember/object';
+import { buildIdentityStub } from '../../../utils/identity-cell-resource';
+import relationValue from '../../../utils/relation-value';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { TRAILER_TYPES, TRAILER_STATUSES, TRAILER_OWNERSHIP_TYPES } from '../../../components/trailer/form';
@@ -163,8 +165,7 @@ export default class ManagementTrailersIndexController extends Controller {
                 label: this.intl.t('trailer.columns.name'),
                 valuePath: 'displayName',
                 photoPath: 'photo_url',
-                cellComponent: 'cell/vehicle-identity',
-                compact: true,
+                cellComponent: 'cell/trailer-identity',
                 permission: 'fleet-ops view trailer',
                 action: this.trailerActions.transition.view,
                 resizable: true,
@@ -172,8 +173,6 @@ export default class ManagementTrailersIndexController extends Controller {
                 filterable: true,
                 filterComponent: 'filter/string',
                 filterParam: 'name',
-                showOnlineIndicator: true,
-                showStatus: false,
             },
             {
                 label: this.intl.t('trailer.columns.type'),
@@ -214,15 +213,16 @@ export default class ManagementTrailersIndexController extends Controller {
             {
                 label: this.intl.t('trailer.columns.vehicle'),
                 valuePath: 'current_vehicle_name',
-                cellComponent: 'table/cell/anchor',
+                cellComponent: 'cell/vehicle-identity',
                 permission: 'fleet-ops view vehicle',
-                action: async (trailer) => {
-                    const vehicle = trailer.current_vehicle ?? (trailer.current_vehicle_id ? await this.store.findRecord('vehicle', trailer.current_vehicle_id) : null);
-
-                    if (vehicle) {
-                        return this.vehicleActions.panel.view(vehicle);
-                    }
-                },
+                action: this.vehicleActions.panel.view,
+                resourcePath: (trailer) =>
+                    relationValue(trailer, 'current_vehicle') ??
+                    buildIdentityStub(trailer, {
+                        type: 'vehicle',
+                        nameKey: 'current_vehicle_name',
+                        load: () => (trailer.current_vehicle_id ? this.store.findRecord('vehicle', trailer.current_vehicle_id) : null),
+                    }),
                 emptyText: '-',
                 resizable: true,
                 filterable: true,
@@ -386,16 +386,12 @@ export default class ManagementTrailersIndexController extends Controller {
             {
                 label: this.intl.t('trailer.columns.vendor'),
                 valuePath: 'vendor_name',
-                cellComponent: 'table/cell/anchor',
+                cellComponent: 'cell/vendor-identity',
                 permission: 'fleet-ops view vendor',
-                action: async ({ vendor_uuid }) => {
-                    if (!vendor_uuid) {
-                        return;
-                    }
-
-                    const vendor = await this.store.findRecord('vendor', vendor_uuid);
-                    this.vendorActions.viewVendor(vendor);
-                },
+                action: this.vendorActions.panel.view,
+                resourcePath: (trailer) =>
+                    relationValue(trailer, 'vendor') ??
+                    buildIdentityStub(trailer, { type: 'vendor', load: () => (trailer.vendor_uuid ? this.store.findRecord('vendor', trailer.vendor_uuid) : null) }),
                 hidden: true,
                 resizable: true,
                 filterable: true,
@@ -568,9 +564,11 @@ export default class ManagementTrailersIndexController extends Controller {
             {
                 label: this.intl.t('resource.devices'),
                 valuePath: 'devices',
+                cellComponent: 'cell/resource-list',
+                resourceType: 'device',
                 hidden: true,
                 filterable: true,
-                filterComponent: 'filter/multi-model',
+                filterComponent: 'filter/model-multiple',
                 filterComponentPlaceholder: this.intl.t('common.select-resource-filter-by', { resource: this.intl.t('resource.device') }),
                 filterParam: 'device',
                 model: 'device',

package/addon/controllers/management/vehicles/index/details.js

@@ -1,11 +1,9 @@
 import Controller from '@ember/controller';
-import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 
 export default class ManagementVehiclesIndexDetailsController extends Controller {
     @service vehicleActions;
-    @service issueActions;
     @service('universe/menu-service') menuService;
     @service hostRouter;
     @service intl;
@@ -53,6 +51,11 @@ export default class ManagementVehiclesIndexDetailsController extends Controller
                 route: 'management.vehicles.index.details.maintenance-history',
                 label: 'Maintenance',
             },
+            {
+                id: 'inspections',
+                route: 'management.vehicles.index.details.inspections',
+                label: this.intl.t('resource.inspections'),
+            },
             ...(isArray(registeredTabs) ? registeredTabs : []),
         ];
     }
@@ -65,85 +68,14 @@ export default class ManagementVehiclesIndexDetailsController extends Controller
                 permission: 'fleet-ops update vehicle',
             },
             {
-                // Actions dropdown — mirrors the row-level actions from the vehicles index table
+                // Actions dropdown — shared with the vehicle context panel
                 icon: 'ellipsis-h',
                 iconPrefix: 'fas',
                 renderInPlace: true,
-                items: [
-                    {
-                        text: this.intl.t('vehicle.actions.locate-vehicle'),
-                        icon: 'location-dot',
-                        fn: () => this.vehicleActions.locate(this.model),
-                        permission: 'fleet-ops view vehicle',
-                    },
-                    {
-                        text: this.intl.t('vehicle.actions.attach-device'),
-                        icon: 'link',
-                        fn: () => this.vehicleActions.attachDevice(this.model),
-                        permission: 'fleet-ops update vehicle',
-                    },
-                    ...(Number(this.model.assigned_orders_count) > 0
-                        ? [
-                              {
-                                  text: this.intl.t('vehicle.actions.unassign-orders'),
-                                  icon: 'truck-ramp-box',
-                                  fn: () => this.vehicleActions.unassignOrders(this.model),
-                                  permission: 'fleet-ops update vehicle',
-                              },
-                          ]
-                        : []),
-                    {
-                        separator: true,
-                    },
-                    {
-                        text: this.intl.t('vehicle.actions.schedule-maintenance'),
-                        icon: 'calendar-check',
-                        fn: () => this.vehicleActions.scheduleMaintenance(this.model),
-                        permission: 'fleet-ops create maintenance-schedule',
-                    },
-                    {
-                        text: this.intl.t('vehicle.actions.create-work-order'),
-                        icon: 'clipboard-list',
-                        fn: () => this.vehicleActions.createWorkOrder(this.model),
-                        permission: 'fleet-ops create work-order',
-                    },
-                    {
-                        text: this.intl.t('vehicle.actions.log-maintenance'),
-                        icon: 'wrench',
-                        fn: () => this.vehicleActions.logMaintenance(this.model),
-                        permission: 'fleet-ops create maintenance',
-                    },
-                    {
-                        text: this.intl.t('vehicle.actions.create-issue'),
-                        icon: 'triangle-exclamation',
-                        fn: () => this.createIssue(this.model),
-                        permission: 'fleet-ops create issue',
-                    },
-                    {
-                        separator: true,
-                    },
-                    {
-                        text: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.vehicle') }),
-                        icon: 'trash',
-                        fn: () =>
-                            this.vehicleActions.delete(this.model, {
-                                onConfirm: () => {
-                                    this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index');
-                                },
-                            }),
-                        permission: 'fleet-ops delete vehicle',
-                        class: 'text-red-500 hover:text-red-600',
-                    },
-                ],
+                items: this.vehicleActions.detailsMenuItems(this.model, {
+                    onDeleted: () => this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index'),
+                }),
             },
         ];
     }
-
-    @action createIssue(vehicle) {
-        this.issueActions.modal.create({
-            vehicle,
-            vehicle_uuid: vehicle.id,
-            title: this.intl.t('vehicle.prompts.issue-title', { vehicleName: vehicle.displayName ?? vehicle.name }),
-        });
-    }
 }

package/addon/controllers/management/vehicles/index.js

@@ -1,5 +1,7 @@
 import Controller from '@ember/controller';
-import { action, get } from '@ember/object';
+import { action } from '@ember/object';
+import { buildIdentityStub } from '../../../utils/identity-cell-resource';
+import relationValue from '../../../utils/relation-value';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
@@ -7,6 +9,8 @@ export default class ManagementVehiclesIndexController extends Controller {
     @service vehicleActions;
     @service issueActions;
     @service driverActions;
+    @service vendorActions;
+    @service store;
     @service tableContext;
     @service intl;
     @service appCache;
@@ -148,7 +152,6 @@ export default class ManagementVehiclesIndexController extends Controller {
                 valuePath: 'displayName',
                 photoPath: 'avatar_url',
                 cellComponent: 'cell/vehicle-identity',
-                compact: true,
                 permission: 'fleet-ops view vehicle',
                 action: this.vehicleActions.transition.view,
                 resizable: true,
@@ -156,8 +159,6 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterable: true,
                 filterComponent: 'filter/string',
                 filterParam: 'name',
-                showOnlineIndicator: true,
-                showStatus: false,
             },
             {
                 label: this.intl.t('column.plate-number'),
@@ -185,41 +186,14 @@ export default class ManagementVehiclesIndexController extends Controller {
             {
                 label: this.intl.t('column.driver-assigned'),
                 cellComponent: 'cell/driver-identity',
-                compact: true,
-                assignedVehicleLabel: (_driver, vehicle) => get(vehicle, 'displayName') ?? get(vehicle, 'display_name') ?? get(vehicle, 'name'),
                 permission: 'fleet-ops view driver',
-                action: async (driver) => {
-                    const resolvedDriver = get(driver, 'id') ? driver : await driver?.loadResource?.();
-
-                    if (resolvedDriver) {
-                        return this.driverActions.panel.view(resolvedDriver);
-                    }
-                },
+                action: this.driverActions.panel.view,
                 valuePath: 'driver_name',
                 emptyText: '-',
-                resourcePath: (vehicle) => {
-                    const driver = get(vehicle, 'driver');
-
-                    if (driver) {
-                        return driver;
-                    }
-
-                    const driverName = get(vehicle, 'driver_name');
-
-                    if (driverName) {
-                        return {
-                            name: driverName,
-                            display_name: driverName,
-                            status: 'assigned',
-                            loadResource: () => vehicle.loadDriver?.(),
-                        };
-                    }
-
-                    return null;
-                },
+                resourcePath: (vehicle) => relationValue(vehicle, 'driver') ?? buildIdentityStub(vehicle, { type: 'driver', load: () => vehicle.loadDriver?.() }),
                 resizable: true,
                 filterable: true,
-                filterComponent: 'filter/multi-model',
+                filterComponent: 'filter/model-multiple',
                 filterComponentPlaceholder: this.intl.t('common.select-resource-filter-by', { resource: this.intl.t('resource.driver') }),
                 filterParam: 'driver',
                 model: 'driver',
@@ -227,9 +201,11 @@ export default class ManagementVehiclesIndexController extends Controller {
             {
                 label: this.intl.t('resource.trailers'),
                 valuePath: 'trailers',
+                cellComponent: 'cell/resource-list',
+                resourceType: 'trailer',
                 hidden: true,
                 filterable: true,
-                filterComponent: 'filter/multi-model',
+                filterComponent: 'filter/model-multiple',
                 filterComponentPlaceholder: this.intl.t('common.select-resource-filter-by', { resource: this.intl.t('resource.trailer') }),
                 filterParam: 'trailer',
                 model: 'trailer',
@@ -238,44 +214,16 @@ export default class ManagementVehiclesIndexController extends Controller {
             {
                 label: this.intl.t('resource.devices'),
                 valuePath: 'devices',
+                cellComponent: 'cell/resource-list',
+                resourceType: 'device',
                 hidden: true,
                 filterable: true,
-                filterComponent: 'filter/multi-model',
+                filterComponent: 'filter/model-multiple',
                 filterComponentPlaceholder: this.intl.t('common.select-resource-filter-by', { resource: this.intl.t('resource.device') }),
                 filterParam: 'device',
                 model: 'device',
                 modelNamePath: 'displayName',
             },
-            {
-                label: this.intl.t('vehicle.filters.has-trailer'),
-                valuePath: 'has_trailer',
-                hidden: true,
-                filterable: true,
-                filterComponent: 'filter/select',
-                filterComponentPlaceholder: this.intl.t('vehicle.filters.any'),
-                filterOptions: this.presenceOptions('attached'),
-                filterParam: 'has_trailer',
-            },
-            {
-                label: this.intl.t('vehicle.filters.has-driver'),
-                valuePath: 'has_driver',
-                hidden: true,
-                filterable: true,
-                filterComponent: 'filter/select',
-                filterComponentPlaceholder: this.intl.t('vehicle.filters.any'),
-                filterOptions: this.presenceOptions('assigned'),
-                filterParam: 'has_driver',
-            },
-            {
-                label: this.intl.t('vehicle.filters.has-device'),
-                valuePath: 'has_device',
-                hidden: true,
-                filterable: true,
-                filterComponent: 'filter/select',
-                filterComponentPlaceholder: this.intl.t('vehicle.filters.any'),
-                filterOptions: this.presenceOptions('attached'),
-                filterParam: 'has_device',
-            },
             {
                 label: this.intl.t('column.id'),
                 valuePath: 'public_id',
@@ -319,14 +267,13 @@ export default class ManagementVehiclesIndexController extends Controller {
             },
             {
                 label: this.intl.t('column.vendor'),
-                cellComponent: 'table/cell/anchor',
+                cellComponent: 'cell/vendor-identity',
                 permission: 'fleet-ops view vendor',
-                action: async ({ vendor_uuid }) => {
-                    const vendor = await this.store.findRecord('vendor', vendor_uuid);
-
-                    this.vendorActions.viewVendor(vendor);
-                },
+                action: this.vendorActions.panel.view,
                 valuePath: 'vendor_name',
+                resourcePath: (vehicle) =>
+                    relationValue(vehicle, 'vendor') ??
+                    buildIdentityStub(vehicle, { type: 'vendor', load: () => (vehicle.vendor_uuid ? this.store.findRecord('vendor', vehicle.vendor_uuid) : null) }),
                 hidden: true,
                 resizable: true,
                 filterable: true,
@@ -368,6 +315,37 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterable: true,
                 filterComponent: 'filter/date',
             },
+            // Filter-only entries omit a column label so the visible-column picker excludes them.
+            {
+                filterLabel: this.intl.t('vehicle.filters.has-trailer'),
+                valuePath: 'has_trailer',
+                hidden: true,
+                filterable: true,
+                filterComponent: 'filter/radio',
+                filterComponentPlaceholder: this.intl.t('vehicle.filters.any'),
+                filterOptions: this.presenceOptions('attached'),
+                filterParam: 'has_trailer',
+            },
+            {
+                filterLabel: this.intl.t('vehicle.filters.has-driver'),
+                valuePath: 'has_driver',
+                hidden: true,
+                filterable: true,
+                filterComponent: 'filter/radio',
+                filterComponentPlaceholder: this.intl.t('vehicle.filters.any'),
+                filterOptions: this.presenceOptions('assigned'),
+                filterParam: 'has_driver',
+            },
+            {
+                filterLabel: this.intl.t('vehicle.filters.has-device'),
+                valuePath: 'has_device',
+                hidden: true,
+                filterable: true,
+                filterComponent: 'filter/radio',
+                filterComponentPlaceholder: this.intl.t('vehicle.filters.any'),
+                filterOptions: this.presenceOptions('attached'),
+                filterParam: 'has_device',
+            },
             {
                 label: '',
                 cellComponent: 'table/cell/dropdown',