@fleetbase/fleetops-engine 0.6.60 → 0.6.62

package/server/tests/Unit/Http/Resources/OrderConfigResourceTest.php

@@ -45,3 +45,94 @@ test('order config resource projects empty and invalid flow as an empty list', f
     expect($payload['id'])->toBe('order_config_public')
         ->and($payload['flow'])->toBe([]);
 });
+
+test('order config resource publishes the flow graph so consumers can sequence it', function () {
+    $request                                          = Request::create('/v1/fleet-ops/order-configs/order_config_public', 'GET');
+    FleetOpsOrderConfigResourceRequestState::$request = $request;
+    FleetOpsSupportRequestState::$request             = $request;
+
+    // Declared deliberately out of workflow order, which is how flows are
+    // stored: `completed` before the step that leads to it, `dispatched` last.
+    $config = new OrderConfig();
+    $config->setRawAttributes([
+        'id'        => 8,
+        'uuid'      => 'order-config-uuid',
+        'public_id' => 'order_config_public',
+        'key'       => 'transport',
+        'name'      => 'Transport',
+        'flow'      => [
+            ['code' => 'completed', 'status' => 'Order Completed', 'complete' => true, 'activities' => []],
+            ['code' => 'created', 'status' => 'Order Created', 'activities' => ['dispatched']],
+            ['code' => 'dispatched', 'status' => 'Order Dispatched', 'activities' => ['enroute'], 'sequence' => 2],
+            [
+                'code'       => 'enroute',
+                'status'     => 'Driver Enroute',
+                'activities' => ['completed', 'failed'],
+                'logic'      => [['type' => 'and', 'conditions' => []]],
+            ],
+        ],
+    ], true);
+
+    $flow   = (new OrderConfigResource($config))->resolve($request)['flow'];
+    $byCode = collect($flow)->keyBy('code');
+
+    expect($byCode['created']['activities'])->toBe(['dispatched'])
+        ->and($byCode['dispatched']['sequence'])->toBe(2)
+        ->and($byCode['enroute']['activities'])->toBe(['completed', 'failed'])
+        ->and($byCode['enroute']['logic'])->toBe([['type' => 'and', 'conditions' => []]])
+        ->and($byCode['completed']['complete'])->toBeTrue();
+});
+
+test('order config resource normalises transitions written as objects', function () {
+    $request                                          = Request::create('/v1/fleet-ops/order-configs/order_config_public', 'GET');
+    FleetOpsOrderConfigResourceRequestState::$request = $request;
+    FleetOpsSupportRequestState::$request             = $request;
+
+    // Flows have been authored both ways; a consumer should not have to guess.
+    $config = new OrderConfig();
+    $config->setRawAttributes([
+        'id'        => 9,
+        'uuid'      => 'order-config-uuid',
+        'public_id' => 'order_config_public',
+        'key'       => 'transport',
+        'name'      => 'Transport',
+        'flow'      => [
+            ['code' => 'created', 'activities' => [['code' => 'dispatched'], 'enroute', ['label' => 'no code here']]],
+            // A flow hand-edited down to a single transition can leave a bare
+            // string where the list belongs. Publish an empty list rather than
+            // letting the shape vary — a consumer iterating the field should
+            // never have to type-check it.
+            ['code' => 'dispatched', 'activities' => 'enroute'],
+        ],
+    ], true);
+
+    $flow = (new OrderConfigResource($config))->resolve($request)['flow'];
+
+    expect($flow[0]['activities'])->toBe(['dispatched', 'enroute'])
+        ->and($flow[1]['activities'])->toBe([]);
+});
+
+test('order config resource keeps flow fields absent from a legacy activity null rather than missing', function () {
+    $request                                          = Request::create('/v1/fleet-ops/order-configs/order_config_public', 'GET');
+    FleetOpsOrderConfigResourceRequestState::$request = $request;
+    FleetOpsSupportRequestState::$request             = $request;
+
+    $config = new OrderConfig();
+    $config->setRawAttributes([
+        'id'        => 10,
+        'uuid'      => 'order-config-uuid',
+        'public_id' => 'order_config_public',
+        'key'       => 'transport',
+        'name'      => 'Transport',
+        'flow'      => [['code' => 'created', 'status' => 'Order Created']],
+    ], true);
+
+    $flow = (new OrderConfigResource($config))->resolve($request)['flow'];
+
+    // Present-and-null is a contract a client can read; absent is one it has to
+    // feel for.
+    expect($flow[0])->toHaveKeys(['sequence', 'activities', 'logic'])
+        ->and($flow[0]['sequence'])->toBeNull()
+        ->and($flow[0]['activities'])->toBe([])
+        ->and($flow[0]['logic'])->toBeNull();
+});

package/server/tests/VehicleControllerHelperContractsTest.php

@@ -39,7 +39,7 @@ class FleetOpsVehicleControllerProbe extends VehicleController
         return $this->vehicle;
     }
 
-    protected function findDriver(string $id): Driver
+    protected function findDriver(?string $id): Driver
     {
         $this->driverLookups[] = $id;
 

package/translations/en-us.yaml

@@ -2006,6 +2006,10 @@ settings:
         map-provider: Map Provider
         map-provider-help-text: Choose the map engine used to render the live operations map. Leaflet uses OpenStreetMap tiles and requires no API key. Google Maps requires a valid Google Maps JavaScript API key.
         select-map-provider: Select map provider
+        leaflet-tile-url: Leaflet Tile Provider URL
+        leaflet-tile-url-help-text: Optional custom XYZ tile provider URL template used by the Leaflet map. Leave blank to use the default OpenStreetMap tiles which require no API key. Use this to point Leaflet at your own tile provider, including keyed providers such as CARTO.
+        leaflet-dark-tile-url: Leaflet Dark Mode Tile Provider URL
+        leaflet-dark-tile-url-help-text: Optional tile provider URL used when the console is in dark mode. Leave blank to fall back to the tile provider URL above, or the default OpenStreetMap tiles.
         google-maps-map-type: Map Type
         google-maps-map-type-help-text: The default map style to display when Google Maps is active.
         select-map-type: Select map type