@fleetbase/fleetops-engine 0.6.9 → 0.6.11

package/addon/components/admin/navigator-app.js

@@ -1,7 +1,7 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 
 export default class NavigatorAppControlsComponent extends Component {
     @service fetch;

package/addon/components/custom-field-form-panel.js

@@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { dasherize, camelize } from '@ember/string';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import isObject from '@fleetbase/ember-core/utils/is-object';
 import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';

package/addon/components/driver-onboard-settings.js

@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 
 export default class DriverOnboardSettingsComponent extends Component {
     @service fetch;

package/addon/components/driver-panel/orders.js

@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action, computed } from '@ember/object';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 
 export default class CustomerOrderHistoryComponent extends Component {
     @service store;

package/addon/components/edit-order-route-panel.js

@@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';

package/addon/components/entity-field-editing-settings.js

@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 import { isNone } from '@ember/utils';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 
 export default class EntityFieldEditingSettingsComponent extends Component {
     @service notifications;

package/addon/components/fleet-driver-listing.js

@@ -4,8 +4,7 @@ import { inject as service } from '@ember/service';
 import { action, computed } from '@ember/object';
 import { isArray } from '@ember/array';
 import { isBlank } from '@ember/utils';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 
 export default class FleetDriverListingComponent extends Component {
     @service store;

package/addon/components/fleet-panel/driver-listing.js

@@ -3,8 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { isBlank } from '@ember/utils';
 import { action, set } from '@ember/object';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 
 export default class FleetPanelDriverListingComponent extends Component {

package/addon/components/fleet-panel/vehicle-listing.js

@@ -3,8 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { isBlank } from '@ember/utils';
 import { action, set } from '@ember/object';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 
 export default class FleetPanelVehicleListingComponent extends Component {

package/addon/components/fleet-vehicle-listing.js

@@ -4,8 +4,7 @@ import { inject as service } from '@ember/service';
 import { action, computed } from '@ember/object';
 import { isArray } from '@ember/array';
 import { isBlank } from '@ember/utils';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 
 export default class FleetVehicleListingComponent extends Component {
     @service store;

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

@@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { later } from '@ember/runloop';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 
 export default class LayoutFleetOpsSidebarDriverListingComponent extends Component {
     @service store;

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

@@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { later } from '@ember/runloop';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 
 export default class LayoutFleetOpsSidebarFleetListingComponent extends Component {
     @service store;

package/addon/components/live-map.js

@@ -8,7 +8,7 @@ import { singularize } from 'ember-inflector';
 import { later } from '@ember/runloop';
 import { debug } from '@ember/debug';
 import { allSettled } from 'rsvp';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import { OSRMv1, Control as RoutingControl } from '@fleetbase/leaflet-routing-machine';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
 import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';

package/addon/components/map-container/toolbar/zones-panel.js

@@ -5,7 +5,7 @@ import { action } from '@ember/object';
 import { later } from '@ember/runloop';
 import { classify } from '@ember/string';
 import { calculateInPlacePosition } from 'ember-basic-dropdown/utils/calculate-position';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 
 /**
  * @class MapContainerToolbarZonesPanelComponent

package/addon/components/order-config-manager/activity-flow.js

@@ -7,7 +7,7 @@ import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 import { later } from '@ember/runloop';
 import { debug } from '@ember/debug';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import generateUUID from '@fleetbase/ember-core/utils/generate-uuid';
 import createFlowActivity from '../../utils/create-flow-activity';
 import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';

package/addon/components/order-config-manager/custom-fields.js

@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 import { later } from '@ember/runloop';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import isObject from '@fleetbase/ember-core/utils/is-object';
 import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 

package/addon/components/order-config-manager/entities.js

@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 import { later } from '@ember/runloop';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
 import ObjectProxy from '@ember/object/proxy';
 import createCustomEntity from '../../utils/create-custom-entity';

package/addon/components/order-config-manager.js

@@ -6,7 +6,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 import { dasherize } from '@ember/string';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import isModel from '@fleetbase/ember-core/utils/is-model';
 import getModelName from '@fleetbase/ember-core/utils/get-model-name';
 import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';

package/addon/components/vendor-panel/drivers.js

@@ -3,8 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { isBlank } from '@ember/utils';
 import { action, set } from '@ember/object';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 
 export default class VendorPanelDriversComponent extends Component {

package/addon/components/widget/fleet-ops-key-metrics.js

@@ -1,7 +1,7 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 
 export default class WidgetFleetOpsKeyMetricsComponent extends Component {
     /**

package/addon/controllers/management/contacts/index.js

@@ -3,8 +3,7 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 
 export default class ManagementContactsIndexController extends BaseController {
     @service store;

package/addon/controllers/management/drivers/index.js

@@ -4,8 +4,7 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import { equal } from '@ember/object/computed';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 
 export default class ManagementDriversIndexController extends BaseController {
     @service notifications;

package/addon/controllers/management/fleets/index.js

@@ -3,8 +3,7 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 
 export default class ManagementFleetsIndexController extends BaseController {
     @service notifications;

package/addon/controllers/management/fuel-reports/index.js

@@ -3,8 +3,7 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 
 export default class ManagementFuelReportsIndexController extends BaseController {
     @service notifications;

package/addon/controllers/management/issues/index.js

@@ -3,8 +3,7 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { isBlank } from '@ember/object';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 import getIssueTypes from '../../../utils/get-issue-types';
 import getIssueCategories from '../../../utils/get-issue-categories';
 

package/addon/controllers/management/vehicles/index.js

@@ -3,8 +3,7 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 
 export default class ManagementVehiclesIndexController extends BaseController {
     @service contextPanel;

package/addon/controllers/management/vendors/index.js

@@ -3,8 +3,7 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 import getVendorStatusOptions from '../../../utils/get-vendor-status-options';
 
 export default class ManagementVendorsIndexController extends BaseController {

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

@@ -8,11 +8,10 @@ import { isArray } from '@ember/array';
 import { isBlank } from '@ember/utils';
 import { dasherize } from '@ember/string';
 import { next } from '@ember/runloop';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import { OSRMv1, Control as RoutingControl } from '@fleetbase/leaflet-routing-machine';
 import { debug } from '@ember/debug';
 import polyline from '@fleetbase/ember-core/utils/polyline';
-import findClosestWaypoint from '@fleetbase/ember-core/utils/find-closest-waypoint';
 import isNotEmpty from '@fleetbase/ember-core/utils/is-not-empty';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
 import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
@@ -939,66 +938,59 @@ export default class OperationsOrdersIndexNewController extends BaseController {
     @task *optimizeRoute() {
         this.isOptimizingRoute = true;
 
+        // Build the coordinate list we’ll send to OSRM
         const driverAssigned = this.order.driver_assigned;
-        const driverPosition = driverAssigned ? driverAssigned.location.coordinates : null;
-        const leafletMap = this.leafletMap;
+        const driverPosition = driverAssigned?.location?.coordinates; // [lon,lat] | undefined
+        const originalCoords = this.getCoordinatesFromPayload(); // [[lon,lat], …]
+        const coordinates = driverPosition ? [driverPosition, ...originalCoords] : [...originalCoords];
+        const hasDriverStart = Boolean(driverPosition);
+        const source = 'first';
+        const destination = 'any';
+        const roundtrip = false; // don’t loop back
         const routingHost = getRoutingHost(this.payload, this.waypoints);
 
-        let originalCoordinates = this.getCoordinatesFromPayload();
-        let coordinates = [...originalCoordinates]; // clone
-
-        let source = 'any';
-        let destination = 'any';
-        let hasDriverStart = false;
-
-        // Inject driver location as starting point if available
-        if (driverPosition && Array.isArray(driverPosition) && driverPosition.length === 2) {
-            coordinates.unshift([driverPosition[0], driverPosition[1]]);
-            source = 'first';
-            hasDriverStart = true;
-        }
-
+        // Call the OSRM /trip service
         try {
-            const response = yield this.fetch.routing(coordinates, { source, destination, annotations: true }, { host: routingHost });
+            const response = yield this.fetch.routing(coordinates, { source, destination, roundtrip, annotations: true }, { host: routingHost });
 
-            if (response?.code === 'Ok') {
-                this.removeRoutingControlPreview();
-                this.removeOptimizedRoute(leafletMap);
-                this.clearLayers();
+            if (response?.code !== 'Ok') {
+                throw new Error(`OSRM error: ${response?.code}`);
+            }
 
-                const trip = response.trips?.firstObject;
-                const route = polyline.decode(trip.geometry);
-                const responseWaypoints = response.waypoints || [];
+            // Pair each OSRM waypoint with its Waypoint model
+            const modelsByInputIndex = hasDriverStart ? [null, ...this.waypoints] : this.waypoints;
 
-                let sortedWaypoints = [];
+            const pairs = response.waypoints.map((wp, idx) => ({
+                model: modelsByInputIndex[idx], // Ember model or null (driver)
+                wp,
+            }));
 
-                for (let i = 0; i < responseWaypoints.length; i++) {
-                    // Skip driver position (first coordinate) if it was included
-                    if (hasDriverStart && i === 0) {
-                        continue;
-                    }
+            // Drop the driver start if present
+            const payloadPairs = hasDriverStart ? pairs.slice(1) : pairs;
 
-                    const wp = responseWaypoints[i];
-                    const lat = wp.location[1];
-                    const lng = wp.location[0];
+            // Sort by the optimised order
+            payloadPairs.sort((a, b) => a.wp.waypoint_index - b.wp.waypoint_index);
 
-                    const model = findClosestWaypoint(lat, lng, this.waypoints);
+            // Extract the Ember models (null-safe)
+            const sortedWaypoints = payloadPairs.map((p) => p.model).filter(Boolean);
 
-                    if (model) {
-                        sortedWaypoints.pushObject(model);
-                    }
-                }
+            // Update map layers & UI
+            this.removeRoutingControlPreview();
+            this.removeOptimizedRoute(this.leafletMap);
+            this.clearLayers();
 
-                this.waypoints = sortedWaypoints;
-                this.setOptimizedRoute(route, trip, responseWaypoints);
-                this.previewDraftOrderRoute(this.payload, this.waypoints, this.isMultipleDropoffOrder);
-                this.updatePayloadCoordinates();
+            const trip = response.trips?.[0];
+            const route = polyline.decode(trip.geometry); // [[lat,lon], …]
 
-                this.order.set('is_route_optimized', true);
+            this.waypoints = sortedWaypoints;
+            this.setOptimizedRoute(route, trip, response.waypoints);
+            this.previewDraftOrderRoute(this.payload, this.waypoints, this.isMultipleDropoffOrder);
+            this.updatePayloadCoordinates();
 
-                if (this.isUsingIntegratedVendor) {
-                    this.getQuotes();
-                }
+            this.order.set('is_route_optimized', true);
+
+            if (this.isUsingIntegratedVendor) {
+                this.getQuotes();
             }
         } catch (err) {
             debug('Error optimizing route', err);

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

@@ -5,7 +5,7 @@ import { tracked } from '@glimmer/tracking';
 import { action, computed } from '@ember/object';
 import { later } from '@ember/runloop';
 import { not, notEmpty, alias } from '@ember/object/computed';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import { OSRMv1, Control as RoutingControl } from '@fleetbase/leaflet-routing-machine';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
 

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

@@ -6,8 +6,7 @@ import { equal } from '@ember/object/computed';
 import { debug } from '@ember/debug';
 import { isArray } from '@ember/array';
 import { isBlank } from '@ember/utils';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 
 export default class OperationsOrdersIndexController extends BaseController {
     @service currentUser;

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

@@ -3,8 +3,7 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 
 export default class OperationsServiceRatesIndexController extends BaseController {
     @service store;

package/addon/services/order-creation.js

@@ -6,7 +6,7 @@ import { tracked } from '@glimmer/tracking';
 // import { isBlank } from '@ember/utils';
 // import { dasherize } from '@ember/string';
 // import { later, next } from '@ember/runloop';
-// import { task } from 'ember-concurrency-decorators';
+// import { task } from 'ember-concurrency';
 // import { OSRMv1, Control as RoutingControl } from '@fleetbase/leaflet-routing-machine';
 // import polyline from '@fleetbase/ember-core/utils/polyline';
 // import findClosestWaypoint from '@fleetbase/ember-core/utils/find-closest-waypoint';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.9",
+    "version": "0.6.11",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.9",
+    "version": "0.6.11",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.9",
+    "version": "0.6.11",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -87,8 +87,7 @@
         "ember-cli-sri": "^2.1.1",
         "ember-cli-terser": "^4.0.2",
         "ember-composable-helpers": "^5.0.0",
-        "ember-concurrency": "^3.1.1",
-        "ember-concurrency-decorators": "^2.0.3",
+        "ember-concurrency": "^4.0.4",
         "ember-data": "^4.12.5",
         "ember-engines": "^0.9.0",
         "ember-load-initializers": "^2.1.2",