@fleetbase/fleetops-engine 0.1.7 → 0.1.9

package/addon/components/live-map.js

@@ -21,7 +21,7 @@ export default class LiveMapComponent extends Component {
     @service notifications;
     @service serviceAreas;
     @service appCache;
-    @service engineContext;
+    @service universe;
 
     @tracked routes = [];
     @tracked drivers = [];
@@ -80,7 +80,7 @@ export default class LiveMapComponent extends Component {
      */
     @action async setupLiveMap() {
         // trigger that initial coordinates have been set
-        this.engineContext.trigger('livemap.loaded', this);
+        this.universe.trigger('livemap.loaded', this);
 
         if (this.skipSetCoordinates === false) {
             if (this.appCache.has(['map_latitude', 'map_longitude'])) {
@@ -101,7 +101,7 @@ export default class LiveMapComponent extends Component {
         }
 
         // trigger that initial coordinates have been set
-        this.engineContext.trigger('livemap.has_coordinates', { latitude: this.latitude, longitude: this.longitude });
+        this.universe.trigger('livemap.has_coordinates', { latitude: this.latitude, longitude: this.longitude });
 
         this.routes = await this.fetchActiveRoutes();
         this.drivers = await this.fetchActiveDrivers();
@@ -115,7 +115,7 @@ export default class LiveMapComponent extends Component {
         }
 
         // add context event
-        this.engineContext.trigger('livemap.ready', this);
+        this.universe.trigger('livemap.ready', this);
     }
 
     @action setMapReference(event) {

package/addon/controllers/operations/orders/index/new.js

@@ -31,16 +31,81 @@ export default class OperationsOrdersIndexNewController extends Controller {
     @controller('management.vendors.index') vendorsController;
     @controller('operations.orders.index') ordersController;
 
+    /**
+     * Inject the `modalsManager` service
+     *
+     * @var {Service}
+     */
     @service modalsManager;
+
+    /**
+     * Inject the `notifications` service
+     *
+     * @var {Service}
+     */
     @service notifications;
+
+    /**
+     * Inject the `loader` service
+     *
+     * @var {Service}
+     */
     @service loader;
+
+    /**
+     * Inject the `currentUser` service
+     *
+     * @var {Service}
+     */
     @service currentUser;
+
+    /**
+     * Inject the `hostRouter` service
+     *
+     * @var {Service}
+     */
     @service hostRouter;
+
+    /**
+     * Inject the `fileQueue` service
+     *
+     * @var {Service}
+     */
     @service fileQueue;
+
+    /**
+     * Inject the `fetch` service
+     *
+     * @var {Service}
+     */
     @service fetch;
+
+    /**
+     * Inject the `store` service
+     *
+     * @var {Service}
+     */
     @service store;
 
+    /**
+     * Inject the `universe` service
+     *
+     * @var {Service}
+     */
+    @service universe;
+
+    /**
+     * Create an OrderModel instance.
+     *
+     * @var {OrderModel}
+     */
     @tracked order = this.store.createRecord('order', { meta: [] });
+
+    /**
+     * Create an PayloadModel instance.
+     *
+     * @var {OrderModel}
+     */
     @tracked payload = this.store.createRecord('payload');
     @tracked driversQuery = {};
     @tracked meta = [];
@@ -182,16 +247,6 @@ export default class OperationsOrdersIndexNewController extends Controller {
         return groups;
     }
 
-    @action dropdownAction(actionName, dd, ...params) {
-        if (typeof dd?.actions?.close === 'function') {
-            dd.actions.close();
-        }
-
-        if (typeof this[actionName] === 'function') {
-            this[actionName](...params);
-        }
-    }
-
     @action createOrder() {
         if (!this.isValid) {
             return;
@@ -223,12 +278,18 @@ export default class OperationsOrdersIndexNewController extends Controller {
             return;
         }
 
+        // send event that fleetops is `creating` an order
+        this.universe.trigger('fleet-ops.order.creating', order);
         this.isCreatingOrder = true;
 
         try {
             return order
                 .save()
                 .then((order) => {
+                    // trigger event that fleet-ops created an order
+                    this.universe.trigger('fleet-ops.order.created', order);
+
+                    // transition to order view
                     return this.transitionToRoute('operations.orders.index.view', order).then(() => {
                         this.notifications.success(`New Order ${order.public_id} Created`);
                         this.loader.removeLoader();
@@ -499,7 +560,7 @@ export default class OperationsOrdersIndexNewController extends Controller {
     }
 
     @action scheduleOrder(dateInstance) {
-        this.order.scheduled_at = dateInstance.toDate();
+        this.order.scheduled_at = dateInstance;
     }
 
     @action setupInterface() {
@@ -890,6 +951,7 @@ export default class OperationsOrdersIndexNewController extends Controller {
 
     @action setOrderFacilitator(model) {
         this.order.set('facilitator', model);
+        // this.order.set('facilitator_type', `fleet-ops:${model.facilitator_type}`);
         this.order.set('driver', null);
 
         this.isUsingIntegratedVendor = model.isIntegratedVendor;
@@ -908,6 +970,11 @@ export default class OperationsOrdersIndexNewController extends Controller {
         }
     }
 
+    @action setOrderCustomer(model) {
+        this.order.set('customer', model);
+        // this.order.set('customer_type', `fleet-ops:${model.customer_type}`);
+    }
+
     @action selectIntegratedServiceType(key) {
         this.integratedVendorServiceType = key;
 

package/addon/controllers/operations/orders/index/view.js

@@ -9,7 +9,6 @@ import { OSRMv1, Control as RoutingControl } from '@fleetbase/leaflet-routing-ma
 import groupBy from '@fleetbase/ember-core/utils/macros/group-by';
 import findClosestWaypoint from '@fleetbase/ember-core/utils/find-closest-waypoint';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
-import extractCoordinates from '@fleetbase/ember-core/utils/extract-coordinates';
 
 export default class OperationsOrdersIndexViewController extends Controller {
     /**
@@ -83,11 +82,11 @@ export default class OperationsOrdersIndexViewController extends Controller {
     @service hostRouter;
 
     /**
-     * Inject the `engineContext` service
+     * Inject the `universe` service
      *
      * @var {Service}
      */
-    @service engineContext;
+    @service universe;
 
     @tracked isLoadingAdditionalData = false;
     @tracked isWaypointsCollapsed;
@@ -169,38 +168,36 @@ export default class OperationsOrdersIndexViewController extends Controller {
 
     @action removeRoutingControlPreview() {
         const { leafletMap, routeControl } = this;
-        let removed = false;
 
         if (routeControl instanceof RoutingControl) {
             try {
                 routeControl.remove();
-                removed = true;
             } catch (e) {
                 // silent
             }
+        }
 
-            if (!removed) {
-                try {
-                    leafletMap?.removeControl(routeControl);
-                } catch (e) {
-                    // silent
-                }
+        if (leafletMap instanceof L.Map) {
+            try {
+                leafletMap.removeControl(routeControl);
+            } catch (e) {
+                // silent
             }
         }
 
-        if (!removed) {
-            this.forceRemoveRoutePreview();
-        }
+        this.forceRemoveRoutePreview();
     }
 
     @action forceRemoveRoutePreview() {
         const { leafletMap } = this;
 
-        leafletMap.eachLayer((layer) => {
-            if (layer instanceof L.Polyline || layer instanceof L.Marker) {
-                layer.remove();
-            }
-        });
+        if (leafletMap instanceof L.Map) {
+            leafletMap.eachLayer((layer) => {
+                if (layer instanceof L.Polyline || layer instanceof L.Marker) {
+                    layer.remove();
+                }
+            });
+        }
     }
 
     @action setupInterface() {
@@ -228,14 +225,14 @@ export default class OperationsOrdersIndexViewController extends Controller {
         };
 
         // re-display order routes when livemap has coordinates
-        this.engineContext.on('livemap.has_coordinates', this, displayOrderRoute);
+        this.universe.on('livemap.has_coordinates', this, displayOrderRoute);
 
         // when transitioning away kill event listener
         this.hostRouter.on('routeWillChange', () => {
-            const isListening = this.engineContext.has('livemap.has_coordinates');
+            const isListening = this.universe.has('livemap.has_coordinates');
 
             if (isListening) {
-                this.engineContext.off('livemap.has_coordinates', this, displayOrderRoute);
+                this.universe.off('livemap.has_coordinates', this, displayOrderRoute);
             }
         });
 
@@ -243,10 +240,28 @@ export default class OperationsOrdersIndexViewController extends Controller {
         setup();
     }
 
+    @computed('model.payload.{dropoff,pickup,waypoints}') get routeWaypoints() {
+        const { payload } = this.model;
+        let waypoints = [];
+        let coordinates = [];
+
+        waypoints.pushObjects([payload.pickup, ...payload.waypoints.toArray(), payload.dropoff]);
+        waypoints.forEach((place) => {
+            if (place && place.get('longitude') && place.get('latitude')) {
+                if (place.hasInvalidCoordinates) {
+                    return;
+                }
+
+                coordinates.pushObject([place.get('latitude'), place.get('longitude')]);
+            }
+        });
+
+        return coordinates;
+    }
+
     @action displayOrderRoute() {
-        // map coordinates from lng, lat -> lat, lng
         const payload = this.model.payload;
-        const waypoints = payload?.payloadCoordinates?.map((coord) => extractCoordinates(coord));
+        const waypoints = this.routeWaypoints;
         const leafletMap = this.leafletMap;
         const routingHost = getRoutingHost(payload, payload?.waypoints?.toArray());
 

package/addon/controllers/operations/orders/index.js

@@ -74,11 +74,11 @@ export default class OperationsOrdersIndexController extends Controller {
     @service crud;
 
     /**
-     * Inject the `engineContext` service
+     * Inject the `universe` service
      *
      * @var {Service}
      */
-    @service engineContext;
+    @service universe;
 
     /**
      * Queryable parameters for this controller's model
@@ -528,7 +528,7 @@ export default class OperationsOrdersIndexController extends Controller {
             this.isSearchVisible = false;
         }
 
-        this.engineContext.trigger('dashboard.layout.changed', mode);
+        this.universe.trigger('dashboard.layout.changed', mode);
     }
 
     @action setMapReference({ target }) {

package/addon/engine.js

@@ -14,6 +14,10 @@ export default class FleetOpsEngine extends Engine {
         services,
         externalRoutes,
     };
+    setupExtension = function (app, engine, universe) {
+        // register menu item in header
+        universe.registerHeaderMenuItem('Fleet Ops', 'console.fleet-ops', { icon: 'route', priority: 0 });
+    };
 }
 
 loadInitializers(FleetOpsEngine, modulePrefix);

package/addon/routes/operations/orders/index/view.js

@@ -7,7 +7,9 @@ export default class OperationsOrdersIndexViewRoute extends Route {
     @service store;
 
     @action willTransition() {
-        this.controller?.resetView();
+        if (this.controller) {
+            this.controller.resetView();
+        }
     }
 
     model(order) {

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

@@ -3,37 +3,37 @@
         <DropdownButton @icon="ellipsis-h" @size="sm" @iconPrefix="fas" @triggerClass="mr-2 hidden md:flex" as |dd|>
             <div class="next-dd-menu mt-1 mx-0" aria-orientation="vertical" aria-labelledby="user-menu">
                 <div class="p-1">
-                    <a href="javascript:;" class="next-dd-item" {{on "click" (fn this.dropdownAction "newCustomer" dd)}}>
+                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.newCustomer)}}>
                         <div class="w-6">
                             <FaIcon @icon="user-plus" />
                         </div>
                         <span>Create new customer</span>
                     </a>
-                    <a href="javascript:;" class="next-dd-item" {{on "click" (fn this.dropdownAction "newFacilitator" dd)}}>
+                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.newFacilitator)}}>
                         <div class="w-6">
                             <FaIcon @icon="truck" />
                         </div>
                         <span>Create new facilitator</span>
                     </a>
-                    <a href="javascript:;" class="next-dd-item" {{on "click" (fn this.dropdownAction "newPlace" dd)}}>
+                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.newPlace)}}>
                         <div class="w-6">
                             <FaIcon @icon="map-pin" />
                         </div>
                         <span>Create new place</span>
                     </a>
-                    <a href="javascript:;" class="next-dd-item" {{on "click" (fn this.dropdownAction "addEntity" dd)}}>
+                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.addEntity)}}>
                         <div class="w-6">
                             <FaIcon @icon="box" />
                         </div>
                         <span>Add entity to order</span>
                     </a>
-                    <a href="javascript:;" class="next-dd-item" {{on "click" (fn this.dropdownAction "editMetaData")}}>
+                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.editMetaData)}}>
                         <div class="w-6">
                             <FaIcon @icon="table" />
                         </div>
                         <span>Edit order metadata</span>
                     </a>
-                    <a href="javascript:;" class="next-dd-item" {{on "click" (fn this.dropdownAction "addCustomField")}}>
+                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.addCustomField)}}>
                         <div class="w-6">
                             <FaIcon @icon="edit" />
                         </div>
@@ -62,7 +62,7 @@
                 </InputGroup>
 
                 <InputGroup @name="Customer" @helpText="Optionally assign the customer of this order. If it's a new customer, use the 'New Customer' button above.">
-                    <ModelSelect @modelName="customer" @selectedModel={{this.order.customer}} @placeholder="Select Customer" @triggerClass="form-select form-input" @infiniteScroll={{false}} @renderInPlace={{true}} @allowClear={{true}} @onChange={{fn (mut this.order.customer)}} as |model|>
+                    <ModelSelect @modelName="customer" @selectedModel={{this.order.customer}} @placeholder="Select Customer" @triggerClass="form-select form-input" @infiniteScroll={{false}} @renderInPlace={{true}} @allowClear={{true}} @onChange={{this.setOrderCustomer}} as |model|>
                         <div class="flex items-center">
                             <div class="w-7">
                                 <FaIcon @icon={{if model.isVendor "warehouse" "user" }} />

package/package.json

@@ -1,13 +1,11 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "extension": "Fleet Ops",
-    "icon": "route",
-    "version": "0.1.7",
-    "priority": 0,
+    "version": "0.1.9",
+    "description": "Fleetbase Fleet-Ops extension provides a fleet management and last mile delivery operations system module.",
     "fleetbase": {
+        "route": "fleet-ops",
         "dashboard": "int/v1/fleet-ops/dashboard"
     },
-    "description": "Fleetbase Fleet-Ops extension provides a fleet management and last mile delivery operations system module.",
     "keywords": [
         "fleetbase-extension",
         "fleet-management",
@@ -39,9 +37,9 @@
         "test:ember-compatibility": "ember try:each"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.0.8",
-        "@fleetbase/ember-ui":  "^0.1.0",
-        "@fleetbase/fleetops-data": "^0.0.5",
+        "@fleetbase/ember-core": "^0.1.0",
+        "@fleetbase/ember-ui": "^0.1.3",
+        "@fleetbase/fleetops-data": "^0.0.6",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",

package/addon/services/engine-context.js

@@ -1,17 +0,0 @@
-import Service from '@ember/service';
-import Evented from '@ember/object/evented';
-
-export default class EngineContextService extends Service.extend(Evented) {
-    options = {};
-
-    setOption(key, value) {
-        this.options = {
-            ...this.options,
-            [key]: value,
-        };
-    }
-
-    getOption(key) {
-        return this.options[key];
-    }
-}

package/app/services/engine-context.js

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