@fleetbase/fleetops-engine 0.3.7 → 0.3.8

package/addon/components/layout/fleet-ops-sidebar/fleet-listing.hbs

@@ -1 +1,5 @@
-<FleetListingPanel ...attributes />
+<Layout::Sidebar::Panel @open={{true}} @titleIcon={{@icon}} @title="Fleets" @wrapperClass="next-fleet-summary">
+    {{#each this.fleets as |fleet|}}
+        <FleetListingPanel @fleet={{fleet}} @onVehicleClicked={{this.onFocusVehicle}} @depth={{1}} @open={{true}} />
+    {{/each}}
+</Layout::Sidebar::Panel>

package/addon/components/layout/fleet-ops-sidebar/fleet-listing.js

@@ -1,3 +1,100 @@
 import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { isArray } from '@ember/array';
+import { later } from '@ember/runloop';
 
-export default class LayoutFleetOpsSidebarFleetListingComponent extends Component {}
+export default class LayoutFleetOpsSidebarFleetListingComponent extends Component {
+    @service store;
+    @service notifications;
+    @service universe;
+    @service hostRouter;
+    @tracked fleets = [];
+    @tracked isLoading = false;
+
+    constructor() {
+        super(...arguments);
+        this.loadFleetsWithVehicles();
+        this.listenForFleetChanges();
+    }
+
+    @action transitionHome() {
+        return this.hostRouter.transitionTo('console.fleet-ops.operations.orders.index', { queryParams: { layout: 'map' } });
+    }
+
+    @action async onFocusVehicle(vehicle) {
+        const { onFocusVehicle } = this.args;
+        // const { currentRouteName } = this.hostRouter;
+        // const isOperationsRouteActive = typeof currentRouteName === 'string' && currentRouteName.includes('fleet-ops.operations.orders');
+
+        // transition to dashboard/map display
+        try {
+            await this.hostRouter.transitionTo('console.fleet-ops.operations.orders.index', { queryParams: { layout: 'map' } });
+        } catch (error) {
+            // silent
+        }
+
+        // focus vehicle on live map
+        this.focusVehicleOnLiveMap(vehicle);
+
+        if (typeof onFocusVehicle === 'function') {
+            onFocusVehicle(vehicle);
+        }
+    }
+
+    @action focusVehicleOnLiveMap(vehicle) {
+        const FleetOpsLiveMap = this.universe.get('FleetOpsLiveMap');
+
+        if (FleetOpsLiveMap) {
+            if (FleetOpsLiveMap.contextPanel) {
+                FleetOpsLiveMap.contextPanel.clear();
+            }
+
+            FleetOpsLiveMap.showAll();
+            FleetOpsLiveMap.focusLayerByRecord(vehicle, 16, {
+                onAfterFocusWithRecord: function () {
+                    later(
+                        this,
+                        () => {
+                            FleetOpsLiveMap.onVehicleClicked(vehicle);
+                        },
+                        600 * 2
+                    );
+                },
+            });
+        }
+    }
+
+    listenForFleetChanges() {
+        // when a vehicle is assigned/ or unassigned reload
+        this.universe.on('fleet.vehicle.assigned', () => {
+            this.loadFleetsWithVehicles();
+        });
+
+        // when a vehicle is assigned/ or unassigned reload
+        this.universe.on('fleet.vehicle.unassigned', () => {
+            this.loadFleetsWithVehicles();
+        });
+    }
+
+    loadFleetsWithVehicles() {
+        this.isLoading = true;
+        this.store
+            .query('fleet', { with: ['vehicles', 'subfleets'], parents_only: true })
+            .then((fleets) => {
+                this.fleets = fleets.toArray().map(this.resolveFleetVehicles);
+            })
+            .catch((error) => {
+                this.notifications.serverError(error);
+            })
+            .finally(() => {
+                this.isLoading = false;
+            });
+    }
+
+    @action resolveFleetVehicles(fleet) {
+        fleet.vehicles = isArray(fleet.vehicles) ? fleet.vehicles.toArray() : [];
+        return fleet;
+    }
+}

package/addon/components/layout/fleet-ops-sidebar.hbs

@@ -11,7 +11,11 @@
 {{#each this.menuPanels as |menuPanel|}}
     <Layout::Sidebar::Panel @open={{menuPanel.open}} @title={{menuPanel.title}}>
         {{#each menuPanel.items as |menuItem|}}
-            <Layout::Sidebar::Item @route={{concat this.routePrefix menuItem.route}} @icon={{menuItem.icon}} @rightSideComponent={{menuItem.rightSideComponent}} @rightSideComponentContext={{menuItem.rightSideComponentContext}} @rightSideStatus={{menuItem.rightSideStatus}} @rightSideStatusText={{menuItem.rightSideStatusText}} @hideRightSideStatusDot={{menuItem.hideRightSideStatusDot}} @rightSideStatusClass={{menuItem.rightSideStatusClass}} @disableRightSideStatusHumanize={{menuItem.disableRightSideStatusHumanize}} @dropdownButton={{menuItem.dropdownButton}} @dropdownButtonActions={{menuItem.dropdownButtonActions}} @dropdownButtonIcon={{menuItem.dropdownButtonIcon}} @dropdownButtonIconPrefix={{menuItem.dropdownButtonIconPrefix}} @dropdownButtonText={{menuItem.dropdownButtonText}} @dropdownButtonCalculatePosition={{menuItem.dropdownButtonCalculatePosition}} @dropdownButtonRenderInPlace={{menuItem.dropdownButtonRenderInPlace}} @dropdownButtonMenuLabel={{menuItem.dropdownButtonMenuLabel}} @dropdownButtonWrapperClass={{menuItem.dropdownButtonWrapperClass}} @dropdownButtonTriggerClass={{menuItem.dropdownButtonTriggerClass}} @registerDropdownButtonAPI={{menuItem.registerDropdownButtonAPI}}>{{menuItem.title}}</Layout::Sidebar::Item>
+            {{#if menuItem.renderComponentInPlace}}
+                {{component menuItem.component menuItem=menuItem title=@menuItem.title route=(concat this.routePrefix menuItem.route) icon=menuItem.icon rightSideComponent=menuItem.rightSideComponent rightSideComponentContext=menuItem.rightSideComponentContext rightSideStatus=menuItem.rightSideStatus rightSideStatusText=menuItem.rightSideStatusText hideRightSideStatusDot=menuItem.hideRightSideStatusDot rightSideStatusClass=menuItem.rightSideStatusClass disableRightSideStatusHumanize=menuItem.disableRightSideStatusHumanize dropdownButton=menuItem.dropdownButton dropdownButtonActions=menuItem.dropdownButtonActions dropdownButtonIcon=menuItem.dropdownButtonIcon dropdownButtonIconPrefix=menuItem.dropdownButtonIconPrefix dropdownButtonText=menuItem.dropdownButtonText dropdownButtonCalculatePosition=menuItem.dropdownButtonCalculatePosition dropdownButtonRenderInPlace=menuItem.dropdownButtonRenderInPlace dropdownButtonMenuLabel=menuItem.dropdownButtonMenuLabel dropdownButtonWrapperClass=menuItem.dropdownButtonWrapperClass dropdownButtonTriggerClass=menuItem.dropdownButtonTriggerClass registerDropdownButtonAPI=menuItem.registerDropdownButtonAPI}}
+            {{else}}
+                <Layout::Sidebar::Item @route={{concat this.routePrefix menuItem.route}} @icon={{menuItem.icon}} @rightSideComponent={{menuItem.rightSideComponent}} @rightSideComponentContext={{menuItem.rightSideComponentContext}} @rightSideStatus={{menuItem.rightSideStatus}} @rightSideStatusText={{menuItem.rightSideStatusText}} @hideRightSideStatusDot={{menuItem.hideRightSideStatusDot}} @rightSideStatusClass={{menuItem.rightSideStatusClass}} @disableRightSideStatusHumanize={{menuItem.disableRightSideStatusHumanize}} @dropdownButton={{menuItem.dropdownButton}} @dropdownButtonActions={{menuItem.dropdownButtonActions}} @dropdownButtonIcon={{menuItem.dropdownButtonIcon}} @dropdownButtonIconPrefix={{menuItem.dropdownButtonIconPrefix}} @dropdownButtonText={{menuItem.dropdownButtonText}} @dropdownButtonCalculatePosition={{menuItem.dropdownButtonCalculatePosition}} @dropdownButtonRenderInPlace={{menuItem.dropdownButtonRenderInPlace}} @dropdownButtonMenuLabel={{menuItem.dropdownButtonMenuLabel}} @dropdownButtonWrapperClass={{menuItem.dropdownButtonWrapperClass}} @dropdownButtonTriggerClass={{menuItem.dropdownButtonTriggerClass}} @registerDropdownButtonAPI={{menuItem.registerDropdownButtonAPI}}>{{menuItem.title}}</Layout::Sidebar::Item>
+            {{/if}}
         {{/each}}
     </Layout::Sidebar::Panel>
 {{/each}}

package/addon/components/layout/fleet-ops-sidebar.js

@@ -3,6 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
+// import FleetListingComponent from './fleet-ops-sidebar/fleet-listing';
 
 /**
  * LayoutFleetOpsSidebarComponent

package/addon/styles/fleetops-engine.css

@@ -33,3 +33,20 @@ body[data-theme='dark'] .scheduler-left-sidebar {
 .fleetbase-console .dragSortList {
     overflow: visible !important;
 }
+
+.next-fleet-summary-fleet .next-content-panel-body > .next-content-panel-body-inner > a.next-nav-item > .next-nav-item-icon-container > svg.text-green-500 {
+    color: rgb(34 197 94) !important;
+}
+
+.next-fleet-summary-fleet .next-content-panel-body > .next-content-panel-body-inner > a.next-nav-item > .next-nav-item-icon-container > svg.text-yellow-200 {
+    color: rgb(254 240 138) !important;
+}
+
+.next-fleet-summary {
+    --fleet-summary-toggle-base-padding: 2rem;
+    --fleet-summary-nav-item-base-padding: 1.25rem;
+}
+
+.next-sidebar .next-sidebar-panel-container.next-fleet-summary > .next-sidebar-panel > .next-content-panel > .next-sidebar-panel-toggle {
+    padding-left: 2rem;
+}

package/addon/templates/operations/service-rates/index/new.hbs

@@ -1,4 +1,4 @@
-<Overlay @position="right" @noBackdrop={{true}} @isResizable={{true}} @fullHeight={{true}} @width="800px">
+<Overlay @position="right" @noBackdrop={{true}} @isResizable={{true}} @fullHeight={{true}} @width="570px">
     <Overlay::Header @title={{if this.serviceRate.id this.serviceRate.service_name "New service rate"}} @status={{this.serviceRate.public_id}} @hideStatusDot={{true}} @createdAt={{this.serviceRate.createdAt}} @onPressCancel={{this.transitionBack}}>
         {{#if this.serviceRate.id}}
             <Button @icon="save" @type="primary" @text="Save Service Rate" @onClick={{this.updateServiceRate}} @isLoading={{this.isUpdatingServiceRate}} />

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.3.7",
+    "version": "0.3.8",
     "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.4",
+        "fleetbase/core-api": "^1.3.6",
         "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.3.7",
+    "version": "0.3.8",
     "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.3.7",
+    "version": "0.3.8",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops",

package/server/src/Casts/MultiPolygon.php

@@ -5,7 +5,7 @@ namespace Fleetbase\FleetOps\Casts;
 use Fleetbase\FleetOps\Support\Utils;
 use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialExpression;
 use Grimzy\LaravelMysqlSpatial\Types\GeometryInterface;
-use Grimzy\LaravelMysqlSpatial\Types\MultiPolygon as MultiPolygonType;
+use Grimzy\LaravelMysqlSpatial\Types\MultiPolygon as SpatialMultiPolygon;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 
 class MultiPolygon implements CastsAttributes
@@ -37,14 +37,25 @@ class MultiPolygon implements CastsAttributes
             return new SpatialExpression($value);
         }
 
+        if ($value instanceof SpatialMultiPolygon) {
+            $model->geometries[$key] = $value;
+
+            return $value;
+        }
+
         if (Utils::isGeoJson($value)) {
-            return Utils::createSpatialExpressionFromGeoJson($value);
+            $value                   = Utils::createGeometryObjectFromGeoJson($value);
+            $model->geometries[$key] = $value;
+
+            return $value;
         }
 
         if ($value instanceof SpatialExpression) {
+            $model->geometries[$key] = $value;
+
             return $value;
         }
 
-        return new SpatialExpression(new MultiPolygonType([]));
+        throw new \Exception('Invalid MultiPolygon provided for ' . $key);
     }
 }

package/server/src/Casts/Point.php

@@ -50,15 +50,25 @@ class Point implements CastsAttributes
         }
 
         if (Utils::isGeoJson($value)) {
-            return Utils::createSpatialExpressionFromGeoJson($value);
+            $value                   = Utils::createSpatialExpressionFromGeoJson($value);
+            $model->geometries[$key] = $value;
+
+            return $value;
         }
 
         if (Utils::isCoordinates($value)) {
-            $point = Utils::getPointFromCoordinates($value);
+            $point                   = Utils::getPointFromCoordinates($value);
+            $model->geometries[$key] = $point;
 
             return $point;
         }
 
+        if ($value instanceof SpatialExpression) {
+            $model->geometries[$key] = $value;
+
+            return $value;
+        }
+
         return static::createEmptySpatialExpression();
     }
 

package/server/src/Casts/Polygon.php

@@ -5,7 +5,7 @@ namespace Fleetbase\FleetOps\Casts;
 use Fleetbase\FleetOps\Support\Utils;
 use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialExpression;
 use Grimzy\LaravelMysqlSpatial\Types\GeometryInterface;
-use Grimzy\LaravelMysqlSpatial\Types\Polygon as PolygonType;
+use Grimzy\LaravelMysqlSpatial\Types\Polygon as SpatialPolygon;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 
 class Polygon implements CastsAttributes
@@ -34,13 +34,28 @@ class Polygon implements CastsAttributes
         if ($value instanceof GeometryInterface) {
             $model->geometries[$key] = $value;
 
-            return new SpatialExpression($value);
+            return $value;
+        }
+
+        if ($value instanceof SpatialPolygon) {
+            $model->geometries[$key] = $value;
+
+            return $value;
         }
 
         if (Utils::isGeoJson($value)) {
-            return Utils::createSpatialExpressionFromGeoJson($value);
+            $value                   = Utils::createGeometryObjectFromGeoJson($value);
+            $model->geometries[$key] = $value;
+
+            return $value;
+        }
+
+        if ($value instanceof SpatialExpression) {
+            $model->geometries[$key] = $value;
+
+            return $value;
         }
 
-        return new SpatialExpression(new PolygonType([]));
+        throw new \Exception('Invalid Polygon provided for ' . $key);
     }
 }

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

@@ -80,9 +80,14 @@ class DriverController extends Controller
             ]);
         }
 
-        // default location
-        if ($request->missing('location')) {
-            $input['location'] = new Point(0, 0);
+        // set default online
+        if (!isset($input['online'])) {
+            $input['online'] = 0;
+        }
+
+        // latitude / longitude
+        if ($request->has(['latitude', 'longitude'])) {
+            $input['location'] = Utils::getPointFromCoordinates($request->only(['latitude', 'longitude']));
         }
 
         // create the driver
@@ -150,6 +155,16 @@ class DriverController extends Controller
             ]);
         }
 
+        // set default online
+        if (!isset($input['online'])) {
+            $input['online'] = 0;
+        }
+
+        // latitude / longitude
+        if ($request->has(['latitude', 'longitude'])) {
+            $input['location'] = Utils::getPointFromCoordinates($request->only(['latitude', 'longitude']));
+        }
+
         // create the driver
         $driver->update($input);
         $driver->flushAttributesCache();
@@ -311,11 +326,11 @@ class DriverController extends Controller
         $platform = $request->or(['platform', 'os']);
 
         if (!$token) {
-            return response()->error('Token is required to register device.');
+            return response()->apiError('Token is required to register device.');
         }
 
         if (!$platform) {
-            return response()->error('Platform is required to register device.');
+            return response()->apiError('Platform is required to register device.');
         }
 
         $device = UserDevice::firstOrCreate(
@@ -350,7 +365,7 @@ class DriverController extends Controller
         $user = User::where('email', $identity)->orWhere('phone', static::phone($identity))->first();
 
         if (!Hash::check($password, $user->password)) {
-            return response()->error('Authentication failed using password provided.', 401);
+            return response()->apiError('Authentication failed using password provided.', 401);
         }
 
         // Get the company session for the user
@@ -376,7 +391,7 @@ class DriverController extends Controller
         try {
             $token = $user->createToken($driver->uuid);
         } catch (\Exception $e) {
-            return response()->error($e->getMessage());
+            return response()->apiError($e->getMessage());
         }
 
         $driver->token = $token->plainTextToken;
@@ -397,7 +412,7 @@ class DriverController extends Controller
         $user = User::where('phone', $phone)->whereNull('deleted_at')->withoutGlobalScopes()->first();
 
         if (!$user) {
-            return response()->error('No driver with this phone # found.');
+            return response()->apiError('No driver with this phone # found.');
         }
 
         // get the current company session
@@ -409,7 +424,7 @@ class DriverController extends Controller
                 return "Your {$company->name} verification code is {$verification->code}";
             });
         } catch (\Throwable $e) {
-            return response()->error($e->getMessage());
+            return response()->apiError($e->getMessage());
         }
 
         return response()->json(['status' => 'OK']);
@@ -438,14 +453,14 @@ class DriverController extends Controller
         })->first();
 
         if (!$user) {
-            return response()->error('Unable to verify code.');
+            return response()->apiError('Unable to verify code.');
         }
 
         // find and verify code
         $verificationCode = VerificationCode::where(['subject_uuid' => $user->uuid, 'code' => $code, 'for' => $for])->exists();
 
         if (!$verificationCode && $code !== config('fleetops.navigator.bypass_verification_code')) {
-            return response()->error('Invalid verification code!');
+            return response()->apiError('Invalid verification code!');
         }
 
         // get the current company session
@@ -471,7 +486,7 @@ class DriverController extends Controller
         try {
             $token = $user->createToken($driver->uuid);
         } catch (\Exception $e) {
-            return response()->error($e->getMessage());
+            return response()->apiError($e->getMessage());
         }
 
         // $driver->update(['auth_token' => $token->plainTextToken]);

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

@@ -7,6 +7,8 @@ use Fleetbase\FleetOps\Http\Requests\UpdateEntityRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\FleetOps\Http\Resources\v1\Entity as EntityResource;
 use Fleetbase\FleetOps\Models\Entity;
+use Fleetbase\FleetOps\Models\Payload;
+use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Illuminate\Http\Request;
@@ -76,6 +78,23 @@ class EntityController extends Controller
             ]);
         }
 
+        // if destination is set
+        if ($request->has('destination') || $request->has('waypoint')) {
+            $destinationKey = $request->or(['destination', 'waypoint']);
+
+            if ($request->has('payload')) {
+                $payload = Payload::where('public_id', $request->input('payload'))->first();
+
+                if ($payload) {
+                    // if a destination or waypoint is explicitly set
+                    $destination = $payload->findDestinationFromKey($destinationKey);
+                    if ($destination instanceof Place) {
+                        $input['destination_uuid'] = $destination->uuid;
+                    }
+                }
+            }
+        }
+
         // make sure company is set
         $input['company_uuid'] = session('company');
 
@@ -161,9 +180,25 @@ class EntityController extends Controller
             ]);
         }
 
+        // if destination is set
+        if ($request->has('destination') || $request->has('waypoint')) {
+            $destinationKey = $request->or(['destination', 'waypoint']);
+
+            if ($request->has('payload')) {
+                $payload = Payload::where('public_id', $request->input('payload'))->first();
+
+                if ($payload) {
+                    // if a destination or waypoint is explicitly set
+                    $destination = $payload->findDestinationFromKey($destinationKey);
+                    if ($destination instanceof Place) {
+                        $attributes['destination_uuid'] = $destination->uuid;
+                    }
+                }
+            }
+        }
+
         // update the entity
         $entity->update($input);
-        // $entity->flushAttributesCache();
 
         // response the entity resource
         return new EntityResource($entity);

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

@@ -36,7 +36,7 @@ class LabelController extends Controller
         }
 
         if (!$subject) {
-            return response()->error('Unable to render label.');
+            return response()->apiError('Unable to render label.');
         }
 
         switch ($format) {
@@ -58,6 +58,6 @@ class LabelController extends Controller
                 return response()->json(['data' => mb_convert_encoding($base64, 'UTF-8', 'UTF-8')]);
         }
 
-        return response()->error('Unable to render label.');
+        return response()->apiError('Unable to render label.');
     }
 }