@fleetbase/fleetops-engine 0.6.36 → 0.6.38

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

@@ -2,10 +2,12 @@ import Controller, { inject as controller } from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import { isArray } from '@ember/array';
 import { task } from 'ember-concurrency';
 
 export default class OperationsOrdersIndexDetailsController extends Controller {
     @controller('operations.orders.index') index;
+    @service('universe/menu-service') menuService;
     @service orderActions;
     @service orderSocketEvents;
     @service leafletMapManager;
@@ -16,11 +18,14 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
     @tracked routingControl;
 
     get tabs() {
+        const registeredTabs = this.menuService.getMenuItems('fleet-ops:component:order:details');
         return [
             {
                 route: 'operations.orders.index.details.index',
                 label: 'Overview',
+                icon: 'folder-open',
             },
+            ...(isArray(registeredTabs) ? registeredTabs : []),
         ];
     }
 

package/addon/extension.js

@@ -7,7 +7,61 @@ export default {
         const widgetService = universe.getService('widget');
 
         // Register header navigation
-        menuService.registerHeaderMenuItem('Fleet-Ops', 'console.fleet-ops', { icon: 'route', priority: 0 });
+        menuService.registerHeaderMenuItem('Fleet-Ops', 'console.fleet-ops', {
+            icon: 'route',
+            priority: 0,
+            description: 'Dispatch, fleet management, driver tracking, and logistics operations.',
+            shortcuts: [
+                {
+                    title: 'Orders',
+                    description: 'Create, dispatch, and track delivery orders in real time.',
+                    icon: 'boxes-stacked',
+                    route: 'console.fleet-ops.operations.orders',
+                },
+                {
+                    title: 'Places',
+                    description: 'Manage saved locations, addresses, and points of interest.',
+                    icon: 'location-dot',
+                    route: 'console.fleet-ops.management.places',
+                },
+                {
+                    title: 'Drivers',
+                    description: 'Manage driver profiles, assignments, and live locations.',
+                    icon: 'id-card',
+                    route: 'console.fleet-ops.management.drivers',
+                },
+                {
+                    title: 'Vehicles',
+                    description: 'View and manage your vehicle fleet and telematics.',
+                    icon: 'truck',
+                    route: 'console.fleet-ops.management.vehicles',
+                },
+                {
+                    title: 'Fleets',
+                    description: 'Organise drivers and vehicles into operational fleets.',
+                    icon: 'layer-group',
+                    route: 'console.fleet-ops.management.fleets',
+                },
+                {
+                    title: 'Service Rates',
+                    description: 'Configure pricing rules and service rate cards.',
+                    icon: 'tags',
+                    route: 'console.fleet-ops.operations.service-rates',
+                },
+                {
+                    title: 'Devices',
+                    description: 'Manage connected telematics devices and their sensor data.',
+                    icon: 'microchip',
+                    route: 'console.fleet-ops.connectivity.devices',
+                },
+                {
+                    title: 'Reports',
+                    description: 'Generate and review operational analytics reports.',
+                    icon: 'chart-bar',
+                    route: 'console.fleet-ops.analytics.reports',
+                },
+            ],
+        });
 
         // Register admin sections
         menuService.registerAdminMenuPanel(

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

@@ -0,0 +1,23 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class OperationsOrdersIndexDetailsVirtualRoute extends Route {
+    @service universe;
+    @service('universe/menu-service') menuService;
+
+    queryParams = {
+        view: {
+            refreshModel: true,
+        },
+    };
+
+    model({ section = null, slug }, transition) {
+        const view = this.universe.getViewFromTransition(transition);
+        return this.menuService.lookupMenuItem('fleet-ops:component:order:details', slug, view, section);
+    }
+
+    setupController(controller) {
+        super.setupController(...arguments);
+        controller.resource = this.modelFor('operations.orders.index.details');
+    }
+}

package/addon/routes.js

@@ -1,3 +1,4 @@
+/* eslint-disable ember/no-shadow-route-definition */
 import buildRoutes from 'ember-engines/routes';
 
 export default buildRoutes(function () {
@@ -19,6 +20,7 @@ export default buildRoutes(function () {
                 this.route('new');
                 this.route('details', { path: '/:public_id' }, function () {
                     this.route('index', { path: '/' });
+                    this.route('virtual', { path: '/:slug' });
                 });
             });
         });

package/addon/templates/operations/orders/index/details/virtual.hbs

@@ -0,0 +1 @@
+{{component (lazy-engine-component @model.component) resource=this.resource order=this.resource params=@model.componentParams}}

package/app/routes/operations/orders/index/details/virtual.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/operations/orders/index/details/virtual';

package/app/templates/operations/orders/index/details/virtual.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/operations/orders/index/details/virtual';

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.36",
+    "version": "0.6.38",
     "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.36",
+    "version": "0.6.38",
     "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.12",
-        "@fleetbase/ember-ui": "^0.3.21",
+        "@fleetbase/ember-core": "^0.3.17",
+        "@fleetbase/ember-ui": "^0.3.25",
         "@fleetbase/fleetops-data": "^0.1.25",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",

package/server/src/Http/Controllers/Internal/v1/DriverController.php

@@ -45,6 +45,17 @@ class DriverController extends FleetOpsController
     {
         $input = $request->input('driver');
 
+        // Normalize vehicle field - the frontend may send the full vehicle object,
+        // a UUID string, or a public_id string. Normalize to a single identifier
+        // so the ResolvableVehicle rule can validate it correctly.
+        if (isset($input['vehicle']) && is_array($input['vehicle'])) {
+            $input['vehicle'] = data_get($input['vehicle'], 'id')
+                ?? data_get($input['vehicle'], 'public_id')
+                ?? data_get($input['vehicle'], 'uuid')
+                ?? null;
+            $request->merge(['driver' => $input]);
+        }
+
         // create validation request
         $createDriverRequest = CreateDriverRequest::createFrom($request);
         $rules               = $createDriverRequest->rules();
@@ -262,6 +273,17 @@ class DriverController extends FleetOpsController
         // get input data
         $input = $request->input('driver');
 
+        // Normalize vehicle field - the frontend may send the full vehicle object,
+        // a UUID string, or a public_id string. Normalize to a single identifier
+        // so the ResolvableVehicle rule can validate it correctly.
+        if (isset($input['vehicle']) && is_array($input['vehicle'])) {
+            $input['vehicle'] = data_get($input['vehicle'], 'id')
+                ?? data_get($input['vehicle'], 'public_id')
+                ?? data_get($input['vehicle'], 'uuid')
+                ?? null;
+            $request->merge(['driver' => $input]);
+        }
+
         // create validation request
         $updateDriverRequest = UpdateDriverRequest::createFrom($request);
         $rules               = $updateDriverRequest->rules();

package/server/src/Http/Requests/Internal/CreateDriverRequest.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Requests\Internal;
 
 use Fleetbase\FleetOps\Http\Requests\CreateDriverRequest as CreateDriverApiRequest;
 use Fleetbase\FleetOps\Rules\ResolvablePoint;
+use Fleetbase\FleetOps\Rules\ResolvableVehicle;
 use Fleetbase\Support\Auth;
 use Illuminate\Validation\Rule;
 
@@ -49,7 +50,7 @@ class CreateDriverRequest extends CreateDriverApiRequest
             'internal_id'            => 'nullable|string|max:255',
             'country'                => 'nullable|string|size:2',
             'city'                   => 'nullable|string|max:255',
-            'vehicle'                => 'nullable|string|starts_with:vehicle_|exists:vehicles,public_id',
+            'vehicle'                => ['nullable', new ResolvableVehicle()],
             'status'                 => 'nullable|string|in:active,inactive',
             'vendor'                 => 'nullable|exists:vendors,public_id',
             'job'                    => 'nullable|exists:orders,public_id',

package/server/src/Rules/ResolvableVehicle.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace Fleetbase\FleetOps\Rules;
+
+use Fleetbase\FleetOps\Models\Vehicle;
+use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Support\Str;
+
+class ResolvableVehicle implements Rule
+{
+    /**
+     * The resolved vehicle instance, if found.
+     */
+    protected ?Vehicle $resolved = null;
+
+    /**
+     * Determine if the validation rule passes.
+     *
+     * Accepts:
+     *  - A public_id string (e.g. "vehicle_abc123")
+     *  - A UUID string (e.g. "550e8400-e29b-41d4-a716-446655440000")
+     *  - An array/object containing an "id", "public_id", or "uuid" key
+     *
+     * @param string $attribute
+     *
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        $identifier = $this->extractIdentifier($value);
+
+        if (empty($identifier)) {
+            return true; // nullable — let the nullable rule handle empty values
+        }
+
+        if (Str::isUuid($identifier)) {
+            $this->resolved = Vehicle::where('uuid', $identifier)->first();
+        } else {
+            $this->resolved = Vehicle::where('public_id', $identifier)->first();
+        }
+
+        return $this->resolved !== null;
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return 'The :attribute must be a valid vehicle public ID, UUID, or vehicle object.';
+    }
+
+    /**
+     * Extract a string identifier from the given value.
+     *
+     * Handles a plain string, an associative array, or a stdClass object.
+     */
+    protected function extractIdentifier($value): ?string
+    {
+        if (is_string($value)) {
+            return $value;
+        }
+
+        if (is_array($value)) {
+            return data_get($value, 'id')
+                ?? data_get($value, 'public_id')
+                ?? data_get($value, 'uuid')
+                ?? null;
+        }
+
+        if (is_object($value)) {
+            return data_get($value, 'id')
+                ?? data_get($value, 'public_id')
+                ?? data_get($value, 'uuid')
+                ?? null;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the resolved Vehicle model instance after validation passes.
+     */
+    public function getResolved(): ?Vehicle
+    {
+        return $this->resolved;
+    }
+}