@fleetbase/fleetops-engine 0.0.9 → 0.1.1

package/addon/components/live-map.js

@@ -9,7 +9,6 @@ import { alias } from '@ember/object/computed';
 import { guidFor } from '@ember/object/internals';
 import { later } from '@ember/runloop';
 import { allSettled } from 'rsvp';
-import config from 'ember-get-config';
 
 const DEFAULT_LATITUDE = 1.369;
 const DEFAULT_LONGITUDE = 103.8864;
@@ -17,6 +16,7 @@ const DEFAULT_LONGITUDE = 103.8864;
 export default class LiveMapComponent extends Component {
     @service store;
     @service fetch;
+    @service socket;
     @service currentUser;
     @service notifications;
     @service serviceAreas;
@@ -681,20 +681,9 @@ export default class LiveMapComponent extends Component {
      * Functions are used to fetch date or handle socket callbacks/initializations.
      *
      */
-
-    createSocketClusterClient() {
-        const socketConfig = { ...config.socket };
-
-        if (isBlank(socketConfig.hostname)) {
-            socketConfig.hostname = window.location.hostname;
-        }
-
-        return socketClusterClient.create(socketConfig);
-    }
-
     @action watchDrivers(drivers = []) {
         // setup socket
-        const socket = this.createSocketClusterClient();
+        const socket = this.socket.instance();
 
         // listen for stivers
         for (let i = 0; i < drivers.length; i++) {

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

@@ -18,7 +18,7 @@
                 <CountrySelect class="w-full form-input form-select form-datalist" @value={{@options.place.country}} @onChange={{fn (mut @options.place.country)}} placeholder="Country" />
             </InputGroup>
             <InputGroup @name="Coordinates" @wrapperClass="col-span-2">
-                <CoordinatesInput @value={{@options.place.location}} @onChange={{@options.updatePlaceCoordinates}} @onGeocode={{@options.autocomplete}} @onInit={{@options.setCoordinatesInput}} />
+                <CoordinatesInput @value={{@options.place.location}} @onChange={{@options.updatePlaceCoordinates}} @onGeocode={{@options.autocomplete}} @onUpdatedFromMap={{@options.reverseGeocode}} @onInit={{@options.setCoordinatesInput}} />
             </InputGroup>
             <div class="col-span-1"></div>
             <InputGroup @name="Phone">

package/addon/components/order-config.js

@@ -3,13 +3,12 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action, computed, set } from '@ember/object';
 import { equal } from '@ember/object/computed';
-import { isBlank } from '@ember/utils';
 import isModel from '@fleetbase/ember-core/utils/is-model';
-import config from 'ember-get-config';
 
 export default class OrderConfigComponent extends Component {
     @service modalsManager;
     @service fetch;
+    @service socket;
     @service store;
     @service notifications;
     @service crud;
@@ -255,22 +254,12 @@ export default class OrderConfigComponent extends Component {
         });
     }
 
-    createSocketClusterClient() {
-        const socketConfig = { ...config.socket };
-
-        if (isBlank(socketConfig.hostname)) {
-            socketConfig.hostname = window.location.hostname;
-        }
-
-        return socketClusterClient.create(socketConfig);
-    }
-
     async listenForUninstallProgress(extension) {
         // get channel identifier
         const channelId = `${extension.id}:${this.currentUser.id}`;
 
         // setup socket
-        const socket = this.createSocketClusterClient();
+        const socket = this.socket.instance();
 
         // get channel
         const channel = socket.subscribe(channelId);

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

@@ -9,6 +9,7 @@ import { task } from 'ember-concurrency-decorators';
 import extractCoordinates from '@fleetbase/ember-core/utils/extract-coordinates';
 import leafletIcon from '@fleetbase/ember-core/utils/leaflet-icon';
 import generateSlug from '@fleetbase/ember-core/utils/generate-slug';
+import Point from '@fleetbase/fleetops-data/utils/geojson/point';
 
 export default class ManagementDriversIndexController extends Controller {
     /**
@@ -672,7 +673,6 @@ export default class ManagementDriversIndexController extends Controller {
                         type: `driver_photo`,
                     },
                     (uploadedFile) => {
-                        console.log('uploadedFile', uploadedFile);
                         driver.setProperties({
                             photo_uuid: uploadedFile.id,
                             photo_url: uploadedFile.url,
@@ -684,6 +684,12 @@ export default class ManagementDriversIndexController extends Controller {
             confirm: (modal, done) => {
                 modal.startLoading();
 
+                if (isBlank(driver.location)) {
+                    // set default location from currentUser service
+                    const { latitude, longitude } = this.currentUser;
+                    driver.set('location', new Point(latitude, longitude));
+                }
+
                 driver
                     .save()
                     .then((driver) => {
@@ -696,7 +702,6 @@ export default class ManagementDriversIndexController extends Controller {
                         done();
                     })
                     .catch((error) => {
-                        console.log(error);
                         // driver.rollbackAttributes();
                         modal.stopLoading();
                         this.notifications.serverError(error);

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

@@ -42,6 +42,13 @@ export default class ManagementPlacesIndexController extends Controller {
      */
     @service store;
 
+    /**
+     * Inject the `fetch` service
+     *
+     * @var {Service}
+     */
+    @service fetch;
+
     /**
      * Inject the `filters` service
      *
@@ -434,14 +441,21 @@ export default class ManagementPlacesIndexController extends Controller {
             autocomplete: (selected) => {
                 const coordinatesInputComponent = this.modalsManager.getOption('coordinatesInputComponent');
 
-                console.log('selected', selected);
-
                 place.setProperties({ ...selected });
 
                 if (coordinatesInputComponent) {
                     coordinatesInputComponent.updateCoordinates(selected.location);
                 }
             },
+            reverseGeocode: ({ latitude, longitude }) => {
+                return this.fetch.get('geocoder/reverse', { coordinates: [latitude, longitude].join(','), single: true }).then((result) => {
+                    if (isBlank(result)) {
+                        return;
+                    }
+
+                    place.setProperties({ ...result });
+                });
+            },
             setCoordinatesInput: (coordinatesInputComponent) => {
                 this.modalsManager.setOption('coordinatesInputComponent', coordinatesInputComponent);
             },

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

@@ -674,8 +674,8 @@ export default class OperationsOrdersIndexNewController extends Controller {
                 profile: 'driving',
             });
 
-            console.log('[this.routePreviewArray]', this.routePreviewArray);
-            console.log('[this.routePreviewCoordinates]', this.routePreviewCoordinates);
+            // console.log('[this.routePreviewArray]', this.routePreviewArray);
+            // console.log('[this.routePreviewCoordinates]', this.routePreviewCoordinates);
 
             this.previewRouteControl = new RoutingControl({
                 waypoints: this.routePreviewCoordinates,

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

@@ -1,4 +1,4 @@
-<Overlay @position="right" @noBackdrop={{true}} @isResizable={{true}} @isMaximizable={{true}} @isMinimizable={{true}} @fullHeight={{true}} @onLoad={{this.setupInterface}} as |overlay|>
+<Overlay @position="right" @noBackdrop={{true}} @isResizable={{true}} @isMaximizable={{true}} @isMinimizable={{true}} @width="700px" @fullHeight={{true}} @onLoad={{this.setupInterface}} as |overlay|>
     <Overlay::Header @overlay={{overlay}} @title="New Order" @onPressCancel={{this.transitionBack}}>
         <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">

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

@@ -1,4 +1,4 @@
-<Overlay @position="right" @noBackdrop={{true}} @fullHeight={{true}} @isResizable={{true}} @isMaximizable={{true}} @isMinimizable={{true}} @onLoad={{this.setupInterface}} as |overlay|>
+<Overlay @position="right" @noBackdrop={{true}} @width="700px" @fullHeight={{true}} @isResizable={{true}} @isMaximizable={{true}} @isMinimizable={{true}} @onLoad={{this.setupInterface}} as |overlay|>
     <Overlay::Header @overlay={{overlay}} @title={{@model.public_id}} @status={{@model.status}} @dispatched={{@model.dispatched}} @createdAt={{@model.createdAt}} @onPressCancel={{this.transitionBack}}>
         {{#if @model.canBeDispatched}}
             <Button @type="primary" @icon="paper-plane" @text="Dispatch" class="mr-2" @onClick={{fn this.dispatchOrder @model}} />

package/addon/utils/is-facilitator-supported-place.js

@@ -4,7 +4,7 @@ import { isArray } from '@ember/array';
 export default function isFacilitatorSupportedPlace(facilitator, place) {
     const supportedCountries = facilitator?.get('supported_countries');
     const country = place?.get('country');
-    console.log('isFacilitatorSupportedPlace()', supportedCountries, country, place);
+    // console.log('isFacilitatorSupportedPlace()', supportedCountries, country, place);
 
     if (isEmpty(supportedCountries) || isEmpty(country)) {
         return true;

package/package.json

@@ -2,8 +2,11 @@
     "name": "@fleetbase/fleetops-engine",
     "extension": "Fleet Ops",
     "icon": "route",
-    "version": "0.0.9",
+    "version": "0.1.1",
     "priority": 0,
+    "fleetbase": {
+        "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",
@@ -36,9 +39,9 @@
         "test:ember-compatibility": "ember try:each"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.0.3",
-        "@fleetbase/ember-ui": "^0.0.6",
-        "@fleetbase/fleetops-data": "^0.0.2",
+        "@fleetbase/ember-core": "^0.0.6",
+        "@fleetbase/ember-ui": "^0.0.8",
+        "@fleetbase/fleetops-data": "^0.0.3",
         "@fleetbase/leaflet-routing-machine": "^3.2.15",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",
@@ -51,7 +54,7 @@
         "ember-cli-es6-transform": "^1.0.0",
         "ember-cli-htmlbars": "^6.1.0",
         "ember-leaflet": "^5.1.1",
-        "ember-radio-button": "3.0.0-beta.1",
+        "ember-radio-button": "^3.0.0-beta.1",
         "ember-wormhole": "^0.6.0",
         "leaflet": "^1.9.4",
         "leaflet-contextmenu": "^1.4.0",