@fleetbase/fleetops-engine 0.6.28 → 0.6.30

package/addon/components/customer/create-order-form.hbs

@@ -75,7 +75,7 @@
                                         <ModelSelect
                                             @modelName="place"
                                             @selectedModel={{waypoint.place}}
-                                            @placeholder={{concat (t "order.fields.select-waypoint-placeholder") " " (add index 1)}}
+                                            @placeholder={{concat (t "order.fields.select-waypoint") " " (add index 1)}}
                                             @triggerClass="form-select form-input truncate max-w-250px"
                                             @infiniteScroll={{false}}
                                             @customSearchEndpoint="places/search"

package/addon/components/customer/order-form.hbs

@@ -51,20 +51,20 @@
                 {{/each}}
             {{/if}}
 
-            <ContentPanel @title={{t "fleet-ops.operations.orders.index.new.route"}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+            <ContentPanel @title={{t "order.fields.route"}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
                 <div class="lg:col-span-2">
                     <div class="flex flex-row justify-between mb-4">
                         <div class="flex">
-                            <Toggle @isToggled={{this.isMultipleDropoffOrder}} @onToggle={{this.toggleMultiDropOrder}} @label={{t "fleet-ops.operations.orders.index.new.route-label"}} />
+                            <Toggle @isToggled={{this.isMultipleDropoffOrder}} @onToggle={{this.toggleMultiDropOrder}} @label={{t "order.fields.route-label"}} />
                         </div>
                         <div class="flex flex-1 justify-end space-x-2">
                             {{#if this.isMultipleDropoffOrder}}
                                 <Button
                                     @icon="map-marked-alt"
-                                    @text={{t "fleet-ops.operations.orders.index.new.add-waypoint"}}
+                                    @text={{t "order.fields.add-waypoint"}}
                                     @size="sm"
                                     @onClick={{this.addWaypoint}}
-                                    @helpText={{t "fleet-ops.operations.orders.index.new.add-waypoint-help-text"}}
+                                    @helpText={{t "order.fields.add-waypoint-help-text"}}
                                     @permission="fleet-ops create order"
                                 />
                             {{/if}}
@@ -84,7 +84,7 @@
                                         <ModelSelect
                                             @modelName="place"
                                             @selectedModel={{waypoint.place}}
-                                            @placeholder={{concat (t "fleet-ops.operations.orders.index.new.select-waypoint-placeholder") " " (add index 1)}}
+                                            @placeholder={{concat (t "order.fields.select-waypoint") " " (add index 1)}}
                                             @triggerClass="form-select form-input truncate max-w-250px"
                                             @infiniteScroll={{false}}
                                             @customSearchEndpoint="places/search"
@@ -99,7 +99,7 @@
                                         {{#if waypoint.place.hasInvalidCoordinates}}
                                             <div class="leading-5 text-sm text-red-400 mt-2">
                                                 <FaIcon @icon="exclamation-triangle" class="mr-1" />
-                                                {{t "fleet-ops.operations.orders.index.new.invalid-coordinates"}}
+                                                {{t "order.fields.invalid-coordinates"}}
                                             </div>
                                         {{/if}}
                                     </div>
@@ -116,7 +116,7 @@
                         <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-2 text-xs dark:text-gray-100">
                             <InputGroup>
                                 <div class="flex items-center justify-between">
-                                    <label>{{t "fleet-ops.operations.orders.index.new.pickup"}}</label>
+                                    <label>{{t "order.fields.pickup"}}</label>
                                     <div class="flex-row space-x-1 pr-0.5">
                                         {{#if this.payload.pickup}}
                                             <a href="javascript:;" {{on "click" (fn this.editPlace this.payload.pickup)}}>
@@ -131,7 +131,7 @@
                                 <ModelSelect
                                     @modelName="place"
                                     @selectedModel={{this.payload.pickup}}
-                                    @placeholder={{t "fleet-ops.operations.orders.index.new.select-pickup"}}
+                                    @placeholder={{t "order.fields.select-pickup"}}
                                     @triggerClass="form-select form-input"
                                     @infiniteScroll={{false}}
                                     @customSearchEndpoint="places/search"
@@ -146,13 +146,13 @@
                                 {{#if this.payload.pickup.hasInvalidCoordinates}}
                                     <div class="leading-5 text-sm text-red-400 mt-2">
                                         <FaIcon @icon="exclamation-triangle" class="mr-1" />
-                                        {{t "fleet-ops.operations.orders.index.new.invalid-coordinates"}}
+                                        {{t "order.fields.invalid-coordinates"}}
                                     </div>
                                 {{/if}}
                             </InputGroup>
                             <InputGroup>
                                 <div class="flex items-center justify-between">
-                                    <label>{{t "fleet-ops.operations.orders.index.new.dropoff"}}</label>
+                                    <label>{{t "order.fields.dropoff"}}</label>
                                     <div class="flex-row space-x-2 pr-0.5">
                                         {{#if this.payload.dropoff}}
                                             <a href="javascript:;" {{on "click" (fn this.editPlace this.payload.dropoff)}} disaled={{cannot "fleet-ops update place"}}>
@@ -167,7 +167,7 @@
                                 <ModelSelect
                                     @modelName="place"
                                     @selectedModel={{this.payload.dropoff}}
-                                    @placeholder={{t "fleet-ops.operations.orders.index.new.select-dropoff"}}
+                                    @placeholder={{t "order.fields.select-dropoff"}}
                                     @triggerClass="form-select form-input"
                                     @infiniteScroll={{false}}
                                     @customSearchEndpoint="places/search"
@@ -182,21 +182,21 @@
                                 {{#if this.payload.dropoff.hasInvalidCoordinates}}
                                     <div class="leading-5 text-sm text-red-400 mt-2">
                                         <FaIcon @icon="exclamation-triangle" class="mr-1" />
-                                        {{t "fleet-ops.operations.orders.index.new.invalid-coordinates"}}
+                                        {{t "order.fields.invalid-coordinates"}}
                                     </div>
                                 {{/if}}
                             </InputGroup>
                             <InputGroup>
                                 <div class="flex items-center justify-between">
-                                    <label>{{t "fleet-ops.operations.orders.index.new.return"}}</label>
+                                    <label>{{t "order.fields.return"}}</label>
                                     {{#if this.payload.return}}
-                                        <a href="javascript:;" {{on "click" (fn this.editPlace this.payload.return)}}>{{t "fleet-ops.operations.orders.index.new.edit-address"}}</a>
+                                        <a href="javascript:;" {{on "click" (fn this.editPlace this.payload.return)}}>{{t "order.fields.edit-address"}}</a>
                                     {{/if}}
                                 </div>
                                 <ModelSelect
                                     @modelName="place"
                                     @selectedModel={{this.payload.return}}
-                                    @placeholder={{t "fleet-ops.operations.orders.index.new.select-return"}}
+                                    @placeholder={{t "order.fields.select-return"}}
                                     @triggerClass="form-select form-input"
                                     @infiniteScroll={{false}}
                                     @customSearchEndpoint="places/search"
@@ -211,7 +211,7 @@
                                 {{#if this.payload.return.hasInvalidCoordinates}}
                                     <div class="leading-5 text-sm text-red-400 mt-2">
                                         <FaIcon @icon="exclamation-triangle" class="mr-1" />
-                                        {{t "fleet-ops.operations.orders.index.new.invalid-coordinates"}}
+                                        {{t "order.fields.invalid-coordinates"}}
                                     </div>
                                 {{/if}}
                             </InputGroup>
@@ -225,26 +225,26 @@
                     <div class="lg:col-span-2">
                         <InputGroup>
                             <Toggle
-                                @label={{t "fleet-ops.operations.orders.index.new.require-proof"}}
+                                @label={{t "order.fields.require-proof"}}
                                 @wrapperClass="justify-start-i"
                                 @isToggled={{this.order.pod_required}}
                                 @onToggle={{this.toggleProofOfDelivery}}
                                 @disabled={{cannot "fleet-ops create order"}}
-                                @helpText={{t "fleet-ops.operations.orders.index.new.require-proof-help-text"}}
+                                @helpText={{t "order.fields.require-proof-help-text"}}
                             />
                         </InputGroup>
                         {{#if this.order.pod_required}}
                             <InputGroup @wrapperClass="mt-4">
                                 <InputLabel
-                                    @labelText={{t "fleet-ops.operations.orders.index.new.proof-delivery"}}
-                                    @helpText={{t "fleet-ops.operations.orders.index.new.proof-delivery-help-text"}}
+                                    @labelText={{t "order.fields.proof-delivery"}}
+                                    @helpText={{t "order.fields.proof-delivery-help-text"}}
                                 />
                                 <Select
                                     class="w-full"
                                     @options={{this.podOptions}}
                                     @value={{this.order.pod_method}}
                                     @onSelect={{fn (mut this.order.pod_method)}}
-                                    @placeholder={{t "fleet-ops.operations.orders.index.new.proof-delivery-placeholder"}}
+                                    @placeholder={{t "order.fields.proof-delivery-placeholder"}}
                                     @disabled={{cannot "fleet-ops create order"}}
                                 />
                             </InputGroup>
@@ -253,13 +253,13 @@
                 </div>
             </ContentPanel>
 
-            <ContentPanel @title={{t "fleet-ops.operations.orders.index.new.payload-entities"}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+            <ContentPanel @title={{t "order.fields.payload-entities"}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
                 <div class="flex items-center mb-4">
                     <Button
                         @wrapperClass="mr-2"
                         @icon="square-plus"
                         @iconPrefix="fas"
-                        @text={{t "fleet-ops.operations.orders.index.new.add-item-order"}}
+                        @text={{t "order.fields.add-item-order"}}
                         @size="sm"
                         @onClick={{this.addEntity}}
                         @permission="fleet-ops create order"
@@ -278,7 +278,7 @@
                                         <Input @value={{entity.name}} @type="text" class="w-full form-input form-input-sm" placeholder={{t "common.name"}} />
                                     </div>
                                     <div>
-                                        <Input @value={{entity.sku}} @type="text" class="w-full form-input form-input-sm" placeholder={{t "fleet-ops.operations.orders.index.new.sku"}} />
+                                        <Input @value={{entity.sku}} @type="text" class="w-full form-input form-input-sm" placeholder={{t "order.fields.sku"}} />
                                     </div>
                                     {{#if this.waypoints.length}}
                                         <Select
@@ -286,12 +286,12 @@
                                             @options={{this.waypoints}}
                                             @optionValue="place.id"
                                             @optionLabel="place.address"
-                                            @placeholder={{t "fleet-ops.operations.orders.index.new.select-destination"}}
+                                            @placeholder={{t "order.fields.select-destination"}}
                                             @onChange={{fn this.setEntityDestionation index}}
                                             class="w-full form-input-sm"
                                         />
                                     {{/if}}
-                                    <Button @icon="pencil" @text={{t "fleet-ops.operations.orders.index.new.edit-item"}} @size="sm" @onClick={{fn this.editEntity entity}} />
+                                    <Button @icon="pencil" @text={{t "order.fields.edit-item"}} @size="sm" @onClick={{fn this.editEntity entity}} />
                                 </div>
                                 <div class="ml-3">
                                     <Button
@@ -315,12 +315,12 @@
                         <Spinner
                             class="text-sm dark:text-gray-100 flex flex-row items-center"
                             @iconClass="mr-2"
-                            @loadingMessage={{t "fleet-ops.operations.orders.index.new.loading-message"}}
+                            @loadingMessage={{t "order.fields.loading-message"}}
                         />
                     </div>
                 {{else}}
                     {{#if this.serviceQuotes}}
-                        <InfoBlock @text={{t "fleet-ops.operations.orders.index.new.info-text"}} class="mb-4" />
+                        <InfoBlock @text={{t "order.fields.info-text"}} class="mb-4" />
                     {{/if}}
                     <div class="radio-group-condensed -space-y-px">
                         {{#each this.serviceQuotes as |serviceQuote|}}
@@ -343,7 +343,7 @@
                                     <table class="table table-fixed flex-1">
                                         <thead>
                                             <tr>
-                                                <th class="text-left">{{t "fleet-ops.operations.orders.index.new.breakdown"}}</th>
+                                                <th class="text-left">{{t "order.fields.breakdown"}}</th>
                                                 <th></th>
                                             </tr>
                                         </thead>
@@ -375,8 +375,8 @@
                                 @type="warning"
                                 @text={{if
                                     this.payloadCoordinates.length
-                                    (t "fleet-ops.operations.orders.index.new.no-service-info-text")
-                                    (t "fleet-ops.operations.orders.index.new.input-order-info-text")
+                                    (t "order.fields.no-service-quotes")
+                                    (t "order.fields.service-quote-info")
                                 }}
                             />
                         {{/each}}
@@ -384,17 +384,17 @@
                 {{/if}}
             </ContentPanel>
 
-            <ContentPanel @title={{t "fleet-ops.operations.orders.index.new.notes-title"}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+            <ContentPanel @title={{t "order.fields.notes-title"}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
                 <Textarea
                     @value={{this.order.notes}}
                     class="form-input w-full"
-                    placeholder={{t "fleet-ops.operations.orders.index.new.notes-placeholder"}}
+                    placeholder={{t "order.fields.notes-placeholder"}}
                     disabled={{cannot "fleet-ops create order"}}
                     rows={{4}}
                 />
             </ContentPanel>
 
-            <ContentPanel @title={{t "fleet-ops.operations.orders.index.view.documents-panel-title"}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+            <ContentPanel @title={{t "order.fields.documents-panel-title"}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
                 <div class="space-y-4">
                     {{#if this.isUploading}}
                         <div

package/addon/components/customer/orders.hbs

@@ -155,7 +155,7 @@
                                                         </div>
                                                     {{else}}
                                                         <div class="px-10 py-2 flex items-center justify-center">
-                                                            <p class="text-red-600 dark:text-red-100">{{t "fleet-ops.operations.orders.index.view.no-order-activity"}}</p>
+                                                            <p class="text-red-600 dark:text-red-100">{{t "order.fields.no-order-activity"}}</p>
                                                         </div>
                                                     {{/each}}
                                                 </div>
@@ -179,7 +179,7 @@
                                                                             @value={{group.waypoint.tracking}}
                                                                             class="rounded-md bg-yellow-300 text-yellow-900 px-2 py-0.5 text-xs flex-grow-0 truncate"
                                                                         >
-                                                                            <span>{{t "fleet-ops.operations.orders.index.view.tracking"}}</span>
+                                                                            <span>{{t "order.fields.tracking"}}</span>
                                                                             <span>{{group.waypoint.tracking}}</span>
                                                                         </ClickToCopy>
                                                                         <Badge @status={{group.waypoint.status_code}} />

package/addon/components/display-place.hbs

@@ -23,7 +23,7 @@
                         <div class="next-dd-menu mt-1 mx-0" aria-labelledby="user-menu">
                             <div class="px-1">
                                 <div class="text-sm flex flex-row items-center px-3 py-1 rounded-md my-1 text-gray-300">
-                                    {{t "fleet-ops.operations.orders.index.view.waypoint-actions"}}
+                                    {{t "order.fields.waypoint-actions"}}
                                 </div>
                             </div>
                             <div class="next-dd-menu-seperator"></div>

package/addon/components/driver/pill.hbs

@@ -1,17 +1,16 @@
-{{#let (or @driver @resource) as |resource|}}
-    <Pill
-        @resource={{resource}}
-        @imageSrc={{avatar-url resource.photo_url}}
-        @subtitle={{n-a resource.phone "No Phone"}}
-        @fallbackImageType="driverImage"
-        @showOnlineIndicator={{true}}
-        @onClick={{@onClick}}
-        @anchorClass={{@anchorClass}}
-        @imageClass={{@imageClass}}
-        @imageWrapperClass={{@imageWrapperClass}}
-        @contentWrapperClass={{@contentWrapperClass}}
-        @titleClass={{@titleClass}}
-        @subtitleClass={{@subtitleClass}}
-        ...attributes
-    />
-{{/let}}
+<Pill
+    @resource={{this.resource}}
+    @imageSrc={{avatar-url this.resource.photo_url}}
+    @titleFallback={{or @titleFallback "No driver"}}
+    @subtitle={{n-a this.resource.phone (if this.resource "No phone" "-")}}
+    @fallbackImageType="driverImage"
+    @showOnlineIndicator={{if this.resource true false}}
+    @onClick={{@onClick}}
+    @anchorClass={{@anchorClass}}
+    @imageClass={{@imageClass}}
+    @imageWrapperClass={{@imageWrapperClass}}
+    @contentWrapperClass={{@contentWrapperClass}}
+    @titleClass={{@titleClass}}
+    @subtitleClass={{@subtitleClass}}
+    ...attributes
+/>

package/addon/components/driver/pill.js

@@ -1,3 +1,7 @@
 import Component from '@glimmer/component';
 
-export default class DriverPillComponent extends Component {}
+export default class DriverPillComponent extends Component {
+    get resource() {
+        return this.args.driver ?? this.args.resource;
+    }
+}

package/addon/components/map/leaflet-live-map.js

@@ -74,6 +74,10 @@ export default class MapLeafletLiveMapComponent extends Component {
         this.#createMapContextMenu(map);
         this.trigger('onLoad', ...arguments);
         this.load.perform();
+
+        // Listen for map move/zoom events to trigger viewport-based resource reload
+        map.on('moveend', () => this.reloadResourcesInViewport.perform());
+        map.on('zoomend', () => this.reloadResourcesInViewport.perform());
     }
 
     @action trigger(name, ...rest) {
@@ -160,11 +164,19 @@ export default class MapLeafletLiveMapComponent extends Component {
     /** load resources and wait for stuff here and trigger map ready **/
     @task *load() {
         try {
+            // Get initial map bounds for spatial filtering
+            const bounds = this.map ? this.map.getBounds() : null;
+            const params = bounds
+                ? {
+                      bounds: [bounds.getSouth(), bounds.getWest(), bounds.getNorth(), bounds.getEast()],
+                  }
+                : {};
+
             const data = yield all([
                 this.loadResource.perform('routes'),
-                this.loadResource.perform('vehicles'),
-                this.loadResource.perform('drivers'),
-                this.loadResource.perform('places'),
+                this.loadResource.perform('vehicles', { params }),
+                this.loadResource.perform('drivers', { params }),
+                this.loadResource.perform('places', { params }),
                 this.loadResource.perform('service-areas'),
             ]);
 
@@ -176,6 +188,26 @@ export default class MapLeafletLiveMapComponent extends Component {
         }
     }
 
+    @task({ restartable: true }) *reloadResourcesInViewport() {
+        if (!this.map) {
+            return;
+        }
+
+        // Get current map bounds
+        const bounds = this.map.getBounds();
+        const params = {
+            bounds: [bounds.getSouth(), bounds.getWest(), bounds.getNorth(), bounds.getEast()],
+        };
+
+        // Reload spatially-filtered resources (drivers, vehicles, places)
+        // Orders, routes, and service-areas are not spatially filtered
+        try {
+            yield all([this.loadResource.perform('vehicles', { params }), this.loadResource.perform('drivers', { params }), this.loadResource.perform('places', { params })]);
+        } catch (err) {
+            debug('Failed to reload resources in viewport: ' + err.message);
+        }
+    }
+
     @task *loadResource(path, options = {}) {
         if (this.abilities.cannot(`fleet-ops list ${path}`)) return [];
 

package/addon/components/map/order-list-overlay/order.hbs

@@ -5,6 +5,7 @@
     {{on "dblclick" (fn this.onDoubleClick @order)}}
     {{on "mouseenter" (fn this.onMouseEnter @order)}}
     {{on "mouseleave" (fn this.onMouseLeave @order)}}
+    {{did-insert this.setupIntersectionObserver}}
     ...attributes
 >
     <div class="order-listing-row">

package/addon/components/map/order-list-overlay/order.js

@@ -1,7 +1,10 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
 
 export default class MapOrderListOverlayOrderComponent extends Component {
+    @tracked trackerDataLoaded = false;
+    observer = null;
     @action onClick(order, event) {
         //Don't run callback if action button is clicked
         if (event.target.closest('span.order-listing-action-button')) {
@@ -32,4 +35,43 @@ export default class MapOrderListOverlayOrderComponent extends Component {
             this.args.onMouseLeave(...arguments);
         }
     }
+
+    @action setupIntersectionObserver(element) {
+        // Create IntersectionObserver to detect when order becomes visible
+        this.observer = new IntersectionObserver(
+            (entries) => {
+                entries.forEach((entry) => {
+                    if (entry.isIntersecting && !this.trackerDataLoaded) {
+                        this.loadTrackerData();
+                    }
+                });
+            },
+            {
+                root: null, // viewport
+                rootMargin: '50px', // start loading slightly before visible
+                threshold: 0.1, // trigger when 10% visible
+            }
+        );
+
+        this.observer.observe(element);
+    }
+
+    loadTrackerData() {
+        const { order } = this.args;
+
+        if (order && typeof order.loadTrackerData === 'function' && !this.trackerDataLoaded) {
+            this.trackerDataLoaded = true;
+            order.loadTrackerData();
+        }
+    }
+
+    willDestroy() {
+        super.willDestroy(...arguments);
+
+        // Clean up observer
+        if (this.observer) {
+            this.observer.disconnect();
+            this.observer = null;
+        }
+    }
 }

package/addon/components/modals/bulk-assign-driver.hbs

@@ -1,11 +1,11 @@
 <Modals::BulkActionModel @options={{@options}} @onConfirm={{@onConfirm}} @onDecline={{@onDecline}} as |options|>
     <div>
-        <InputGroup @name={{t "common.select-driver"}} @helpText={{t "fleet-ops.operations.orders.index.bulk-assign-driver-helptext"}}>
+        <InputGroup @name={{t "common.select-field" field=(t "resource.driver")}} @helpText={{t "fleet-ops.operations.orders.index.bulk-assign-driver-helptext"}}>
             <ModelSelect
                 @modelName="driver"
                 @selectedModel={{options.driverAssigned}}
                 @query={{options.driversQuery}}
-                @placeholder={{t "fleet-ops.operations.orders.index.new.assign-driver-placeholder"}}
+                @placeholder={{t "order.fields.assign-driver-placeholder"}}
                 @triggerClass="form-select form-input"
                 @infiniteScroll={{false}}
                 @renderInPlace={{true}}

package/addon/components/order/details/detail.hbs

@@ -16,7 +16,7 @@
                     <span>{{t "order.fields.driver-assigned"}}</span>
                 </div>
                 <div class="field-value">
-                    <Driver::Pill @driver={{@resource.driver_assigned}} @onClick={{this.focusOrderAssignedDriver}} />
+                    <Driver::Pill @driver={{@resource.driver_assigned}} @onClick={{this.focusOrderAssignedDriver}} @titleFallback="No driver assigned" @titleClass={{unless @resource.driver_assigned "text-gray-300"}} />
                 </div>
             </div>
             <div class="field-info-container">
@@ -24,7 +24,7 @@
                     <span>{{t "order.fields.vehicle-assigned"}}</span>
                 </div>
                 <div class="field-value">
-                    <Vehicle::Pill @vehicle={{@resource.vehicle_assigned}} />
+                    <Vehicle::Pill @vehicle={{@resource.vehicle_assigned}} @titleFallback="No vehicle assigned" @titleClass={{unless @resource.vehicle_assigned "text-gray-300"}} />
                 </div>
             </div>
             <div class="field-info-container">
@@ -48,8 +48,8 @@
                                 />
                             </div>
                             <div>
-                                <div class="text-sm">{{n-a @resource.customer.name "No Customer"}}</div>
-                                <div class="text-xs text-gray-400 dark:text-gray-500">{{n-a @resource.customer.phone "No Phone"}}</div>
+                                <div class="text-sm {{unless @resource.customer 'text-gray-300'}}">{{n-a @resource.customer.name "No customer"}}</div>
+                                <div class="text-xs text-gray-400 dark:text-gray-500">{{n-a @resource.customer.phone "No phone"}}</div>
                             </div>
                         </div>
                     </div>
@@ -70,8 +70,8 @@
                             />
                         </div>
                         <div>
-                            <div class="text-sm">{{n-a @resource.facilitator.name "No Facilitator"}}</div>
-                            <div class="text-xs text-gray-400 dark:text-gray-500">{{n-a @resource.facilitator.phone "No Phone"}}</div>
+                            <div class="text-sm {{unless @resource.facilitator 'text-gray-300'}}">{{n-a @resource.facilitator.name "No facilitator"}}</div>
+                            <div class="text-xs text-gray-400 dark:text-gray-500">{{n-a @resource.facilitator.phone "No phone"}}</div>
                         </div>
                     </div>
                 </div>

package/addon/components/order/details/notes.js

@@ -29,7 +29,7 @@ export default class OrderDetailsNotesComponent extends Component {
     @task *save() {
         try {
             yield this.args.resource.persistProperty('notes', this.args.resource.notes);
-            this.notifications.success(this.intl.t('fleet-ops.operations.orders.index.view.order-notes-updated'));
+            this.notifications.success(this.intl.t('order.fields.order-notes-updated'));
             this.isEditing = false;
         } catch (error) {
             this.notifications.serverError(error);

package/addon/components/order/route-editor.hbs

@@ -11,11 +11,11 @@
                     <Button
                         @type="magic"
                         @icon="magic"
-                        @text={{t "fleet-ops.operations.orders.index.new.optimize-route"}}
+                        @text={{t "order.fields.optimize-route"}}
                         @size="sm"
                         @onClick={{perform this.optimizeRoute}}
                         @permission="fleet-ops optimize order"
-                        @helpText={{t "fleet-ops.operations.orders.index.new.optimize-route-help-text"}}
+                        @helpText={{t "order.fields.optimize-route-help-text"}}
                         @disabled={{lt @resource.payload.waypoints.length 3}}
                         @isLoading={{this.optimizeRoute.isRunning}}
                     />
@@ -46,7 +46,7 @@
                         <ModelSelect
                             @modelName="place"
                             @selectedModel={{waypoint}}
-                            @placeholder={{concat (t "fleet-ops.operations.orders.index.new.select-waypoint-placeholder") " " (add index 1)}}
+                            @placeholder={{concat (t "order.fields.select-waypoint") " " (add index 1)}}
                             @triggerClass="form-select form-input truncate max-w-300px"
                             @infiniteScroll={{false}}
                             @customSearchEndpoint="places/search"

package/addon/components/order-tracking-lookup.hbs

@@ -144,7 +144,7 @@
                                         </div>
                                     {{else}}
                                         <div class="px-10 py-2 flex items-center justify-center">
-                                            <p class="text-red-600 dark:text-red-100">{{t "fleet-ops.operations.orders.index.view.no-order-activity"}}</p>
+                                            <p class="text-red-600 dark:text-red-100">{{t "order.fields.no-order-activity"}}</p>
                                         </div>
                                     {{/each}}
                                 </div>