@fleetbase/fleetops-engine 0.6.64 → 0.6.65

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

@@ -29,6 +29,11 @@ export default class ManagementVehiclesIndexController extends Controller {
         'vehicle_make',
         'vehicle_model',
         'display_name',
+        'trailer',
+        'device',
+        'has_trailer',
+        'has_driver',
+        'has_device',
     ];
     @tracked query = null;
     @tracked page = 1;
@@ -45,6 +50,11 @@ export default class ManagementVehiclesIndexController extends Controller {
     @tracked fleet;
     @tracked vendor;
     @tracked driver;
+    @tracked trailer;
+    @tracked device;
+    @tracked has_trailer;
+    @tracked has_driver;
+    @tracked has_device;
     @tracked display_name;
     @tracked table;
     @tracked layout = this.appCache.get('fleetops:vehicles:layout', 'table');
@@ -118,6 +128,17 @@ export default class ManagementVehiclesIndexController extends Controller {
         ];
     }
 
+    /**
+     * Yes/no choices for the "has trailer / driver / device" filters. `kind` picks the
+     * wording: assets are attached, drivers are assigned.
+     */
+    presenceOptions(kind) {
+        return [
+            { value: 'true', label: this.intl.t(`vehicle.filters.${kind}`) },
+            { value: 'false', label: this.intl.t(`vehicle.filters.not-${kind}`) },
+        ];
+    }
+
     /** columns */
     get columns() {
         return [
@@ -157,7 +178,8 @@ export default class ManagementVehiclesIndexController extends Controller {
                 sortable: true,
                 filterable: true,
                 hidden: true,
-                filterComponent: 'filter/string',
+                filterComponent: 'filter/multi-input',
+                filterComponentPlaceholder: this.intl.t('vehicle.placeholders.filter-internal-id'),
                 filterParam: 'internal_id',
             },
             {
@@ -197,11 +219,63 @@ export default class ManagementVehiclesIndexController extends Controller {
                 },
                 resizable: true,
                 filterable: true,
-                filterComponent: 'filter/model',
-                filterComponentPlaceholder: 'Select driver to filter by',
+                filterComponent: 'filter/multi-model',
+                filterComponentPlaceholder: this.intl.t('common.select-resource-filter-by', { resource: this.intl.t('resource.driver') }),
                 filterParam: 'driver',
                 model: 'driver',
             },
+            {
+                label: this.intl.t('resource.trailers'),
+                valuePath: 'trailers',
+                hidden: true,
+                filterable: true,
+                filterComponent: 'filter/multi-model',
+                filterComponentPlaceholder: this.intl.t('common.select-resource-filter-by', { resource: this.intl.t('resource.trailer') }),
+                filterParam: 'trailer',
+                model: 'trailer',
+                modelNamePath: 'displayName',
+            },
+            {
+                label: this.intl.t('resource.devices'),
+                valuePath: 'devices',
+                hidden: true,
+                filterable: true,
+                filterComponent: 'filter/multi-model',
+                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',
@@ -257,7 +331,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 resizable: true,
                 filterable: true,
                 filterComponent: 'filter/model',
-                filterComponentPlaceholder: this.intl.t('select-resource-filter-by', { resource: this.intl.t('resource.vendor') }),
+                filterComponentPlaceholder: this.intl.t('common.select-resource-filter-by', { resource: this.intl.t('resource.vendor') }),
                 filterParam: 'vendor',
                 model: 'vendor',
             },

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

@@ -1,12 +1,14 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
 import fleetOpsOptions from '../../../utils/fleet-ops-options';
 
 export default class ManagementVendorsIndexController extends Controller {
     @service vendorActions;
     @service tableContext;
     @service intl;
+    @service appCache;
 
     /** query params */
     @tracked queryParams = [
@@ -40,10 +42,35 @@ export default class ManagementVendorsIndexController extends Controller {
     @tracked email;
     @tracked country;
     @tracked table;
+    @tracked layout = this.appCache.get(this.layoutCacheKey, 'table');
+
+    /** cache key that remembers the chosen layout per listing */
+    get layoutCacheKey() {
+        return 'fleetops:vendors:layout';
+    }
 
     /** action buttons */
     get actionButtons() {
         return [
+            {
+                component: 'dropdown-button',
+                icon: 'display',
+                size: 'xs',
+                items: [
+                    {
+                        label: this.intl.t('common.table-view'),
+                        icon: 'table-list',
+                        onClick: () => this.setLayout('table'),
+                    },
+                    {
+                        label: this.intl.t('common.grid-view'),
+                        icon: 'grip',
+                        onClick: () => this.setLayout('grid'),
+                    },
+                ],
+                renderInPlace: true,
+                helpText: this.intl.t('common.change-layout'),
+            },
             {
                 icon: 'refresh',
                 onClick: this.vendorActions.refresh,
@@ -250,4 +277,9 @@ export default class ManagementVendorsIndexController extends Controller {
             },
         ];
     }
+
+    @action setLayout(layout) {
+        this.layout = layout;
+        this.appCache.set(this.layoutCacheKey, layout);
+    }
 }

package/addon/controllers/operations/orders/index.js

@@ -157,7 +157,9 @@ export default class OperationsOrdersIndexController extends Controller {
                 resizable: true,
                 sortable: true,
                 filterable: true,
-                filterComponent: 'filter/string',
+                // Batch scanning: each scanned or pasted id becomes a chip and all of them match.
+                filterComponent: 'filter/multi-input',
+                filterComponentPlaceholder: this.intl.t('order.placeholders.filter-internal-id'),
             },
             {
                 label: this.intl.t('column.payload'),

package/addon/controllers/settings/custom-fields.js

@@ -1,6 +1,8 @@
 import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
 
 export default class SettingsCustomFieldsController extends Controller {
+    @service intl;
     get subjects() {
         return [
             {
@@ -15,6 +17,12 @@ export default class SettingsCustomFieldsController extends Controller {
                 label: 'Vehicle',
                 groups: [],
             },
+            {
+                model: 'trailer',
+                type: 'fleet-ops:trailer',
+                label: this.intl.t('resource.trailer'),
+                groups: [],
+            },
             {
                 model: 'contact',
                 type: 'fleet-ops:contact',

package/addon/extension.js

@@ -5,6 +5,7 @@ export default {
         const menuService = universe.getService('menu');
         const registryService = universe.getService('registry');
         const widgetService = universe.getService('widget');
+        const intlService = app.lookup('service:intl');
 
         // Register header navigation
         menuService.registerHeaderMenuItem('Fleet-Ops', 'console.fleet-ops', {
@@ -36,6 +37,12 @@ export default {
                     icon: 'truck',
                     route: 'console.fleet-ops.management.vehicles',
                 },
+                {
+                    title: intlService.t('menu.trailers'),
+                    description: intlService.t('trailer.navigation-description'),
+                    icon: 'trailer',
+                    route: 'console.fleet-ops.management.trailers',
+                },
                 {
                     title: 'Fleets',
                     description: 'Organise drivers and vehicles into operational fleets.',

package/addon/helpers/placeholder-image.js

@@ -0,0 +1,6 @@
+import { helper } from '@ember/component/helper';
+import { getPlaceholderImage } from '../utils/placeholder-images';
+
+export default helper(function placeholderImage([type]) {
+    return getPlaceholderImage(type);
+});

package/addon/helpers/resource-image.js

@@ -0,0 +1,10 @@
+import { helper } from '@ember/component/helper';
+import { resolveResourceImage } from '../utils/placeholder-images';
+
+/**
+ * `{{resource-image @resource.photo_url "driver"}}` — the record's photo, or the styled
+ * placeholder for its resource type when the photo is missing or a legacy default.
+ */
+export default helper(function resourceImage([url, type]) {
+    return resolveResourceImage(url, type);
+});

package/addon/helpers/trailer-placeholder-image.js

@@ -0,0 +1,6 @@
+import { helper } from '@ember/component/helper';
+import getTrailerPlaceholderImage from '../utils/trailer-placeholder-image';
+
+export default helper(function trailerPlaceholderImage() {
+    return getTrailerPlaceholderImage();
+});

package/addon/routes/management/trailers/index/details/connections.js

@@ -0,0 +1,2 @@
+import Route from '@ember/routing/route';
+export default class ManagementTrailersIndexDetailsConnectionsRoute extends Route {}

package/addon/routes/management/trailers/index/details/devices.js

@@ -0,0 +1,2 @@
+import Route from '@ember/routing/route';
+export default class ManagementTrailersIndexDetailsDevicesRoute extends Route {}

package/addon/routes/management/trailers/index/details/equipment.js

@@ -0,0 +1,2 @@
+import Route from '@ember/routing/route';
+export default class ManagementTrailersIndexDetailsEquipmentRoute extends Route {}

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

@@ -0,0 +1,2 @@
+import Route from '@ember/routing/route';
+export default class ManagementTrailersIndexDetailsIndexRoute extends Route {}

package/addon/routes/management/trailers/index/details/maintenance-history.js

@@ -0,0 +1,2 @@
+import Route from '@ember/routing/route';
+export default class ManagementTrailersIndexDetailsMaintenanceHistoryRoute extends Route {}

package/addon/routes/management/trailers/index/details/positions.js

@@ -0,0 +1,2 @@
+import Route from '@ember/routing/route';
+export default class ManagementTrailersIndexDetailsPositionsRoute extends Route {}

package/addon/routes/management/trailers/index/details/schedules.js

@@ -0,0 +1,2 @@
+import Route from '@ember/routing/route';
+export default class ManagementTrailersIndexDetailsSchedulesRoute extends Route {}

package/addon/routes/management/trailers/index/details/work-orders.js

@@ -0,0 +1,2 @@
+import Route from '@ember/routing/route';
+export default class ManagementTrailersIndexDetailsWorkOrdersRoute extends Route {}

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

@@ -0,0 +1,30 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class ManagementTrailersIndexDetailsRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+        if (typeof error?.message === 'string' && error.message.endsWith('not found')) {
+            return this.hostRouter.transitionTo('console.fleet-ops.management.trailers.index');
+        }
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops view trailer')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.management.trailers.index');
+        }
+    }
+
+    model({ public_id }) {
+        // The details panel needs the towing state, so load the connection eagerly.
+        return this.store.queryRecord('trailer', { public_id, single: true, with: ['currentConnection.vehicle', 'category', 'vendor', 'warranty'] });
+    }
+}

package/addon/routes/management/trailers/index/edit.js

@@ -0,0 +1,23 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+export default class ManagementTrailersIndexEditRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+    @action error(error) {
+        this.notifications.serverError(error);
+        return this.hostRouter.transitionTo('console.fleet-ops.management.trailers.index');
+    }
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops update trailer')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.management.trailers.index');
+        }
+    }
+    model({ public_id }) {
+        return this.store.findRecord('trailer', public_id);
+    }
+}

package/addon/routes/management/trailers/index/new.js

@@ -0,0 +1,14 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+export default class ManagementTrailersIndexNewRoute extends Route {
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops create trailer')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.management.trailers.index');
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class ManagementTrailersIndexRoute extends Route {
+    @service store;
+
+    queryParams = {
+        page: { refreshModel: true },
+        limit: { refreshModel: true },
+        sort: { refreshModel: true },
+        query: { refreshModel: true },
+        public_id: { refreshModel: true },
+        name: { refreshModel: true },
+        code: { refreshModel: true },
+        trailer_type: { refreshModel: true },
+        status: { refreshModel: true },
+        attachment_state: { refreshModel: true },
+        vehicle: { refreshModel: true },
+        connectivity_status: { refreshModel: true },
+        trailer_make: { refreshModel: true },
+        trailer_model: { refreshModel: true },
+        trailer_year: { refreshModel: true },
+        plate_number: { refreshModel: true },
+        vin: { refreshModel: true },
+        serial_number: { refreshModel: true },
+        vendor: { refreshModel: true },
+        ownership_type: { refreshModel: true },
+        refrigerated: { refreshModel: true },
+        device: { refreshModel: true },
+        last_online_at: { refreshModel: true },
+        created_at: { refreshModel: true },
+        updated_at: { refreshModel: true },
+    };
+
+    model(params) {
+        // Only forward meaningful filters; blank query params would otherwise be sent as
+        // empty strings and coerced into no-op or mismatching backend filters.
+        const query = Object.fromEntries(Object.entries(params).filter(([, value]) => value !== undefined && value !== null && value !== ''));
+
+        return this.store.query('trailer', query);
+    }
+}

package/addon/routes/management/vehicles/index/details/trailers.js

@@ -0,0 +1,2 @@
+import Route from '@ember/routing/route';
+export default class ManagementVehiclesIndexDetailsTrailersRoute extends Route {}

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

@@ -21,6 +21,11 @@ export default class ManagementVehiclesIndexRoute extends Route {
         fleet: { refreshModel: true },
         vendor: { refreshModel: true },
         driver: { refreshModel: true },
+        trailer: { refreshModel: true },
+        device: { refreshModel: true },
+        has_trailer: { refreshModel: true },
+        has_driver: { refreshModel: true },
+        has_device: { refreshModel: true },
         created_at: { refreshModel: true },
         updated_at: { refreshModel: true },
         'within[latitude]': { refreshModel: true, replace: true },
@@ -30,6 +35,7 @@ export default class ManagementVehiclesIndexRoute extends Route {
     };
 
     model(params) {
-        return this.store.query('vehicle', { ...params });
+        // Current trailers back the card view's towing line; the internal API camelizes `with`.
+        return this.store.query('vehicle', { ...params, with: ['currentTrailers'] });
     }
 }

package/addon/routes.js

@@ -86,6 +86,7 @@ export default buildRoutes(function () {
                     this.route('positions');
                     this.route('devices');
                     this.route('equipment');
+                    this.route('trailers');
                     this.route('schedules');
                     this.route('work-orders');
                     this.route('maintenance-history');
@@ -94,6 +95,22 @@ export default buildRoutes(function () {
                 this.route('edit', { path: '/edit/:public_id' });
             });
         });
+        this.route('trailers', function () {
+            this.route('index', { path: '/' }, function () {
+                this.route('new');
+                this.route('details', { path: '/:public_id' }, function () {
+                    this.route('index', { path: '/' });
+                    this.route('positions');
+                    this.route('devices');
+                    this.route('equipment');
+                    this.route('connections');
+                    this.route('schedules');
+                    this.route('work-orders');
+                    this.route('maintenance-history');
+                });
+                this.route('edit', { path: '/edit/:public_id' });
+            });
+        });
         this.route('places', function () {
             this.route('index', { path: '/' }, function () {
                 this.route('new');

package/addon/services/device-actions.js

@@ -58,7 +58,7 @@ export default class DeviceActionsService extends ResourceActionService {
                     {
                         key: 'vehicle',
                         id: 'vehicle',
-                        label: this.intl.t('resource.vehicle'),
+                        label: this.intl.t('device.attachment.asset'),
                         component: 'device/panel-tabs/vehicle',
                     },
                     {
@@ -112,26 +112,28 @@ export default class DeviceActionsService extends ResourceActionService {
         },
     };
 
-    @action attachToVehicle(device, options = {}) {
+    @action attachToAsset(device, options = {}) {
         this.modalsManager.show('modals/attach-telematic-device', {
-            title: this.intl.t('device.prompts.attach-to-vehicle-title'),
-            acceptButtonText: this.intl.t('device.actions.attach-to-vehicle'),
+            title: this.intl.t('device.prompts.attach-to-asset-title'),
+            acceptButtonText: this.intl.t('device.actions.attach-to-asset'),
             acceptButtonIcon: 'link',
             device,
-            selectedVehicle: null,
+            selectedAssetType: null,
+            selectedAsset: null,
             confirm: async (modal) => {
-                const selectedVehicle = modal.getOption('selectedVehicle');
+                const selectedAssetType = modal.getOption('selectedAssetType');
+                const selectedAsset = modal.getOption('selectedAsset');
 
-                if (!selectedVehicle) {
-                    return this.notifications.warning(this.intl.t('device.prompts.select-vehicle-warning'));
+                if (!selectedAssetType || !selectedAsset) {
+                    return this.notifications.warning(this.intl.t('device.prompts.select-asset-warning'));
                 }
 
                 modal.startLoading();
 
                 try {
-                    await this.fetch.post(`devices/${device.id}/attach`, { vehicle: selectedVehicle.id });
+                    await this.fetch.post(`devices/${device.id}/attach`, { attachable_type: selectedAssetType.value, attachable: selectedAsset.id });
                     await device.reload?.();
-                    this.notifications.success(this.intl.t('device.prompts.attach-to-vehicle-success'));
+                    this.notifications.success(this.intl.t('device.prompts.attach-to-asset-success'));
                     modal.done();
                     this.refresh();
                 } catch (error) {
@@ -143,24 +145,28 @@ export default class DeviceActionsService extends ResourceActionService {
         });
     }
 
-    @action detachFromVehicle(device, options = {}) {
+    @action attachToVehicle(device, options = {}) {
+        return this.attachToAsset(device, options);
+    }
+
+    @action detachFromAsset(device, options = {}) {
         const deviceName = device.displayName ?? device.name ?? this.intl.t('resource.device');
-        const vehicleName = device.attached_to_name ?? device.attachable?.display_name ?? device.attachable?.name;
+        const assetName = device.attached_to_name ?? device.attachable?.display_name ?? device.attachable?.name;
 
-        if (!device.attachable_uuid && !vehicleName) {
+        if (!device.attachable_uuid && !assetName) {
             return this.notifications.warning(this.intl.t('device.prompts.not-attached-warning', { deviceName }));
         }
 
         this.modalsManager.confirm({
-            title: this.intl.t('device.prompts.detach-from-vehicle-title', { deviceName }),
-            body: this.intl.t('device.prompts.detach-from-vehicle-body', { deviceName, vehicleName: vehicleName ?? this.intl.t('resource.vehicle') }),
+            title: this.intl.t('device.prompts.detach-from-asset-title', { deviceName }),
+            body: this.intl.t('device.prompts.detach-from-asset-body', { deviceName, assetName: assetName ?? this.intl.t('device.attachment.asset') }),
             confirm: async (modal) => {
                 modal.startLoading();
 
                 try {
                     await this.fetch.post(`devices/${device.id}/detach`);
                     await device.reload?.();
-                    this.notifications.success(this.intl.t('device.prompts.detach-from-vehicle-success'));
+                    this.notifications.success(this.intl.t('device.prompts.detach-from-asset-success'));
                     modal.done();
                     this.refresh();
                 } catch (error) {
@@ -171,4 +177,8 @@ export default class DeviceActionsService extends ResourceActionService {
             ...options,
         });
     }
+
+    @action detachFromVehicle(device, options = {}) {
+        return this.detachFromAsset(device, options);
+    }
 }