@fleetbase/fleetops-engine 0.6.51 → 0.6.52

package/addon/components/fuel-integration/matching-priority.js

@@ -0,0 +1,145 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+
+const MATCHING_FIELDS = [
+    {
+        key: 'plate_number',
+        label: 'Plate number',
+        source: 'Provider plate number',
+        target: 'Vehicle plate number',
+        description: 'Best default for fuel card imports. Matches license plates with normalized spacing and casing.',
+    },
+    {
+        key: 'internal_id',
+        label: 'Internal ID',
+        source: 'Provider internal fleet number',
+        target: 'Vehicle internal ID',
+        description: 'Use when the provider fleet number is the same identifier operators maintain on the vehicle.',
+    },
+    {
+        key: 'vin',
+        label: 'VIN',
+        source: 'Provider VIN',
+        target: 'Vehicle VIN',
+        description: 'Matches the vehicle identification number when the provider sends it with the transaction.',
+    },
+    {
+        key: 'serial_number',
+        label: 'Serial number',
+        source: 'Provider serial number',
+        target: 'Vehicle serial number',
+        description: 'Matches manufacturer or fleet serial numbers recorded on the vehicle.',
+    },
+    {
+        key: 'call_sign',
+        label: 'Call sign',
+        source: 'Provider call sign',
+        target: 'Vehicle call sign',
+        description: 'Matches operational call signs when those are shared with the fuel provider.',
+    },
+    {
+        key: 'fuel_card_number',
+        label: 'Fuel card number',
+        source: 'Provider fuel card number',
+        target: 'Vehicle fuel card number',
+        description: 'Use when each vehicle has a dedicated fuel card number saved on the vehicle record.',
+    },
+    {
+        key: 'trip_number',
+        label: 'Trip number / order reference',
+        source: 'Provider trip/order reference',
+        target: 'Order public ID, internal ID, or tracking number',
+        description: 'Links the transaction to an order when the provider sends a trip or order reference. It does not identify the vehicle by itself.',
+    },
+    {
+        key: 'provider_vehicle_id',
+        label: 'Provider vehicle ID',
+        source: 'Provider-specific vehicle ID',
+        target: 'Vehicle provider metadata',
+        description: 'Advanced fallback only. Use it when provider vehicle IDs have been intentionally stored on vehicle metadata.',
+    },
+];
+
+const DEFAULT_MATCHING_ORDER = ['plate_number', 'internal_id', 'vin', 'serial_number', 'call_sign', 'fuel_card_number', 'trip_number'];
+const LEGACY_DEFAULT_MATCHING_ORDER = ['provider_vehicle_id', 'internal_number', 'structure_number', 'plate_number', 'vehicle_card_id', 'trip_number'];
+const LEGACY_FIELD_ALIASES = {
+    internal_number: 'internal_id',
+    vehicle_card_id: 'fuel_card_number',
+};
+
+export default class FuelIntegrationMatchingPriorityComponent extends Component {
+    fields = MATCHING_FIELDS;
+
+    get order() {
+        if (Array.isArray(this.args.order)) {
+            if (this.args.order.join('|') === LEGACY_DEFAULT_MATCHING_ORDER.join('|')) {
+                return DEFAULT_MATCHING_ORDER;
+            }
+
+            return Array.from(this.args.order)
+                .map((key) => LEGACY_FIELD_ALIASES[key] ?? key)
+                .filter((key, index, order) => key && order.indexOf(key) === index);
+        }
+
+        return DEFAULT_MATCHING_ORDER;
+    }
+
+    get selectedFields() {
+        const lastIndex = this.order.length - 1;
+
+        return this.order
+            .map((key, index) => {
+                const field = this.fields.find((option) => option.key === key);
+                if (!field) {
+                    return null;
+                }
+
+                return {
+                    ...field,
+                    index,
+                    priority: index + 1,
+                    canMoveUp: index > 0,
+                    canMoveDown: index < lastIndex,
+                };
+            })
+            .filter(Boolean);
+    }
+
+    get availableFields() {
+        const selected = new Set(this.order);
+        return this.fields.filter((field) => !selected.has(field.key));
+    }
+
+    get hasSelectedFields() {
+        return this.selectedFields.length > 0;
+    }
+
+    updateOrder(order) {
+        this.args.onChange?.(order);
+    }
+
+    @action addField(field) {
+        if (this.order.includes(field.key)) {
+            return;
+        }
+
+        this.updateOrder([...this.order, field.key]);
+    }
+
+    @action removeField(field) {
+        this.updateOrder(this.order.filter((key) => key !== field.key));
+    }
+
+    @action moveField(field, direction) {
+        const currentIndex = this.order.indexOf(field.key);
+        const nextIndex = currentIndex + direction;
+
+        if (currentIndex < 0 || nextIndex < 0 || nextIndex >= this.order.length) {
+            return;
+        }
+
+        const nextOrder = [...this.order];
+        [nextOrder[currentIndex], nextOrder[nextIndex]] = [nextOrder[nextIndex], nextOrder[currentIndex]];
+        this.updateOrder(nextOrder);
+    }
+}

package/addon/components/fuel-report/details.hbs

@@ -9,6 +9,18 @@
                 <div class="field-name">{{t "common.status"}}</div>
                 <div class="field-value"><Badge @status={{@resource.status}} /></div>
             </div>
+            {{#if @resource.source}}
+                <div class="field-info-container">
+                    <div class="field-name">Source</div>
+                    <div class="field-value"><Badge @status={{@resource.source}} /></div>
+                </div>
+            {{/if}}
+            {{#if @resource.provider}}
+                <div class="field-info-container">
+                    <div class="field-name">Provider</div>
+                    <div class="field-value uppercase">{{@resource.provider}}</div>
+                </div>
+            {{/if}}
             <div class="field-info-container">
                 <div class="field-name">{{t "fuel-report.fields.reporter"}}</div>
                 <div class="field-value">{{n-a @resource.reporter_name}}</div>
@@ -45,4 +57,4 @@
     </ContentPanel>
 
     <CustomField::Yield @subject={{@resource}} @viewMode={{true}} @wrapperClass="bordered-top" />
-</div>
+</div>

package/addon/components/issue/details.hbs

@@ -139,67 +139,13 @@
             </section>
 
             <section class="issue-detail-side-card">
-                <div class="issue-detail-section-title">Linked Order</div>
+                <div class="issue-detail-section-title">{{t "order.card.linked-order"}}</div>
                 {{#if this.order}}
-                    <button type="button" class="issue-detail-order-card" {{on "click" this.viewOrder}}>
-                        <div class="issue-detail-order-topline">
-                            <div class="issue-detail-order-title-block">
-                                <div class="issue-detail-order-title">{{this.orderLabel}}</div>
-                                <div class="issue-detail-order-subtitle">{{n-a (smart-humanize this.order.type)}}</div>
-                            </div>
-                            <Badge @status={{this.order.status}} />
-                        </div>
-                        <div class="issue-detail-order-progress {{this.orderProgressClass}}">
-                            <span></span>
-                        </div>
-                        {{#if this.hasOrderStops}}
-                            <div class="issue-detail-order-route">
-                                <div class="issue-detail-order-stop">
-                                    <div class="issue-detail-order-stop-marker pickup">1</div>
-                                    <div class="min-w-0">
-                                        <div class="issue-detail-order-stop-label">Pickup</div>
-                                        <div class="issue-detail-order-stop-address">{{n-a this.orderOriginAddress "No pickup address"}}</div>
-                                    </div>
-                                </div>
-                                {{#if this.isMultiStopOrder}}
-                                    <div class="issue-detail-order-stop compact">
-                                        <div class="issue-detail-order-stop-marker middle">+</div>
-                                        <div class="min-w-0">
-                                            <div class="issue-detail-order-stop-label">Waypoints</div>
-                                            <div class="issue-detail-order-stop-address">{{this.middleStopCount}} additional {{if (eq this.middleStopCount 1) "stop" "stops"}}</div>
-                                        </div>
-                                    </div>
-                                {{/if}}
-                                <div class="issue-detail-order-stop">
-                                    <div class="issue-detail-order-stop-marker dropoff">{{this.orderStopCount}}</div>
-                                    <div class="min-w-0">
-                                        <div class="issue-detail-order-stop-label">{{if (eq this.orderDestination.type "return") "Return" "Dropoff"}}</div>
-                                        <div class="issue-detail-order-stop-address">{{n-a this.orderDestinationAddress "No dropoff address"}}</div>
-                                    </div>
-                                </div>
-                            </div>
-                        {{else}}
-                            <div class="issue-detail-empty issue-detail-empty-compact">
-                                <FaIcon @icon="route" />
-                                <span>No route details available.</span>
-                            </div>
-                        {{/if}}
-                        <div class="issue-detail-order-meta">
-                            {{#if this.orderScheduledAt}}
-                                <span><FaIcon @icon="calendar" /> {{format-date-fns this.orderScheduledAt "MMM d, HH:mm"}}</span>
-                            {{/if}}
-                            {{#if this.orderDriverLabel}}
-                                <span><FaIcon @icon="id-card" /> {{this.orderDriverLabel}}</span>
-                            {{/if}}
-                            {{#if this.orderVehicleLabel}}
-                                <span><FaIcon @icon="truck" /> {{this.orderVehicleLabel}}</span>
-                            {{/if}}
-                        </div>
-                    </button>
+                    <Order::Card @order={{this.order}} @variant="default" @interactive={{true}} @onClick={{this.viewOrder}} />
                 {{else}}
                     <div class="issue-detail-empty">
                         <FaIcon @icon="route" />
-                        <span>No order is linked to this issue.</span>
+                        <span>{{t "order.card.no-order-linked"}}</span>
                     </div>
                 {{/if}}
             </section>

package/addon/components/issue/details.js

@@ -3,9 +3,6 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { formatDistanceStrict, isValid } from 'date-fns';
 
-const COMPLETE_ORDER_STATUSES = ['completed', 'delivered'];
-const ACTIVE_ORDER_STATUSES = ['dispatched', 'started', 'in_progress', 'driver_enroute', 'driver_nearby'];
-
 export default class IssueDetailsComponent extends Component {
     @service hostRouter;
     @service issueActions;
@@ -121,104 +118,11 @@ export default class IssueDetailsComponent extends Component {
         return formatDistanceStrict(createdAt, resolvedAt);
     }
 
-    get orderLabel() {
-        return this.order?.tracking_number?.tracking_number || this.order?.tracking_number || this.order?.tracking || this.order?.public_id || this.order?.id;
-    }
-
-    get orderStops() {
-        const payload = this.order?.payload ?? {};
-        const stops = [];
-
-        if (payload.pickup) {
-            stops.push({ type: 'pickup', place: payload.pickup });
-        }
-
-        (payload.waypoints ?? []).forEach((waypoint, index) => {
-            stops.push({
-                type: waypoint.type ?? 'waypoint',
-                place: waypoint.place ?? waypoint,
-                index: index + 1,
-            });
-        });
-
-        if (payload.dropoff) {
-            stops.push({ type: 'dropoff', place: payload.dropoff });
-        }
-
-        if (payload.return) {
-            stops.push({ type: 'return', place: payload.return });
-        }
-
-        return stops.filter((stop) => this.addressForPlace(stop.place));
-    }
-
-    get orderOrigin() {
-        return this.orderStops[0];
-    }
-
-    get orderDestination() {
-        return this.orderStops[this.orderStops.length - 1];
-    }
-
-    get orderOriginAddress() {
-        return this.addressForPlace(this.orderOrigin?.place);
-    }
-
-    get orderDestinationAddress() {
-        return this.addressForPlace(this.orderDestination?.place);
-    }
-
-    get orderStopCount() {
-        return this.orderStops.length;
-    }
-
-    get middleStopCount() {
-        return Math.max(this.orderStopCount - 2, 0);
-    }
-
-    get isMultiStopOrder() {
-        return this.orderStopCount > 2;
-    }
-
-    get hasOrderStops() {
-        return this.orderStopCount > 0;
-    }
-
-    get orderProgressClass() {
-        const status = this.order?.status;
-
-        if (COMPLETE_ORDER_STATUSES.includes(status)) {
-            return 'is-complete';
-        }
-
-        if (ACTIVE_ORDER_STATUSES.includes(status)) {
-            return 'is-active';
-        }
-
-        return 'is-pending';
-    }
-
-    get orderScheduledAt() {
-        return this.order?.scheduled_at || this.order?.created_at || this.order?.createdAt;
-    }
-
-    get orderDriverLabel() {
-        return this.order?.driver_assigned?.name || this.order?.driver_name || this.order?.driver?.name;
-    }
-
-    get orderVehicleLabel() {
-        return this.order?.vehicle_assigned?.displayName || this.order?.vehicle_assigned?.display_name || this.order?.vehicle_name || this.order?.vehicle?.displayName;
-    }
-
     get hasLocation() {
         const location = this.resource?.location;
         return Boolean(location?.latitude || location?.longitude || location?.coordinates);
     }
 
-    addressForPlace(place) {
-        return place?.address ?? place?.address_html ?? place?.street1 ?? place?.name;
-    }
-
     dateFromValue(value) {
         if (!value) {
             return null;

package/addon/components/layout/fleet-ops-sidebar.js

@@ -162,6 +162,15 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
             },
             {
                 priority: 7,
+                intl: 'menu.fuel-transactions',
+                title: this.intl.t('menu.fuel-transactions'),
+                icon: 'credit-card',
+                route: 'management.fuel-transactions',
+                permission: 'fleet-ops list fuel-report',
+                visible: this.abilities.can('fleet-ops see fuel-report'),
+            },
+            {
+                priority: 8,
                 intl: 'menu.issues',
                 title: this.intl.t('menu.issues'),
                 icon: 'triangle-exclamation',
@@ -184,6 +193,15 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
             },
             {
                 priority: 1,
+                intl: 'menu.fuel-providers',
+                title: this.intl.t('menu.fuel-providers'),
+                icon: 'gas-pump',
+                route: 'connectivity.fuel-providers',
+                permission: 'fleet-ops list fuel-report',
+                visible: this.abilities.can('fleet-ops see fuel-report'),
+            },
+            {
+                priority: 2,
                 intl: 'menu.devices',
                 title: this.intl.t('menu.devices'),
                 icon: 'hard-drive',
@@ -192,7 +210,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see device'),
             },
             {
-                priority: 2,
+                priority: 3,
                 intl: 'menu.sensors',
                 title: this.intl.t('menu.sensors'),
                 icon: 'temperature-full',
@@ -201,7 +219,7 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
                 visible: this.abilities.can('fleet-ops see sensor'),
             },
             {
-                priority: 3,
+                priority: 4,
                 intl: 'menu.events',
                 title: this.intl.t('menu.events'),
                 icon: 'stream',

package/addon/components/map/drawer/device-event-listing.hbs

@@ -60,5 +60,15 @@
         {{/if}}
     </div>
 </div>
-<Table @rows={{this.events}} @columns={{this.columns}} />
-<Spacer @height="200px" />
+<Table
+    @rows={{this.events}}
+    @columns={{this.columns}}
+    @emptyStateComponent={{component
+        "table/empty-state"
+        variant="compact"
+        icon="bolt"
+        title="No device events"
+        description="Events appear here after connected devices report activity for the selected filters."
+    }}
+/>
+<Spacer @height="200px" />

package/addon/components/map/drawer/driver-listing.hbs

@@ -3,4 +3,17 @@
         <Input @value={{this.query}} @type="text" class="form-input form-input-sm w-60" placeholder={{t "live-map-drawer.driver-listing.message"}} />
     </div>
 </div>
-<Table @rows={{this.filteredDrivers}} @columns={{this.columns}} />
+<Table
+    @rows={{this.filteredDrivers}}
+    @columns={{this.columns}}
+    @searchQuery={{this.query}}
+    @emptyStateComponent={{component
+        "table/empty-state"
+        variant="compact"
+        icon="id-card"
+        title="No drivers visible"
+        description="Drivers appear here when they are available in the live map context."
+        filteredTitle="No drivers match this search"
+        filteredDescription="Adjust the search to find another driver."
+    }}
+/>

package/addon/components/map/drawer/place-listing.hbs

@@ -3,4 +3,17 @@
         <Input @value={{this.query}} @type="text" class="form-input form-input-sm w-60" placeholder={{t "live-map-drawer.place-listing.message"}} />
     </div>
 </div>
-<Table @rows={{this.filteredPlaces}} @columns={{this.columns}} />
+<Table
+    @rows={{this.filteredPlaces}}
+    @columns={{this.columns}}
+    @searchQuery={{this.query}}
+    @emptyStateComponent={{component
+        "table/empty-state"
+        variant="compact"
+        icon="location-dot"
+        title="No places visible"
+        description="Places appear here when they are available in the current map context."
+        filteredTitle="No places match this search"
+        filteredDescription="Adjust the search to find another place."
+    }}
+/>

package/addon/components/map/drawer/position-listing.hbs

@@ -96,5 +96,15 @@
         </div>
     </div>
 </div>
-<Table @rows={{this.positions}} @columns={{this.columns}} />
-<Spacer @height="400px" />
+<Table
+    @rows={{this.positions}}
+    @columns={{this.columns}}
+    @emptyStateComponent={{component
+        "table/empty-state"
+        variant="compact"
+        icon="route"
+        title="No positions loaded"
+        description="Select a trackable and date range to load position history for replay."
+    }}
+/>
+<Spacer @height="400px" />

package/addon/components/map/drawer/vehicle-listing.hbs

@@ -3,4 +3,17 @@
         <Input @value={{this.query}} @type="text" class="form-input form-input-sm w-60" placeholder={{t "live-map-drawer.vehicle-listing.message"}} />
     </div>
 </div>
-<Table @rows={{this.filteredVehicles}} @columns={{this.columns}} />
+<Table
+    @rows={{this.filteredVehicles}}
+    @columns={{this.columns}}
+    @searchQuery={{this.query}}
+    @emptyStateComponent={{component
+        "table/empty-state"
+        variant="compact"
+        icon="truck"
+        title="No vehicles visible"
+        description="Vehicles appear here when they are available in the live map context."
+        filteredTitle="No vehicles match this search"
+        filteredDescription="Adjust the search to find another vehicle."
+    }}
+/>

package/addon/components/modals/assigned-orders.hbs

@@ -0,0 +1,40 @@
+<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
+    <div class="modal-body-container">
+        <div class="mb-4 rounded-md border border-gray-200 bg-gray-50 p-3 dark:border-gray-700 dark:bg-gray-800">
+            <div class="text-xs font-semibold uppercase text-gray-500 dark:text-gray-400">{{@options.subjectLabel}}</div>
+            <div class="mt-1 text-sm font-semibold text-gray-900 dark:text-gray-100">{{@options.subjectName}}</div>
+            <div class="mt-1 text-xs text-gray-500 dark:text-gray-400">{{t "modals.assigned-orders.help-text" count=@options.orders.length}}</div>
+        </div>
+
+        <div class="space-y-2">
+            {{#each @options.orders as |order|}}
+                <div class="rounded-md border border-gray-200 p-3 dark:border-gray-700">
+                    <div class="flex items-start gap-3">
+                        <Checkbox
+                            @value={{includes order.id @options.selectedOrderIds}}
+                            @onToggle={{fn @options.toggleOrder order}}
+                            @alignItems="center"
+                            @labelClass="mb-0i"
+                        />
+                        <div class="min-w-0 flex-1">
+                            <div class="flex items-center justify-between gap-2">
+                                <div class="truncate text-sm font-semibold text-gray-900 dark:text-gray-100">
+                                    {{or order.tracking order.public_id order.id}}
+                                </div>
+                                <div class="flex shrink-0 items-center gap-1">
+                                    {{#if order.is_current_job}}
+                                        <Badge @hideStatusDot={{true}} @status="info">{{t "common.current-job"}}</Badge>
+                                    {{/if}}
+                                    <Badge @hideStatusDot={{true}} @status={{order.status}} />
+                                </div>
+                            </div>
+                            <div class="mt-1 truncate text-xs text-gray-500 dark:text-gray-400">
+                                {{or order.internal_id order.public_id}}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            {{/each}}
+        </div>
+    </div>
+</Modal::Default>

package/addon/components/modals/attach-device.hbs

@@ -1,12 +1,13 @@
 <Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
     <div class="modal-body-container">
-        <InputGroup @name={{t "common.select-field" field=(t "resource.device")}} @value={{@options.driver.vehicle_uuid}}>
+        <InputGroup @name={{t "common.select-field" field=(t "resource.device")}} @value={{@options.selectedDevice}}>
             <ModelSelect
                 @modelName="device"
                 @selectedModel={{@options.selectedDevice}}
+                @query={{hash attachment_state="unattached"}}
                 @placeholder={{t "common.select-field" field=(t "resource.device")}}
                 @triggerClass="form-select form-input"
-                @infiniteScroll={{false}}
+                @infiniteScroll={{true}}
                 @renderInPlace={{true}}
                 @onChange={{fn (mut @options.selectedDevice)}}
                 as |model|
@@ -15,4 +16,4 @@
             </ModelSelect>
         </InputGroup>
     </div>
-</Modal::Default>
+</Modal::Default>

package/addon/components/modals/attach-telematic-device.hbs

@@ -0,0 +1,25 @@
+<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
+    <div class="modal-body-container">
+        <div class="mb-4 rounded-md border border-gray-200 bg-gray-50 p-3 dark:border-gray-700 dark:bg-gray-800">
+            <div class="text-xs font-semibold uppercase text-gray-500 dark:text-gray-400">Synced device</div>
+            <div class="mt-2">
+                <Device::Pill @device={{@options.device}} />
+            </div>
+        </div>
+
+        <InputGroup @name={{t "common.select-field" field=(t "resource.vehicle")}} @value={{@options.selectedVehicle}}>
+            <ModelSelect
+                @modelName="vehicle"
+                @selectedModel={{@options.selectedVehicle}}
+                @placeholder={{t "common.select-field" field=(t "resource.vehicle")}}
+                @triggerClass="form-select form-input"
+                @infiniteScroll={{true}}
+                @renderInPlace={{true}}
+                @onChange={{fn (mut @options.selectedVehicle)}}
+                as |vehicle|
+            >
+                <Vehicle::Pill @resource={{vehicle}} />
+            </ModelSelect>
+        </InputGroup>
+    </div>
+</Modal::Default>

package/addon/components/modals/attach-telematic-device.js

@@ -0,0 +1,3 @@
+import Component from '@glimmer/component';
+
+export default class ModalsAttachTelematicDeviceComponent extends Component {}