@fleetbase/fleetops-engine 0.6.29 → 0.6.30

package/addon/components/service-rate/details.hbs

@@ -47,8 +47,8 @@
     </ContentPanel>
 
     {{#if @resource.isFixedRate}}
-        <ContentPanel @title={{t "service-rate.fields.fixed-meter"}} @open={{true}} @wrapperClass="bordered-top">
-            <div class="mb-3">
+        <ContentPanel @title={{t "service-rate.fields.fixed-meter"}} @open={{true}} @wrapperClass="bordered-top" @panelBodyWrapperClass="p-0i">
+            <div class="mb-3 px-3">
                 <div class="grid grid-cols-1 lg:grid-cols-2 gap-2">
                     <div class="field-info-container">
                         <div class="field-name">{{t "service-rate.fields.maximum-distance"}}</div>
@@ -70,31 +70,33 @@
             </div>
 
             <div class="overflow-x-auto">
-                <table class="table table-fixed w-full">
-                    <thead>
-                        <tr>
-                            <th>{{t "service-rate.fields.distance"}}</th>
-                            <th>{{t "service-rate.fields.fee"}}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {{#each @resource.rateFees as |rateFee|}}
+                <div class="next-table-wrapper h-auto table-fluid rounded-none overflow-x-auto">
+                    <table class="table table-fixed w-full">
+                        <thead>
                             <tr>
-                                <td>{{rateFee.distance}}-{{add rateFee.distance 1}} {{@resource.max_distance_unit}}</td>
-                                <td>{{format-currency rateFee.fee @resource.currency}}</td>
+                                <th>{{t "service-rate.fields.distance"}}</th>
+                                <th>{{t "service-rate.fields.fee"}}</th>
                             </tr>
-                        {{else}}
-                            <tr>
-                                <td colspan="2" class="text-center text-gray-500">No rate fees defined</td>
-                            </tr>
-                        {{/each}}
-                    </tbody>
-                </table>
+                        </thead>
+                        <tbody>
+                            {{#each @resource.rateFees as |rateFee|}}
+                                <tr>
+                                    <td>{{rateFee.distance}}-{{add rateFee.distance 1}} {{@resource.max_distance_unit}}</td>
+                                    <td>{{format-currency rateFee.fee @resource.currency}}</td>
+                                </tr>
+                            {{else}}
+                                <tr>
+                                    <td colspan="2" class="text-center text-gray-500 italic">No rate fees defined</td>
+                                </tr>
+                            {{/each}}
+                        </tbody>
+                    </table>
+                </div>
             </div>
         </ContentPanel>
     {{else if @resource.isPerDrop}}
-        <ContentPanel @title={{t "service-rate.fields.per-drop-off-title"}} @open={{true}} @wrapperClass="bordered-top">
-            <div class="overflow-x-auto">
+        <ContentPanel @title={{t "service-rate.fields.per-drop-off-title"}} @open={{true}} @wrapperClass="bordered-top" @panelBodyWrapperClass="p-0i">
+            <div class="next-table-wrapper h-auto table-fluid rounded-none overflow-x-auto">
                 <table class="table table-fixed w-full">
                     <thead>
                         <tr>
@@ -104,7 +106,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        {{#each @resource.perDropFees as |rateFee|}}
+                        {{#each @resource.rate_fees as |rateFee|}}
                             <tr>
                                 <td>{{n-a rateFee.min}}</td>
                                 <td>{{n-a rateFee.max}}</td>
@@ -112,7 +114,7 @@
                             </tr>
                         {{else}}
                             <tr>
-                                <td colspan="3" class="text-center text-gray-500">No per drop fees defined</td>
+                                <td colspan="3" class="text-center text-gray-500 italic">No per drop fees defined</td>
                             </tr>
                         {{/each}}
                     </tbody>
@@ -162,59 +164,99 @@
         </ContentPanel>
     {{/if}}
 
-    <ContentPanel @title={{t "service-rate.fields.percel-fee-title"}} @open={{true}} @wrapperClass="bordered-top">
-        <div class="grid grid-cols-1 lg:grid-cols-2 gap-2">
-            {{#if @resource.hasParcelFees}}
-                <div class="field-info-container">
-                    <div class="field-name">{{t "service-rate.fields.cod-fee-label"}}</div>
-                    <div class="field-value">
-                        {{#if @resource.cod_calculation_method}}
-                            {{#let (find-by "value" @resource.cod_calculation_method (get-fleet-ops-options "serviceRateCodCalculationMethods")) as |method|}}
-                                {{#if method}}
-                                    {{method.label}}:
-                                    {{#if @resource.hasCodFlatFee}}
-                                        {{format-currency @resource.cod_flat_fee @resource.currency}}
-                                    {{else if @resource.hasCodPercentageFee}}
-                                        {{@resource.cod_percent}}%
-                                    {{/if}}
-                                {{else}}
-                                    {{n-a @resource.cod_calculation_method}}
-                                {{/if}}
-                            {{/let}}
-                        {{else}}
-                            N/A
-                        {{/if}}
-                    </div>
-                </div>
+    {{#if @resource.isParcelService}}
+        <ContentPanel @title={{t "service-rate.fields.percel-fee-title"}} @open={{true}} @wrapperClass="bordered-top">
+            <div class="space-y-2">
+                {{#each @resource.parcel_fees as |parcelFee|}}
+                    <div class="dark:text-gray-100">
+                        <div class="grid grid-cols-7">
+                            <div class="flex flex-col items-start justify-start pt-3">
+                                <img src="/engines-dist/images/boxes/{{parcelFee.size}}.png" alt="parcel size {{parcelFee.size}}" width="44" class="w-11" />
+                                <div class="mt-2 text-sm font-medium">
+                                    {{humanize parcelFee.size}}
+                                </div>
+                            </div>
 
-                <div class="field-info-container">
-                    <div class="field-name">{{t "service-rate.fields.peak-hours-fee-label"}}</div>
-                    <div class="field-value">
-                        {{#if @resource.peak_hours_calculation_method}}
-                            {{#let (find-by "value" @resource.peak_hours_calculation_method (get-fleet-ops-options "serviceRatePeakHourCalculationMethods")) as |method|}}
-                                {{#if method}}
-                                    {{method.label}}:
-                                    {{#if @resource.hasPeakHoursFlatFee}}
-                                        {{format-currency @resource.peak_hours_flat_fee @resource.currency}}
-                                    {{else if @resource.hasPeakHoursPercentageFee}}
-                                        {{@resource.peak_hours_percent}}%
-                                    {{/if}}
-                                {{else}}
-                                    {{n-a @resource.peak_hours_calculation_method}}
-                                {{/if}}
-                            {{/let}}
-                        {{else}}
-                            N/A
-                        {{/if}}
+                            <div class="col-span-6 dimensions-box space-x-2">
+                                <div class="grid grid-cols-4 gap-2 px-2">
+                                    <div class="field-info-container">
+                                        <div class="field-name">
+                                            {{t "service-rate.fields.length-label"}}
+                                        </div>
+                                        <div class="field-value">
+                                            {{n-a parcelFee.length}}
+                                            {{parcelFee.dimensions_unit}}
+                                        </div>
+                                    </div>
+
+                                    <div class="field-info-container">
+                                        <div class="field-name">
+                                            {{t "service-rate.fields.width-label"}}
+                                        </div>
+                                        <div class="field-value">
+                                            {{n-a parcelFee.width}}
+                                            {{parcelFee.dimensions_unit}}
+                                        </div>
+                                    </div>
+
+                                    <div class="field-info-container">
+                                        <div class="field-name">
+                                            {{t "service-rate.fields.height-label"}}
+                                        </div>
+                                        <div class="field-value">
+                                            {{n-a parcelFee.height}}
+                                            {{parcelFee.dimensions_unit}}
+                                        </div>
+                                    </div>
+
+                                    <div class="field-info-container">
+                                        <div class="field-name">
+                                            {{t "service-rate.fields.weight-label"}}
+                                        </div>
+                                        <div class="field-value">
+                                            {{n-a parcelFee.weight}}
+                                            {{parcelFee.weight_unit}}
+                                        </div>
+                                    </div>
+
+                                    <div class="field-info-container">
+                                        <div class="field-name">
+                                            {{t "service-rate.fields.deminsions-unit"}}
+                                        </div>
+                                        <div class="field-value">
+                                            {{n-a (get-fleet-ops-option-label "dimensionUnits" parcelFee.dimensions_unit)}}
+                                        </div>
+                                    </div>
+
+                                    <div class="field-info-container">
+                                        <div class="field-name">
+                                            {{t "service-rate.fields.weight-unit"}}
+                                        </div>
+                                        <div class="field-value">
+                                            {{n-a (get-fleet-ops-option-label "weightUnits" parcelFee.weight_unit)}}
+                                        </div>
+                                    </div>
+
+                                    <div class="field-info-container col-span-2">
+                                        <div class="field-name">
+                                            {{t "service-rate.fields.additional-fee"}}
+                                        </div>
+                                        <div class="field-value">
+                                            {{n-a (format-currency parcelFee.fee @resource.currency)}}
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
-                </div>
-            {{else}}
-                <div class="field-info-container col-span-2">
-                    <div class="field-value text-gray-500">No parcel fees configured</div>
-                </div>
-            {{/if}}
-        </div>
-    </ContentPanel>
+                {{else}}
+                    <div class="col-span-2">
+                        <span class="text-gray-500 text-sm italic">No parcel fees configured</span>
+                    </div>
+                {{/each}}
+            </div>
+        </ContentPanel>
+    {{/if}}
 
     <ContentPanel @title={{t "service-rate.fields.restrict-service-title"}} @open={{true}} @wrapperClass="bordered-top">
         <div class="grid grid-cols-1 lg:grid-cols-2 gap-2">

package/addon/components/service-rate/form.hbs

@@ -16,7 +16,7 @@
                         @options={{this.orderConfigActions.allOrderConfigs}}
                         @selected={{@resource.order_config}}
                         @onChange={{this.selectOrderConfig}}
-                        @placeholder={{t "fleet-ops.operations.orders.index.new.select-order-type"}}
+                        @placeholder={{t "service-rate.fields.select-order-type"}}
                         @triggerClass="form-select form-input"
                         @disabled={{cannot-write @resource}}
                         as |orderConfig|
@@ -112,6 +112,7 @@
                         @helpText={{t "service-rate.fields.maximum-distance-help-text"}}
                         @required={{true}}
                         min={{1}}
+                        {{on "change" this.onMaxDistanceChange}}
                     />
                     <InputGroup @name="Max Distance Unit" @helpText="Select the maximum distance this service rate supports" @required={{true}}>
                         <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
@@ -191,7 +192,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            {{#each @resource.perDropFees as |rateFee index|}}
+                            {{#each @resource.rate_fees as |rateFee|}}
                                 <tr>
                                     <td>
                                         <Input
@@ -215,7 +216,7 @@
                                         <MoneyInput class="w-full" @currency={{@resource.currency}} @value={{rateFee.fee}} disabled={{cannot-write @resource}} />
                                     </td>
                                     <td>
-                                        <Button @type="danger" @icon="trash" @onClick={{fn @resource.removePerDropFee index}} />
+                                        <Button @type="danger" @icon="trash" @onClick={{fn @resource.removePerDropFee rateFee}} />
                                     </td>
                                 </tr>
                             {{/each}}
@@ -560,6 +561,7 @@
                 @onChange={{fn (mut @resource.serviceArea)}}
                 @onChangeId={{fn (mut @resource.service_area_uuid)}}
                 @disabled={{cannot-write @resource}}
+                @allowClear={{true}}
                 as |model|
             >
                 {{model.name}}
@@ -567,7 +569,7 @@
         </InputGroup>
 
         {{#if @resource.serviceArea}}
-            <InputGroup @name={{t "service-rate.fields.zone-label"}} @helpText={{t "service-rate.fields.zone-help-text"}}>
+            <InputGroup @name={{t "service-rate.fields.zone-label"}} @helpText={{t "service-rate.fields.zone-help-text"}} @wrapperClass="mt-2">
                 <ModelSelect
                     @modelName="zone"
                     @selectedModel={{@resource.zone}}
@@ -579,6 +581,7 @@
                     @onChange={{fn (mut @resource.zone)}}
                     @onChangeId={{fn (mut @resource.zone_uuid)}}
                     @disabled={{cannot-write @resource}}
+                    @allowClear={{true}}
                     as |model|
                 >
                     {{model.name}}

package/addon/components/service-rate/form.js

@@ -22,6 +22,12 @@ export default class ServiceRateFormComponent extends Component {
 
         if (rateCalculationMethod === 'per_drop') {
             this.args.resource.resetPerDropFees();
+        } else if (rateCalculationMethod === 'fixed_meter' || rateCalculationMethod === 'fixed_rate') {
+            this.serviceRateActions.generateFixedRateFees(this.args.resource);
         }
     }
+
+    @action onMaxDistanceChange() {
+        this.serviceRateActions.generateFixedRateFees(this.args.resource);
+    }
 }

package/addon/components/vehicle/pill.hbs

@@ -1,34 +1,33 @@
-{{#let (or @vehicle @resource) as |resource|}}
-    <Pill
-        @resource={{resource}}
-        @imageSrc={{resource.photo_url}}
-        @fallbackImageType="vehicleImage"
-        @showOnlineIndicator={{true}}
-        @onClick={{@onClick}}
-        @anchorClass={{@anchorClass}}
-        @imageClass={{@imageClass}}
-        @imageWrapperClass={{@imageWrapperClass}}
-        @contentWrapperClass={{@contentWrapperClass}}
-        @titleClass={{@titleClass}}
-        @subtitleClass={{@subtitleClass}}
-        ...attributes
-    >
-        <:default>
-            <div class="text-sm">{{n-a resource.name resource.yearMakeModel}}</div>
-            <div class="text-xs text-gray-400 dark:text-gray-500">{{or resource.plate_number resource.vin resource.serial_number resource.call_sign}}</div>
-        </:default>
-        <:tooltip>
-            <div>
-                <div class="text-xs font-semibold">{{resource.name resource.yearMakeModel}}</div>
-                <div class="text-xs">{{t "resource.driver"}}: {{n-a resource.driver_name}}</div>
-                <div class="text-xs">
-                    <span>{{t "common.status"}}:</span>
-                    <span class="{{if resource.online 'text-green-500' 'text-red-400'}}">
-                        {{if resource.online (t 'common.online') (t 'common.offline')}}
-                    </span>
-                </div>
-                <div class="text-xs truncate">Pos: {{point-coordinates resource.location}}</div>
+<Pill
+    @this.resource={{this.resource}}
+    @imageSrc={{this.resource.photo_url}}
+    @fallbackImageType="vehicleImage"
+    @showOnlineIndicator={{if this.resource true false}}
+    @noTooltip={{not this.resource}}
+    @onClick={{@onClick}}
+    @anchorClass={{@anchorClass}}
+    @imageClass={{@imageClass}}
+    @imageWrapperClass={{@imageWrapperClass}}
+    @contentWrapperClass={{@contentWrapperClass}}
+    @titleClass={{@titleClass}}
+    @subtitleClass={{@subtitleClass}}
+    ...attributes
+>
+    <:default>
+        <div class="text-sm">{{or this.resource.name this.resource.yearMakeModel @titleFallback "No vehicle"}}</div>
+        <div class="text-xs text-gray-400 dark:text-gray-500">{{or this.resource.plate_number this.resource.vin this.resource.serial_number this.resource.call_sign "-"}}</div>
+    </:default>
+    <:tooltip>
+        <div>
+            <div class="text-xs font-semibold">{{this.resource.name this.resource.yearMakeModel}}</div>
+            <div class="text-xs">{{t "this.resource.driver"}}: {{n-a this.resource.driver_name}}</div>
+            <div class="text-xs">
+                <span>{{t "common.status"}}:</span>
+                <span class="{{if this.resource.online 'text-green-500' 'text-red-400'}}">
+                    {{if this.resource.online (t "common.online") (t "common.offline")}}
+                </span>
             </div>
-        </:tooltip>
-    </Pill>
-{{/let}}
+            <div class="text-xs truncate">Pos: {{point-coordinates this.resource.location}}</div>
+        </div>
+    </:tooltip>
+</Pill>

package/addon/components/vehicle/pill.js

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

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

@@ -113,7 +113,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 fn: this.orderActions.bulkDispatch,
             },
             {
-                label: this.intl.t('common.assign-driver'),
+                label: this.intl.t('common.assign-drivers'),
                 icon: 'user-plus',
                 fn: this.orderActions.bulkAssignDriver,
             },

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

@@ -5,9 +5,10 @@ import { action, computed } from '@ember/object';
 import { later } from '@ember/runloop';
 import { task } from 'ember-concurrency';
 import { format, isValid as isValidDate } from 'date-fns';
+import { Tooltip } from '@fleetbase/ember-ui/utils/floating';
 import isObject from '@fleetbase/ember-core/utils/is-object';
 import isJson from '@fleetbase/ember-core/utils/is-json';
-import createFullCalendarEventFromOrder, { createOrderEventTitle } from '../../../utils/create-full-calendar-event-from-order';
+import createFullCalendarEventFromOrder, { createOrderEventTitle, createOrderEventDescription } from '../../../utils/create-full-calendar-event-from-order';
 
 function createFullCalendarEventFromScheduleItem(item, driver) {
     return {
@@ -42,7 +43,7 @@ export default class OperationsSchedulerIndexController extends Controller {
     @service store;
     @service intl;
     @service hostRouter;
-    @service scheduling;
+    // @service scheduling;
     @tracked scheduledOrders = [];
     @tracked unscheduledOrders = [];
     @tracked drivers = [];
@@ -105,6 +106,17 @@ export default class OperationsSchedulerIndexController extends Controller {
         this.calendar = calendar;
         // setup some custom post initialization stuff here
         // calendar.setOption('height', 800);
+        calendar.setOption('eventDidMount', (info) => {
+            if (!info.event.extendedProps.description) return;
+
+            info.tooltip = new Tooltip(info.el, {
+                text: info.event.extendedProps.description,
+            });
+        });
+
+        calendar.setOption('eventWillUnmount', (info) => {
+            info.tooltip?.destroy();
+        });
     }
 
     @action viewEvent(order) {
@@ -152,6 +164,7 @@ export default class OperationsSchedulerIndexController extends Controller {
 
                     // update event props
                     this.setEventProperty(event, 'title', createOrderEventTitle(order));
+                    this.setEventProperty(event, 'description', createOrderEventDescription(order));
 
                     // refresh route
                     return this.hostRouter.refresh();
@@ -249,6 +262,7 @@ export default class OperationsSchedulerIndexController extends Controller {
         const order = this.store.peekRecord('order', event.id);
 
         this.setEventProperty(event, 'title', createOrderEventTitle(order));
+        this.setEventProperty(event, 'description', createOrderEventDescription(order));
     }
 
     @action async rescheduleEventFromDrag(eventDropInfo) {
@@ -282,6 +296,7 @@ export default class OperationsSchedulerIndexController extends Controller {
             order.set('scheduled_at', isValidDate(newDate) ? newDate : start);
             await order.save();
             this.setEventProperty(event, 'title', createOrderEventTitle(order));
+            this.setEventProperty(event, 'description', createOrderEventDescription(order));
             return this.hostRouter.refresh();
         } catch (error) {
             this.notifications.serverError(error);

package/addon/controllers/operations/service-rates/index/edit.js

@@ -5,6 +5,7 @@ import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 
 export default class OperationsServiceRatesIndexEditController extends Controller {
+    @service serviceRateActions;
     @service hostRouter;
     @service intl;
     @service notifications;
@@ -18,13 +19,6 @@ export default class OperationsServiceRatesIndexEditController extends Controlle
     ];
 
     @task *save(serviceRate) {
-        if (typeof serviceRate.syncServiceRateFees === 'function') {
-            serviceRate.syncServiceRateFees();
-        }
-        if (typeof serviceRate.syncPerDropFees === 'function') {
-            serviceRate.syncPerDropFees();
-        }
-
         try {
             yield serviceRate.save();
             this.overlay?.close();

package/addon/controllers/operations/service-rates/index/new.js

@@ -13,13 +13,6 @@ export default class OperationsServiceRatesIndexNewController extends Controller
     @tracked serviceRate = this.serviceRateActions.createNewInstance();
 
     @task *save(serviceRate) {
-        if (typeof serviceRate.syncServiceRateFees === 'function') {
-            serviceRate.syncServiceRateFees();
-        }
-        if (typeof serviceRate.syncPerDropFees === 'function') {
-            serviceRate.syncPerDropFees();
-        }
-
         try {
             yield serviceRate.save();
             this.overlay?.close();

package/addon/controllers/operations/service-rates/index.js

@@ -126,12 +126,20 @@ export default class OperationsServiceRatesIndexController extends Controller {
                 width: 60,
                 actions: [
                     {
-                        label: this.intl.t('column.edit-service'),
+                        label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.service-rate') }),
+                        icon: 'eye',
+                        fn: this.serviceRateActions.transition.view,
+                        permission: 'fleet-ops view service-rate',
+                    },
+                    {
+                        label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.service-rate') }),
+                        icon: 'pencil',
                         fn: this.serviceRateActions.transition.edit,
                         permission: 'fleet-ops view service-rate',
                     },
                     {
-                        label: this.intl.t('column.delete-service'),
+                        label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.service-rate') }),
+                        icon: 'trash',
                         fn: this.serviceRateActions.delete,
                         permission: 'fleet-ops delete service-rate',
                     },

package/addon/routes/operations/orders/index/details.js

@@ -58,4 +58,11 @@ export default class OperationsOrdersIndexDetailsRoute extends Route {
             with: ['payload', 'driverAssigned', 'orderConfig', 'customer', 'facilitator', 'trackingStatuses', 'trackingNumber', 'purchaseRate', 'comments', 'files'],
         });
     }
+
+    async afterModel(order) {
+        await order.loadTrackingActivity();
+        if (order.meta?._index_resource) {
+            await order.reload();
+        }
+    }
 }

package/addon/routes/operations/scheduler/index.js

@@ -2,7 +2,7 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { isValid as isValidDate } from 'date-fns';
 import { isNone } from '@ember/utils';
-import createFullCalendarEventFromOrder from '../../../utils/create-full-calendar-event-from-order';
+// import createFullCalendarEventFromOrder from '../../../utils/create-full-calendar-event-from-order';
 
 const getUnscheduledOrder = (order) => {
     return isNone(order.scheduled_at);
@@ -40,7 +40,7 @@ export default class OperationsSchedulerIndexRoute extends Route {
         // set scheduled orders
         controller.scheduledOrders = orders.filter(getScheduledOrder);
 
-        // create events from scheduledOrders
-        controller.events = controller.scheduledOrders.map(createFullCalendarEventFromOrder);
+        // // create events from scheduledOrders
+        // controller.events = controller.scheduledOrders.map(createFullCalendarEventFromOrder);
     }
 }

package/addon/services/driver-actions.js

@@ -29,7 +29,11 @@ export default class DriverActionsService extends ResourceActionService {
                 ...options,
             });
         },
-        edit: (driver, options = {}) => {
+        edit: async (driver, options = {}) => {
+            if (driver?.meta?._index_resource) {
+                await driver.reload();
+            }
+
             return this.resourceContextPanel.open({
                 content: 'driver/form',
                 title: this.intl.t('common.edit-resource-name', { resourceName: driver.name }),
@@ -47,7 +51,11 @@ export default class DriverActionsService extends ResourceActionService {
                 ...options,
             });
         },
-        view: (driver, options = {}) => {
+        view: async (driver, options = {}) => {
+            if (driver?.meta?._index_resource) {
+                await driver.reload();
+            }
+
             return this.resourceContextPanel.open({
                 driver,
                 header: 'driver/panel-header',
@@ -83,7 +91,11 @@ export default class DriverActionsService extends ResourceActionService {
                 ...options,
             });
         },
-        edit: (driver, options = {}, saveOptions = {}) => {
+        edit: async (driver, options = {}, saveOptions = {}) => {
+            if (driver?.meta?._index_resource) {
+                await driver.reload();
+            }
+
             return this.modalsManager.show('modals/resource', {
                 resource: driver,
                 title: this.intl.t('common.edit-resource-name', { resourceName: driver.name }),
@@ -94,7 +106,11 @@ export default class DriverActionsService extends ResourceActionService {
                 ...options,
             });
         },
-        view: (driver, options = {}) => {
+        view: async (driver, options = {}) => {
+            if (driver?.meta?._index_resource) {
+                await driver.reload();
+            }
+
             return this.modalsManager.show('modals/resource', {
                 resource: driver,
                 title: driver.name,

package/addon/services/leaflet-routing-control.js

@@ -51,7 +51,13 @@ export default class LeafletRoutingControlService extends Service {
 
     get(name) {
         name = name ?? this.getRouter();
-        return this.registry.routers[underscore(name)];
+        let router = this.registry.routers[underscore(name)];
+        if (!router) {
+            // Fallback to OSRM default router
+            router = this.registry.routers.osrm;
+        }
+
+        return router;
     }
 
     getRouter(fallback = 'osrm') {

package/addon/services/order-list-overlay.js

@@ -150,7 +150,6 @@ export default class OrderListOverlayService extends Service {
                 'fleet-ops/live/orders',
                 {
                     active: 1,
-                    with_tracker_data: 1,
                     exclude: excludeOrderIds,
                 },
                 {