@fleetbase/fleetops-engine 0.6.56 → 0.6.57

package/server/tests/OrderPayloadPlaceResolutionTest.php

@@ -0,0 +1,53 @@
+<?php
+
+use Fleetbase\FleetOps\Models\Order;
+
+function fleetopsOrderPayloadResolutionProbe(bool $hasExistingUuid)
+{
+    return new class($hasExistingUuid) extends Order {
+        public function __construct(private bool $hasExistingUuid = false)
+        {
+            parent::__construct();
+        }
+
+        public function shouldResolveForTest(array $attributes, string $role): bool
+        {
+            return $this->shouldResolvePayloadPlace($attributes, $role);
+        }
+
+        protected function hasExistingPayloadPlaceUuid(?array $attributes, string $role): bool
+        {
+            return $this->hasExistingUuid;
+        }
+    };
+}
+
+test('order payload creation prefers existing place uuid over embedded place object', function () {
+    $order = fleetopsOrderPayloadResolutionProbe(true);
+
+    expect($order->shouldResolveForTest([
+        'pickup_uuid' => '628892cc-271c-89fd-cdaa-39d02b40bd13',
+        'pickup'      => [
+            'uuid'     => '628892cc-271c-89fd-cdaa-39d02b40bd13',
+            'location' => [
+                'bbox'        => [103.851, 1.2816, 103.851, 1.2816],
+                'type'        => 'Point',
+                'coordinates' => [103.851, 1.2816],
+            ],
+        ],
+    ], 'pickup'))->toBeFalse();
+});
+
+test('order payload creation resolves embedded place when no valid uuid exists', function () {
+    $order = fleetopsOrderPayloadResolutionProbe(false);
+
+    expect($order->shouldResolveForTest([
+        'pickup' => [
+            'location' => [
+                'bbox'        => [103.851, 1.2816, 103.851, 1.2816],
+                'type'        => 'Point',
+                'coordinates' => [103.851, 1.2816],
+            ],
+        ],
+    ], 'pickup'))->toBeTrue();
+});

package/server/tests/PointResolutionTest.php

@@ -0,0 +1,63 @@
+<?php
+
+use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\FleetOps\Support\Utils;
+
+function fleetopsBboxPoint(): array
+{
+    return [
+        'bbox'        => [103.851, 1.2816, 103.851, 1.2816],
+        'type'        => 'Point',
+        'coordinates' => [103.851, 1.2816],
+    ];
+}
+
+test('point resolution accepts GeoJSON point with bbox', function () {
+    $point = Utils::getPointFromMixed(fleetopsBboxPoint());
+
+    expect($point->getLat())->toBe(1.2816)
+        ->and($point->getLng())->toBe(103.851);
+});
+
+test('point resolution accepts feature wrapped GeoJSON point with bbox', function () {
+    $point = Utils::getPointFromMixed([
+        'type'     => 'Feature',
+        'geometry' => fleetopsBboxPoint(),
+    ]);
+
+    expect($point->getLat())->toBe(1.2816)
+        ->and($point->getLng())->toBe(103.851);
+});
+
+test('point resolution rejects malformed feature points cleanly', function () {
+    expect(fn () => Utils::getPointFromMixed([
+        'type'     => 'Feature',
+        'geometry' => [
+            'type'        => 'Point',
+            'coordinates' => [],
+        ],
+    ]))->toThrow(Exception::class, 'Attempted to resolve Point from invalid location.');
+});
+
+test('coordinate helper does not collapse bbox GeoJSON point to zero', function () {
+    $point = Utils::getPointFromCoordinates([
+        'type'     => 'Feature',
+        'geometry' => fleetopsBboxPoint(),
+    ]);
+
+    expect($point->getLat())->toBe(1.2816)
+        ->and($point->getLng())->toBe(103.851);
+});
+
+test('structured place normalization accepts bbox GeoJSON point locations', function () {
+    $place = Place::mergeStructuredPlaceAttributes([
+        'name'     => 'AI Pickup',
+        'street1'  => '16 Simon Walk',
+        'city'     => 'Singapore',
+        'country'  => 'SG',
+        'location' => fleetopsBboxPoint(),
+    ]);
+
+    expect($place['location']->getLat())->toBe(1.2816)
+        ->and($place['location']->getLng())->toBe(103.851);
+});

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';