@fleetbase/fleetops-engine 0.2.8 → 0.3.0

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

@@ -88,6 +88,13 @@ export default class ManagementDriversIndexController extends Controller {
      */
     @service currentUser;
 
+    /**
+     * Inject the `contextPanel` service
+     *
+     * @var {Service}
+     */
+    @service contextPanel;
+
     /**
      * Queryable parameters for this controller's model
      *
@@ -275,7 +282,16 @@ export default class ManagementDriversIndexController extends Controller {
         {
             label: 'Vehicle',
             cellComponent: 'table/cell/anchor',
-            action: this.viewDriverVehicle,
+            onClick: (driver) => {
+                return driver
+                    .loadVehicle()
+                    .then((vehicle) => {
+                        return this.contextPanel.focus(vehicle);
+                    })
+                    .catch((error) => {
+                        this.notifications.serverError(error);
+                    });
+            },
             valuePath: 'vehicle.display_name',
             modelNamePath: 'display_name',
             resizable: true,
@@ -498,132 +514,6 @@ export default class ManagementDriversIndexController extends Controller {
     @action viewDriver(driver) {
         return this.transitionToRoute('management.drivers.index.details', driver);
     }
-
-    // @action viewDriver(driver, options = {}) {
-    //     const viewDriverOnMap = () => {
-    //         this.modalsManager.done().then(() => {
-    //             return this.viewOnMap(driver, {
-    //                 onFinish: () => {
-    //                     this.viewDriver(driver);
-    //                 },
-    //             });
-    //         });
-    //     };
-
-    //     this.modalsManager.show('modals/driver-details', {
-    //         title: driver.name,
-    //         titleComponent: 'modal/title-with-buttons',
-    //         acceptButtonText: 'Done',
-    //         acceptButtonIcon: 'check',
-    //         acceptButtonIconPrefix: 'fas',
-    //         hideDeclineButton: true,
-    //         declineButtonIcon: 'times',
-    //         declineButtonIconPrefix: 'fas',
-    //         headerStatus: driver.status,
-    //         headerButtons: [
-    //             {
-    //                 icon: 'cog',
-    //                 iconPrefix: 'fas',
-    //                 type: 'link',
-    //                 size: 'xs',
-    //                 ddMenuLabel: 'Driver Actions',
-    //                 options: [
-    //                     {
-    //                         title: 'Edit Driver',
-    //                         icon: 'edit',
-    //                         action: () => {
-    //                             this.modalsManager.done().then(() => {
-    //                                 return this.editDriver(driver, {
-    //                                     onFinish: () => {
-    //                                         this.viewDriver(driver);
-    //                                     },
-    //                                 });
-    //                             });
-    //                         },
-    //                     },
-    //                     {
-    //                         separator: true,
-    //                     },
-    //                     {
-    //                         title: 'Assign Order to Driver',
-    //                         icon: 'user-check',
-    //                         action: () => {
-    //                             this.modalsManager.done().then(() => {
-    //                                 return this.assignOrder(driver, {
-    //                                     onFinish: () => {
-    //                                         this.viewDriver(driver);
-    //                                     },
-    //                                 });
-    //                             });
-    //                         },
-    //                     },
-    //                     {
-    //                         title: 'Assign Vehicle to Driver',
-    //                         icon: 'car',
-    //                         action: () => {
-    //                             this.modalsManager.done().then(() => {
-    //                                 return this.assignVehicle(driver, {
-    //                                     onFinish: () => {
-    //                                         this.viewDriver(driver);
-    //                                     },
-    //                                 });
-    //                             });
-    //                         },
-    //                     },
-    //                     {
-    //                         title: 'Locate Driver',
-    //                         icon: 'map-pin',
-    //                         action: viewDriverOnMap,
-    //                     },
-    //                     {
-    //                         separator: true,
-    //                     },
-    //                     {
-    //                         title: 'Listen to socket channel',
-    //                         icon: 'headphones',
-    //                         action: () => {
-    //                             this.modalsManager.done().then(() => {
-    //                                 this.hostRouter.transitionTo('console.developers.sockets.view', `driver.${driver.public_id}`);
-    //                             });
-    //                         },
-    //                     },
-    //                     {
-    //                         separator: true,
-    //                     },
-    //                     {
-    //                         title: 'Delete Driver',
-    //                         icon: 'trash',
-    //                         action: () => {
-    //                             this.modalsManager.done().then(() => {
-    //                                 return this.deleteDriver(driver, {
-    //                                     onDecline: () => {
-    //                                         this.viewDriver(driver);
-    //                                     },
-    //                                 });
-    //                             });
-    //                         },
-    //                     },
-    //                 ],
-    //             },
-    //         ],
-    //         viewVendor: () =>
-    //             this.viewDriverVendor(driver, {
-    //                 onFinish: () => {
-    //                     this.viewDriver(driver);
-    //                 },
-    //             }),
-    //         viewVehicle: () =>
-    //             this.viewDriverVehicle(driver, {
-    //                 onFinish: () => {
-    //                     this.viewDriver(driver);
-    //                 },
-    //             }),
-    //         viewDriverOnMap,
-    //         driver,
-    //         ...options,
-    //     });
-    // }
-
     /**
      * Create a new `driver` in modal
      *
@@ -632,85 +522,8 @@ export default class ManagementDriversIndexController extends Controller {
      */
     @action createDriver() {
         return this.transitionToRoute('management.drivers.index.new');
-
-        // return this.editDriver(driver, {
-        //     title: 'New Driver',
-        //     acceptButtonText: 'Create',
-        //     acceptButtonIcon: 'check',
-        //     acceptButtonIconPrefix: 'fas',
-        //     successNotification: (driver) => `New driver (${driver.name}) created.`,
-        //     onConfirm: () => {
-        //         return this.hostRouter.refresh();
-        //     },
-        // });
     }
 
-    // /**
-    //  * Edit a `driver` details
-    //  *
-    //  * @param {DriverModel} driver
-    //  * @param {Object} options
-    //  * @void
-    //  */
-    // @action editDriver(driver, options = {}) {
-    //     // make sure vehicle is loaded
-    //     driver.loadVehicle();
-
-    //     this.modalsManager.show('modals/driver-form', {
-    //         title: 'Edit Driver',
-    //         acceptButtonText: 'Save Changes',
-    //         acceptButtonIcon: 'save',
-    //         declineButtonIcon: 'times',
-    //         declineButtonIconPrefix: 'fas',
-    //         driver,
-    //         uploadNewPhoto: (file) => {
-    //             this.fetch.uploadFile.perform(
-    //                 file,
-    //                 {
-    //                     path: `uploads/${this.currentUser.companyId}/drivers/${driver.slug}`,
-    //                     subject_uuid: driver.id,
-    //                     subject_type: `driver`,
-    //                     type: `driver_photo`,
-    //                 },
-    //                 (uploadedFile) => {
-    //                     driver.setProperties({
-    //                         photo_uuid: uploadedFile.id,
-    //                         photo_url: uploadedFile.url,
-    //                         photo: uploadedFile,
-    //                     });
-    //                 }
-    //             );
-    //         },
-    //         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) => {
-    //                     if (typeof options.successNotification === 'function') {
-    //                         this.notifications.success(options.successNotification(driver));
-    //                     } else {
-    //                         this.notifications.success(options.successNotification || `${driver.name} details updated.`);
-    //                     }
-
-    //                     done();
-    //                 })
-    //                 .catch((error) => {
-    //                     // driver.rollbackAttributes();
-    //                     modal.stopLoading();
-    //                     this.notifications.serverError(error);
-    //                 });
-    //         },
-    //         ...options,
-    //     });
-    // }
-
     /**
      * View a `driver` details in modal
      *
@@ -847,23 +660,6 @@ export default class ManagementDriversIndexController extends Controller {
         });
     }
 
-    /**
-     * View information about the drivers assigned vehicle
-     *
-     * @param {DriverModel} driver
-     * @param {Object} options
-     * @void
-     */
-    @action async viewDriverVehicle(driver, options = {}) {
-        this.modalsManager.displayLoader();
-
-        const vehicle = await this.store.queryRecord('vehicle', driver.vehicle_uuid);
-
-        this.modalsManager.done().then(() => {
-            return this.vehicles.viewVehicle(vehicle, options);
-        });
-    }
-
     /**
      * View information about the driver vendor
      *

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

@@ -49,7 +49,7 @@ export default class ManagementFleetsIndexEditController extends Controller {
 
         console.log(model, model);
         this.isUpdatingFleet = true;
-        this.loader.showLoader('.overlay-inner-content', 'Updating fleet...');
+        this.loader.showLoader('.overlay-inner-content', { loadingMessage: 'Updating fleet...' });
 
         try {
             return model

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

@@ -62,7 +62,7 @@ export default class ManagementFleetsIndexNewController extends Controller {
         const { fleet } = this;
 
         this.isCreatingFleet = true;
-        this.loader.showLoader('.overlay-inner-content', 'Creating fleet...');
+        this.loader.showLoader('.overlay-inner-content', { loadingMessage: 'Creating fleet...' });
 
         try {
             return fleet

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

@@ -319,7 +319,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
             return this.notifications.warning('No driver attributed to fuel report.');
         }
 
-        this.loader.show('Loading...');
+        this.loader.show({ loadingMessage: 'Loading...' });
         const driver = await this.store.findRecord('driver', fuelReport.driver_uuid);
         this.loader.removeLoader();
 
@@ -332,7 +332,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
             return this.notifications.warning('No vehicle attributed to fuel report.');
         }
 
-        this.loader.show('Loading...');
+        this.loader.show({ loadingMessage: 'Loading...' });
         const vehicle = await this.store.findRecord('vehicle', fuelReport.vehicle_uuid);
         this.loader.remove();
 

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

@@ -2,11 +2,60 @@ import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 
+/**
+ * Controller for managing the details view within the "Management -> Vehicles -> Index" route.
+ *
+ * @class ManagementVehiclesIndexDetailsController
+ * @extends Controller
+ */
 export default class ManagementVehiclesIndexDetailsController extends Controller {
+    /**
+     * The currently active view tab ('details' by default).
+     *
+     * @type {String}
+     * @tracked
+     */
     @tracked view = 'details';
+
+    /**
+     * An array of query parameters to be serialized in the URL.
+     *
+     * @type {String[]}
+     * @tracked
+     */
     @tracked queryParams = ['view'];
 
+    /**
+     * Transitions back to the "management.vehicles.index" route.
+     *
+     * @method
+     * @action
+     * @returns {Transition} The transition object representing the route change.
+     */
     @action transitionBack() {
         return this.transitionToRoute('management.vehicles.index');
     }
+
+    /**
+     * Transitions to the edit view for a specific vehicle.
+     *
+     * @method
+     * @param {VehicleModel} vehicle - The vehicle to be edited.
+     * @action
+     * @returns {Transition} The transition object representing the route change.
+     */
+    @action onEdit(vehicle) {
+        return this.transitionToRoute('management.vehicles.index.edit', vehicle);
+    }
+
+    /**
+     * Updates the active view tab.
+     *
+     * @method
+     * @param {String} tab - The name of the tab to activate.
+     * @action
+     */
+    @action onTabChanged(tab) {
+        this.view = tab;
+    }
 }

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

@@ -1,8 +1,111 @@
 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 ManagementVehiclesIndexEditController extends Controller {
-    @action transitionBack() {
+    /**
+     * Inject the `hostRouter` service
+     *
+     * @memberof ManagementVehiclesIndexEditController
+     */
+    @service hostRouter;
+
+    /**
+     * Inject the `hostRouter` service
+     *
+     * @memberof ManagementVehiclesIndexEditController
+     */
+    @service modalsManager;
+
+    /**
+     * The overlay component context.
+     *
+     * @memberof ManagementVehiclesIndexEditController
+     */
+    @tracked overlay;
+
+    /**
+     * When exiting the overlay.
+     *
+     * @return {Transition}
+     * @memberof ManagementVehiclesIndexEditController
+     */
+    @action transitionBack(vehicle) {
+        // check if vehicle record has been edited and prompt for confirmation
+        if (vehicle.hasDirtyAttributes) {
+            return this.confirmContinueWithUnsavedChanges(vehicle, {
+                confirm: () => {
+                    vehicle.rollbackAttributes();
+                    return this.transitionToRoute('management.vehicles.index');
+                },
+            });
+        }
+
         return this.transitionToRoute('management.vehicles.index');
     }
+
+    /**
+     * Set the overlay component context object.
+     *
+     * @param {OverlayContext} overlay
+     * @memberof ManagementVehiclesIndexEditController
+     */
+    @action setOverlayContext(overlay) {
+        this.overlay = overlay;
+    }
+
+    /**
+     * When vehicle details button is clicked in overlay.
+     *
+     * @param {VehicleModel} vehicle
+     * @return {Promise}
+     * @memberof ManagementVehiclesIndexEditController
+     */
+    @action onViewDetails(vehicle) {
+        // check if vehicle record has been edited and prompt for confirmation
+        if (vehicle.hasDirtyAttributes) {
+            return this.confirmContinueWithUnsavedChanges(vehicle);
+        }
+
+        return this.transitionToRoute('management.vehicles.index.details', vehicle);
+    }
+
+    /**
+     * Trigger a route refresh and focus the new vehicle created.
+     *
+     * @param {VehicleModel} vehicle
+     * @return {Promise}
+     * @memberof ManagementVehiclesIndexEditController
+     */
+    @action onAfterSave(vehicle) {
+        if (this.overlay) {
+            this.overlay.close();
+        }
+
+        this.hostRouter.refresh();
+        return this.transitionToRoute('management.vehicles.index.details', vehicle);
+    }
+
+    /**
+     * Prompts the user to confirm if they wish to continue with unsaved changes.
+     *
+     * @method
+     * @param {VehicleModel} vehicle - The vehicle object with unsaved changes.
+     * @param {Object} [options={}] - Additional options for configuring the modal.
+     * @returns {Promise} A promise that resolves when the user confirms, and transitions to a new route.
+     * @memberof ManagementVehiclesIndexEditController
+     */
+    confirmContinueWithUnsavedChanges(vehicle, options = {}) {
+        return this.modalsManager.confirm({
+            title: 'Continue Without Saving?',
+            body: 'Unsaved changes to this vehicle will be lost. Click continue to proceed.',
+            acceptButtonText: 'Continue without saving',
+            confirm: () => {
+                vehicle.rollbackAttributes();
+                return this.transitionToRoute('management.vehicles.index.details', vehicle);
+            },
+            ...options,
+        });
+    }
 }

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

@@ -4,8 +4,34 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class ManagementVehiclesIndexNewController extends Controller {
+    /**
+     * Inject the `store` service
+     *
+     * @memberof ManagementVehiclesIndexNewController
+     */
     @service store;
 
+    /**
+     * Inject the `hostRouter` service
+     *
+     * @memberof ManagementVehiclesIndexNewController
+     */
+    @service hostRouter;
+
+    /**
+     * Inject the `hostRouter` service
+     *
+     * @memberof ManagementVehiclesIndexNewController
+     */
+    @service modalsManager;
+
+    /**
+     * The overlay component context.
+     *
+     * @memberof ManagementVehiclesIndexNewController
+     */
+    @tracked overlay;
+
     /**
      * The vehicle being created.
      *
@@ -15,7 +41,52 @@ export default class ManagementVehiclesIndexNewController extends Controller {
         status: `active`,
     });
 
+    /**
+     * Set the overlay component context object.
+     *
+     * @param {OverlayContext} overlay
+     * @memberof ManagementVehiclesIndexNewController
+     */
+    @action setOverlayContext(overlay) {
+        this.overlay = overlay;
+    }
+
+    /**
+     * When exiting the overlay.
+     *
+     * @return {Transition}
+     * @memberof ManagementVehiclesIndexNewController
+     */
     @action transitionBack() {
         return this.transitionToRoute('management.vehicles.index');
     }
+
+    /**
+     * Trigger a route refresh and focus the new vehicle created.
+     *
+     * @param {VehicleModel} vehicle
+     * @return {Promise}
+     * @memberof ManagementVehiclesIndexNewController
+     */
+    @action onAfterSave(vehicle) {
+        if (this.overlay) {
+            this.overlay.close();
+        }
+
+        this.hostRouter.refresh();
+        return this.transitionToRoute('management.vehicles.index.details', vehicle).then(() => {
+            this.resetForm();
+        });
+    }
+
+    /**
+     * Resets the form with a new vehicle record
+     *
+     * @memberof ManagementVehiclesIndexNewController
+     */
+    resetForm() {
+        this.vehicle = this.store.createRecord('vehicle', {
+            status: `active`,
+        });
+    }
 }

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

@@ -253,7 +253,7 @@ export default class OperationsOrdersIndexNewController extends Controller {
         }
 
         this.previewRoute(false);
-        this.loader.showLoader('body', 'Creating Order...');
+        this.loader.showLoader('body', { loadingMessage: 'Creating Order...' });
 
         const { order, groupedMetaFields, payload, entities, waypoints, isMultipleDropoffOrder } = this;
         const route = this.leafletOptimizedRoute ? this.getOptimizedRoute() : this.getRoute();
@@ -567,8 +567,7 @@ export default class OperationsOrdersIndexNewController extends Controller {
 
     @action setupInterface() {
         if (this.leafletMap && this.leafletMap.liveMap) {
-            this.leafletMap.liveMap.hideDrivers();
-            this.leafletMap.liveMap.hideRoutes();
+            this.leafletMap.liveMap.hideAll();
 
             // track all layers added from this view
             this.leafletMap.on('layeradd', ({ layer }) => {
@@ -585,7 +584,7 @@ export default class OperationsOrdersIndexNewController extends Controller {
             });
         } else {
             // setup interface when livemap is ready
-            this.universe.on('livemap.ready', () => {
+            this.universe.on('fleetops.livemap.ready', () => {
                 this.setupInterface();
             });
         }
@@ -596,8 +595,7 @@ export default class OperationsOrdersIndexNewController extends Controller {
 
     @action resetInterface() {
         if (this.leafletMap && this.leafletMap.liveMap) {
-            this.leafletMap.liveMap.showDrivers();
-            this.leafletMap.liveMap.showRoutes();
+            this.leafletMap.liveMap.show(['drivers', 'vehicles', 'routes']);
         }
     }
 

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

@@ -95,6 +95,13 @@ export default class OperationsOrdersIndexViewController extends Controller {
      */
     @service universe;
 
+    /**
+     * Inject the `contextPanel` service
+     *
+     * @var {Service}
+     */
+    @service contextPanel;
+
     @tracked isLoadingAdditionalData = false;
     @tracked isWaypointsCollapsed;
     @tracked leafletRoute;
@@ -170,8 +177,7 @@ export default class OperationsOrdersIndexViewController extends Controller {
 
     @action resetInterface() {
         if (this.leafletMap && this.leafletMap.liveMap) {
-            this.leafletMap.liveMap.showDrivers();
-            this.leafletMap.liveMap.showRoutes();
+            this.leafletMap.liveMap.show(['drivers', 'routes']);
         }
     }
 
@@ -219,8 +225,7 @@ export default class OperationsOrdersIndexViewController extends Controller {
                 this,
                 () => {
                     if (this.leafletMap && this.leafletMap.liveMap) {
-                        this.leafletMap.liveMap.hideDrivers();
-                        this.leafletMap.liveMap.hideRoutes();
+                        this.leafletMap.liveMap.hideAll();
                     }
 
                     // display order route on map
@@ -236,14 +241,14 @@ export default class OperationsOrdersIndexViewController extends Controller {
         };
 
         // re-display order routes when livemap has coordinates
-        this.universe.on('livemap.has_coordinates', this, displayOrderRoute);
+        this.universe.on('fleetops.livemap.has_coordinates', this, displayOrderRoute);
 
         // when transitioning away kill event listener
         this.hostRouter.on('routeWillChange', () => {
-            const isListening = this.universe.has('livemap.has_coordinates');
+            const isListening = this.universe.has('fleetops.livemap.has_coordinates');
 
             if (isListening) {
-                this.universe.off('livemap.has_coordinates', this, displayOrderRoute);
+                this.universe.off('fleetops.livemap.has_coordinates', this, displayOrderRoute);
             }
         });
 
@@ -784,15 +789,18 @@ export default class OperationsOrdersIndexViewController extends Controller {
         this.vendorsController.viewVendor(customer);
     }
 
-    @action async viewDriver(order) {
-        if (order.canLoadDriver) {
-            this.modalsManager.displayLoader();
-
-            order.driver = await this.store.findRecord('driver', order.driver_uuid);
-            await this.modalsManager.done();
+    @action focusOrderAssignedDriver({ driver_assigned, driver_assigned_uuid, canLoadDriver }) {
+        // if can load the driver then load and display via context
+        if (canLoadDriver) {
+            return this.store.findRecord('driver', driver_assigned_uuid).then((driver) => {
+                this.contextPanel.focus(driver);
+            });
         }
 
-        this.driversController.viewDriver(order.driver_assigned);
+        // if driver already loaded use this
+        if (driver_assigned) {
+            this.contextPanel.focus(driver_assigned);
+        }
     }
 
     @action async viewFacilitator({ facilitator, facilitator_is_contact }) {