@fleetbase/fleetops-engine 0.6.56 → 0.6.58

package/server/tests/TrackingIntelligenceTest.php

@@ -10,16 +10,45 @@ use Fleetbase\FleetOps\Tracking\TrackingContextBuilder;
 use Fleetbase\FleetOps\Tracking\TrackingOptions;
 use Fleetbase\FleetOps\Tracking\TrackingProviderManager;
 use Fleetbase\FleetOps\Tracking\TrackingProviderRegistry;
+use Fleetbase\FleetOps\Tracking\TrackingProviderResult;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Support\Carbon;
 
+class TrackingTestOrder extends Order
+{
+    public function loadMissing($relations)
+    {
+        return $this;
+    }
+}
+
+class TrackingTestPayload extends Payload
+{
+    public function loadMissing($relations)
+    {
+        return $this;
+    }
+}
+
+function trackingModel(string $class): object
+{
+    return (new ReflectionClass($class))->newInstanceWithoutConstructor();
+}
+
+function trackingSetAttributes($model, array $attributes): void
+{
+    $model->setRawAttributes(array_merge($model->getAttributes(), $attributes), true);
+}
+
 function trackingPlace(string $uuid, float $lat, float $lng): Place
 {
-    $place            = new Place();
-    $place->uuid      = $uuid;
-    $place->public_id = 'place_' . substr($uuid, 0, 8);
-    $place->address   = 'Test address ' . $uuid;
-    $place->location  = new Point($lat, $lng);
+    $place = trackingModel(Place::class);
+    trackingSetAttributes($place, [
+        'uuid'      => $uuid,
+        'public_id' => 'place_' . substr($uuid, 0, 8),
+        'address'   => 'Test address ' . $uuid,
+        'location'  => new Point($lat, $lng),
+    ]);
 
     return $place;
 }
@@ -28,25 +57,32 @@ function trackingOrderWithStops(): Order
 {
     $pickup                         = trackingPlace('11111111-1111-1111-1111-111111111111', 1.30, 103.80);
     $dropoff                        = trackingPlace('22222222-2222-2222-2222-222222222222', 1.35, 103.85);
-    $payload                        = new Payload();
-    $payload->uuid                  = '33333333-3333-3333-3333-333333333333';
-    $payload->current_waypoint_uuid = $pickup->uuid;
+    $payload                        = trackingModel(TrackingTestPayload::class);
+    trackingSetAttributes($payload, [
+        'uuid'                  => '33333333-3333-3333-3333-333333333333',
+        'current_waypoint_uuid' => $pickup->uuid,
+    ]);
     $payload->setRelation('pickup', $pickup);
     $payload->setRelation('dropoff', $dropoff);
+    $payload->setRelation('return', null);
     $payload->setRelation('waypoints', collect());
     $payload->setRelation('waypointMarkers', collect());
 
-    $driver             = new Driver();
-    $driver->uuid       = '44444444-4444-4444-4444-444444444444';
-    $driver->location   = new Point(1.29, 103.79);
-    $driver->online     = true;
-    $driver->updated_at = Carbon::now();
-
-    $order             = new Order();
-    $order->uuid       = '55555555-5555-5555-5555-555555555555';
-    $order->public_id  = 'order_test';
-    $order->status     = 'started';
-    $order->updated_at = Carbon::now();
+    $driver = trackingModel(Driver::class);
+    trackingSetAttributes($driver, [
+        'uuid'       => '44444444-4444-4444-4444-444444444444',
+        'location'   => new Point(1.29, 103.79),
+        'online'     => true,
+        'updated_at' => Carbon::now(),
+    ]);
+
+    $order = trackingModel(TrackingTestOrder::class);
+    trackingSetAttributes($order, [
+        'uuid'       => '55555555-5555-5555-5555-555555555555',
+        'public_id'  => 'order_test',
+        'status'     => 'started',
+        'updated_at' => Carbon::now(),
+    ]);
     $order->setRelation('payload', $payload);
     $order->setRelation('driverAssigned', $driver);
 
@@ -59,15 +95,15 @@ test('tracking context builder normalizes order stops and driver telemetry', fun
     ]));
 
     expect($context->stops)->toHaveCount(2)
-        ->and($context->activeStop?->type)->toBe('dropoff')
-        ->and($context->nextStop)->toBeNull()
+        ->and($context->activeStop?->type)->toBe('pickup')
+        ->and($context->nextStop?->type)->toBe('dropoff')
         ->and($context->driverLocationAgeSeconds)->toBeInt()
         ->and($context->warnings)->toBe([]);
 });
 
 test('tracking context ignores zero coordinate driver location and falls back to pickup origin', function () {
     $order                           = trackingOrderWithStops();
-    $order->driverAssigned->location = new Point(0, 0);
+    trackingSetAttributes($order->driverAssigned, ['location' => new Point(0, 0)]);
 
     $context = (new TrackingContextBuilder())->build($order, TrackingOptions::fromArray([
         'provider' => 'calculated',
@@ -102,9 +138,13 @@ test('tracking route legs include cumulative stop eta values', function () {
         'provider' => 'calculated',
     ]));
 
-    $result = (new CalculatedTrackingProvider())->track($context, TrackingOptions::fromArray([
-        'provider' => 'calculated',
-    ]));
+    $result = new TrackingProviderResult(
+        provider: 'test',
+        legs: [
+            ['duration_s' => 120],
+            ['duration_s' => 180],
+        ]
+    );
     $service = app(Fleetbase\FleetOps\Tracking\TrackingIntelligenceService::class);
     $method  = new ReflectionMethod($service, 'legs');
     $method->setAccessible(true);

package/server/tests/VehicleDriverAssignmentTest.php

@@ -56,12 +56,11 @@ test('driver assigned-order workflows expose list and multi-unassign endpoints',
         ->and($controller)
         ->toContain('public function assignedOrders(string $id): JsonResponse')
         ->toContain('public function unassignOrders(Request $request, string $id): JsonResponse')
-        ->toContain("->where('driver_assigned_uuid', \$driver->uuid)")
+        ->toContain("Order::where('driver_assigned_uuid', \$driver->uuid)")
         ->toContain("->orderByRaw('uuid = ? desc', [\$driver->current_job_uuid])")
-        ->toContain("\$request->validate(['orders' => ['required', 'array', 'min:1']])")
-        ->toContain("->where('driver_assigned_uuid', \$driver->uuid)")
-        ->toContain("->whereIn('uuid', \$selectedOrderUuids)")
-        ->toContain("->update(['driver_assigned_uuid' => null])")
+        ->toContain("'orders'   => 'required|array|min:1'")
+        ->toContain("->whereIn('uuid', \$ids)->orWhereIn('public_id', \$ids)")
+        ->toContain("'driver_assigned_uuid' => null")
         ->toContain("if (\$driver->current_job_uuid && \$orders->contains('uuid', \$driver->current_job_uuid))")
         ->toContain("\$driver->update(['current_job_uuid' => null])")
         ->and($resource)
@@ -83,10 +82,10 @@ test('vehicle assigned-order workflows expose list and multi-unassign endpoints
         ->and($controller)
         ->toContain('public function assignedOrders(string $id): JsonResponse')
         ->toContain('public function unassignOrders(Request $request, string $id): JsonResponse')
-        ->toContain("->where('vehicle_assigned_uuid', \$vehicle->uuid)")
-        ->toContain("\$request->validate(['orders' => ['required', 'array', 'min:1']])")
-        ->toContain("->whereIn('uuid', \$selectedOrderUuids)")
-        ->toContain("->update(['vehicle_assigned_uuid' => null])")
+        ->toContain("Order::where('vehicle_assigned_uuid', \$vehicle->uuid)")
+        ->toContain("'orders'   => 'required|array|min:1'")
+        ->toContain("->whereIn('uuid', \$ids)->orWhereIn('public_id', \$ids)")
+        ->toContain("'vehicle_assigned_uuid' => null")
         ->not->toContain("->update(['vehicle_uuid' => null])")
         ->and($resource)
         ->toContain("'assigned_orders_count'")

package/addon/components/table/cell/dropdown/action-item.hbs

@@ -1,31 +0,0 @@
-{{#if this.visible}}
-    {{#if @columnAction.separator}}
-        <div class="next-dd-menu-seperator"></div>
-    {{else}}
-        <div role="group" class="px-1">
-            <a
-                href="javascript:;"
-                role="menuitem"
-                class="next-dd-item {{@columnAction.class}} {{if this.disabled 'disabled'}}"
-                disabled={{this.disabled}}
-                {{on "click" (fn this.onClick @columnAction @row @dd)}}
-            >
-                {{#if @columnAction.icon}}
-                    <div class="w-6">
-                        <FaIcon class={{@columnAction.iconClass}} @icon={{@columnAction.icon}} @prefix={{@columnAction.iconPrefix}} />
-                    </div>
-                {{/if}}
-                {{@columnAction.label}}
-                {{#if this.doesntHavePermissions}}
-                    <Attach::Tooltip @class="clean" @animation="scale" @placement={{or @columnAction.tooltipPlacement "right"}}>
-                        <InputInfo @text={{t "common.unauthorized"}} />
-                    </Attach::Tooltip>
-                {{else if @columnAction.helpText}}
-                    <Attach::Tooltip @class="clean" @animation="scale" @placement={{or @columnAction.tooltipPlacement "right"}}>
-                        <InputInfo @text={{@columnAction.helpText}} @exampleText={{@columnAction.exampleText}} />
-                    </Attach::Tooltip>
-                {{/if}}
-            </a>
-        </div>
-    {{/if}}
-{{/if}}

package/addon/components/table/cell/dropdown/action-item.js

@@ -1,62 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { isNone } from '@ember/utils';
-
-export default class TableCellDropdownActionItemComponent extends Component {
-    @service abilities;
-    @tracked permissionRequired;
-    @tracked doesntHavePermissions = false;
-    @tracked disabled = false;
-    @tracked visible = true;
-
-    constructor(owner, { columnAction = {}, row = {}, disabled = false, permission = null }) {
-        super(...arguments);
-        this.permissionRequired = columnAction.permission ?? permission;
-        this.disabled = this.disabledCheck(columnAction, this.permissionRequired, disabled);
-        this.visible = (columnAction.visible ?? true) && this.visibilityCheck(columnAction, row);
-    }
-
-    @action onClick(columnAction, row, dd) {
-        if (this.disabled) {
-            return;
-        }
-
-        if (typeof dd?.actions?.close === 'function') {
-            dd.actions.close();
-        }
-
-        if (typeof columnAction?.fn === 'function') {
-            columnAction.fn(row);
-        }
-    }
-
-    disabledCheck(columnAction, permission, defaultValue = false) {
-        let disabled = columnAction.disabled ?? defaultValue;
-        if (!disabled) {
-            disabled = permission && this.abilities.cannot(permission);
-            this.doesntHavePermissions = disabled;
-        }
-
-        return disabled;
-    }
-
-    visibilityCheck(columnAction, context) {
-        const isVisible = columnAction.isVisible;
-
-        if (isNone(context) || !isVisible) {
-            return true;
-        }
-
-        if (typeof isVisible === 'boolean') {
-            return isVisible;
-        }
-
-        if (typeof isVisible === 'function') {
-            return isVisible(context);
-        }
-
-        return true;
-    }
-}

package/addon/components/table/cell/dropdown.hbs

@@ -1,28 +0,0 @@
-<div class="cell-dropdown-button overflow-visible {{@column.wrapperClass}}" {{did-insert this.setupComponent}} ...attributes>
-    <DropdownButton
-        @icon={{@column.ddButtonIcon}}
-        @iconPrefix={{@column.ddButtonIconPrefix}}
-        @text={{this.buttonText}}
-        @size="xs"
-        @horizontalPosition="left"
-        @calculatePosition={{this.calculatePosition}}
-        @renderInPlace={{true}}
-        @onOpen={{this.onOpen}}
-        @onClose={{this.onClose}}
-        as |dd|
-    >
-        <div class="next-dd-menu next-dd-menu-table-dd mt-0i {{@column.ddMenuWrapperClass}}" role="menu" aria-orientation="vertical" aria-labelledby="user-menu">
-            {{#if @column.ddMenuLabel}}
-                <div class="next-dd-menu-label-container px-1">
-                    <div class="next-dd-menu-label {{@column.ddMenuLabelClass}}">
-                        {{@column.ddMenuLabel}}
-                    </div>
-                </div>
-                <div class="next-dd-menu-seperator"></div>
-            {{/if}}
-            {{#each @column.actions as |columnAction|}}
-                <Table::Cell::Dropdown::ActionItem @columnAction={{columnAction}} @row={{@row}} @column={{@column}} @dd={{dd}} />
-            {{/each}}
-        </div>
-    </DropdownButton>
-</div>

package/addon/components/table/cell/dropdown.js

@@ -1,91 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { action, computed } from '@ember/object';
-
-export default class TableCellDropdownComponent extends Component {
-    @tracked tableCellNode;
-    defaultButtonText = 'Actions';
-
-    @computed('args.column.ddButtonText', 'defaultButtonText') get buttonText() {
-        const { ddButtonText } = this.args.column;
-
-        if (ddButtonText === undefined) {
-            return this.defaultButtonText;
-        }
-
-        if (ddButtonText === false) {
-            return null;
-        }
-
-        return ddButtonText;
-    }
-
-    @action setupComponent(dropdownWrapperNode) {
-        const tableCellNode = this.getOwnerTableCell(dropdownWrapperNode);
-
-        if (tableCellNode) {
-            tableCellNode.style.overflow = 'visible';
-        }
-
-        this.tableCellNode = tableCellNode;
-    }
-
-    @action onOpen() {
-        if (!this.tableCellNode) {
-            return;
-        }
-
-        const currentZIndex = Number.parseInt(this.tableCellNode.style.zIndex, 10) || 0;
-        this.tableCellNode.style.zIndex = currentZIndex + 1;
-    }
-
-    @action onClose() {
-        if (!this.tableCellNode) {
-            return;
-        }
-
-        const currentZIndex = Number.parseInt(this.tableCellNode.style.zIndex, 10) || 1;
-        this.tableCellNode.style.zIndex = currentZIndex - 1;
-    }
-
-    @action getOwnerTableCell(dropdownWrapperNode) {
-        while (dropdownWrapperNode) {
-            dropdownWrapperNode = dropdownWrapperNode.parentNode;
-
-            if (dropdownWrapperNode?.tagName?.toLowerCase() === 'td') {
-                return dropdownWrapperNode;
-            }
-        }
-
-        return undefined;
-    }
-
-    @action onDropdownItemClick(columnAction, row, dd) {
-        if (typeof dd?.actions?.close === 'function') {
-            dd.actions.close();
-        }
-
-        if (typeof columnAction?.fn === 'function') {
-            columnAction.fn(row);
-        }
-    }
-
-    @action calculatePosition(trigger, content) {
-        if (typeof this.args.column?.calculatePosition === 'function') {
-            return this.args.column.calculatePosition(trigger, content);
-        }
-
-        const triggerRect = trigger.getBoundingClientRect();
-        const contentRect = content?.getBoundingClientRect?.();
-        const contentWidth = contentRect?.width || 224;
-
-        const style = {
-            position: 'fixed',
-            marginTop: '0px',
-            left: `${triggerRect.left - contentWidth - 3}px`,
-            top: `${triggerRect.top}px`,
-        };
-
-        return { style };
-    }
-}

package/app/components/table/cell/dropdown/action-item.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/components/table/cell/dropdown/action-item';

package/app/components/table/cell/dropdown.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/components/table/cell/dropdown';

package/server/src/Http/Controllers/Api/v1/OrganizationController.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
-
-use Fleetbase\Http\Controllers\Controller;
-use Fleetbase\Http\Resources\Organization;
-use Fleetbase\Models\Company;
-use Fleetbase\Models\Setting;
-use Illuminate\Http\Request;
-
-class OrganizationController extends Controller
-{
-    /**
-     * Return List organizations.
-     *
-     * @return Organization
-     */
-    public function listOrganizations(Request $request)
-    {
-        $limit                    = $request->input('limit', 10);
-        $withDriverOnboardEnabled = $request->boolean('with_driver_onboard');
-
-        $companies = Company::whereHas('users')->get()->map(function ($company) {
-            return [
-                'name'   => $company->name,
-                'id'     => $company->public_id,
-            ];
-        });
-
-        if ($withDriverOnboardEnabled) {
-            $driverOnboardSettings  = Setting::where('key', 'fleet-ops.driver-onboard-settings')->value('value');
-
-            $companies = $companies->filter(function ($company) use ($driverOnboardSettings) {
-                return $driverOnboardSettings && isset($driverOnboardSettings[$company['uuid']]) && data_get($driverOnboardSettings[$company['uuid']], 'enableDriverOnboardFromApp') === true;
-            });
-        }
-
-        // limit
-        $companies = $companies->take($limit);
-
-        $companiesArray = $companies->values()->toArray();
-
-        return response()->json($companiesArray);
-    }
-}