@fleetbase/fleetops-engine 0.6.53 → 0.6.55

package/addon/routes/connectivity/telematics/details/devices.js

@@ -12,7 +12,13 @@ export default class ConnectivityTelematicsDetailsDevicesRoute extends Route {
         status: { refreshModel: true },
         provider: { refreshModel: true },
         attachment_state: { refreshModel: true },
+        vehicle: { refreshModel: true },
+        connection_status: { refreshModel: true },
         device_id: { refreshModel: true },
+        type: { refreshModel: true },
+        serial_number: { refreshModel: true },
+        last_online_at: { refreshModel: true },
+        updated_at: { refreshModel: true },
     };
 
     model(params) {

package/addon/routes/connectivity/telematics/details/sensors.js

@@ -12,6 +12,7 @@ export default class ConnectivityTelematicsDetailsSensorsRoute extends Route {
         status: { refreshModel: true },
         type: { refreshModel: true },
         device_uuid: { refreshModel: true },
+        last_reading_at: { refreshModel: true },
     };
 
     model(params) {

package/addon/routes/connectivity/telematics/details.js

@@ -24,6 +24,6 @@ export default class ConnectivityTelematicsDetailsRoute extends Route {
     }
 
     model({ public_id }) {
-        return this.store.findRecord('telematic', public_id);
+        return this.store.queryRecord('telematic', { public_id, single: true });
     }
 }

package/addon/routes/connectivity/telematics/edit.js

@@ -24,6 +24,6 @@ export default class ConnectivityTelematicsEditRoute extends Route {
     }
 
     model({ public_id }) {
-        return this.store.findRecord('telematic', public_id);
+        return this.store.queryRecord('telematic', { public_id, single: true });
     }
 }

package/addon/routes/maintenance/work-orders/index.js

@@ -11,6 +11,7 @@ export default class MaintenanceWorkOrdersIndexRoute extends Route {
         query: { refreshModel: true },
         name: { refreshModel: true },
         public_id: { refreshModel: true },
+        category: { refreshModel: true },
         status: { refreshModel: true },
         priority: { refreshModel: true },
         created_at: { refreshModel: true },

package/addon/routes.js

@@ -184,6 +184,8 @@ export default buildRoutes(function () {
                 this.route('edit', { path: '/edit/:public_id' });
                 this.route('details', { path: '/:public_id' }, function () {
                     this.route('index', { path: '/' });
+                    this.route('vehicle');
+                    this.route('sensors');
                     this.route('events');
                     this.route('virtual', { path: '/:slug' });
                 });

package/addon/services/device-actions.js

@@ -1,8 +1,10 @@
 import ResourceActionService, { inject as service } from '@fleetbase/ember-core/services/resource-action';
 import { action } from '@ember/object';
+import { isArray } from '@ember/array';
 
 export default class DeviceActionsService extends ResourceActionService {
     @service fetch;
+    @service('universe/menu-service') menuService;
 
     constructor() {
         super(...arguments);
@@ -37,13 +39,41 @@ export default class DeviceActionsService extends ResourceActionService {
             });
         },
         view: (device) => {
+            if (!device?.id) {
+                return this.notifications?.warning?.(this.intl.t('common.invalid-resource'));
+            }
+
+            const registeredTabs = this.menuService?.getMenuItems?.('fleet-ops:component:device:details');
+
             return this.resourceContextPanel.open({
                 device,
+                header: 'device/panel-header',
                 tabs: [
                     {
+                        key: 'overview',
+                        id: 'overview',
                         label: this.intl.t('common.overview'),
                         component: 'device/details',
                     },
+                    {
+                        key: 'vehicle',
+                        id: 'vehicle',
+                        label: this.intl.t('resource.vehicle'),
+                        component: 'device/panel-tabs/vehicle',
+                    },
+                    {
+                        key: 'sensors',
+                        id: 'sensors',
+                        label: this.intl.t('resource.sensors'),
+                        component: 'device/panel-tabs/sensors',
+                    },
+                    {
+                        key: 'events',
+                        id: 'events',
+                        label: this.intl.t('resource.device-events'),
+                        component: 'device/panel-tabs/events',
+                    },
+                    ...(isArray(registeredTabs) ? registeredTabs.filter((tab) => tab.component || tab.render) : []),
                 ],
             });
         },

package/addon/services/device-event-actions.js

@@ -11,7 +11,7 @@ export default class DeviceEventActionsService extends ResourceActionService {
     }
 
     transition = {
-        view: (deviceEvent) => this.transitionTo('connectivity.events.index.details', deviceEvent),
+        view: (deviceEvent) => this.transitionTo('connectivity.events.details', deviceEvent),
     };
 
     panel = {

package/addon/services/equipment-actions.js

@@ -9,6 +9,7 @@ export default class EquipmentActionsService extends ResourceActionService {
         super(...arguments);
         this.initialize('equipment', {
             defaultAttributes: {
+                status: 'available',
                 currency: this.defaultCurrency,
             },
         });

package/addon/services/order-creation.js

@@ -1,12 +1,17 @@
 import Service, { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { next } from '@ember/runloop';
+import Evented from '@ember/object/evented';
 
-export default class OrderCreationService extends Service {
+export const SERVICE_QUOTE_REFRESH_REQUESTED = 'service-quote-refresh-requested';
+
+export default class OrderCreationService extends Service.extend(Evented) {
     @service orderActions;
     @tracked context;
     @tracked order;
     @tracked cfManager;
+    @tracked serviceQuoteOverrides = {};
+    orderValidationRules = {};
 
     newOrder(attrs = {}) {
         const order = this.orderActions.createNewInstance(attrs);
@@ -34,4 +39,52 @@ export default class OrderCreationService extends Service {
     removeContext(key) {
         delete this.context[key];
     }
+
+    requestServiceQuoteRefresh(reason, order = this.order) {
+        this.trigger(SERVICE_QUOTE_REFRESH_REQUESTED, {
+            reason,
+            order,
+        });
+    }
+
+    setServiceQuoteOverride(key, config = {}) {
+        this.serviceQuoteOverrides = {
+            ...this.serviceQuoteOverrides,
+            [key]: {
+                ...config,
+                key,
+            },
+        };
+    }
+
+    getServiceQuoteOverride() {
+        return Object.values(this.serviceQuoteOverrides ?? {}).find((override) => override?.mode === 'locked') ?? null;
+    }
+
+    clearServiceQuoteOverride(key) {
+        const overrides = { ...(this.serviceQuoteOverrides ?? {}) };
+        delete overrides[key];
+        this.serviceQuoteOverrides = overrides;
+    }
+
+    setOrderValidationRule(key, fn) {
+        if (typeof fn !== 'function') {
+            return;
+        }
+
+        this.orderValidationRules = {
+            ...(this.orderValidationRules ?? {}),
+            [key]: fn,
+        };
+    }
+
+    clearOrderValidationRule(key) {
+        const rules = { ...(this.orderValidationRules ?? {}) };
+        delete rules[key];
+        this.orderValidationRules = rules;
+    }
+
+    validateOrderRules(order, cfManager = null) {
+        return Object.values(this.orderValidationRules ?? {}).every((fn) => fn(order, cfManager) !== false);
+    }
 }

package/addon/services/order-validation.js

@@ -24,12 +24,13 @@ export default class OrderValidationService extends Service {
         const hasPickup = isNotEmpty(order.payload.pickup);
         const hasDropoff = isNotEmpty(order.payload.dropoff);
         const hasValidCustomFields = cfManager ? this.isCustomFieldsValid(cfManager) : true;
+        const hasValidExtensionRules = this.orderCreation.validateOrderRules(order, cfManager);
 
         if (hasWaypoints) {
-            return hasOrderConfig && hasOrderType && hasValidCustomFields;
+            return hasOrderConfig && hasOrderType && hasValidCustomFields && hasValidExtensionRules;
         }
 
-        return hasPickup && hasDropoff && hasOrderConfig && hasOrderType && hasValidCustomFields;
+        return hasPickup && hasDropoff && hasOrderConfig && hasOrderType && hasValidCustomFields && hasValidExtensionRules;
     }
 
     validationFails(order, cfManager) {

package/addon/services/sensor-actions.js

@@ -36,8 +36,11 @@ export default class SensorActionsService extends ResourceActionService {
         view: (sensor) => {
             return this.resourceContextPanel.open({
                 sensor,
+                header: 'sensor/panel-header',
                 tabs: [
                     {
+                        key: 'overview',
+                        id: 'overview',
                         label: this.intl.t('common.overview'),
                         component: 'sensor/details',
                     },

package/addon/services/service-rate-actions.js

@@ -96,8 +96,15 @@ export default class ServiceRateActionsService extends ResourceActionService {
     };
 
     @task *queryServiceRatesForOrder(order, params = {}) {
+        const payloadCoordinates = order.payload?.payloadCoordinates ?? [];
+        const routeCoordinates = payloadCoordinates.map((coordinate) => this.#serializeRouteCoordinate(coordinate)).filter(Boolean);
+
+        if (routeCoordinates.length < 2) {
+            return [];
+        }
+
         const queryParams = {
-            coordinates: order.payload.payloadCoordinates.join(';'),
+            coordinates: routeCoordinates.join(';'),
             facilitator: order.facilitator?.get('isIntegratedVendor') ? order.facilitator.get('public_id') : null,
             service_type: order.order_config?.get('key'),
             ...params,
@@ -117,6 +124,37 @@ export default class ServiceRateActionsService extends ResourceActionService {
         }
     }
 
+    #serializeRouteCoordinate(coordinate) {
+        if (Array.isArray(coordinate)) {
+            const [longitude, latitude] = coordinate;
+
+            if (!this.#isValidCoordinate(latitude) || !this.#isValidCoordinate(longitude)) {
+                return null;
+            }
+
+            return `${latitude},${longitude}`;
+        }
+
+        if (typeof coordinate === 'string') {
+            const parts = coordinate
+                .split(',')
+                .map((part) => part.trim())
+                .filter(Boolean);
+
+            if (parts.length !== 2 || !parts.every((part) => this.#isValidCoordinate(part))) {
+                return null;
+            }
+
+            return parts.join(',');
+        }
+
+        return null;
+    }
+
+    #isValidCoordinate(value) {
+        return value !== null && value !== undefined && value !== '' && Number.isFinite(Number(value));
+    }
+
     @task *getServiceQuotes(serviceRate, order) {
         if (order.payload.payloadCoordinates.length < 2) return;
 
@@ -134,6 +172,7 @@ export default class ServiceRateActionsService extends ResourceActionService {
                 scheduled_at: order.scheduled_at,
                 is_route_optimized: order.optimized,
                 service: serviceRate.id,
+                meta: order.meta,
             });
 
             return serviceQuotes;

package/addon/services/vehicle-actions.js

@@ -66,6 +66,26 @@ export default class VehicleActionsService extends ResourceActionService {
         this.initialize('vehicle', { status: 'available' });
     }
 
+    async resolveVehicleResource(vehicle) {
+        if (typeof vehicle?.then === 'function') {
+            return await vehicle;
+        }
+
+        if (typeof vehicle?.loadResource === 'function') {
+            return (await vehicle.loadResource()) ?? vehicle;
+        }
+
+        return vehicle;
+    }
+
+    async reloadIndexResource(vehicle) {
+        if (vehicle?.meta?._index_resource) {
+            await vehicle.reload();
+        }
+
+        return vehicle;
+    }
+
     transition = {
         view: (vehicle) => this.transitionTo('management.vehicles.index.details', vehicle),
         edit: (vehicle) => this.transitionTo('management.vehicles.index.edit', vehicle),
@@ -87,9 +107,7 @@ export default class VehicleActionsService extends ResourceActionService {
             });
         },
         edit: async (vehicle, options = {}) => {
-            if (vehicle?.meta?._index_resource) {
-                await vehicle.reload();
-            }
+            vehicle = await this.reloadIndexResource(await this.resolveVehicleResource(vehicle));
 
             return this.resourceContextPanel.open({
                 content: 'vehicle/form',
@@ -109,9 +127,7 @@ export default class VehicleActionsService extends ResourceActionService {
             });
         },
         view: async (vehicle, options = {}) => {
-            if (vehicle?.meta?._index_resource) {
-                await vehicle.reload();
-            }
+            vehicle = await this.reloadIndexResource(await this.resolveVehicleResource(vehicle));
 
             return this.resourceContextPanel.open({
                 vehicle,
@@ -144,9 +160,7 @@ export default class VehicleActionsService extends ResourceActionService {
             });
         },
         edit: async (vehicle, options = {}, saveOptions = {}) => {
-            if (vehicle?.meta?._index_resource) {
-                await vehicle.reload();
-            }
+            vehicle = await this.reloadIndexResource(await this.resolveVehicleResource(vehicle));
 
             return this.modalsManager.show('modals/resource', {
                 resource: vehicle,
@@ -159,9 +173,7 @@ export default class VehicleActionsService extends ResourceActionService {
             });
         },
         view: async (vehicle, options = {}) => {
-            if (vehicle?.meta?._index_resource) {
-                await vehicle.reload();
-            }
+            vehicle = await this.reloadIndexResource(await this.resolveVehicleResource(vehicle));
 
             return this.modalsManager.show('modals/resource', {
                 resource: vehicle,

package/addon/services/vendor-actions.js

@@ -43,8 +43,11 @@ export default class VendorActionsService extends ResourceActionService {
         view: (vendor) => {
             return this.resourceContextPanel.open({
                 vendor,
+                header: 'vendor/panel-header',
                 tabs: [
                     {
+                        key: 'overview',
+                        id: 'overview',
                         label: this.intl.t('common.overview'),
                         component: 'vendor/details',
                     },

package/addon/styles/fleetops-engine.css

@@ -235,8 +235,6 @@ body[data-theme='dark'] .fleetops-connectivity-kpi-accent-rose .fleetops-connect
 
 .fleetops-provider-connections-actions .fleetops-provider-connections-search {
     min-width: 16rem;
-    height: 2.25rem;
-    min-height: 2.25rem;
 }
 
 .fleetops-provider-connections-header {
@@ -257,8 +255,6 @@ body[data-theme='dark'] .fleetops-connectivity-kpi-accent-rose .fleetops-connect
 .fleetops-provider-connections-actions .fleetops-telematics-action-button,
 .fleetops-provider-connections-actions button {
     flex-shrink: 0;
-    height: 2.25rem;
-    min-height: 2.25rem;
     white-space: nowrap;
 }
 
@@ -266,6 +262,26 @@ body[data-theme='dark'] .fleetops-connectivity-kpi-accent-rose .fleetops-connect
     white-space: nowrap;
 }
 
+.fleetops-attachments-vehicle-filter-trigger.ember-power-select-trigger {
+    display: flex;
+    align-items: center;
+    min-height: 2rem;
+    padding-right: 1.75rem;
+}
+
+.fleetops-attachments-vehicle-filter-trigger.ember-power-select-trigger .ember-power-select-placeholder,
+.fleetops-attachments-vehicle-filter-trigger.ember-power-select-trigger .ember-power-select-selected-item {
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.fleetops-attachments-vehicle-filter-trigger.ember-power-select-trigger .ember-power-select-status-icon {
+    display: block;
+    right: 0.65rem;
+}
+
 .status-badge.long-offline-status-badge > span,
 .status-badge.long_offline-status-badge > span {
     background-color: #854d0e;
@@ -278,6 +294,14 @@ body[data-theme='dark'] .fleetops-connectivity-kpi-accent-rose .fleetops-connect
     color: #fde047;
 }
 
+.fleetops-device-status-badge.status-badge > span {
+    padding: 0 0.25rem !important;
+    border-radius: 0.125rem !important;
+    font-size: 0.5625rem !important;
+    line-height: 0.75rem !important;
+    font-weight: 700;
+}
+
 .fleetops-provider-connections-panel .table-wrapper table tbody tr td,
 .fleetops-provider-connections-panel .next-table-wrapper table tbody tr td {
     vertical-align: top;

package/addon/templates/connectivity/devices/index/details/events.hbs

@@ -1 +1,85 @@
-{{outlet}}
+<div class="flex flex-col gap-3 p-3">
+    <div class="flex flex-col gap-1">
+        <h2 class="text-base font-bold text-gray-900 dark:text-gray-100">Event Review + Triage</h2>
+        <p class="text-xs text-gray-500 dark:text-gray-300">Warning signals, diagnostics, and unprocessed telemetry.</p>
+    </div>
+
+    <section class="grid grid-cols-1 gap-2 sm:grid-cols-2 lg:grid-cols-4">
+        {{#each this.metrics as |metric|}}
+            <div class="fleet-ops-widget fleet-ops-kpi-tile fleetops-connectivity-kpi-tile {{metric.accentClass}} relative min-h-[82px] overflow-hidden rounded-md border bg-white shadow-sm dark:bg-gray-800">
+                <div class="flex h-full items-start justify-between gap-2 p-3">
+                    <div class="min-w-0">
+                        <div class="truncate text-[10px] font-bold uppercase text-gray-500 dark:text-gray-400">{{metric.label}}</div>
+                        <div class="mt-1 text-xl font-extrabold leading-none text-gray-900 dark:text-gray-50">{{metric.value}}</div>
+                    </div>
+                    <div class="fleetops-connectivity-kpi-icon flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-md text-[13px]">
+                        <FaIcon @icon={{metric.icon}} />
+                    </div>
+                </div>
+            </div>
+        {{/each}}
+    </section>
+
+    {{#if this.hasHealthyEventState}}
+        <Telematic::TabEmptyState
+            @tone="success"
+            @icon="check"
+            @title="No warning or unprocessed events"
+            @message="Recent telemetry is reviewed and no warning-level events are currently visible for this device."
+            @primaryText="Refresh"
+            @primaryIcon="refresh"
+            @primaryAction={{this.refresh}}
+        />
+    {{/if}}
+
+    <section class="overflow-hidden rounded-md border border-gray-200 bg-white shadow-sm dark:border-gray-700 dark:bg-gray-800">
+        <div class="fleetops-provider-connections-header border-b border-gray-200 px-3 py-2 dark:border-gray-700">
+            <div>
+                <h3 class="text-sm font-bold text-gray-900 dark:text-gray-100">Telemetry Events</h3>
+                <p class="mt-1 text-xs text-gray-500 dark:text-gray-300">Filter by type, severity, processed state, and date.</p>
+            </div>
+            <div class="fleetops-provider-connections-actions flex min-w-0 flex-wrap items-center gap-1 lg:ml-auto lg:flex-nowrap lg:justify-end">
+                <Layout::Resource::TabularActions
+                    @title="Telemetry Events"
+                    @searchQuery={{this.events_query}}
+                    @onSearch={{perform this.searchTask}}
+                    @columns={{this.columns}}
+                    @page={{this.events_page}}
+                    @onPageChange={{fn (mut this.events_page)}}
+                    @actionButtons={{this.actionButtons}}
+                    @bulkActions={{this.bulkActions}}
+                    @controller={{this}}
+                    @searchInputClass="fleetops-provider-connections-search"
+                    @filterPickerButtonClass="fleetops-provider-connections-action-button"
+                    @columnPickerButtonClass="fleetops-provider-connections-action-button"
+                    @filterPickerSize="sm"
+                    @columnPickerSize="sm"
+                />
+            </div>
+        </div>
+
+        <Layout::Resource::Tabular
+            @resource="device-event"
+            @title="Telemetry Events"
+            @data={{@model}}
+            @columns={{this.columns}}
+            @page={{this.events_page}}
+            @onPageChange={{fn (mut this.events_page)}}
+            @controller={{this}}
+            @withoutHeader={{true}}
+            @tableWrapperClass="no-table-extra-spacing"
+            @emptyStateComponent={{component
+                "table/empty-state"
+                variant="compact"
+                icon="bolt"
+                title="No telemetry events"
+                description="Events appear after this device reports provider activity."
+                filteredTitle="No events match your filters"
+                filteredDescription="Adjust the search, severity, or date filters to review other events."
+                primaryText="Refresh"
+                primaryIcon="refresh"
+                primaryAction=this.refresh
+            }}
+        />
+    </section>
+</div>

package/addon/templates/connectivity/devices/index/details/sensors.hbs

@@ -0,0 +1,73 @@
+<div class="flex flex-col gap-3 p-3">
+    <div class="flex flex-col gap-1">
+        <h2 class="text-base font-bold text-gray-900 dark:text-gray-100">Sensor Inventory + Health</h2>
+        <p class="text-xs text-gray-500 dark:text-gray-300">Readings, thresholds, and reporting health for this device.</p>
+    </div>
+
+    <section class="grid grid-cols-1 gap-2 sm:grid-cols-2 lg:grid-cols-4">
+        {{#each this.metrics as |metric|}}
+            <div class="fleet-ops-widget fleet-ops-kpi-tile fleetops-connectivity-kpi-tile {{metric.accentClass}} relative min-h-[82px] overflow-hidden rounded-md border bg-white shadow-sm dark:bg-gray-800">
+                <div class="flex h-full items-start justify-between gap-2 p-3">
+                    <div class="min-w-0">
+                        <div class="truncate text-[10px] font-bold uppercase text-gray-500 dark:text-gray-400">{{metric.label}}</div>
+                        <div class="mt-1 text-xl font-extrabold leading-none text-gray-900 dark:text-gray-50">{{metric.value}}</div>
+                    </div>
+                    <div class="fleetops-connectivity-kpi-icon flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-md text-[13px]">
+                        <FaIcon @icon={{metric.icon}} />
+                    </div>
+                </div>
+            </div>
+        {{/each}}
+    </section>
+
+    <section class="overflow-hidden rounded-md border border-gray-200 bg-white shadow-sm dark:border-gray-700 dark:bg-gray-800">
+        <div class="fleetops-provider-connections-header border-b border-gray-200 px-3 py-2 dark:border-gray-700">
+            <div>
+                <h3 class="text-sm font-bold text-gray-900 dark:text-gray-100">Device Sensors</h3>
+                <p class="mt-1 text-xs text-gray-500 dark:text-gray-300">Filter by type, status, and last reading.</p>
+            </div>
+            <div class="fleetops-provider-connections-actions flex min-w-0 flex-wrap items-center gap-2 lg:ml-auto lg:flex-nowrap lg:justify-end">
+                <Layout::Resource::TabularActions
+                    @title="Device Sensors"
+                    @searchQuery={{this.sensors_query}}
+                    @onSearch={{perform this.searchTask}}
+                    @columns={{this.columns}}
+                    @page={{this.sensors_page}}
+                    @onPageChange={{fn (mut this.sensors_page)}}
+                    @actionButtons={{this.actionButtons}}
+                    @bulkActions={{this.bulkActions}}
+                    @controller={{this}}
+                    @searchInputClass="fleetops-provider-connections-search"
+                    @filterPickerButtonClass="fleetops-provider-connections-action-button"
+                    @columnPickerButtonClass="fleetops-provider-connections-action-button"
+                    @filterPickerSize="sm"
+                    @columnPickerSize="sm"
+                />
+            </div>
+        </div>
+
+        <Layout::Resource::Tabular
+            @resource="sensor"
+            @title="Device Sensors"
+            @data={{@model}}
+            @columns={{this.columns}}
+            @page={{this.sensors_page}}
+            @onPageChange={{fn (mut this.sensors_page)}}
+            @controller={{this}}
+            @withoutHeader={{true}}
+            @tableWrapperClass="no-table-extra-spacing"
+            @emptyStateComponent={{component
+                "table/empty-state"
+                variant="compact"
+                icon="gauge-high"
+                title="No sensors connected"
+                description="Sensors appear here after provider telemetry links them to this device."
+                filteredTitle="No sensors match your filters"
+                filteredDescription="Adjust the search or filters to find another sensor."
+                primaryText="Refresh"
+                primaryIcon="refresh"
+                primaryAction=this.refresh
+            }}
+        />
+    </section>
+</div>