@fleetbase/fleetops-engine 0.6.44 → 0.6.46

package/addon/components/modals/orchestrator-import.hbs

@@ -228,17 +228,10 @@
 
                                     {{! Order type badge }}
                                     <td>
-                                        {{#if (eq group.order_type "multi_waypoint")}}
-                                            <span class="import-preview-badge import-preview-badge--blue">
-                                                <FaIcon @icon="route" class="mr-0.5" />
-                                                {{t "orchestrator.col-preview-multi-stop" count=group.waypointCount}}
-                                            </span>
-                                        {{else}}
-                                            <span class="import-preview-badge import-preview-badge--gray">
-                                                <FaIcon @icon="exchange-alt" class="mr-0.5" />
-                                                {{t "orchestrator.col-preview-pickup-dropoff"}}
-                                            </span>
-                                        {{/if}}
+                                        <span class="{{group.routeSummary.badgeClass}}">
+                                            <FaIcon @icon={{group.routeSummary.icon}} class="mr-0.5" />
+                                            {{group.routeSummary.label}}
+                                        </span>
                                     </td>
 
                                     {{! Pickup }}

package/addon/components/modals/orchestrator-import.js

@@ -4,6 +4,7 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 import * as XLSX from 'xlsx';
+import { buildRouteTypeSummary } from '../../utils/order-route-summary';
 
 /**
  * Orchestrator Import Modal
@@ -328,7 +329,22 @@ export default class OrchestratorImportComponent extends Component {
             if (!g.scheduled_at && row.scheduled_at) g.scheduled_at = row.scheduled_at;
         });
 
-        return Array.from(groups.values());
+        return Array.from(groups.values()).map((group) => ({
+            ...group,
+            routeSummary: this.routeTypeSummaryForGroup(group),
+        }));
+    }
+
+    routeTypeSummaryForGroup(group) {
+        const baseSummary = buildRouteTypeSummary({
+            hasIntermediateWaypoints: group.order_type === 'multi_waypoint' || group.waypointCount > 0,
+            intermediateStopCount: group.waypointCount,
+        });
+
+        return {
+            ...baseSummary,
+            label: this.intl.t(baseSummary.translationKey, baseSummary.translationOptions),
+        };
     }
 
     // ── Footer action buttons (injected into modal footer via modalsManager) ──

package/addon/components/modals/update-order-activity.hbs

@@ -65,7 +65,7 @@
                     </div>
                     <label for="activity_custom" class="ml-3 flex flex-col cursor-pointer w-full pr-5">
                         <div class="font-semibold text-sm mb-1">Add custom activity</div>
-                        <span class="block text-sm font-medium">
+                        <span class="block text-sm font-medium mb-0.5">
                             <Input
                                 @type="text"
                                 @value={{this.customActivity.status}}

package/addon/components/orchestrator/order-pool.js

@@ -1,5 +1,6 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
+import { isArray } from '@ember/array';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 
@@ -157,7 +158,7 @@ export default class OrchestratorOrderPoolComponent extends Component {
             stops.push(payload.pickup.address ?? payload.pickup.street1 ?? payload.pickup.name ?? '—');
         }
 
-        const waypoints = typeof payload.waypoints?.toArray === 'function' ? payload.waypoints.toArray() : Array.isArray(payload.waypoints) ? payload.waypoints : [];
+        const waypoints = typeof payload.waypoints?.toArray === 'function' ? payload.waypoints.toArray() : isArray(payload.waypoints) ? payload.waypoints : [];
 
         for (const wp of waypoints) {
             const place = wp.place ?? wp;
@@ -318,7 +319,7 @@ export default class OrchestratorOrderPoolComponent extends Component {
                 let value = null;
 
                 const cfvCollection = order.custom_field_values ?? order.customFieldValues ?? [];
-                const cfvArray = typeof cfvCollection?.toArray === 'function' ? cfvCollection.toArray() : Array.isArray(cfvCollection) ? cfvCollection : [];
+                const cfvArray = typeof cfvCollection?.toArray === 'function' ? cfvCollection.toArray() : isArray(cfvCollection) ? cfvCollection : [];
 
                 for (const cfv of cfvArray) {
                     const cf = cfv.custom_field ?? (typeof cfv.customField?.get === 'function' ? cfv.customField : null) ?? cfv.customField ?? null;

package/addon/components/orchestrator-workbench.js

@@ -1,4 +1,5 @@
 import Component from '@glimmer/component';
+import { isArray } from '@ember/array';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -6,8 +7,6 @@ import { later } from '@ember/runloop';
 import { debug } from '@ember/debug';
 import { task } from 'ember-concurrency';
 import { colorForId, waypointIconHtml } from '../utils/route-colors';
-import polyline from '@fleetbase/ember-core/utils/polyline';
-import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
 
 /**
  * OrchestratorWorkbenchComponent
@@ -36,7 +35,8 @@ export default class OrchestratorWorkbenchComponent extends Component {
     @service intl;
     @service modalsManager;
     @service location;
-    @service leafletMapManager;
+    @service mapManager;
+    @service routeEngine;
     @service('order-allocation') allocationService;
 
     /** Routing controls added to the map for the current proposed plan. */
@@ -152,6 +152,10 @@ export default class OrchestratorWorkbenchComponent extends Component {
         this.loadCardFields.perform();
     }
 
+    willDestroy() {
+        super.willDestroy(...arguments);
+    }
+
     // ── Data loading ──────────────────────────────────────────────────────────
 
     @task *loadData() {
@@ -536,10 +540,8 @@ export default class OrchestratorWorkbenchComponent extends Component {
 
     @action onMapLoad({ target: map }) {
         this.leafletMap = map;
-        // Register the map with the service so addRoutingControl / ensureInteractive
-        // can resolve it. Without this call, waitForMap() never resolves and
-        // routing controls silently time out.
-        this.leafletMapManager.setMap(map);
+        this.mapManager.setActiveProvider('leaflet');
+        this.mapManager.setMapInstance(map);
         // If orders have already loaded before the map mounted, re-center now
         // using the same fitBounds strategy as _centerMapOnOrders().
         if (this._mapCenteredOnOrders) {
@@ -563,37 +565,28 @@ export default class OrchestratorWorkbenchComponent extends Component {
      */
     async _drawRoutingControls() {
         this._clearRoutingControls();
-        const map = this.leafletMap;
-        if (!map) return;
         const groups = this.planByVehicle;
         if (!groups.length) return;
-
-        const routingHost = getRoutingHost();
         const allLatLngs = [];
 
         for (const group of groups) {
             const waypoints = group.routeWaypoints;
             if (!waypoints || waypoints.length < 2) continue;
             try {
-                // OSRM route/v1 expects coordinates as lon,lat pairs joined by semicolons.
-                const coordStr = waypoints.map(([lat, lng]) => `${lng},${lat}`).join(';');
-                const url = `${routingHost}/route/v1/driving/${coordStr}?overview=full&geometries=polyline`;
-                const resp = await fetch(url);
-                if (!resp.ok) continue;
-                const data = await resp.json();
-                const geometry = data?.routes?.[0]?.geometry;
-                if (!geometry) continue;
-                // polyline.decode returns [[lat, lng], ...] — exactly what L.polyline expects.
-                const latlngs = polyline.decode(geometry);
-                if (!latlngs.length) continue;
-                const pl = L.polyline(latlngs, {
-                    color: group.routeColor,
-                    weight: 4,
-                    opacity: 0.85,
+                const routeHandle = await this.mapManager.addRoutingControl(waypoints, {
+                    engine: this.routeEngine.getDisplayEngine('osrm'),
+                    suppressMarkers: true,
+                    position: false,
+                    tag: `orchestrator:${group.vehicle?.public_id ?? group.vehicleId ?? group.vehicle_uuid ?? 'unknown'}`,
+                    polylineOptions: {
+                        color: group.routeColor,
+                        weight: 4,
+                        opacity: 0.85,
+                    },
                 });
-                pl.addTo(map);
-                this._routingControls.push(pl);
-                allLatLngs.push(...latlngs);
+                if (!routeHandle?.route?.coordinates?.length) continue;
+                this._routingControls.push(routeHandle);
+                allLatLngs.push(...routeHandle.route.coordinates);
             } catch {
                 // Non-fatal: routing may fail for individual vehicles if OSRM
                 // cannot find a route (e.g. ferry-only legs, missing road data)
@@ -603,7 +596,7 @@ export default class OrchestratorWorkbenchComponent extends Component {
         // Fit the map to show all drawn routes.
         if (allLatLngs.length >= 2) {
             try {
-                map.fitBounds(allLatLngs, { padding: [40, 40], maxZoom: 14 });
+                this.mapManager.fitBounds(allLatLngs, { padding: [40, 40], maxZoom: 14 });
             } catch {
                 // ignore fitBounds errors
             }
@@ -614,14 +607,9 @@ export default class OrchestratorWorkbenchComponent extends Component {
      * Remove all route polylines that were added for the current plan.
      */
     _clearRoutingControls() {
-        const map = this.leafletMap;
-        for (const layer of this._routingControls) {
+        for (const routeHandle of this._routingControls) {
             try {
-                if (map) {
-                    map.removeLayer(layer);
-                } else {
-                    layer.remove?.();
-                }
+                this.mapManager.removeRoutingControl(routeHandle);
             } catch {
                 // ignore removal errors
             }
@@ -686,7 +674,7 @@ export default class OrchestratorWorkbenchComponent extends Component {
     }
 
     get hasProposedPlan() {
-        return Array.isArray(this.proposedPlan) && this.proposedPlan.length > 0;
+        return isArray(this.proposedPlan) && this.proposedPlan.length > 0;
     }
 
     get hasUnassigned() {
@@ -792,7 +780,7 @@ export default class OrchestratorWorkbenchComponent extends Component {
         if (loc) {
             // GeoJSON Point — with or without the type field.
             // LaravelMysqlSpatial SpatialExpression may serialize without type.
-            if (Array.isArray(loc.coordinates) && loc.coordinates.length >= 2) {
+            if (isArray(loc.coordinates) && loc.coordinates.length >= 2) {
                 const lng = parseFloat(loc.coordinates[0]);
                 const lat = parseFloat(loc.coordinates[1]);
                 // Use isFinite to accept 0 as a valid coordinate (not just truthy)
@@ -809,7 +797,7 @@ export default class OrchestratorWorkbenchComponent extends Component {
                 }
             }
             // Numeric array [lat, lng] (some internal formats)
-            if (Array.isArray(loc) && loc.length >= 2) {
+            if (isArray(loc) && loc.length >= 2) {
                 const lat = parseFloat(loc[0]);
                 const lng = parseFloat(loc[1]);
                 if (isFinite(lat) && isFinite(lng) && (lat !== 0 || lng !== 0)) {
@@ -848,7 +836,7 @@ export default class OrchestratorWorkbenchComponent extends Component {
         // NOTE: isMultiDrop is an Ember Data computed property and won't exist on
         // plain JSON objects returned by the orchestrator/orders endpoint.
         const waypoints = payload.waypoints;
-        const hasWaypoints = Array.isArray(waypoints) && waypoints.length > 0;
+        const hasWaypoints = isArray(waypoints) && waypoints.length > 0;
         const isMultiDrop = payload.isMultiDrop === true || (hasWaypoints && !payload.pickup && !payload.dropoff);
         if (isMultiDrop && hasWaypoints) {
             const sorted = [...waypoints].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));

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

@@ -5,7 +5,7 @@ import { action } from '@ember/object';
 export default class OrderDetailsDetailComponent extends Component {
     @service orderActions;
     @service driverActions;
-    @service leafletMapManager;
+    @service mapManager;
     @service intl;
 
     get actionButtons() {
@@ -37,6 +37,6 @@ export default class OrderDetailsDetailComponent extends Component {
 
     @action focusOrderAssignedDriver(driver) {
         this.driverActions.panel.view(driver);
-        this.leafletMapManager.map?.flyTo(driver.coordinates, 18);
+        this.mapManager.focusResource(driver, 18);
     }
 }

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

@@ -1,5 +1,5 @@
 <ContentPanel @title={{t "order.fields.payload"}} @open={{true}} @actionButtons={{this.actionButtons}} @wrapperClass="bordered-top">
-    {{#if @resource.isMultiDrop}}
+    {{#if @resource.hasIntermediateWaypoints}}
         <div class="space-y-2">
             {{#each @resource.entitiesByDestination as |group|}}
                 <div class="rounded-md border border-gray-200 dark:border-gray-900 p-3">
@@ -25,11 +25,11 @@
                                     </div>
                                 </div>
                             {{/if}}
-                            <DisplayPlace @place={{group.waypoint}} @addressClass="text-sm" />
-                            <div class="my-2">
-                                <span class="rounded-md bg-yellow-300 text-yellow-900 px-2 py-1 text-sm">{{t "order.fields.tracking"}}
+                            <DisplayPlace @place={{group.waypoint}} @addressClass="text-sm" @hideBadges={{true}} />
+                            <div class="flex align-self mt-1">
+                                <ClickToCopy @value={{group.waypoint.tracking}} class="rounded-md bg-yellow-300 text-yellow-900 px-2 py-1 text-sm">{{t "order.fields.tracking"}}
                                     {{group.waypoint.tracking}}
-                                </span>
+                                </ClickToCopy>
                             </div>
                         </div>
                         <div>

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

@@ -3,6 +3,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { debug } from '@ember/debug';
 import { task } from 'ember-concurrency';
+import placeAddressHtml from '../../../utils/place-address-html';
 
 export default class OrderDetailsPayloadComponent extends Component {
     @service entityActions;
@@ -13,7 +14,23 @@ export default class OrderDetailsPayloadComponent extends Component {
     @service intl;
 
     get actionButtons() {
-        if (this.args.resource.isMultiDrop) return [];
+        if (this.args.resource.hasIntermediateWaypoints) {
+            const places = this.args.resource.places ?? [];
+            return [
+                {
+                    type: 'default',
+                    text: this.intl.t('order.actions.add-entity'),
+                    icon: 'plus',
+                    iconPrefix: 'fas',
+                    permission: 'fleet-ops update order',
+                    disabled: this.args.resource.status === 'canceled',
+                    items: places.map((p) => ({
+                        text: placeAddressHtml(p),
+                        onClick: () => this.addEntity.perform(p),
+                    })),
+                },
+            ];
+        }
 
         return [
             {

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

@@ -1,5 +1,5 @@
 <ContentPanel @title={{t "order.fields.route-panel-title"}} @open={{true}} @actionButtons={{this.actionButtons}} @wrapperClass="bordered-top">
-    {{#if @resource.payload.isMultiDrop}}
+    {{#if @resource.hasIntermediateWaypoints}}
         <div>
             <RouteList @order={{@resource}} @eta={{@resource.eta}} @waypointActions={{hash viewWaypointLabel=(hash label=(t "order.fields.get-label") fn=this.viewWaypointLabel)}} />
         </div>
@@ -19,4 +19,4 @@
             </div>
         </div>
     {{/if}}
-</ContentPanel>
+</ContentPanel>

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

@@ -2,14 +2,38 @@ import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { debug } from '@ember/debug';
+import { task } from 'ember-concurrency';
+import { applyOptimizedIntermediateWaypoints, buildRouteOptimizationInput, canOptimizeIntermediateWaypoints } from '../../../utils/order-route-editing';
 
 export default class OrderDetailsRouteComponent extends Component {
     @service orderActions;
     @service modalsManager;
     @service fetch;
+    @service notifications;
+    @service routeEngine;
+    @service routeOptimization;
+    @service hostRouter;
+    @service intl;
 
     get actionButtons() {
         return [
+            this.showOptimizationSelect
+                ? {
+                      component: 'route-optimization-engine-select-button',
+                      onClick: (service) => this.optimizeRouteWithService.perform(service),
+                      isLoading: this.optimizeRouteWithService.isRunning,
+                      disabled: !this.canOptimizeRoute,
+                  }
+                : {
+                      type: 'magic',
+                      icon: 'magic',
+                      text: this.intl.t('order.fields.optimize-route'),
+                      onClick: () => this.optimizeRoute.perform(),
+                      permission: 'fleet-ops optimize order',
+                      helpText: this.intl.t('order.fields.optimize-route-help-text'),
+                      disabled: !this.canOptimizeRoute,
+                      isLoading: this.optimizeRoute.isRunning,
+                  },
             {
                 type: 'default',
                 text: 'Edit',
@@ -24,8 +48,59 @@ export default class OrderDetailsRouteComponent extends Component {
         ];
     }
 
+    get canOptimizeRoute() {
+        return canOptimizeIntermediateWaypoints(this.args.resource?.payload);
+    }
+
+    get showOptimizationSelect() {
+        return this.routeOptimization.availableEngines.length > 1;
+    }
+
+    @task *optimizeRouteWithService(service) {
+        const order = this.args.resource;
+        const optimizationInput = buildRouteOptimizationInput(order);
+
+        if (!service) {
+            this.notifications.error('No route optimization engine was selected.');
+            return;
+        }
+
+        try {
+            const result = yield this.routeOptimization.optimize(service, {
+                context: 'order_details_route',
+                ...optimizationInput,
+            });
+
+            yield this.persistOptimizedRoute(result);
+        } catch (err) {
+            this.notifications.error(err.message ?? this.intl.t('fleet-ops.operations.orders.index.new.route-error'));
+        }
+    }
+
+    @task *optimizeRoute() {
+        const order = this.args.resource;
+        const optimizationInput = buildRouteOptimizationInput(order);
+        const service = this.routeEngine.getOptimizationEngine('osrm');
+
+        try {
+            const result = yield this.routeOptimization.optimize(service, {
+                context: 'order_details_route',
+                ...optimizationInput,
+            });
+
+            yield this.persistOptimizedRoute(result);
+        } catch (_err) {
+            this.notifications.error(this.intl.t('fleet-ops.operations.orders.index.new.route-error'));
+        }
+    }
+
+    *persistOptimizedRoute({ sortedWaypoints }) {
+        applyOptimizedIntermediateWaypoints(this.args.resource.payload, sortedWaypoints);
+        yield this.orderActions.saveRoute.perform(this.args.resource);
+        yield this.hostRouter.refresh();
+    }
+
     @action async viewWaypointLabel(waypoint) {
-        // render dialog to display label within
         this.modalsManager.show(`modals/order-label`, {
             title: 'Waypoint Label',
             modalClass: 'modal-xl',
@@ -34,14 +109,12 @@ export default class OrderDetailsRouteComponent extends Component {
         });
 
         try {
-            // load the pdf label from base64
             // eslint-disable-next-line no-undef
             const fileReader = new FileReader();
             const { data: pdfStream } = await this.fetch.get(`orders/label/${waypoint.waypoint_public_id}?format=base64`);
             // eslint-disable-next-line no-undef
             const base64 = await fetch(`data:application/pdf;base64,${pdfStream}`);
             const blob = await base64.blob();
-            // load into file reader
             fileReader.onload = (event) => {
                 const data = event.target.result;
                 this.modalsManager.setOption('data', data);

package/addon/components/order/form/payload.hbs

@@ -71,6 +71,24 @@
                                             <div>
                                                 <Input @value={{entity.sku}} @type="text" class="w-full form-input form-input-sm" placeholder={{t "order.fields.sku"}} />
                                             </div>
+                                            <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                                                <PowerSelect
+                                                    @options={{get-fleet-ops-options "entityTypes"}}
+                                                    @selected={{find-by "value" entity.type (get-fleet-ops-options "entityTypes")}}
+                                                    @onChange={{set-model-attr entity "type"}}
+                                                    @placeholder="Select entity type"
+                                                    @triggerClass="form-select"
+                                                    as |type|
+                                                >
+                                                    <div class="text-sm">
+                                                        <div class="font-semibold normalize-in-trigger">{{type.label}}</div>
+                                                        <div class="hide-from-trigger">{{type.description}}</div>
+                                                    </div>
+                                                </PowerSelect>
+                                            </div>
+                                            <RegistryYield @registry="fleet-ops:component:order:form:payload:entity:form" as |RegistryComponent|>
+                                                <RegistryComponent @entity={{entity}} @order={{@resource}} @controller={{this}} />
+                                            </RegistryYield>
                                             <Button @icon="pencil" @text={{t "order.fields.edit-item"}} @size="sm" @onClick={{fn this.editEntity entity}} />
                                         </div>
                                         <div class="absolute top-0 right-0 p-2">
@@ -105,6 +123,21 @@
                                 <div>
                                     <Input @value={{entity.sku}} @type="text" class="w-full form-input form-input-sm" placeholder={{t "order.fields.sku"}} />
                                 </div>
+                                <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                                    <PowerSelect
+                                        @options={{get-fleet-ops-options "entityTypes"}}
+                                        @selected={{find-by "value" entity.type (get-fleet-ops-options "entityTypes")}}
+                                        @onChange={{set-model-attr entity "type"}}
+                                        @placeholder="Select entity type"
+                                        @triggerClass="form-select"
+                                        as |type|
+                                    >
+                                        <div class="text-sm">
+                                            <div class="font-semibold normalize-in-trigger">{{type.label}}</div>
+                                            <div class="hide-from-trigger">{{type.description}}</div>
+                                        </div>
+                                    </PowerSelect>
+                                </div>
                                 <RegistryYield @registry="fleet-ops:component:order:form:payload:entity:form" as |RegistryComponent|>
                                     <RegistryComponent @entity={{entity}} @order={{@resource}} @controller={{this}} />
                                 </RegistryYield>

package/addon/components/order/form/payload.js

@@ -52,6 +52,7 @@ export default class OrderFormPayloadComponent extends Component {
     @action addEntity(importId = null) {
         const entity = this.store.createRecord('entity', {
             _import_id: typeof importId === 'string' ? importId : null,
+            type: 'entity',
         });
 
         this.args.resource.payload.entities.pushObject(entity);

package/addon/components/order/form/route.hbs

@@ -56,9 +56,9 @@
                                 @renderInPlace={{true}}
                                 @onChange={{fn this.setWaypointPlace index}}
                                 @permission={{cannot-write @resource}}
-                                as |model|
+                                as |place|
                             >
-                                {{model.address}}
+                                <Place::Address @place={{place}} />
                             </ModelSelect>
                             {{#if (and @resource.facilitator.isIntegratedVendor (is-not-facilitator-supported-place @resource.facilitator waypoint.place))}}
                                 <InfoBlock
@@ -169,9 +169,9 @@
                     @renderInPlace={{true}}
                     @onChange={{fn this.setPayloadPlace "pickup"}}
                     @permission={{cannot-write @resource}}
-                    as |model|
+                    as |place|
                 >
-                    {{model.address}}
+                    <Place::Address @place={{place}} />
                 </ModelSelect>
 
                 {{#if (and @resource.facilitator.isIntegratedVendor (is-not-facilitator-supported-place @resource.facilitator @resource.payload.pickup))}}
@@ -213,9 +213,9 @@
                     @renderInPlace={{true}}
                     @onChange={{fn this.setPayloadPlace "dropoff"}}
                     @permission={{cannot-write @resource}}
-                    as |model|
+                    as |place|
                 >
-                    {{model.address}}
+                    <Place::Address @place={{place}} />
                 </ModelSelect>
 
                 {{#if (and @resource.facilitator.isIntegratedVendor (is-not-facilitator-supported-place @resource.facilitator @resource.payload.dropoff))}}
@@ -250,9 +250,9 @@
                     @renderInPlace={{true}}
                     @onChange={{fn this.setPayloadPlace "return"}}
                     @permission={{cannot-write @resource}}
-                    as |model|
+                    as |place|
                 >
-                    {{model.address}}
+                    <Place::Address @place={{place}} />
                 </ModelSelect>
 
                 {{#if (and @resource.facilitator.isIntegratedVendor (is-not-facilitator-supported-place @resource.facilitator @resource.payload.return))}}