@fleetbase/fleetops-engine 0.3.5 → 0.3.7

package/addon/utils/waypoint-label.js

@@ -0,0 +1,3 @@
+export default function waypointLabel(index) {
+    return (parseInt(index) + 9).toString(36).toUpperCase();
+}

package/app/controllers/{operations/zones/index.js → base-controller.js}

@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops-engine/controllers/operations/zones/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/base-controller';

package/app/utils/waypoint-label.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/utils/waypoint-label';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.3.5",
+    "version": "0.3.7",
     "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.2",
+        "fleetbase/core-api": "^1.3.4",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",

package/config/environment.js

@@ -1,11 +1,12 @@
 /* eslint-env node */
 'use strict';
-const { name } = require('../package');
+const { name, fleetbase } = require('../package');
 
 module.exports = function (environment) {
     let ENV = {
         modulePrefix: name,
         environment,
+        mountedEngineRoutePrefix: getMountedEngineRoutePrefix(),
 
         defaultValues: {
             driverImage: getenv('DEFAULT_DRIVER_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
@@ -20,6 +21,15 @@ module.exports = function (environment) {
     return ENV;
 };
 
+function getMountedEngineRoutePrefix() {
+    let mountedEngineRoutePrefix = 'fleet-ops';
+    if (fleetbase && typeof fleetbase.route === 'string') {
+        mountedEngineRoutePrefix = fleetbase.route;
+    }
+
+    return `console.${mountedEngineRoutePrefix}.`;
+}
+
 function getenv(variable, defaultValue = null) {
     return process.env[variable] !== undefined ? process.env[variable] : defaultValue;
 }

package/extension.json

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

package/index.js

@@ -69,6 +69,7 @@ module.exports = buildEngine({
             new Funnel(leafletImagesPath, {
                 srcDir: '/',
                 destDir: '/leaflet-images',
+                allowEmpty: true,
             })
         );
         trees.push(

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.3.5",
+    "version": "0.3.7",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops",
@@ -25,23 +25,26 @@
     },
     "scripts": {
         "build": "ember build --environment=production",
-        "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
-        "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
+        "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
+        "lint:css": "stylelint \"**/*.css\"",
+        "lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
+        "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
         "lint:hbs": "ember-template-lint .",
         "lint:hbs:fix": "ember-template-lint . --fix",
         "lint:js": "eslint . --cache",
         "lint:js:fix": "eslint . --fix",
         "start": "ember serve",
-        "test": "npm-run-all lint test:*",
+        "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
         "test:ember": "ember test",
         "test:ember-compatibility": "ember try:each",
         "publish:npm": "npm config set registry https://registry.npmjs.org/ && npm publish",
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.1.8",
-        "@fleetbase/ember-ui": "^0.2.6",
-        "@fleetbase/fleetops-data": "^0.1.5",
+        "@babel/core": "^7.23.2",
+        "@fleetbase/ember-core": "^0.1.9",
+        "@fleetbase/ember-ui": "^0.2.8",
+        "@fleetbase/fleetops-data": "^0.1.6",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",
@@ -50,14 +53,14 @@
         "@zestia/ember-dragula": "^12.0.0",
         "broccoli-funnel": "^3.0.8",
         "broccoli-merge-trees": "^4.2.0",
-        "ember-cli-babel": "^7.26.11",
-        "ember-cli-es6-transform": "^1.0.0",
-        "ember-cli-htmlbars": "^6.1.0",
-        "ember-intl": "^6.0.0-beta.6",
+        "ember-cli-babel": "^8.2.0",
+        "ember-cli-htmlbars": "^6.3.0",
+        "ember-intl": "6.3.2",
         "ember-leaflet": "^5.1.1",
         "ember-radio-button": "^3.0.0-beta.1",
         "ember-tag-input": "^3.1.0",
         "ember-wormhole": "^0.6.0",
+        "ember-drag-sort": "^3.0.1",
         "leaflet": "^1.9.4",
         "leaflet-contextmenu": "^1.4.0",
         "leaflet-draw": "^1.0.4",
@@ -65,56 +68,59 @@
         "leaflet-rotatedmarker": "^0.2.0"
     },
     "devDependencies": {
+        "@babel/eslint-parser": "^7.22.15",
+        "@babel/plugin-proposal-decorators": "^7.23.2",
         "@ember/optional-features": "^2.0.0",
-        "@ember/test-helpers": "^2.8.1",
-        "@embroider/test-setup": "^1.8.3",
+        "@ember/test-helpers": "^3.2.0",
+        "@embroider/test-setup": "^3.0.2",
         "@glimmer/component": "^1.1.2",
         "@glimmer/tracking": "^1.1.2",
-        "babel-eslint": "^10.1.0",
         "broccoli-asset-rev": "^3.0.0",
+        "concurrently": "^8.2.2",
         "dragula": "^3.7.3",
-        "ember-auto-import": "^2.4.2",
-        "ember-cli": "~4.6.0",
-        "ember-cli-dependency-checker": "^3.3.1",
+        "ember-auto-import": "^2.6.3",
+        "ember-cli": "~5.4.1",
+        "ember-cli-clean-css": "^3.0.0",
+        "ember-cli-dependency-checker": "^3.3.2",
         "ember-cli-inject-live-reload": "^2.1.0",
         "ember-cli-sri": "^2.1.1",
         "ember-cli-terser": "^4.0.2",
         "ember-composable-helpers": "^5.0.0",
-        "ember-concurrency": "^2.3.7",
+        "ember-concurrency": "^3.1.1",
         "ember-concurrency-decorators": "^2.0.3",
-        "ember-data": "~4.6.0",
-        "ember-disable-prototype-extensions": "^1.1.3",
-        "ember-drag-sort": "^3.0.1",
-        "ember-engines": "^0.8.23",
+        "ember-data": "^4.12.5",
+        "ember-engines": "^0.9.0",
         "ember-load-initializers": "^2.1.2",
-        "ember-math-helpers": "^2.18.2",
-        "ember-page-title": "^7.0.0",
-        "ember-qunit": "^5.1.5",
-        "ember-resolver": "^8.0.3",
+        "ember-math-helpers": "^4.0.0",
+        "ember-page-title": "^8.0.0",
+        "ember-qunit": "^8.0.1",
+        "ember-resolver": "^11.0.1",
         "ember-responsive": "^5.0.0",
-        "ember-source": "~4.6.0",
+        "ember-source": "~5.4.0",
         "ember-source-channel-url": "^3.0.0",
-        "ember-template-lint": "^4.10.1",
-        "ember-try": "^2.0.0",
-        "eslint": "^7.32.0",
-        "eslint-config-prettier": "^8.5.0",
-        "eslint-plugin-ember": "^11.0.2",
-        "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-prettier": "^4.2.1",
-        "eslint-plugin-qunit": "^7.3.1",
+        "ember-template-lint": "^5.11.2",
+        "ember-try": "^3.0.0",
+        "eslint": "^8.52.0",
+        "eslint-config-prettier": "^9.0.0",
+        "eslint-plugin-ember": "^11.11.1",
+        "eslint-plugin-n": "^16.2.0",
+        "eslint-plugin-prettier": "^5.0.1",
+        "eslint-plugin-qunit": "^8.0.1",
         "loader.js": "^4.7.0",
-        "npm-run-all": "^4.1.5",
-        "prettier": "^2.7.1",
-        "qunit": "^2.19.1",
+        "prettier": "^3.0.3",
+        "qunit": "^2.20.0",
         "qunit-dom": "^2.0.0",
         "resolve": "^1.22.2",
-        "webpack": "^5.74.0"
+        "stylelint": "^15.11.0",
+        "stylelint-config-standard": "^34.0.0",
+        "stylelint-prettier": "^4.0.2",
+        "webpack": "^5.89.0"
     },
     "peerDependencies": {
-        "ember-engines": "^0.8.23"
+        "ember-engines": "^0.9.0"
     },
     "engines": {
-        "node": "14.* || >= 16"
+        "node": ">= 18"
     },
     "ember": {
         "edition": "octane"

package/server/config/fleetops.php

@@ -12,7 +12,10 @@ return [
             'prefix' => null,
             'internal_prefix' => 'int'
         ]
-    ], 
+    ],
+    'navigator' => [
+        'bypass_verification_code' => env('NAVIGATOR_BYPASS_VERIFICATION_CODE', '999000')
+    ],
     'connection' => [
         'db' => env('DB_CONNECTION', 'mysql')
     ]

package/server/migrations/2023_11_28_074244_add_supplier_uuid_column_to_entities_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddSupplierUuidColumnToEntitiesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('entities', function (Blueprint $table) {
+            $table->foreignUuid('supplier_uuid')->nullable()->after('driver_assigned_uuid')->references('uuid')->on('vendors');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('entities', function (Blueprint $table) {
+            $table->dropForeign(['supplier_uuid']);
+            $table->dropColumn(['supplier_uuid']);
+        });
+    }
+}

package/server/migrations/2023_12_14_100209_add_meta_column_on_driver_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddMetaColumnOnDriverTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('drivers', function (Blueprint $table) {
+            $table->json('meta')->nullable()->after('slug');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

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

@@ -353,10 +353,10 @@ class DriverController extends Controller
             return response()->error('Authentication failed using password provided.', 401);
         }
 
-        // get the current company session
+        // Get the company session for the user
         $company = Flow::getCompanySessionForUser($user);
 
-        // get driver record
+        // Get driver record
         $driver = Driver::firstOrCreate(
             [
                 'user_uuid'    => $user->uuid,
@@ -365,9 +365,10 @@ class DriverController extends Controller
             [
                 'user_uuid'    => $user->uuid,
                 'company_uuid' => $company->uuid,
-                'name'         => $attrs['name'] ?? $user->name,
-                'phone'        => $attrs['phone'] ?? $user->phone,
-                'email'        => $attrs['email'] ?? $user->email,
+                'name'         => data_get($attrs, 'name', $user->name),
+                'phone'        => data_get($attrs, 'phone', $user->phone),
+                'email'        => data_get($attrs, 'email', $user->email),
+                'location'     => new Point(0, 0),
             ]
         );
 
@@ -431,7 +432,10 @@ class DriverController extends Controller
         }
 
         // check if user exists
-        $user = User::where('phone', $identity)->orWhere('email', $identity)->first();
+        $user = User::where('type', 'driver')->where(function ($query) use ($identity) {
+            $query->where('phone', $identity);
+            $query->orWhere('phone', $identity);
+        })->first();
 
         if (!$user) {
             return response()->error('Unable to verify code.');
@@ -440,7 +444,7 @@ class DriverController extends Controller
         // find and verify code
         $verificationCode = VerificationCode::where(['subject_uuid' => $user->uuid, 'code' => $code, 'for' => $for])->exists();
 
-        if (!$verificationCode && $code !== '999000') {
+        if (!$verificationCode && $code !== config('fleetops.navigator.bypass_verification_code')) {
             return response()->error('Invalid verification code!');
         }
 
@@ -456,9 +460,9 @@ class DriverController extends Controller
             [
                 'user_uuid'    => $user->uuid,
                 'company_uuid' => $company->uuid,
-                'name'         => $attrs['name'] ?? $user->name,
-                'phone'        => $attrs['phone'] ?? $user->phone,
-                'email'        => $attrs['email'] ?? $user->email,
+                'name'         => data_get($attrs, 'name', $user->name),
+                'phone'        => data_get($attrs, 'phone', $user->phone),
+                'email'        => data_get($attrs, 'email', $user->email),
                 'location'     => new Point(0, 0),
             ]
         );

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

@@ -33,7 +33,7 @@ class OrderController extends Controller
     /**
      * Creates a new Fleetbase Order resource.
      *
-     * @param \Fleetbase\Http\Requests\CreateOrderRequest $request
+     * @param \Illuminate\Http\Request|\Fleetbase\Http\Requests\CreateOrderRequest $request
      *
      * @return \Fleetbase\Http\Resources\Order
      */
@@ -61,18 +61,36 @@ class OrderController extends Controller
 
         // create payload
         if ($request->has('payload') && $request->isArray('payload')) {
-            $payloadInput = $request->input('payload');
             $payload      = new Payload();
+            $payloadInput = $request->input('payload');
+            $entities     = data_get($payloadInput, 'entities', []);
+            $waypoints    = data_get($payloadInput, 'waypoints', []);
+            $pickup       = data_get($payloadInput, 'pickup');
+            $dropoff      = data_get($payloadInput, 'dropoff');
+            $return       = data_get($payloadInput, 'return');
+
+            // if no pickup and dropoff extract from waypoints
+            if (empty($pickup) && empty($dropoff) && count($waypoints)) {
+                $pickup  = array_shift($waypoints);
+                $dropoff = array_pop($waypoints);
+            }
 
-            $payload->setPickup($payloadInput['pickup']);
-            $payload->setDropoff($payloadInput['dropoff']);
-            if ($request->has('payload.return')) {
-                $payload->setReturn($payloadInput['return']);
+            $payload->setPickup($pickup, [
+                'callback' => function ($pickup, $payload) {
+                    $payload->setCurrentWaypoint($pickup);
+                },
+            ]);
+            $payload->setDropoff($dropoff);
+            if ($return) {
+                $payload->setReturn($return);
             }
-            $payload->setWaypoints($payloadInput['waypoints'] ?? []);
-            $payload->setEntities($payloadInput['entities'] ?? []);
+
             $payload->save();
 
+            // set waypoints and entities after payload is saved
+            $payload->setWaypoints($waypoints);
+            $payload->setEntities($entities);
+
             $input['payload_uuid'] = $payload->uuid;
         } elseif ($request->isString('payload')) {
             $input['payload_uuid'] = Utils::getUuid('payloads', [
@@ -84,19 +102,40 @@ class OrderController extends Controller
 
         // create a payload if missing payload[] but has pickup/dropoff/etc
         if ($request->missing('payload')) {
-            $payloadInput = $request->only(['pickup', 'dropoff', 'return', 'waypoints', 'entities']);
             $payload      = new Payload();
+            $payloadInput = $request->only(['pickup', 'dropoff', 'return', 'waypoints', 'entities']);
+            $entities     = data_get($payloadInput, 'entities', []);
+            $waypoints    = data_get($payloadInput, 'waypoints', []);
+            $pickup       = data_get($payloadInput, 'pickup');
+            $dropoff      = data_get($payloadInput, 'dropoff');
+            $return       = data_get($payloadInput, 'return');
+
+            // if no pickup and dropoff extract from waypoints
+            if (empty($pickup) && empty($dropoff) && count($waypoints)) {
+                $pickup  = array_shift($waypoints);
+                $dropoff = array_pop($waypoints);
+            }
 
-            $payload->setPickup($payloadInput['pickup']);
-            $payload->setDropoff($payloadInput['dropoff']);
-            if ($request->has('return')) {
-                $payload->setReturn($payloadInput['return']);
+            $payload->setPickup($pickup, [
+                'callback' => function ($pickup, $payload) {
+                    $payload->setCurrentWaypoint($pickup);
+                },
+            ]);
+            $payload->setDropoff($dropoff);
+            if ($return) {
+                $payload->setReturn($return);
             }
-            $payload->setWaypoints($payloadInput['waypoints'] ?? []);
-            $payload->setEntities($payloadInput['entities'] ?? []);
+
             $payload->save();
 
+            // set waypoints and entities after payload is saved
+            $payload->setWaypoints($waypoints);
+            $payload->setEntities($entities);
+
             $input['payload_uuid'] = $payload->uuid;
+
+            // set the first / current waypoint
+            $payload->setCurrentWaypoint($payload->pickup);
         }
 
         // driver assignment
@@ -218,18 +257,43 @@ class OrderController extends Controller
 
         // update payload if new input or change payload by id
         if ($request->isArray('payload')) {
+            $payload      = data_get($order, 'payload', new Payload());
             $payloadInput = $request->input('payload');
-            $payload      = new Payload();
+            $entities     = data_get($payloadInput, 'entities', []);
+            $waypoints    = data_get($payloadInput, 'waypoints', []);
+            $pickup       = data_get($payloadInput, 'pickup');
+            $dropoff      = data_get($payloadInput, 'dropoff');
+            $return       = data_get($payloadInput, 'return');
+
+            // if no pickup and dropoff extract from waypoints
+            if (empty($pickup) && empty($dropoff) && count($waypoints)) {
+                $pickup  = array_shift($waypoints);
+                $dropoff = array_pop($waypoints);
+            }
+
+            if ($pickup) {
+                $payload->setPickup($pickup);
+            }
+
+            if ($dropoff) {
+                $payload->setDropoff($dropoff);
+            }
 
-            $payload->setPickup($payloadInput['pickup']);
-            $payload->setDropoff($payloadInput['dropoff']);
-            if ($request->has('payload.return')) {
-                $payload->setReturn($payloadInput['return']);
+            if ($return) {
+                $payload->setReturn($return);
             }
-            $payload->setWaypoints($payloadInput['waypoints'] ?? []);
-            $payload->setEntities($payloadInput['entities'] ?? []);
+
             $payload->save();
 
+            // set waypoints and entities after payload is saved
+            if ($waypoints) {
+                $payload->setWaypoints($waypoints);
+            }
+
+            if ($entities) {
+                $payload->setEntities($entities);
+            }
+
             $input['payload_uuid'] = $payload->uuid;
         } elseif ($request->has('payload')) {
             $input['payload_uuid'] = Utils::getUuid('payloads', [
@@ -239,34 +303,46 @@ class OrderController extends Controller
             unset($input['payload']);
         }
 
-        // update payload properties if applicable
-        if ($request->has('pickup')) {
-            if ($order->payload) {
-                $order->payload->setPickup($request->input('pickup'));
+        // create a payload if missing payload[] but has pickup/dropoff/etc
+        if ($request->missing('payload')) {
+            $payload      = data_get($order, 'payload', new Payload());
+            $payloadInput = $request->only(['pickup', 'dropoff', 'return', 'waypoints', 'entities']);
+            $entities     = data_get($payloadInput, 'entities', []);
+            $waypoints    = data_get($payloadInput, 'waypoints', []);
+            $pickup       = data_get($payloadInput, 'pickup');
+            $dropoff      = data_get($payloadInput, 'dropoff');
+            $return       = data_get($payloadInput, 'return');
+
+            // if no pickup and dropoff extract from waypoints
+            if (empty($pickup) && empty($dropoff) && count($waypoints)) {
+                $pickup  = array_shift($waypoints);
+                $dropoff = array_pop($waypoints);
             }
-        }
-        if ($request->has('dropoff')) {
-            if ($order->payload) {
-                $order->payload->setDropoff($request->input('dropoff'));
+
+            if ($pickup) {
+                $payload->setPickup($pickup);
             }
-        }
 
-        if ($request->has('return')) {
-            if ($order->payload) {
-                $order->payload->setReturn($request->input('return'));
+            if ($dropoff) {
+                $payload->setDropoff($dropoff);
             }
-        }
 
-        if ($request->has('waypoints')) {
-            if ($order->payload) {
-                $order->payload->setWaypoints($request->input('waypoints'));
+            if ($return) {
+                $payload->setReturn($return);
             }
-        }
 
-        if ($request->has('entities')) {
-            if ($order->payload) {
-                $order->payload->setEntities($request->input('entities'));
+            $payload->save();
+
+            // set waypoints and entities after payload is saved
+            if ($waypoints) {
+                $payload->setWaypoints($waypoints);
             }
+
+            if ($entities) {
+                $payload->setEntities($entities);
+            }
+
+            $input['payload_uuid'] = $payload->uuid;
         }
 
         // driver assignment