@fleetbase/fleetops-engine 0.0.6 → 0.0.8

package/addon/components/leaflet-draw-control.js

@@ -74,7 +74,7 @@ export default class LeafletDrawControl extends BaseLayer {
         const { onDrawControlCreated, onDrawControlAddedToMap } = this.args;
         const showDrawingLayer = getWithDefault(this.args, 'showDrawingLayer', true);
 
-        if (this.map && this._layer) {
+        if (this.map && this._layer && this.L.drawLocal) {
             this.options.edit = assign({ featureGroup: this._layer }, this.options.edit);
             this.options.draw = assign({}, this.L.drawLocal.draw, this.options.draw);
 

package/addon/components/live-map.js

@@ -142,11 +142,14 @@ export default class LiveMapComponent extends Component {
 
     @action toggleDrawControlContextMenuItem() {
         const index = this.currentContextMenuItems.findIndex((options) => options.text?.includes('draw controls'));
-        const options = this.currentContextMenuItems.objectAt(index);
-
-        set(options, 'text', this.isDrawControlsVisible ? `Hide draw controls...` : `Enable draw controls...`);
 
         if (index > 0) {
+            const options = this.currentContextMenuItems.objectAt(index);
+
+            if (!isEmpty(options)) {
+                options.text = this.isDrawControlsVisible ? 'Hide draw controls...' : 'Enable draw controls...';
+            }
+
             this.leafletMap?.contextmenu?.removeItem(index);
             this.leafletMap?.contextmenu?.insertItem(options, index);
         }

package/addon/initializers/load-leaflet-assets.js

@@ -0,0 +1,22 @@
+export function initialize() {
+    const path = '/engines-dist/leaflet/';
+    const scripts = ['leaflet.contextmenu.js', 'leaflet.draw-src.js', 'leaflet.rotatedMarker.js'];
+    const stylesheets = ['leaflet.contextmenu.css', 'leaflet.draw.css'];
+
+    for (let i = 0; i < scripts.length; i++) {
+        const script = document.createElement('script');
+        script.src = path + scripts[i];
+        document.body.appendChild(script);
+    }
+
+    for (let i = 0; i < stylesheets.length; i++) {
+        const link = document.createElement('link');
+        link.rel = 'stylesheet';
+        link.href = path + stylesheets[i];
+        document.body.appendChild(link);
+    }
+}
+
+export default {
+    initialize,
+};

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

@@ -29,7 +29,7 @@ export default class OperationsOrdersIndexRoute extends Route {
         this.controller?.resetView(transition);
     }
 
-    model(params) {
+    @action model(params) {
         return this.store.query('order', params);
     }
 }

package/index.js

@@ -1,8 +1,9 @@
 'use strict';
-const Funnel = require('broccoli-funnel');
-const MergeTrees = require('broccoli-merge-trees');
 const { buildEngine } = require('ember-engines/lib/engine-addon');
 const { name } = require('./package');
+const Funnel = require('broccoli-funnel');
+const MergeTrees = require('broccoli-merge-trees');
+const resolve = require('resolve');
 const path = require('path');
 
 module.exports = buildEngine({
@@ -12,44 +13,51 @@ module.exports = buildEngine({
         enabled: true,
     },
 
-    included: function () {
-        this._super.included.apply(this, arguments);
-
-        const importJs = (module, file, options) => {
-            const modulePath = path.dirname(require.resolve(module));
-            this.import(`${modulePath}/${file}`, options);
-        };
-
-        importJs('leaflet-rotatedmarker', 'leaflet.rotatedMarker.js');
-        importJs('leaflet-draw', 'leaflet.draw-src.js');
-        importJs('leaflet-contextmenu', 'leaflet.contextmenu.js');
-
-        // import stylesheets
-        this.import('node_modules/leaflet-contextmenu/dist/leaflet.contextmenu.css');
-        this.import('node_modules/leaflet-draw/dist/leaflet.draw.css');
-    },
-
     treeForPublic: function () {
         const publicTree = this._super.treeForPublic.apply(this, arguments);
-
-        // Use a Funnel assets
         const leafletPath = path.dirname(require.resolve('leaflet'));
         const leafletImagesPath = path.join(leafletPath, 'images');
-        const addonTree = [
+        const alwaysExclude = ['LICENSE', 'package.json', 'example.html'];
+        const leafletAddons = [
+            { package: 'leaflet', include: ['leaflet-src.js'], exclude: [...alwaysExclude], path: ['dist'] },
+            { package: 'leaflet-contextmenu', include: undefined, exclude: [...alwaysExclude], path: ['dist'] },
+            { package: 'leaflet-draw', include: undefined, exclude: [...alwaysExclude], path: ['dist'] },
+            { package: 'leaflet-rotatedmarker', include: undefined, exclude: [...alwaysExclude], path: [] },
+        ];
+        const trees = [];
+
+        for (let i = 0; i < leafletAddons.length; i++) {
+            const leafletAdddon = leafletAddons[i];
+            const leafletAddonDist = path.join(this.pathBase(leafletAdddon.package), ...leafletAdddon.path);
+
+            trees.push(
+                new Funnel(leafletAddonDist, {
+                    destDir: 'leaflet',
+                    include: leafletAdddon.include,
+                    exclude: leafletAdddon.exclude,
+                })
+            );
+        }
+
+        trees.push(
             new Funnel(leafletImagesPath, {
                 srcDir: '/',
                 destDir: '/leaflet-images',
-            }),
+            })
+        );
+        trees.push(
             new Funnel(path.join(__dirname, 'assets'), {
                 destDir: '/',
-            }),
-        ];
+            })
+        );
 
         // Merge the addon tree with the existing tree
-        return publicTree ? new MergeTrees([publicTree, ...addonTree], { overwrite: true }) : new MergeTrees([...addonTree], { overwrite: true });
+        return publicTree ? new MergeTrees([publicTree, ...trees], { overwrite: true }) : new MergeTrees([...trees], { overwrite: true });
     },
 
-    _concatStyles: () => {},
+    pathBase(packageName) {
+        return path.dirname(resolve.sync(packageName + '/package.json', { basedir: __dirname }));
+    },
 
     isDevelopingAddon() {
         return true;

package/package.json

@@ -2,7 +2,7 @@
     "name": "@fleetbase/fleetops-engine",
     "extension": "Fleet Ops",
     "icon": "route",
-    "version": "0.0.6",
+    "version": "0.0.8",
     "priority": 0,
     "description": "Fleetbase Fleet-Ops extension provides a fleet management and last mile delivery operations system module.",
     "keywords": [
@@ -37,7 +37,7 @@
     },
     "dependencies": {
         "@fleetbase/ember-core": "^0.0.2",
-        "@fleetbase/ember-ui": "^0.0.4",
+        "@fleetbase/ember-ui": "^0.0.6",
         "@fleetbase/fleetops-data": "^0.0.2",
         "@fleetbase/leaflet-routing-machine": "^3.2.15",
         "@fortawesome/ember-fontawesome": "^0.4.1",
@@ -50,10 +50,10 @@
         "ember-cli-babel": "^7.26.11",
         "ember-cli-es6-transform": "^1.0.0",
         "ember-cli-htmlbars": "^6.1.0",
-        "ember-leaflet": "^5.0.1",
+        "ember-leaflet": "^5.1.1",
         "ember-radio-button": "3.0.0-beta.1",
         "ember-wormhole": "^0.6.0",
-        "leaflet": "^1.8.0",
+        "leaflet": "^1.9.4",
         "leaflet-contextmenu": "^1.4.0",
         "leaflet-draw": "^1.0.4",
         "leaflet-rotatedmarker": "^0.2.0",
@@ -102,6 +102,7 @@
         "prettier": "^2.7.1",
         "qunit": "^2.19.1",
         "qunit-dom": "^2.0.0",
+        "resolve": "^1.22.2",
         "webpack": "^5.74.0"
     },
     "peerDependencies": {

package/addon/components/modals/resend-verification-email.hbs

@@ -1,25 +0,0 @@
-<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
-    <div class="modal-body-container">
-        <div class="bg-blue-50 rounded shadow-sm border-l-4 border-blue-400 p-4 mb-5">
-            <div class="flex">
-                <div class="flex-shrink-0">
-                    <svg class="h-5 w-5 text-blue-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"
-                        fill="currentColor" aria-hidden="true">
-                        <path fill-rule="evenodd"
-                            d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z"
-                            clip-rule="evenodd" />
-                    </svg>
-                </div>
-                <div class="ml-3 flex items-center">
-                    <span class="font-extrabold text-blue-800">Verify your email address</span>
-                </div>
-            </div>
-            <div class="py-3">
-                <p class="text-blue-700">Re-verify your email address and click Send to continue.</p>
-            </div>
-        </div>
-
-        <InputGroup @type="email" @name="Verify your email address" @value={{@options.email}}
-            @helpText="Have a second look and confirm your email address is correct." @inputClass="input-lg" />
-    </div>
-</Modal::Default>

package/app/components/modals/resend-verification-email.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/components/modals/resend-verification-email';