@fleetbase/fleetops-engine 0.6.46 → 0.6.48

package/addon/templates/settings/routing.hbs

@@ -1,4 +1,4 @@
-<Layout::Section::Header @title={{t "settings.routing.fleet-ops-routing-settings"}}>
+<Layout::Section::Header @title="FleetOps Routing & Tracking">
     <Button
         @type="primary"
         @size="sm"
@@ -48,10 +48,68 @@
                     />
                 </InputGroup>
             </ContentPanel>
+            <ContentPanel @title="Tracking Intelligence" @open={{true}} @wrapperClass="bordered-classic">
+                <InputGroup @name="Tracking Provider" @helpText="Choose the provider used for live tracking intelligence and ETA calculations.">
+                    <Select
+                        @value={{this.trackingProvider}}
+                        @options={{this.trackingProviderOptions}}
+                        @optionLabel="label"
+                        @optionValue="value"
+                        @onSelect={{fn (mut this.trackingProvider)}}
+                        @placeholder="Select tracking provider"
+                        class="w-full"
+                    />
+                </InputGroup>
+                <InputGroup @name="Fallback Providers" @helpText="Providers used when the selected tracking provider is unavailable.">
+                    <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                        <PowerSelectMultiple
+                            @searchEnabled={{true}}
+                            @options={{this.trackingProviderOptions}}
+                            @selected={{this.selectedTrackingFallbackOptions}}
+                            @onChange={{this.setTrackingFallbacks}}
+                            @placeholder="Select fallback providers"
+                            @triggerClass="form-select form-input flex-1"
+                            as |provider|
+                        >
+                            {{provider.label}}
+                        </PowerSelectMultiple>
+                    </div>
+                </InputGroup>
+                <div class="flex justify-end">
+                    <Button
+                        @type="default"
+                        @size="xs"
+                        @icon={{if this.showTrackingAdvancedSettings "chevron-up" "chevron-down"}}
+                        @text="Advanced Settings"
+                        @onClick={{this.toggleTrackingAdvancedSettings}}
+                    />
+                </div>
+                {{#if this.showTrackingAdvancedSettings}}
+                    <div class="mt-2 space-y-4 rounded-md border border-gray-200 bg-gray-50 p-3 dark:border-gray-700 dark:bg-gray-800">
+                        <InputGroup @name="Traffic-Aware ETA" @helpText="Use provider traffic data when supported.">
+                            <Toggle @isToggled={{this.trackingTrafficEnabled}} @onToggle={{fn (mut this.trackingTrafficEnabled)}} />
+                        </InputGroup>
+                        <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                            <InputGroup @name="Summary Cache TTL" @helpText="Seconds to cache the final tracking summary.">
+                                <Input @type="number" @value={{this.trackingCacheTtlSeconds}} min="15" max="300" class="form-input w-full" />
+                            </InputGroup>
+                            <InputGroup @name="Route Cache TTL" @helpText="Seconds to cache provider route responses.">
+                                <Input @type="number" @value={{this.trackingRouteCacheTtlSeconds}} min="60" max="1800" class="form-input w-full" />
+                            </InputGroup>
+                            <InputGroup @name="Stale Location Threshold" @helpText="Seconds before driver location is marked stale.">
+                                <Input @type="number" @value={{this.trackingStaleLocationThresholdSeconds}} min="30" max="3600" class="form-input w-full" />
+                            </InputGroup>
+                            <InputGroup @name="Fallback Speed" @helpText="Kilometers per hour used by the calculated provider.">
+                                <Input @type="number" @value={{this.trackingDefaultVehicleSpeedKph}} min="1" max="160" class="form-input w-full" />
+                            </InputGroup>
+                        </div>
+                    </div>
+                {{/if}}
+            </ContentPanel>
             <RegistryYield @registry="fleet-ops:template:settings:routing" as |RegistryComponent|>
                 <RegistryComponent @controller={{this}} />
             </RegistryYield>
         </div>
     </div>
     <Spacer @height="600px" />
-</Layout::Section::Body>
+</Layout::Section::Body>

package/app/components/tracking-stop-progress.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/tracking-stop-progress';

package/app/helpers/format-duration.js

@@ -0,0 +1 @@
+export { default, formatDurationValue } from '@fleetbase/fleetops-engine/helpers/format-duration';

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.46",
+    "version": "0.6.48",
     "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.46",
+    "version": "0.6.48",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -42,9 +42,9 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.3.18",
+        "@fleetbase/ember-core": "^0.3.19",
         "@fleetbase/ember-ui": "^0.3.29",
-        "@fleetbase/fleetops-data": "^0.1.31",
+        "@fleetbase/fleetops-data": "^0.1.32",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",

package/pnpm-workspace.yaml

@@ -0,0 +1,7 @@
+allowBuilds:
+  '@fortawesome/fontawesome-common-types': false
+  '@fortawesome/fontawesome-svg-core': false
+  '@fortawesome/free-brands-svg-icons': false
+  '@fortawesome/free-solid-svg-icons': false
+  core-js: false
+  fsevents: false

package/server/config/fleetops.php

@@ -3,7 +3,7 @@
 /**
  * -------------------------------------------
  * FleetOps API Configuration
- * -------------------------------------------
+ * -------------------------------------------.
  */
 return [
     /*
@@ -14,17 +14,17 @@ return [
     'api' => [
         'version' => '0.0.1',
         'routing' => [
-            'prefix' => null,
-            'internal_prefix' => 'int'
-        ]
+            'prefix'          => null,
+            'internal_prefix' => 'int',
+        ],
     ],
     'connection' => [
-        'db' => env('DB_CONNECTION', 'mysql')
+        'db' => env('DB_CONNECTION', 'mysql'),
     ],
 
     /*
     |--------------------------------------------------------------------------
-    | Facilitator Fee - This is a percentage fee the system admin takes when 
+    | Facilitator Fee - This is a percentage fee the system admin takes when
     | facilitating any payments in the system.
     | Example: if `10` then 10% fee will be taken on all payments.
     |--------------------------------------------------------------------------
@@ -37,7 +37,7 @@ return [
     |--------------------------------------------------------------------------
     */
     'osrm' => [
-        'host' => env('OSRM_HOST', 'https://router.project-osrm.org')
+        'host' => env('OSRM_HOST', 'https://router.project-osrm.org'),
     ],
 
     /*
@@ -61,12 +61,33 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Distance Matrix Calculator 
+    | Distance Matrix Calculator
     | Options: "calculate", "google", "osrm"
     |--------------------------------------------------------------------------
     */
     'distance_matrix' => [
-        'provider' => env('DISTANCE_MATRIX_PROVIDER', 'calculate')
+        'provider' => env('DISTANCE_MATRIX_PROVIDER', 'calculate'),
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Order Tracking Intelligence
+    |--------------------------------------------------------------------------
+    |
+    | Provider-neutral tracking data for active orders. The provider registry
+    | can be extended by third-party packages without editing FleetOps core.
+    |
+    | Built-in providers: "google_routes", "osrm", "calculated"
+    |--------------------------------------------------------------------------
+    */
+    'tracking' => [
+        'provider'                         => env('TRACKING_PROVIDER', 'google_routes'),
+        'fallbacks'                        => array_filter(explode(',', env('TRACKING_PROVIDER_FALLBACKS', 'osrm,calculated'))),
+        'traffic_enabled'                  => env('TRACKING_TRAFFIC_ENABLED', true),
+        'cache_ttl_seconds'                => env('TRACKING_CACHE_TTL_SECONDS', 60),
+        'route_cache_ttl_seconds'          => env('TRACKING_ROUTE_CACHE_TTL_SECONDS', 600),
+        'stale_location_threshold_seconds' => env('TRACKING_STALE_LOCATION_THRESHOLD_SECONDS', 300),
+        'default_vehicle_speed_kph'        => env('TRACKING_DEFAULT_VEHICLE_SPEED_KPH', 35),
     ],
 
     /*
@@ -76,7 +97,7 @@ return [
     */
     'navigator' => [
         'bypass_verification_code' => env('SMS_AUTH_BYPASS_CODE', env('NAVIGATOR_BYPASS_VERIFICATION_CODE')),
-        'app_identifier' => env('NAVIGATOR_APP_IDENTIFIER', 'io.fleetbase.navigator')
+        'app_identifier'           => env('NAVIGATOR_APP_IDENTIFIER', 'io.fleetbase.navigator'),
     ],
 
     /*
@@ -189,5 +210,5 @@ return [
     |--------------------------------------------------------------------------
     */
     'versions' => ['2020-09-30', '2024-03-12'],
-    'version' => '2024-03-12',
+    'version'  => '2024-03-12',
 ];

package/server/migrations/2026_05_13_000001_repair_customer_contact_user_types.php

@@ -0,0 +1,86 @@
+<?php
+
+use Fleetbase\FleetOps\Models\Contact;
+use Fleetbase\Models\CompanyUser;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Contact::withoutGlobalScopes()
+            ->where('type', 'customer')
+            ->whereNull('deleted_at')
+            ->chunkById(100, function ($contacts) {
+                foreach ($contacts as $contact) {
+                    try {
+                        $contact->repairCustomerTypeInvariant(true);
+                    } catch (Throwable $e) {
+                        // Skip ambiguous or unrecoverable records; runtime invariants handle new writes.
+                    }
+                }
+            });
+
+        if (!$this->canUseCustomerRoleHint()) {
+            return;
+        }
+
+        DB::table('contacts')
+            ->select('contacts.id')
+            ->join('company_users', function ($join) {
+                $join->on('company_users.user_uuid', '=', 'contacts.user_uuid');
+                $join->on('company_users.company_uuid', '=', 'contacts.company_uuid');
+            })
+            ->join('model_has_roles', function ($join) {
+                $join->on('model_has_roles.model_uuid', '=', 'company_users.uuid');
+                $join->where('model_has_roles.model_type', CompanyUser::class);
+            })
+            ->join('roles', 'roles.id', '=', 'model_has_roles.role_id')
+            ->where('roles.name', 'Fleet-Ops Customer')
+            ->whereNull('contacts.deleted_at')
+            ->where(function ($query) {
+                $query->whereNull('contacts.type');
+                $query->orWhere('contacts.type', '!=', 'customer');
+            })
+            ->distinct()
+            ->orderBy('contacts.id')
+            ->chunk(100, function ($rows) {
+                foreach ($rows as $row) {
+                    $contact = Contact::withoutGlobalScopes()->find($row->id);
+                    if (!$contact) {
+                        continue;
+                    }
+
+                    try {
+                        $contact->repairCustomerTypeInvariant(true);
+                    } catch (Throwable $e) {
+                        // Skip ambiguous or unrecoverable records; role is only a recovery hint.
+                    }
+                }
+            });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // Data repair is intentionally not reversible.
+    }
+
+    private function canUseCustomerRoleHint(): bool
+    {
+        return Schema::hasTable('contacts')
+            && Schema::hasTable('company_users')
+            && Schema::hasTable('model_has_roles')
+            && Schema::hasTable('roles');
+    }
+};