@fleetbase/fleetops-engine 0.0.4 → 0.0.5

package/addon/components/modals/vendor-form.hbs

@@ -8,7 +8,7 @@
                             <FaIcon @icon="handshake" @size="xl" class="text-blue-500" />
                         </div>
                         <div>
-                            <h3 class="text-gray-900 dark:text-gray-100">Choose Integrated Vendor</h3>
+                            <span class="text-gray-900 dark:text-gray-100 text-lg">Choose Integrated Vendor</span>
                         </div>
                     </button>
                     <button type="button" class="outline-none flex-1 rounded-lg bg-white dark:bg-gray-900 border-2 border-transparent px-4 py-2 flex items-center justify-center {{if (eq @options.action "create") 'border-blue-500'}}" {{on "click" (fn (mut @options.action) "create")}}>
@@ -16,7 +16,7 @@
                             <FaIcon @icon="building" @size="xl" class="text-blue-500" />
                         </div>
                         <div>
-                            <h3 class="text-gray-900 dark:text-gray-100">Create Custom Vendor</h3>
+                            <span class="text-gray-900 dark:text-gray-100 text-lg">Create Custom Vendor</span>
                         </div>
                     </button>
                 </div>
@@ -31,7 +31,7 @@
                             <img src={{integratedVendor.logo}} alt={{integratedVendor.code}} class="w-20 h-20" width="80" height="80" />
                         </div>
                         <div>
-                            <h3 class="text-sm font-semibold dark:text-white">{{integratedVendor.name}}</h3>
+                            <span class="text-sm font-semibold dark:text-white text-lg">{{integratedVendor.name}}</span>
                         </div>
                     </button>
                 {{/each}}
@@ -91,13 +91,13 @@
                             <InputGroup @name={{smart-humanize param.key}} @value={{mut (get @options.vendor.credentials param.key)}} @helpText={{concat "Optionally supply your own " (smart-humanize param.key) " to configure this vendor."}} />
                         {{/each}}
                         <div class="my-4">
-                            <Button @text="Cancel credentials reset" @type="danger" @size="sm" @icon="times" @onClick={{fn @options.toggleCredentialsReset}} />
+                            <Button @text="Cancel credentials reset" @type="danger" @size="sm" @icon="times" @onClick={{@options.toggleCredentialsReset}} />
                         </div>
                     {{else}}
                         <div>
                             <div class="rounded-md border border-blue-300 dark:border-blue-600 bg-blue-100 dark:bg-blue-500 text-blue-900 dark:text-white text-sm px-4 py-2 mb-4">
                                 <p class="mb-2">Sensitive credentials can only be reset, to update credentials you must re-enter the credentials.</p>
-                                <Button @type="default" @size="xs" @icon="repeat" @text="Click here to reset" @onClick={{fn @options.toggleCredentialsReset}} />
+                                <Button @type="default" @size="xs" @icon="repeat" @text="Click here to reset" @onClick={{@options.toggleCredentialsReset}} />
                             </div>
                         </div>
                         {{#each @options.vendor.provider_settings.credential_params as |param|}}
@@ -147,13 +147,13 @@
                             </label>
                             <div class="mb-1.5 flex flex-row">
                                 {{#if @options.vendor.has_place}}
-                                    <Button @type="default" @size="xs" @icon="edit" @text="Edit" @onClick={{fn @options.editAddress}} />
+                                    <Button @type="default" @size="xs" @icon="edit" @text="Edit" @onClick={{@options.editAddress}} />
                                 {{/if}}
-                                <Button @type="default" @size="xs" @icon="plus" @text="New" @onClick={{fn @options.newAddress}} />
+                                <Button @type="default" @size="xs" @icon="plus" @text="New" @onClick={{@options.newAddress}} />
                             </div>
                         </div>
 
-                        <ModelSelect @modelName="place" @selectedModel={{@options.vendor.place}} @placeholder="Select Address" @triggerClass="form-select form-input" @infiniteScroll={{false}} @renderInPlace={{true}} @onChange={{fn @options.selectAddress}} as |model|>
+                        <ModelSelect @modelName="place" @selectedModel={{@options.vendor.place}} @placeholder="Select Address" @triggerClass="form-select form-input" @infiniteScroll={{false}} @renderInPlace={{true}} @onChange={{@options.selectAddress}} as |model|>
                             {{model.name}} - {{model.street1}}
                         </ModelSelect>
                     </InputGroup>

package/addon/components/modals/zone-form.hbs

@@ -2,7 +2,7 @@
     <div class="modal-body-container">
         <div class="input-group">
             <InputLabel @labelText="Zone Name" @helpText="Set a display name for the zone." @required={{true}} />
-            <Input @value={{@options.zone.name}} type="text" class="w-full form-input" placeholder="Zone Name" />
+            <Input @value={{@options.zone.name}}  @type="text" class="w-full form-input" placeholder="Zone Name" />
         </div>
 
         <InputGroup @type="color" @value={{@options.zone.stroke_color}} @name="Zone Border Color" @helpText="Customize the border color for this zone." class="p-0 border-0 m-0 w-8 h-8 bg-transparent rounded-none" />

package/addon/components/order-config/activity-flow-editor.hbs

@@ -81,7 +81,7 @@
                                                                     </div>
                                                                     <Select @options={{this.logicOperators}} @value={{get logic 1}} @optionLabel="label" @optionValue="value" @onSelect={{fn this.updateActivityLogic status event conditionIndex 1}} @placeholder="Select operator" />
                                                                     <div class="flex items-center col-span-2">
-                                                                        <Input @type="text" @value={{get logic 2}} @onKeyUp={{fn this.updateActivityLogic status event conditionIndex 2}} placeholder="Enter value to compare" class="form-input w-full flex-1 mr-3" />
+                                                                        <Input @type="text" @value={{get logic 2}} {{on "keyup" (fn this.updateActivityLogic status event conditionIndex 2)}} placeholder="Enter value to compare" class="form-input w-full flex-1 mr-3" />
                                                                         <Button @size="sm" @icon="trash" @onClick={{fn this.removeLogicCondition event logic}} />
                                                                     </div>
                                                                 </div>

package/addon/components/order-config/fields-editor.js

@@ -196,27 +196,22 @@ export default class OrderConfigFieldsEditorComponent extends Component {
         }
     }
 
+    /* eslint no-unused-vars: "off" */
     @action sortMetaFieldOptions(metaField, el, target) {
-        console.log(`sortMetaFieldOptions`, ...arguments);
+        // console.log(`[sortMetaFieldOptions()]`, ...arguments);
         // const { fields } = this;
         // const { index } = el.dataset;
         // const parentEl = el.parentElement();
-
         // console.log(parentEl);
         // const { metaGroupKey } = target.dataset;
-
         // // get the index of the moved metafield
         // const metaFieldIndex = fields.findIndex((field) => field.key === metaFieldKey);
-
         // // get the meta field and update the group
         // const metaField = fields[metaFieldIndex];
-
         // if (!metaField) {
         //     return;
         // }
-
         // metaField.group = metaGroupKey;
-
         // if (typeof this.args.onFieldsChanged === 'function') {
         //     this.args.onFieldsChanged(fields);
         // }

package/addon/components/order-list-overlay/order.hbs

@@ -1,5 +1,4 @@
 <div class="{{@wrapperClass}}">
-    {{log @order}}
     <a href="javascript:;" class="order-listings-row flex flex-col {{if @isSelected 'selected'}}" {{on "click" (fn @onClick @order)}} {{on "dblclick" (fn @onDoubleClick @order)}} ...attributes>
         <div class="flex flex-row items-center">
             <div class="mr-4 text-gray-600 {{if @isSelected 'text-blue-900'}}">

package/addon/components/order-list-overlay.hbs

@@ -9,7 +9,7 @@
         {{#if this.selectedOrders.length}}
             <BasicDropdown class="mr-2" @renderInPlace={{true}} as |dd|>
                 <dd.Trigger>
-                    <div role="button" class="next-org-button-trigger has-selections {{if dd.isOpen 'is-open'}}">
+                    <div class="next-org-button-trigger has-selections {{if dd.isOpen 'is-open'}}">
                         <FaIcon @icon="ellipsis-h" @prefix="fas" class="text-gray-800 dark:text-white" />
                     </div>
                 </dd.Trigger>
@@ -32,7 +32,7 @@
         {{/if}}
         <BasicDropdown @renderInPlace={{true}} as |dd|>
             <dd.Trigger>
-                <div role="button" class="next-org-button-trigger {{if dd.isOpen 'is-open'}}">
+                <div class="next-org-button-trigger {{if dd.isOpen 'is-open'}}">
                     <FaIcon @icon="ellipsis-h" @prefix="fas" class="text-gray-900 dark:text-gray-500" />
                 </div>
             </dd.Trigger>

package/addon/controllers/management/contacts/index.js

@@ -1,8 +1,8 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action, get } from '@ember/object';
-import { isArray } from '@ember/array';
+import { action } from '@ember/object';
+import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
@@ -82,7 +82,7 @@ export default class ManagementContactsIndexController extends Controller {
      *
      * @var {String}
      */
-    @tracked sort= '-created_at';
+    @tracked sort = '-created_at';
 
     /**
      * The filterable param `public_id`
@@ -429,7 +429,7 @@ export default class ManagementContactsIndexController extends Controller {
     @action deleteContact(contact, options = {}) {
         this.crud.delete(contact, {
             acceptButtonIcon: 'trash',
-            onConfirm: (contact) => {
+            onConfirm: () => {
                 this.hostRouter.refresh();
             },
             ...options,

package/addon/controllers/management/fleets/index.js

@@ -2,6 +2,7 @@ import Controller, { inject as controller } from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
@@ -95,7 +96,7 @@ export default class ManagementFleetsIndexController extends Controller {
      *
      * @var {String}
      */
-    @tracked sort= '-created_at';
+    @tracked sort = '-created_at';
 
     /**
      * The filterable param `public_id`
@@ -438,8 +439,6 @@ export default class ManagementFleetsIndexController extends Controller {
      * @void
      */
     @action editFleet(fleet, options = {}) {
-        const isNew = fleet.get('isNew');
-
         this.modalsManager.show('modals/fleet-form', {
             title: 'Edit Fleet',
             acceptButtonText: 'Save Changes',
@@ -448,7 +447,7 @@ export default class ManagementFleetsIndexController extends Controller {
             declineButtonIconPrefix: 'fas',
             statusOptions: this.statusOptions,
             fleet,
-            confirm: (modal, done) => {
+            confirm: (modal) => {
                 modal.startLoading();
 
                 return fleet

package/addon/controllers/management/fuel-reports/index.js

@@ -2,6 +2,7 @@ import Controller, { inject as controller } from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
@@ -95,7 +96,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
      *
      * @var {String}
      */
-    @tracked sort= '-created_at';
+    @tracked sort = '-created_at';
 
     /**
      * The filterable param `public_id`
@@ -419,7 +420,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
      */
     @action deleteFuelReport(fuelReport, options = {}) {
         this.crud.delete(fuelReport, {
-            onConfirm: (fuelReport) => {
+            onConfirm: () => {
                 this.hostRouter.refresh();
             },
             ...options,

package/addon/controllers/management/issues/index.js

@@ -1,7 +1,8 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
+import { isBlank } from '@ember/object';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 

package/addon/controllers/management/places/index.js

@@ -1,10 +1,9 @@
 import Controller, { inject as controller } from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action, computed } from '@ember/object';
-import { A, isArray } from '@ember/array';
+import { action } from '@ember/object';
+import { isBlank } from '@ember/utils';
 import { task, timeout } from 'ember-concurrency';
-import isModel from '@fleetbase/ember-core/utils/is-model';
 import Point from '@fleetbase/fleetops-data/utils/geojson/point';
 
 export default class ManagementPlacesIndexController extends Controller {
@@ -209,7 +208,7 @@ export default class ManagementPlacesIndexController extends Controller {
             sortable: true,
             filterable: true,
             filterComponent: 'filter/country',
-            filterParam: 'country'
+            filterParam: 'country',
         },
         {
             label: 'Created At',
@@ -483,7 +482,7 @@ export default class ManagementPlacesIndexController extends Controller {
      */
     @action deletePlace(place, options = {}) {
         this.crud.delete(place, {
-            onConfirm: (place) => {
+            onConfirm: () => {
                 return this.hostRouter.refresh();
             },
             ...options,

package/addon/controllers/management/vehicles/index.js

@@ -99,7 +99,7 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      *
      * @var {String}
      */
-    @tracked sort= '-created_at';
+    @tracked sort = '-created_at';
 
     /**
      * The filterable param `public_id`.
@@ -612,5 +612,5 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      * @todo implement
      * @void
      */
-    @action assignDriver(vehicle, options = {}) {}
+    @action assignDriver() {}
 }

package/addon/controllers/management/vendors/index.js

@@ -1,10 +1,11 @@
 import Controller, { inject as controller } from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action, get } from '@ember/object';
+import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import { isArray } from '@ember/array';
 import { capitalize } from '@ember/string';
+import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 import apiUrl from '@fleetbase/ember-core/utils/api-url';
 
@@ -434,7 +435,7 @@ export default class ManagementVendorsIndexController extends Controller {
                     credentials: {},
                     options: {},
                     credential_params,
-                    option_params
+                    option_params,
                 });
 
                 this.modalsManager.setOption('integratedVendor', vendor);
@@ -509,7 +510,7 @@ export default class ManagementVendorsIndexController extends Controller {
                     },
                 });
             },
-            confirm: (modal, done) => {
+            confirm: (modal) => {
                 modal.startLoading();
 
                 const isAddingIntegratedVendor = modal.getOption('action') !== undefined && modal.getOption('integratedVendor')?.isNew;

package/addon/controllers/management.js

@@ -1,5 +1,3 @@
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
 
 export default class ManagementController extends Controller {}

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

@@ -10,7 +10,6 @@ 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';
-import getModelName from '@fleetbase/ember-core/utils/get-model-name';
 
 export default class OperationsOrdersIndexViewController extends Controller {
     /**

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

@@ -4,6 +4,7 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { equal } from '@ember/object/computed';
 import { isArray } from '@ember/array';
+import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 import isModel from '@fleetbase/ember-core/utils/is-model';

package/addon/controllers/operations/service-rates/index.js

@@ -1,7 +1,7 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
@@ -250,7 +250,7 @@ export default class OperationsServiceRatesIndexController extends Controller {
      */
     @action deleteServiceRate(serviceRate, options = {}) {
         this.crud.delete(serviceRate, {
-            onSuccess: (serviceRate) => {
+            onSuccess: () => {
                 return this.hostRouter.refresh();
             },
             ...options,

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

@@ -2,6 +2,7 @@ import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { later } from '@ember/runloop';
 import GeoJson from '@fleetbase/fleetops-data/utils/geojson/geo-json';
 import FeatureCollection from '@fleetbase/fleetops-data/utils/geojson/feature-collection';
 import last from '@fleetbase/ember-core/utils/last';
@@ -120,9 +121,13 @@ export default class OperationsZonesIndexController extends Controller {
         this.leafletMap = event.target;
 
         // handle resize event now
-        setTimeout(() => {
-            this.leafletMap.invalidateSize();
-        }, 100);
+        later(
+            this,
+            () => {
+                this.leafletMap.invalidateSize();
+            },
+            100
+        );
     }
 
     /**

package/addon/helpers/feature-group.js

@@ -1,5 +1,4 @@
 import { helper } from '@ember/component/helper';
-/* global L */
 
 /**
  * Represents a Leaflet FeatureGroup

package/addon/routes/comms/chat.js

@@ -1,3 +1,3 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({});
+export default class CommsChatRoute extends Route {}

package/addon/routes/comms/intercom.js

@@ -1,3 +1,3 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({});
+export default class CommsIntercomRoute extends Route {}

package/addon/routes/management/contacts/index.js

@@ -1,6 +1,5 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
 
 export default class ManagementContactsIndexRoute extends Route {
     @service store;

package/addon/routes/operations/dispatch.js

@@ -1,3 +1,3 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({});
+export default class OperationsDispatchRoute extends Route {}

package/addon/services/service-areas.js

@@ -5,7 +5,6 @@ import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 import { dasherize } from '@ember/string';
 import { later } from '@ember/runloop';
-import first from '@fleetbase/ember-core/utils/first';
 import GeoJson from '@fleetbase/fleetops-data/utils/geojson/geo-json';
 import MultiPolygon from '@fleetbase/fleetops-data/utils/geojson/multi-polygon';
 import Polygon from '@fleetbase/fleetops-data/utils/geojson/polygon';

package/addon/templates/management/index.hbs

@@ -1,49 +1,49 @@
 <div class="content">
     <div class="row">
         <div class="col-12 col-lg-3 col-xl-3">
-            <LinkTo @route="dashboard.fleet-ops.management.vendors" @tagName="div" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
+            <LinkTo @route="dashboard.fleet-ops.management.vendors" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
                 <p class="font-semibold text-lg mb-1 text-black group-hover:text-white">Vendors</p>
                 <p class="text-grey-darker group-hover:text-white mb-2">Manage your vendors</p>
             </LinkTo>
         </div>
         <div class="col-12 col-lg-3 col-xl-3">
-            <LinkTo @route="dashboard.fleet-ops.management.fleets" @tagName="div" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
+            <LinkTo @route="dashboard.fleet-ops.management.fleets" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
                 <p class="font-semibold text-lg mb-1 text-black group-hover:text-white">Fleets</p>
                 <p class="text-grey-darker group-hover:text-white mb-2">Manage your vendors</p>
             </LinkTo>
         </div>
         <div class="col-12 col-lg-3 col-xl-3">
-            <LinkTo @route="dashboard.fleet-ops.management.drivers" @tagName="div" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
+            <LinkTo @route="dashboard.fleet-ops.management.drivers" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
                 <p class="font-semibold text-lg mb-1 text-black group-hover:text-white">Drivers</p>
                 <p class="text-grey-darker group-hover:text-white mb-2">Manage your vendors</p>
             </LinkTo>
         </div>
         <div class="col-12 col-lg-3 col-xl-3">
-            <LinkTo @route="dashboard.fleet-ops.management.vehicles" @tagName="div" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
+            <LinkTo @route="dashboard.fleet-ops.management.vehicles" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
                 <p class="font-semibold text-lg mb-1 text-black group-hover:text-white">Vehicles</p>
                 <p class="text-grey-darker group-hover:text-white mb-2">Manage your vendors</p>
             </LinkTo>
         </div>
         <div class="col-12 col-lg-3 col-xl-3">
-            <LinkTo @route="dashboard.fleet-ops.management.places" @tagName="div" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
+            <LinkTo @route="dashboard.fleet-ops.management.places" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
                 <p class="font-semibold text-lg mb-1 text-black group-hover:text-white">Places</p>
                 <p class="text-grey-darker group-hover:text-white mb-2">Manage your vendors</p>
             </LinkTo>
         </div>
         <div class="col-12 col-lg-3 col-xl-3">
-            <LinkTo @route="dashboard.fleet-ops.management.contacts" @tagName="div" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
+            <LinkTo @route="dashboard.fleet-ops.management.contacts" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
                 <p class="font-semibold text-lg mb-1 text-black group-hover:text-white">Contacts</p>
                 <p class="text-grey-darker group-hover:text-white mb-2">Manage your vendors</p>
             </LinkTo>
         </div>
         <div class="col-12 col-lg-3 col-xl-3">
-            <LinkTo @route="dashboard.fleet-ops.management.issues" @tagName="div" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
+            <LinkTo @route="dashboard.fleet-ops.management.issues" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
                 <p class="font-semibold text-lg mb-1 text-black group-hover:text-white">Issues</p>
                 <p class="text-grey-darker group-hover:text-white mb-2">Manage your vendors</p>
             </LinkTo>
         </div>
         <div class="col-12 col-lg-3 col-xl-3">
-            <LinkTo @route="dashboard.fleet-ops.management.fuel-reports" @tagName="div" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
+            <LinkTo @route="dashboard.fleet-ops.management.fuel-reports" class="group hover:bg-flb-blue p-4 cursor-pointer bg-white rounded max-w-xs w-full shadow-lg select-none overflow-hidden mx-auto mb-6">
                 <p class="font-semibold text-lg mb-1 text-black group-hover:text-white">Fuel Reports</p>
                 <p class="text-grey-darker group-hover:text-white mb-2">Manage your vendors</p>
             </LinkTo>

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

@@ -365,10 +365,10 @@
                                             </div>
                                             <div class="space-y-2">
                                                 <div>
-                                                    <Input @value={{entity.name}} type="text" class="w-full form-input form-input-sm" placeholder="Name" />
+                                                    <Input @value={{entity.name}}  @type="text" class="w-full form-input form-input-sm" placeholder="Name" />
                                                 </div>
                                                 <div>
-                                                    <Input @value={{entity.sku}} type="text" class="w-full form-input form-input-sm" placeholder="SKU" />
+                                                    <Input @value={{entity.sku}}  @type="text" class="w-full form-input form-input-sm" placeholder="SKU" />
                                                 </div>
                                                 <Button @icon="pencil" @text="Edit Item" @size="sm" @onClick={{fn this.editEntity entity}} />
                                             </div>
@@ -392,10 +392,10 @@
                                 </div>
                                 <div class="space-y-2">
                                     <div>
-                                        <Input @value={{entity.name}} type="text" class="w-full form-input form-input-sm" placeholder="Name" />
+                                        <Input @value={{entity.name}}  @type="text" class="w-full form-input form-input-sm" placeholder="Name" />
                                     </div>
                                     <div>
-                                        <Input @value={{entity.sku}} type="text" class="w-full form-input form-input-sm" placeholder="SKU" />
+                                        <Input @value={{entity.sku}}  @type="text" class="w-full form-input form-input-sm" placeholder="SKU" />
                                     </div>
                                     {{#if this.waypoints.length}}
                                         <select class="form-select w-full form-input-sm" {{on "change" (fn

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

@@ -294,7 +294,7 @@
         <ContentPanel @title="Restrict Service" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
             <div class="input-group">
                 <InputLabel @labelText="Service Area" @helpText="Restrict this service to order request originating from a service area." />
-                <Select class="w-full" @options={{this.serviceAreas}} @optionLabel="name" @optionValue="id" @value={{this.serviceRate.service_area_uuid}} @onSelect={{fn this.selectServiceArea}} @placeholder="Restrict to service area" @disabled={{not this.serviceAreas.length}} />
+                <Select class="w-full" @options={{this.serviceAreas}} @optionLabel="name" @optionValue="id" @value={{this.serviceRate.service_area_uuid}} @onSelect={{this.selectServiceArea}} @placeholder="Restrict to service area" @disabled={{not this.serviceAreas.length}} />
             </div>
 
             {{#if this.serviceRate.service_area_uuid}}

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

@@ -32,20 +32,20 @@
                     </div>
                 </div>
                 <div class="content-panel-body no-padding sidebar-panels not-service-nav w-full">
-                    <ContentPanel @title={{serviceArea.name}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+                    <ContentPanel @title={{this.activeServiceArea.name}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
                         <div class="px-2 mb-2">
                             <div class="flex items-center justify-end">
-                                <Button class="mr-2" @icon="eye" @type="magic" @text="Focus" @onClick={{fn this.startZoneEditing serviceArea}} @helpText="Moves map focus to {{serviceArea.name}}. Once focused you will then be able to edit, delete, and define zone bounds for the service area." />
-                                <DropdownButton @icon="cog" @size="sm" @contentClass="dropdown-menu" @size="xs" @horizontalPosition="right" @helpText="Service Area options." as |dd|>
+                                <Button class="mr-2" @icon="eye" @type="magic" @text="Focus" @onClick={{fn this.startZoneEditing this.activeServiceArea}} @helpText="Moves map focus to {{this.activeServiceArea.name}}. Once focused you will then be able to edit, delete, and define zone bounds for the service area." />
+                                <DropdownButton @icon="cog" @contentClass="dropdown-menu" @size="xs" @horizontalPosition="right" @helpText="Service Area options.">
                                     <div class="dropdown-menu-content context-menu">
-                                        <a href="javascript:;" class="dropdown-menu-item" {{on "click" (fn this.renameServiceArea serviceArea)}}>Rename Service Area</a>
-                                        <a href="javascript:;" class="dropdown-menu-item" {{on "click" (fn this.deleteServiceArea serviceArea)}}>Delete Service Area</a>
+                                        <a href="javascript:;" class="dropdown-menu-item" {{on "click" (fn this.renameServiceArea this.activeServiceArea)}}>Rename Service Area</a>
+                                        <a href="javascript:;" class="dropdown-menu-item" {{on "click" (fn this.deleteServiceArea this.activeServiceArea)}}>Delete Service Area</a>
                                     </div>
                                 </DropdownButton>
                             </div>
                         </div>
                         <div class="px-0 py-1">
-                            {{#each serviceArea.zones as |zone|}}
+                            {{#each this.activeServiceArea.zones as |zone|}}
                                 <div class="flex items-center justify-between border-t w-full border-gray-900 py-3 px-5 dark:text-gray-100">
                                     <div>
                                         <div class="font-semibold mb-1">

package/config/environment.js

@@ -19,7 +19,6 @@ module.exports = function (environment) {
     return ENV;
 };
 
-
 function getenv(variable, defaultValue = null) {
     return process.env[variable] !== undefined ? process.env[variable] : defaultValue;
-}
+}

package/index.js

@@ -12,7 +12,7 @@ module.exports = buildEngine({
         enabled: true,
     },
 
-    included: function (app) {
+    included: function () {
         this._super.included.apply(this, arguments);
 
         const importJs = (module, file, options) => {
@@ -36,13 +36,13 @@ module.exports = buildEngine({
         const leafletPath = path.dirname(require.resolve('leaflet'));
         const leafletImagesPath = path.join(leafletPath, 'images');
         const addonTree = [
-            new Funnel(`node_modules/${name}/assets`, {
-                destDir: '/',
-            }),
             new Funnel(leafletImagesPath, {
                 srcDir: '/',
                 destDir: '/leaflet-images',
             }),
+            new Funnel(path.join(__dirname, 'assets'), {
+                destDir: '/',
+            }),
         ];
 
         // Merge the addon tree with the existing tree