@fleetbase/fleetops-engine 0.0.3 → 0.0.5

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

package/package.json

@@ -2,7 +2,7 @@
     "name": "@fleetbase/fleetops-engine",
     "extension": "Fleet Ops",
     "icon": "route",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "priority": 0,
     "description": "Fleetbase Fleet-Ops extension provides a fleet management and last mile delivery operations system module.",
     "keywords": [
@@ -36,12 +36,13 @@
         "test:ember-compatibility": "ember try:each"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.0.1",
-        "@fleetbase/ember-ui": "^0.0.2",
+        "@fleetbase/ember-core": "^0.0.2",
+        "@fleetbase/ember-ui": "^0.0.4",
         "@fleetbase/fleetops-data": "^0.0.1",
         "@fleetbase/leaflet-routing-machine": "^3.2.15",
         "@fortawesome/ember-fontawesome": "^0.4.1",
-        "@fortawesome/free-solid-svg-icons": "^6.2.0",
+        "@fortawesome/fontawesome-svg-core": "^6.4.0",
+        "@fortawesome/free-solid-svg-icons": "^6.4.0",
         "@terraformer/spatial": "^2.1.2",
         "@zestia/ember-dragula": "^12.0.0",
         "broccoli-funnel": "^3.0.8",
@@ -55,7 +56,8 @@
         "leaflet": "^1.8.0",
         "leaflet-contextmenu": "^1.4.0",
         "leaflet-draw": "^1.0.4",
-        "leaflet-rotatedmarker": "^0.2.0"
+        "leaflet-rotatedmarker": "^0.2.0",
+        "socketcluster-client": "^17.1.1"
     },
     "devDependencies": {
         "@ember/optional-features": "^2.0.0",

package/addon/components/event-timeline.hbs

@@ -1,7 +0,0 @@
-<div class="timeline" {{did-insert (fn this.createTimeline this.defaultSettings)}}>
-    <div class="timeline__wrap">
-        <div class="timeline__items">
-            {{yield}}
-        </div>
-    </div>
-</div>