Merge pull request #198 from fleetbase/dev-v0.3.32

roncodes · web-flow · commit 2bebe8ef2772 · 2025-12-29T18:19:28.000+08:00
feat: Remove usage of `window.Fleetbase`, improve several order relat…
diff --git a/addon/components/customer/orders.js b/addon/components/customer/orders.js
@@ -42,7 +42,7 @@ export default class CustomerOrdersComponent extends Component {
 
     get modalsManager() {
         const owner = getOwner(this);
-        const application = typeof this.universe.getApplicationInstance === 'function' ? this.universe.getApplicationInstance() : window.Fleetbase;
+        const application = this.universe.getApplicationInstance();
         const modalsManager = application ? application.lookup('service:modals-manager') : owner.lookup('service:modals-manager');
         return modalsManager;
     }
diff --git a/addon/services/leaflet-routing-control.js b/addon/services/leaflet-routing-control.js
@@ -67,7 +67,7 @@ export default class LeafletRoutingControlService extends Service {
 
     #initializeRegistry() {
         const registry = 'registry:routing-controls';
-        const application = typeof this.universe?.getApplicationInstance === 'function' ? this.universe.getApplicationInstance() : window.Fleetbase;
+        const application = this.universe.getApplicationInstance();
         if (!application.hasRegistration(registry)) {
             application.register(registry, new RoutingControlRegistry(), { instantiate: false });
         }
diff --git a/addon/services/movement-tracker.js b/addon/services/movement-tracker.js
@@ -122,6 +122,7 @@ export class EventBuffer {
 
 export default class MovementTrackerService extends Service {
     @service socket;
+    @service universe;
     @tracked channels = [];
     @tracked buffers = new Map();
 
@@ -131,7 +132,7 @@ export default class MovementTrackerService extends Service {
     }
 
     #getOwner(owner = null) {
-        return owner ?? window.Fleetbase ?? getOwner(this);
+        return owner ?? this.universe.getApplicationInstance() ?? getOwner(this);
     }
 
     #getBuffer(key, model, opts = {}) {
diff --git a/addon/services/route-optimization.js b/addon/services/route-optimization.js
@@ -57,7 +57,7 @@ export default class RouteOptimizationService extends Service {
 
     #initializeRegistry() {
         const registry = 'registry:route-optimization-engines';
-        const application = typeof this.universe?.getApplicationInstance === 'function' ? this.universe.getApplicationInstance() : window.Fleetbase;
+        const application = this.universe.getApplicationInstance();
         if (!application.hasRegistration(registry)) {
             application.register(registry, new RouteOptimizationRegistry(), { instantiate: false });
         }
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.31",
+    "version": "0.6.32",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
diff --git a/extension.json b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.31",
+    "version": "0.6.32",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.31",
+    "version": "0.6.32",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -42,8 +42,8 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.3.9",
-        "@fleetbase/ember-ui": "^0.3.15",
+        "@fleetbase/ember-core": "^0.3.10",
+        "@fleetbase/ember-ui": "^0.3.17",
         "@fleetbase/fleetops-data": "^0.1.24",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/server/src/Http/Controllers/Internal/v1/LiveController.php b/server/src/Http/Controllers/Internal/v1/LiveController.php
@@ -139,6 +139,7 @@ function ($q) {
 
             if ($active) {
                 $query->whereHas('driverAssigned');
+                $query->whereNotIn('status', ['created', 'completed', 'expired', 'order_canceled', 'canceled', 'pending']);
             }
 
             if ($unassigned) {
@@ -166,7 +167,7 @@ public function drivers(Request $request)
 
         return LiveCacheService::remember('drivers', $cacheParams, function () use ($bounds) {
             $query = Driver::where(['company_uuid' => session('company')])
-                ->with(['user', 'vehicle', 'currentJob'])
+                ->with(['user', 'vehicle'])
                 ->applyDirectivesForPermissions('fleet-ops list driver');
 
             // Filter out drivers with invalid coordinates
diff --git a/server/src/Http/Filter/OrderFilter.php b/server/src/Http/Filter/OrderFilter.php
@@ -116,7 +116,7 @@ public function active(bool $active = false)
             $this->builder->where(
                 function ($q) {
                     $q->whereHas('driverAssigned');
-                    $q->whereNotIn('status', ['created', 'canceled', 'order_canceled', 'completed']);
+                    $q->whereNotIn('status', ['created', 'completed', 'expired', 'order_canceled', 'canceled', 'pending']);
                 }
             );
         }
diff --git a/server/src/Http/Resources/v1/Order.php b/server/src/Http/Resources/v1/Order.php
@@ -84,6 +84,7 @@ public function toArray($request): array
             'pod_method'           => $this->pod_method,
             'pod_required'         => (bool) data_get($this, 'pod_required', false),
             'dispatched'           => (bool) data_get($this, 'dispatched', false),
+            'started'              => (bool) data_get($this, 'started', false),
             'adhoc'                => (bool) data_get($this, 'adhoc', false),
             'adhoc_distance'       => (int) $this->getAdhocDistance(),
             'distance'             => (int) $this->distance,
diff --git a/server/src/Models/Driver.php b/server/src/Models/Driver.php
@@ -262,12 +262,12 @@ public function vendor(): BelongsTo|Builder
 
     public function currentJob(): BelongsTo|Builder
     {
-        return $this->belongsTo(Order::class)->select(['id', 'uuid', 'public_id', 'payload_uuid', 'driver_assigned_uuid'])->without(['driver']);
+        return $this->belongsTo(Order::class)->without(['driver']);
     }
 
     public function currentOrder(): BelongsTo|Builder
     {
-        return $this->belongsTo(Order::class, 'current_job_uuid')->select(['id', 'uuid', 'public_id', 'payload_uuid', 'driver_assigned_uuid'])->without(['driver']);
+        return $this->belongsTo(Order::class, 'current_job_uuid')->without(['driver']);
     }
 
     public function jobs(): HasMany|Builder
diff --git a/server/src/Observers/OrderObserver.php b/server/src/Observers/OrderObserver.php
@@ -18,6 +18,20 @@ public function created(Order $order)
         $this->invalidateCache($order);
     }
 
+    /**
+     * Handle the Order "updating" event.
+     *
+     * This event is fired before the order is persisted to the database.
+     * It is used to mutate attributes as part of the same update operation
+     * without triggering additional save cycles.
+     *
+     * @param Order $order The order being updated
+     */
+    public function updating(Order $order): void
+    {
+        $this->ensureOrderStarted($order);
+    }
+
     /**
      * Handle the Order "updated" event.
      *
@@ -62,4 +76,40 @@ protected function invalidateCache(?Order $order = null): void
             Cache::forget("order:{$order->uuid}:tracker");
         }
     }
+
+    /**
+     * Detects when an order has just transitioned to the "started" status
+     * and initializes start-related fields.
+     *
+     * This method should be called during the "updating" lifecycle event
+     * to ensure that the changes are persisted as part of the same database
+     * update and do not trigger additional observer events.
+     *
+     * An order is considered "started" when:
+     * - The "status" attribute is being changed in the current update
+     * - The previous status was not "started"
+     * - The new status is "started"
+     *
+     * When these conditions are met, the order's start timestamp and
+     * started flag are set if they have not already been initialized.
+     *
+     * @param Order $order The order being evaluated for a start transition
+     */
+    protected function ensureOrderStarted(Order $order): void
+    {
+        if (
+            $order->isDirty('status')
+            && $order->getOriginal('status') === 'dispatched'
+            && $order->status === 'started'
+        ) {
+            // Only set defaults if not explicitly provided
+            if (is_null($order->started_at)) {
+                $order->started_at = now();
+            }
+
+            if (!$order->started) {
+                $order->started = true;
+            }
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export default class CustomerOrdersComponent extends Component {`
`42`	`42`
`43`	`43`	`get modalsManager() {`
`44`	`44`	`const owner = getOwner(this);`
`45`		`- const application = typeof this.universe.getApplicationInstance === 'function' ? this.universe.getApplicationInstance() : window.Fleetbase;`
	`45`	`+ const application = this.universe.getApplicationInstance();`
`46`	`46`	`const modalsManager = application ? application.lookup('service:modals-manager') : owner.lookup('service:modals-manager');`
`47`	`47`	`return modalsManager;`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ export default class LeafletRoutingControlService extends Service {`
`67`	`67`
`68`	`68`	`#initializeRegistry() {`
`69`	`69`	`const registry = 'registry:routing-controls';`
`70`		`- const application = typeof this.universe?.getApplicationInstance === 'function' ? this.universe.getApplicationInstance() : window.Fleetbase;`
	`70`	`+ const application = this.universe.getApplicationInstance();`
`71`	`71`	`if (!application.hasRegistration(registry)) {`
`72`	`72`	`application.register(registry, new RoutingControlRegistry(), { instantiate: false });`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ export class EventBuffer {`
`122`	`122`
`123`	`123`	`export default class MovementTrackerService extends Service {`
`124`	`124`	`@service socket;`
	`125`	`+ @service universe;`
`125`	`126`	`@tracked channels = [];`
`126`	`127`	`@tracked buffers = new Map();`
`127`	`128`
`@@ -131,7 +132,7 @@ export default class MovementTrackerService extends Service {`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`#getOwner(owner = null) {`
`134`		`- return owner ?? window.Fleetbase ?? getOwner(this);`
	`135`	`+ return owner ?? this.universe.getApplicationInstance() ?? getOwner(this);`
`135`	`136`	`}`
`136`	`137`
`137`	`138`	`#getBuffer(key, model, opts = {}) {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export default class RouteOptimizationService extends Service {`
`57`	`57`
`58`	`58`	`#initializeRegistry() {`
`59`	`59`	`const registry = 'registry:route-optimization-engines';`
`60`		`- const application = typeof this.universe?.getApplicationInstance === 'function' ? this.universe.getApplicationInstance() : window.Fleetbase;`
	`60`	`+ const application = this.universe.getApplicationInstance();`
`61`	`61`	`if (!application.hasRegistration(registry)) {`
`62`	`62`	`application.register(registry, new RouteOptimizationRegistry(), { instantiate: false });`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "fleetbase/fleetops-api",`
`3`		`- "version": "0.6.31",`
	`3`	`+ "version": "0.6.32",`
`4`	`4`	`"description": "Fleet & Transport Management Extension for Fleetbase",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"fleetbase-extension",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Fleet-Ops",`
`3`		`- "version": "0.6.31",`
	`3`	`+ "version": "0.6.32",`
`4`	`4`	`"description": "Fleet & Transport Management Extension for Fleetbase",`
`5`	`5`	`"repository": "https://github.com/fleetbase/fleetops",`
`6`	`6`	`"license": "AGPL-3.0-or-later",`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public function active(bool $active = false)`
`116`	`116`	`$this->builder->where(`
`117`	`117`	`function ($q) {`
`118`	`118`	`$q->whereHas('driverAssigned');`
`119`		`- $q->whereNotIn('status', ['created', 'canceled', 'order_canceled', 'completed']);`
	`119`	`+ $q->whereNotIn('status', ['created', 'completed', 'expired', 'order_canceled', 'canceled', 'pending']);`
`120`	`120`	`}`
`121`	`121`	`);`
`122`	`122`	`}`