@fleetbase/fleetops-engine 0.1.7 → 0.1.8

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

@@ -182,16 +182,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;
@@ -499,7 +489,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 +880,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 +899,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

@@ -169,38 +169,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() {

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

@@ -2,7 +2,7 @@
     "name": "@fleetbase/fleetops-engine",
     "extension": "Fleet Ops",
     "icon": "route",
-    "version": "0.1.7",
+    "version": "0.1.8",
     "priority": 0,
     "fleetbase": {
         "dashboard": "int/v1/fleet-ops/dashboard"
@@ -40,8 +40,8 @@
     },
     "dependencies": {
         "@fleetbase/ember-core": "^0.0.8",
-        "@fleetbase/ember-ui":  "^0.1.0",
-        "@fleetbase/fleetops-data": "^0.0.5",
+        "@fleetbase/ember-ui":  "^0.1.2",
+        "@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",