@fleetbase/fleetops-engine 0.2.9 → 0.3.1

package/addon/templates/operations/orders/index/view.hbs

@@ -150,7 +150,7 @@
                         <span>Driver Assigned</span>
                     </div>
                     <div>
-                        <div class="flex flex-row">
+                        <a href="javascript:;" class="flex flex-row" {{on "click" (fn this.focusOrderAssignedDriver @model)}}>
                             <div>
                                 <Image src={{avatar-url @model.driver_assigned.photo_url}} @fallbackSrc={{config "defaultValues.driverImage"}} width="32" height="32" class="w-8 h-8 rounded-md shadow-sm mr-3 lg:mr-2" alt={{@model.driver_assigned.name}} />
                             </div>
@@ -160,7 +160,7 @@
                                     <div>{{@model.driver_assigned.phone}}</div>
                                 {{/if}}
                             </div>
-                        </div>
+                        </a>
                         <div class="mt-1">
                             <Button @size="xs" @type="default" @icon="edit" @text={{if @model.has_driver_assigned "Change Driver" "Assign Driver"}} @onClick={{fn this.assignDriver @model}} />
                         </div>

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

@@ -13,7 +13,7 @@
 {{#if this.isMapLayout}}
     <MapContainer @layout={{this.layout}} @onReady={{this.onMapContainerReady}}>
         <GlobalSearch @visible={{this.isSearchVisible}} @onPressOrder={{this.viewOrder}} />
-        <MapContainer::Toolbar @activeOrdersCount={{this.activeOrdersCount}} @map={{this.leafletMap}} @onPressDisplayPlaces={{this.viewPlacesOnMap}} @onPressViewOrders={{this.toggleOrdersPanel}} @onPressSearch={{this.toggleSearch}} @onPressCreateOrder={{this.createOrder}} @onPressCreateDriver={{this.driversController.createDriver}} @onPressDriverProfile={{this.driversController.viewDriver}} />
+        <MapContainer::Toolbar @activeOrdersCount={{this.activeOrdersCount}} @liveMap={{this.liveMap}} @map={{this.leafletMap}} @onPressViewOrders={{this.toggleOrdersPanel}} @onPressSearch={{this.toggleSearch}} @onPressCreateOrder={{this.createOrder}} @onPressCreateDriver={{this.driversController.createDriver}} @onPressDriverProfile={{this.driversController.viewDriver}} />
         <OrderListOverlay @noBackdrop={{true}} @fullHeight={{true}} @outView={{not this.isOrdersPanelVisible}} @width={{if (media 'isMobile') "100%" "338px"}} @onPressCancel={{this.hideOrdersPanel}} @onPressCreateOrder={{this.createOrder}} @onPressViewOrder={{this.viewOrder}} @onPressCreateFleet={{this.fleetController.createFleet}} @onPressManageFleet={{this.fleetController.viewFleet}} @onPressCancelOrders={{this.bulkCancelOrders}} @onPressDeleteOrders={{this.bulkDeleteOrders}} />
         <LiveMap id="leafletMap" class="next-leaflet-container-map" @lat={{1.3521}} @lng={{103.8198}} @zoom={{12}} @zoomControl={{false}} @onLoad={{this.setMapReference}} {{set-container-dimensions}} />
     </MapContainer>

package/addon/utils/apply-context-component-arguments.js

@@ -0,0 +1,31 @@
+import getModelName from '@fleetbase/ember-core/utils/get-model-name';
+
+/**
+ * Applies context and dynamic arguments to a given component.
+ *
+ * @param {Component} component - The component to which context and arguments will be applied.
+ */
+export default function applyContextComponentArguments(component) {
+    const { context, dynamicArgs = {} } = component.args;
+
+    // Apply context model if available
+    if (context) {
+        const contextModelName = getModelName(context);
+        if (contextModelName) {
+            component[contextModelName] = context;
+        }
+    }
+
+    // Execute any apply callback present in dynamic arguments
+    const { applyCallback } = dynamicArgs;
+    if (typeof applyCallback === 'function') {
+        applyCallback(component);
+    }
+
+    // Apply other dynamic arguments to the component
+    for (const [key, value] of Object.entries(dynamicArgs)) {
+        if (key !== 'applyCallback') {
+            component[key] = value;
+        }
+    }
+}

package/addon/utils/context-component-callback.js

@@ -0,0 +1,16 @@
+export default function contextComponentCallback(component, name, ...params) {
+    let callbackInvoked = false;
+
+    if (typeof component.args[name] === 'function') {
+        component.args[name](...params);
+        callbackInvoked = true;
+    }
+
+    // now do for context options
+    if (typeof component.args.options === 'object' && typeof component.args.options[name] === 'function') {
+        component.args.options[name](...params);
+        callbackInvoked = true;
+    }
+
+    return callbackInvoked;
+}

package/app/components/map-container/toolbar/visibility-control-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/map-container/toolbar/visibility-control-panel';

package/app/helpers/is-visibility-control-visible.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/helpers/is-visibility-control-visible';

package/app/utils/apply-context-component-arguments.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/utils/apply-context-component-arguments';

package/app/utils/context-component-callback.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/utils/context-component-callback';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.2.9",
+    "version": "0.3.1",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "fleetbase/core-api": "^1.3.1",
+        "fleetbase/core-api": "^1.3.2",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.2.9",
+    "version": "0.3.1",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.2.9",
+    "version": "0.3.1",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops",
@@ -39,8 +39,8 @@
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.1.5",
-        "@fleetbase/ember-ui": "^0.2.0",
+        "@fleetbase/ember-core": "^0.1.6",
+        "@fleetbase/ember-ui": "^0.2.2",
         "@fleetbase/fleetops-data": "^0.1.1",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",

package/server/migrations/2023_09_14_074512_update_vehicles_table.php

@@ -6,95 +6,96 @@ use Illuminate\Support\Facades\Schema;
 
 class UpdateVehiclesTable extends Migration
 {
-  public function up()
-  {
-    Schema::table('vehicles', function (Blueprint $table) {
-      if (!Schema::hasColumn('vehicles', 'location')) {
-        $table->point('location')->nullable()->after('avatar_url');
-      }
-      if (!Schema::hasColumn('vehicles', 'model')) {
-        $table->string('model')->nullable()->after('make');
-      }
-      if (!Schema::hasColumn('vehicles', 'model_data')) {
-        $table->json('model_data')->nullable()->after('meta');
-      }
-      if (!Schema::hasColumn('vehicles', 'telematics')) {
-        $table->json('telematics')->nullable()->after('meta');
-      }
+    public function up()
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            if (!Schema::hasColumn('vehicles', 'location')) {
+                $table->point('location')->nullable()->after('avatar_url');
+            }
 
-      $table->dropColumn([
-        'model_0_to_100_kph',
-        'model_body',
-        'model_co2',
-        'model_doors',
-        'model_drive',
-        'model_engine_bore_mm',
-        'model_engine_cc',
-        'model_engine_compression',
-        'model_engine_cyl',
-        'model_engine_fuel',
-        'model_engine_position',
-        'model_engine_power_ps',
-        'model_engine_power_rpm',
-        'model_engine_stroke_mm',
-        'model_engine_torque_nm',
-        'model_engine_torque_rpm',
-        'model_engine_valves_per_cyl',
-        'model_fuel_cap_l',
-        'model_length_mm',
-        'model_lkm_city',
-        'model_lkm_hwy',
-        'model_lkm_mixed',
-        'model_make_display',
-        'model_seats',
-        'model_sold_in_us',
-        'model_top_speed_kph',
-        'model_transmission_type',
-        'model_weight_kg',
-        'model_wheelbase_mm',
-        'model_width_mm',
-      ]);
-    });
-  }
+            if (!Schema::hasColumn('vehicles', 'model')) {
+                $table->string('model')->nullable()->after('make');
+            }
+            if (!Schema::hasColumn('vehicles', 'model_data')) {
+                $table->json('model_data')->nullable()->after('meta');
+            }
+            if (!Schema::hasColumn('vehicles', 'telematics')) {
+                $table->json('telematics')->nullable()->after('meta');
+            }
 
-  public function down()
-  {
-    Schema::table('vehicles', function (Blueprint $table) {
-      $table->dropColumn('location');
-      $table->dropColumn('model');
-      $table->dropColumn('model_data');
-      $table->dropColumn('telematics');
+            $table->dropColumn([
+                'model_0_to_100_kph',
+                'model_body',
+                'model_co2',
+                'model_doors',
+                'model_drive',
+                'model_engine_bore_mm',
+                'model_engine_cc',
+                'model_engine_compression',
+                'model_engine_cyl',
+                'model_engine_fuel',
+                'model_engine_position',
+                'model_engine_power_ps',
+                'model_engine_power_rpm',
+                'model_engine_stroke_mm',
+                'model_engine_torque_nm',
+                'model_engine_torque_rpm',
+                'model_engine_valves_per_cyl',
+                'model_fuel_cap_l',
+                'model_length_mm',
+                'model_lkm_city',
+                'model_lkm_hwy',
+                'model_lkm_mixed',
+                'model_make_display',
+                'model_seats',
+                'model_sold_in_us',
+                'model_top_speed_kph',
+                'model_transmission_type',
+                'model_weight_kg',
+                'model_wheelbase_mm',
+                'model_width_mm',
+            ]);
+        });
+    }
 
-      $table->string('model_0_to_100_kph')->nullable();
-      $table->string('model_body')->nullable();
-      $table->string('model_co2')->nullable();
-      $table->string('model_doors')->nullable();
-      $table->string('model_drive')->nullable();
-      $table->string('model_engine_bore_mm')->nullable();
-      $table->string('model_engine_cc')->nullable();
-      $table->string('model_engine_compression')->nullable();
-      $table->string('model_engine_cyl')->nullable();
-      $table->string('model_engine_fuel')->nullable();
-      $table->string('model_engine_position')->nullable();
-      $table->string('model_engine_power_ps')->nullable();
-      $table->string('model_engine_power_rpm')->nullable();
-      $table->string('model_engine_stroke_mm')->nullable();
-      $table->string('model_engine_torque_nm')->nullable();
-      $table->string('model_engine_torque_rpm')->nullable();
-      $table->string('model_engine_valves_per_cyl')->nullable();
-      $table->string('model_fuel_cap_l')->nullable();
-      $table->string('model_length_mm')->nullable();
-      $table->string('model_lkm_city')->nullable();
-      $table->string('model_lkm_hwy')->nullable();
-      $table->string('model_lkm_mixed')->nullable();
-      $table->string('model_make_display')->nullable();
-      $table->string('model_seats')->nullable();
-      $table->string('model_sold_in_us')->nullable();
-      $table->string('model_top_speed_kph')->nullable();
-      $table->string('model_transmission_type')->nullable();
-      $table->string('model_weight_kg')->nullable();
-      $table->string('model_wheelbase_mm')->nullable();
-      $table->string('model_width_mm')->nullable();
-    });
-  }
+    public function down()
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            $table->dropColumn('location');
+            $table->dropColumn('model');
+            $table->dropColumn('model_data');
+            $table->dropColumn('telematics');
+
+            $table->string('model_0_to_100_kph')->nullable();
+            $table->string('model_body')->nullable();
+            $table->string('model_co2')->nullable();
+            $table->string('model_doors')->nullable();
+            $table->string('model_drive')->nullable();
+            $table->string('model_engine_bore_mm')->nullable();
+            $table->string('model_engine_cc')->nullable();
+            $table->string('model_engine_compression')->nullable();
+            $table->string('model_engine_cyl')->nullable();
+            $table->string('model_engine_fuel')->nullable();
+            $table->string('model_engine_position')->nullable();
+            $table->string('model_engine_power_ps')->nullable();
+            $table->string('model_engine_power_rpm')->nullable();
+            $table->string('model_engine_stroke_mm')->nullable();
+            $table->string('model_engine_torque_nm')->nullable();
+            $table->string('model_engine_torque_rpm')->nullable();
+            $table->string('model_engine_valves_per_cyl')->nullable();
+            $table->string('model_fuel_cap_l')->nullable();
+            $table->string('model_length_mm')->nullable();
+            $table->string('model_lkm_city')->nullable();
+            $table->string('model_lkm_hwy')->nullable();
+            $table->string('model_lkm_mixed')->nullable();
+            $table->string('model_make_display')->nullable();
+            $table->string('model_seats')->nullable();
+            $table->string('model_sold_in_us')->nullable();
+            $table->string('model_top_speed_kph')->nullable();
+            $table->string('model_transmission_type')->nullable();
+            $table->string('model_weight_kg')->nullable();
+            $table->string('model_wheelbase_mm')->nullable();
+            $table->string('model_width_mm')->nullable();
+        });
+    }
 }

package/server/migrations/2023_10_25_093014_create_vehicle_device_events_table.php

@@ -0,0 +1,56 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateVehicleDeviceEventsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // fix indexes on vehicle_devices table
+        Schema::table('vehicle_devices', function (Blueprint $table) {
+            $table->index('uuid');
+        });
+
+        // create events table
+        Schema::create('vehicle_device_events', function (Blueprint $table) {
+            $table->increments('id');
+            $table->uuid('uuid')->nullable();
+            $table->uuid('vehicle_device_uuid');
+            $table->foreign('vehicle_device_uuid')->references('uuid')->on('vehicle_devices');
+            $table->json('payload')->nullable();
+            $table->json('meta')->nullable();
+            $table->string('ident')->nullable();
+            $table->string('protocol')->nullable();
+            $table->string('provider')->nullable();
+            $table->point('location')->nullable();
+            $table->string('mileage')->nullable();
+            $table->string('state')->nullable();
+            $table->string('code')->nullable();
+            $table->string('reason')->nullable();
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('vehicle_device_events');
+
+        // fix indexes on vehicle_devices table
+        Schema::table('vehicle_devices', function (Blueprint $table) {
+            $table->dropIndex(['uuid']);
+        });
+    }
+}

package/server/src/Http/Resources/v1/Vehicle.php

@@ -30,6 +30,7 @@ class Vehicle extends FleetbaseResource
                 'driver'                 => $this->whenLoaded('driver', new Driver($this->driver)),
                 'devices'                => $this->whenLoaded('devices', $this->devices),
                 'photo'                  => $this->photoUrl,
+                'avatar_url'             => $this->avatar_url,
                 'make'                   => $this->make,
                 'model'                  => $this->model,
                 'year'                   => $this->year,

package/server/src/Models/Fleet.php

@@ -9,6 +9,7 @@ use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
+use Illuminate\Notifications\Notifiable;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
 use Spatie\Sluggable\SlugOptions;
@@ -23,6 +24,7 @@ class Fleet extends Model
     use Searchable;
     use HasSlug;
     use LogsActivity;
+    use Notifiable;
 
     /**
      * The database table used by the model.

package/server/src/Models/VehicleDevice.php

@@ -10,9 +10,7 @@ use Fleetbase\Traits\TracksApiCredential;
 
 class VehicleDevice extends Model
 {
-    use HasUuid;
-    use TracksApiCredential;
-    use HasApiModelBehavior;
+    use HasUuid, TracksApiCredential, HasApiModelBehavior;
 
     /**
      * The database table used by the model.
@@ -76,4 +74,20 @@ class VehicleDevice extends Model
      * @var array
      */
     protected $hidden = [];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function vehicle()
+    {
+        return $this->belongsTo(Vehicle::class);
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function events()
+    {
+        return $this->hasMany(VehicleDeviceEvent::class);
+    }
 }

package/server/src/Models/VehicleDeviceEvent.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace Fleetbase\FleetOps\Models;
+
+use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Casts\Point;
+use Fleetbase\Models\Model;
+use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasUuid;
+use Fleetbase\Traits\Searchable;
+use Fleetbase\Traits\TracksApiCredential;
+use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+
+class VehicleDeviceEvent extends Model
+{
+    use HasUuid, TracksApiCredential, HasApiModelBehavior, SpatialTrait, Searchable;
+
+    /**
+     * The database table used by the model.
+     *
+     * @var string
+     */
+    protected $table = 'vehicle_device_events';
+
+    /**
+     * Attributes that is filterable on this model.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'uuid',
+        'vehicle_device_uuid',
+        'payload',
+        'meta',
+        'location',
+        'ident',
+        'protocol',
+        'provider',
+        'mileage',
+        'state',
+        'code',
+        'reason',
+    ];
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'payload' => Json::class,
+        'meta' => Json::class,
+        'location' => Point::class,
+    ];
+
+    /**
+     * The attributes that are spatial columns.
+     *
+     * @var array
+     */
+    protected $spatialFields = ['location'];
+
+    /**
+     * Dynamic attributes that are appended to object.
+     *
+     * @var array
+     */
+    protected $appends = [];
+
+    /**
+     * Filterable params.
+     *
+     * @var array
+     */
+    protected $filterParams = [];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    protected $hidden = [];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function device()
+    {
+        return $this->belongsTo(VehicleDevice::class);
+    }
+}

package/server/src/Notifications/OrderAssigned.php

@@ -30,6 +30,27 @@ class OrderAssigned extends Notification implements ShouldQueue
      */
     public $order;
 
+    /**
+     * Notification name.
+     *
+     * @var string
+     */
+    public static string $name = 'Order Assigned';
+
+    /**
+     * Notification description.
+     *
+     * @var string
+     */
+    public static string $description = 'Notify when an order has been assigned to a driver.';
+
+    /**
+     * Notification package.
+     *
+     * @var string
+     */
+    public static string $package = 'fleet-ops';
+
     /**
      * Create a new notification instance.
      *

package/server/src/Notifications/OrderCanceled.php

@@ -30,6 +30,27 @@ class OrderCanceled extends Notification implements ShouldQueue
      */
     public $order;
 
+    /**
+     * Notification name.
+     *
+     * @var string
+     */
+    public static string $name = 'Order Canceled';
+
+    /**
+     * Notification description.
+     *
+     * @var string
+     */
+    public static string $description = 'Notify when an order has been canceled.';
+
+    /**
+     * Notification package.
+     *
+     * @var string
+     */
+    public static string $package = 'fleet-ops';
+
     /**
      * Create a new notification instance.
      *

package/server/src/Notifications/OrderDispatchFailed.php

@@ -29,6 +29,27 @@ class OrderDispatchFailed extends Notification implements ShouldQueue
      */
     public $reason;
 
+    /**
+     * Notification name.
+     *
+     * @var string
+     */
+    public static string $name = 'Order dispatch Failed';
+
+    /**
+     * Notification description.
+     *
+     * @var string
+     */
+    public static string $description = 'Notify when an order dispatch has been failed.';
+
+    /**
+     * Notification package.
+     *
+     * @var string
+     */
+    public static string $package = 'fleet-ops';
+
     /**
      * Create a new notification instance.
      *

package/server/src/Notifications/OrderDispatched.php

@@ -33,6 +33,27 @@ class OrderDispatched extends Notification implements ShouldQueue
      */
     public $order;
 
+    /**
+     * Notification name.
+     *
+     * @var string
+     */
+    public static string $name = 'Order Dispatched';
+
+    /**
+     * Notification description.
+     *
+     * @var string
+     */
+    public static string $description = 'Notify when an order has been dispatched.';
+
+    /**
+     * Notification package.
+     *
+     * @var string
+     */
+    public static string $package = 'fleet-ops';
+
     /**
      * Create a new notification instance.
      *