@fleetbase/fleetops-engine 0.2.2 → 0.2.4

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

@@ -75,7 +75,7 @@ export default class ManagementFleetsIndexController extends Controller {
      *
      * @var {Array}
      */
-    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'internal_id', 'zone', 'service_area', 'created_by', 'updated_by', 'status'];
+    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'internal_id', 'zone', 'service_area', 'parent_fleet', 'vendor', 'created_by', 'updated_by', 'status'];
 
     /**
      * The current page of data being viewed
@@ -118,6 +118,18 @@ export default class ManagementFleetsIndexController extends Controller {
      * @var {String}
      */
     @tracked service_area;
+    /**
+     * The filterable param `parent_fleet`
+     *
+     * @var {String}
+     */
+    @tracked parent_fleet;
+    /**
+     * The filterable param `vendor`
+     *
+     * @var {String}
+     */
+    @tracked vendor;
 
     /**
      * The filterable param `zone`
@@ -184,6 +196,32 @@ export default class ManagementFleetsIndexController extends Controller {
             filterParam: 'service_area',
             model: 'service-area',
         },
+        {
+            label: 'Parent Fleet',
+            cellComponent: 'table/cell/anchor',
+            // action: this.viewServiceArea.bind(this),
+            valuePath: 'parent_fleet.name',
+            resizable: true,
+            width: '130px',
+            filterable: true,
+            filterComponent: 'filter/model',
+            filterComponentPlaceholder: 'Select fleet',
+            filterParam: 'parent_fleet',
+            model: 'fleet',
+        },
+        {
+            label: 'Vendor',
+            cellComponent: 'table/cell/anchor',
+            action: this.viewServiceArea.bind(this),
+            valuePath: 'vendor.name',
+            resizable: true,
+            width: '130px',
+            filterable: true,
+            filterComponent: 'filter/model',
+            filterComponentPlaceholder: 'Select vendor',
+            filterParam: 'vendor',
+            model: 'vendor',
+        },
         {
             label: 'Zone',
             cellComponent: 'table/cell/anchor',
@@ -293,6 +331,10 @@ export default class ManagementFleetsIndexController extends Controller {
                     label: 'View fleet details...',
                     fn: this.viewFleet,
                 },
+                {
+                    label: 'Edit fleet details...',
+                    fn: this.editFleet,
+                },
                 {
                     label: 'Assign driver to fleet...',
                     fn: () => {},
@@ -370,47 +412,8 @@ export default class ManagementFleetsIndexController extends Controller {
      * @param {Object} options
      * @void
      */
-    @action viewFleet(fleet, options = {}) {
-        this.modalsManager.show('modals/fleet-details', {
-            title: fleet.name,
-            titleComponent: 'modal/title-with-buttons',
-            headerStatus: fleet.status,
-            headerButtons: [
-                {
-                    icon: 'cog',
-                    iconPrefix: 'fas',
-                    type: 'link',
-                    size: 'xs',
-                    ddMenuLabel: 'Fleet Actions',
-                    options: [
-                        {
-                            title: 'Edit fleet details...',
-                            action: () => {
-                                this.modalsManager.done().then(() => {
-                                    return this.editFleet(fleet, {
-                                        onFinish: () => {
-                                            this.viewFleet(fleet);
-                                        },
-                                    });
-                                });
-                            },
-                        },
-                    ],
-                },
-            ],
-            acceptButtonText: 'Done',
-            acceptButtonIcon: 'check',
-            acceptButtonIconPrefix: 'fas',
-            hideDeclineButton: true,
-            fleet,
-            addDriver: (driver) => {
-                this.fetch.post('fleets/add', { driver: driver.id, fleet: fleet.id });
-            },
-            removeDriver: (driver) => {
-                this.fetch.post('fleets/remove', { driver: driver.id, fleet: fleet.id });
-            },
-            ...options,
-        });
+    @action viewFleet(fleet) {
+        return this.transitionToRoute('management.fleets.index.details', fleet);
     }
 
     /**
@@ -420,15 +423,7 @@ export default class ManagementFleetsIndexController extends Controller {
      * @void
      */
     @action createFleet() {
-        const fleet = this.store.createRecord('fleet', { status: 'active' });
-
-        return this.editFleet(fleet, {
-            title: 'New Fleet',
-            acceptButtonText: 'Confirm & Create',
-            acceptButtonIcon: 'check',
-            acceptButtonIconPrefix: 'fas',
-            successNotification: (fleet) => `New fleet (${fleet.name}) created.`,
-        });
+        return this.transitionToRoute('management.fleets.index.new');
     }
 
     /**
@@ -438,32 +433,9 @@ export default class ManagementFleetsIndexController extends Controller {
      * @param {Object} options
      * @void
      */
-    @action editFleet(fleet, options = {}) {
-        this.modalsManager.show('modals/fleet-form', {
-            title: 'Edit Fleet',
-            acceptButtonText: 'Save Changes',
-            acceptButtonIcon: 'save',
-            declineButtonIcon: 'times',
-            declineButtonIconPrefix: 'fas',
-            statusOptions: this.statusOptions,
-            fleet,
-            confirm: (modal) => {
-                modal.startLoading();
-
-                return fleet
-                    .save()
-                    .then((fleet) => {
-                        this.notifications.invoke('success', options.successNotification ?? `${fleet.name} details updated.`, fleet);
-
-                        return this.hostRouter.refresh();
-                    })
-                    .catch((error) => {
-                        modal.stopLoading();
-                        this.notifications.serverError(error);
-                    });
-            },
-            ...options,
-        });
+    @action editFleet(fleet) {
+        console.log('xxx', fleet);
+        return this.transitionToRoute('management.fleets.index.edit', fleet);
     }
 
     /**

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

@@ -0,0 +1,12 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+
+export default class ManagementVehiclesIndexDetailsController extends Controller {
+    @tracked view = 'details';
+    @tracked queryParams = ['view'];
+
+    @action transitionBack() {
+        return this.transitionToRoute('management.vehicles.index');
+    }
+}

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

@@ -0,0 +1,8 @@
+import Controller from '@ember/controller';
+import { action } from '@ember/object';
+
+export default class ManagementVehiclesIndexEditController extends Controller {
+    @action transitionBack() {
+        return this.transitionToRoute('management.vehicles.index');
+    }
+}

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

@@ -0,0 +1,21 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class ManagementVehiclesIndexNewController extends Controller {
+    @service store;
+
+    /**
+     * The vehicle being created.
+     *
+     * @var {VehicleModel}
+     */
+    @tracked vehicle = this.store.createRecord('vehicle', {
+        status: `active`,
+    });
+
+    @action transitionBack() {
+        return this.transitionToRoute('management.vehicles.index');
+    }
+}

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

@@ -6,8 +6,6 @@ import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
-import withDefaultValue from '@fleetbase/ember-core/utils/with-default-value';
-import generateSlug from '@fleetbase/ember-core/utils/generate-slug';
 
 export default class ManagementVehiclesIndexController extends ManagementController {
     /**
@@ -217,6 +215,7 @@ export default class ManagementVehiclesIndexController extends ManagementControl
             filterable: true,
             filterComponent: 'filter/string',
             filterParam: 'name',
+            showOnlineIndicator: true,
         },
         {
             label: 'Plate Number',
@@ -441,73 +440,8 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      * @param {Object} options
      * @void
      */
-    @action async viewVehicle(vehicle, options) {
-        await vehicle?.loadDriver();
-
-        this.modalsManager.show('modals/vehicle-details', {
-            title: withDefaultValue(vehicle.display_name),
-            titleComponent: 'modal/title-with-buttons',
-            modalClass: 'modal-lg',
-            acceptButtonText: 'Done',
-            headerButtons: [
-                {
-                    icon: 'cog',
-                    iconPrefix: 'fas',
-                    type: 'link',
-                    size: 'xs',
-                    ddMenuLabel: 'Vehicle Actions',
-                    options: [
-                        {
-                            title: 'Edit vehicle details...',
-                            action: () => {
-                                this.modalsManager.done().then(() => {
-                                    return this.editVehicle(vehicle, {
-                                        onFinish: () => {
-                                            this.viewVehicle(vehicle);
-                                        },
-                                    });
-                                });
-                            },
-                        },
-                        {
-                            title: 'Assign driver to vehicle...',
-                            action: () => {
-                                this.modalsManager.done().then(() => {
-                                    return this.assignDriver(vehicle, {
-                                        onFinish: () => {
-                                            this.viewVehicle(vehicle);
-                                        },
-                                    });
-                                });
-                            },
-                        },
-                        {
-                            title: 'Delete vehicle...',
-                            action: () => {
-                                this.modalsManager.done().then(() => {
-                                    return this.deleteVehicle(vehicle, {
-                                        onDecline: () => {
-                                            this.viewVehicle(vehicle);
-                                        },
-                                    });
-                                });
-                            },
-                        },
-                    ],
-                },
-            ],
-            viewDriver: (driver) => {
-                this.modalsManager.done().then(() => {
-                    return this.drivers.viewDriver(driver, {
-                        onFinish: () => {
-                            this.viewVehicle(vehicle);
-                        },
-                    });
-                });
-            },
-            vehicle,
-            ...options,
-        });
+    @action viewVehicle(vehicle) {
+        return this.transitionToRoute('management.vehicles.index.details', vehicle);
     }
 
     /**
@@ -517,21 +451,7 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      * @void
      */
     @action createVehicle() {
-        const vehicle = this.store.createRecord('vehicle', {
-            status: 'active',
-            slug: generateSlug(),
-        });
-
-        return this.editVehicle(vehicle, {
-            title: 'New Vehicle',
-            acceptButtonText: 'Confirm & Create',
-            acceptButtonIcon: 'check',
-            acceptButtonIconPrefix: 'fas',
-            // successNotification: `New vehicle (${vehicle.name}) created.`,
-            onConfirm: () => {
-                return this.hostRouter.refresh();
-            },
-        });
+        return this.transitionToRoute('management.vehicles.index.new');
     }
 
     /**
@@ -541,51 +461,8 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      * @param {Object} options
      * @void
      */
-    @action async editVehicle(vehicle, options = {}) {
-        await vehicle?.loadDriver();
-
-        this.modalsManager.show('modals/vehicle-form', {
-            title: 'Edit Vehicle',
-            acceptButtonText: 'Save Changes',
-            acceptButtonIcon: 'save',
-            modalClass: 'modal-lg',
-            vehicle,
-            uploadNewPhoto: (file) => {
-                this.fetch.uploadFile.perform(
-                    file,
-                    {
-                        path: `uploads/${this.currentUser.companyId}/vehicles/${vehicle.slug}`,
-                        subject_uuid: vehicle.id,
-                        subject_type: `vehicle`,
-                        type: `vehicle_photo`,
-                    },
-                    (uploadedFile) => {
-                        vehicle.setProperties({
-                            photo_uuid: uploadedFile.id,
-                            photo_url: uploadedFile.url,
-                            photo: uploadedFile,
-                        });
-                    }
-                );
-            },
-            confirm: (modal, done) => {
-                modal.startLoading();
-
-                vehicle
-                    .save()
-                    .then((vehicle) => {
-                        this.notifications.success(options.successNotification ?? `${vehicle.name} details updated.`);
-                    })
-                    .catch((error) => {
-                        modal.stopLoading();
-                        this.notifications.serverError(error);
-                    })
-                    .finally(() => {
-                        done();
-                    });
-            },
-            ...options,
-        });
+    @action editVehicle(vehicle) {
+        return this.transitionToRoute('management.vehicles.index.edit', vehicle);
     }
 
     /**

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

@@ -5,7 +5,7 @@ import { action, computed, setProperties, set, get } from '@ember/object';
 import { not, equal, alias } from '@ember/object/computed';
 import { isArray } from '@ember/array';
 import { dasherize } from '@ember/string';
-import { later } from '@ember/runloop';
+import { later, next } from '@ember/runloop';
 import { OSRMv1, Control as RoutingControl } from '@fleetbase/leaflet-routing-machine';
 import polyline from '@fleetbase/ember-core/utils/polyline';
 import findClosestWaypoint from '@fleetbase/ember-core/utils/find-closest-waypoint';
@@ -494,7 +494,9 @@ export default class OperationsOrdersIndexNewController extends Controller {
     }
 
     @action newPlace() {
-        this.placesController?.createPlace();
+        if (this.placesController) {
+            return this.placesController.createPlace();
+        }
     }
 
     @action async getQuotes(service) {
@@ -564,26 +566,39 @@ export default class OperationsOrdersIndexNewController extends Controller {
     }
 
     @action setupInterface() {
-        this.leafletMap?.liveMap?.hideDrivers();
-        this.leafletMap?.liveMap?.hideRoutes();
-
-        // track all layers added from this view
-        this.leafletMap?.on('layeradd', ({ layer }) => {
-            // disable dragging of layer
-            layer.dragging?.disable();
+        if (this.leafletMap && this.leafletMap.liveMap) {
+            this.leafletMap.liveMap.hideDrivers();
+            this.leafletMap.liveMap.hideRoutes();
+
+            // track all layers added from this view
+            this.leafletMap.on('layeradd', ({ layer }) => {
+                // disable dragging of layer
+                if (layer.dragging && typeof layer.dragging.disable === 'function') {
+                    layer.dragging.disable();
+                }
 
-            if (!this.leafletLayers?.includes(layer)) {
-                this.leafletLayers.pushObject(layer);
-            }
-        });
+                next(this, function () {
+                    if (isArray(this.leafletLayers) && !this.leafletLayers.includes(layer)) {
+                        this.leafletLayers.pushObject(layer);
+                    }
+                });
+            });
+        } else {
+            // setup interface when livemap is ready
+            this.universe.on('livemap.ready', () => {
+                this.setupInterface();
+            });
+        }
 
         // switch to map mode
         this.ordersController.setLayoutMode('map');
     }
 
     @action resetInterface() {
-        this.leafletMap?.liveMap?.showDrivers();
-        this.leafletMap?.liveMap?.showRoutes();
+        if (this.leafletMap && this.leafletMap.liveMap) {
+            this.leafletMap.liveMap.showDrivers();
+            this.leafletMap.liveMap.showRoutes();
+        }
     }
 
     @action getRoute() {
@@ -674,15 +689,47 @@ export default class OperationsOrdersIndexNewController extends Controller {
     }
 
     @action clearLayers() {
-        const { leafletLayers, leafletMap } = this;
+        if (this.leafletMap) {
+            try {
+                this.leafletMap.eachLayer((layer) => {
+                    if (isArray(this.leafletLayers) && this.leafletLayers.includes(layer)) {
+                        this.leafletMap.removeLayer(layer);
+                    }
+                });
+            } catch (error) {
+                // fallback method with tracked layers
+                if (isArray(this.leafletLayers)) {
+                    this.leafletLayers.forEach((layer) => {
+                        try {
+                            this.leafletMap.removeLayer(layer);
+                        } catch (error) {
+                            // silent error just continue with order processing if any
+                        }
+                    });
+                }
+            }
+        }
+    }
 
-        leafletLayers?.forEach((layer) => {
+    @action clearAllLayers() {
+        if (this.leafletMap) {
             try {
-                leafletMap.removeLayer(layer);
+                this.leafletMap.eachLayer((layer) => {
+                    this.leafletMap.removeLayer(layer);
+                });
             } catch (error) {
-                // silent error just continue with order processing if any
+                // fallback method with tracked layers
+                if (isArray(this.leafletLayers)) {
+                    this.leafletLayers.forEach((layer) => {
+                        try {
+                            this.leafletMap.removeLayer(layer);
+                        } catch (error) {
+                            // silent error just continue with order processing if any
+                        }
+                    });
+                }
             }
-        });
+        }
     }
 
     @action createPlaceArrayFromPayload(payload, waypoints, isMultipleDropoffOrder = false) {

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

@@ -81,6 +81,13 @@ export default class OperationsOrdersIndexViewController extends Controller {
      */
     @service hostRouter;
 
+    /**
+     * Inject the `socket` service
+     *
+     * @var {Service}
+     */
+    @service socket;
+
     /**
      * Inject the `universe` service
      *
@@ -162,8 +169,10 @@ export default class OperationsOrdersIndexViewController extends Controller {
     }
 
     @action resetInterface() {
-        this.leafletMap?.liveMap?.showDrivers();
-        this.leafletMap?.liveMap?.showRoutes();
+        if (this.leafletMap && this.leafletMap.liveMap) {
+            this.leafletMap.liveMap.showDrivers();
+            this.leafletMap.liveMap.showRoutes();
+        }
     }
 
     @action removeRoutingControlPreview() {
@@ -209,8 +218,10 @@ export default class OperationsOrdersIndexViewController extends Controller {
             return later(
                 this,
                 () => {
-                    this.leafletMap?.liveMap?.hideDrivers();
-                    this.leafletMap?.liveMap?.hideRoutes();
+                    if (this.leafletMap && this.leafletMap.liveMap) {
+                        this.leafletMap.liveMap.hideDrivers();
+                        this.leafletMap.liveMap.hideRoutes();
+                    }
 
                     // display order route on map
                     this.displayOrderRoute();

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

@@ -80,6 +80,13 @@ export default class OperationsOrdersIndexController extends Controller {
      */
     @service universe;
 
+    /**
+     * Inject the `socket` service
+     *
+     * @var {Service}
+     */
+    @service socket;
+
     /**
      * Queryable parameters for this controller's model
      *
@@ -537,6 +544,54 @@ export default class OperationsOrdersIndexController extends Controller {
         },
     ];
 
+    /**
+     * Creates an instance of OperationsOrdersIndexController.
+     * @memberof OperationsOrdersIndexController
+     */
+    constructor() {
+        super(...arguments);
+        this.listenForOrderEvents();
+    }
+
+    /**
+     * Listen for incoming order events to refresh listing.
+     *
+     * @memberof OperationsOrdersIndexController
+     */
+    @action async listenForOrderEvents() {
+        // wait for user to be loaded into service
+        this.currentUser.on('user.loaded', () => {
+            // Get socket instance
+            const socket = this.socket.instance();
+
+            // The channel ID to listen on
+            const channelId = `company.${this.currentUser.companyId}`;
+
+            // Listed on company channel
+            const channel = socket.subscribe(channelId);
+
+            // Events which should trigger refresh
+            const listening = ['order.ready', 'order.driver_assigned'];
+
+            // Listen for channel subscription
+            (async () => {
+                for await (let output of channel) {
+                    const { event } = output;
+
+                    // if an order event refresh orders
+                    if (typeof event === 'string' && listening.includes(event)) {
+                        this.hostRouter.refresh();
+                    }
+                }
+            })();
+
+            // disconnect when transitioning
+            this.hostRouter.on('routeWillChange', () => {
+                channel.close();
+            });
+        });
+    }
+
     /**
      * The search task.
      *
@@ -572,13 +627,9 @@ export default class OperationsOrdersIndexController extends Controller {
     }
 
     @action resetView() {
-        const {
-            leafletMap: { liveMap },
-        } = this;
-
-        if (liveMap) {
-            liveMap.hideDrivers();
-            liveMap.hideRoutes();
+        if (this.leafletMap && this.leafletMap.liveMap) {
+            this.leafletMap.liveMap.hideDrivers();
+            this.leafletMap.liveMap.hideRoutes();
         }
     }
 

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

@@ -1,7 +1,6 @@
 import OperationsServiceRatesIndexNewController from './new';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-// import { alias } from '@ember/object/computed';
 
 export default class OperationsServiceRatesIndexEditController extends OperationsServiceRatesIndexNewController {
     /**
@@ -44,6 +43,7 @@ export default class OperationsServiceRatesIndexEditController extends Operation
                     return this.transitionToRoute('operations.service-rates.index').then(() => {
                         this.notifications.success(`Service rate '${serviceRate.service_name}' updated`);
                         this.resetForm();
+                        this.hostRouter.refresh();
                     });
                 })
                 .catch(this.notifications.serverError)