@fleetbase/fleetops-engine 0.2.3 → 0.2.5

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

@@ -0,0 +1,103 @@
+import Controller, { inject as controller } from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+
+export default class ManagementFleetsIndexNewController extends Controller {
+    /**
+     * Inject the `management.fleets.index` controller
+     *
+     * @var {Controller}
+     */
+    @controller('management.fleets.index') index;
+
+    /**
+     * Inject the `currentUser` service
+     *
+     * @var {Service}
+     */
+    @service store;
+
+    /**
+     * Inject the `hostRouter` service
+     *
+     * @var {Service}
+     */
+    @service hostRouter;
+
+    /**
+     * Inject the `notifications` service
+     *
+     * @var {Service}
+     */
+    @service notifications;
+
+    /**
+     * Inject the `loader` service
+     *
+     * @var {Service}
+     */
+    @service loader;
+
+    /**
+     * The fleet being created.
+     *
+     * @var {FleetModel}
+     */
+    @tracked fleet = this.store.createRecord('fleet', { status: 'active' });
+
+    /**
+     * True if creating fleet.
+     *
+     * @var {Boolean}
+     */
+    @tracked isCreatingFleet = false;
+
+    /**
+     * Saves the fleet to server
+     *
+     * @void
+     */
+    @action createFleet() {
+        const { fleet } = this;
+
+        this.isCreatingFleet = true;
+        this.loader.showLoader('.overlay-inner-content', 'Creating fleet...');
+
+        try {
+            return fleet
+                .save()
+                .then((fleet) => {
+                    return this.transitionToRoute('management.fleets.index').then(() => {
+                        this.notifications.success(`New fleet (${fleet.name}) created.`);
+                        this.resetForm();
+                        this.hostRouter.refresh();
+                    });
+                })
+                .catch((error) => {
+                    console.log(error);
+                    this.notifications.serverError(error);
+                })
+                .finally(() => {
+                    this.isCreatingFleet = false;
+                    this.loader.removeLoader();
+                });
+        } catch (error) {
+            this.isCreatingFleet = false;
+            this.loader.removeLoader();
+        }
+    }
+
+    /**
+     * Resets the driver form
+     *
+     * @void
+     */
+    @action resetForm() {
+        this.fleet = this.store.createRecord('fleet');
+    }
+
+    @action transitionBack() {
+        return this.transitionToRoute('management.fleets.index');
+    }
+}

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/service-rates/index.js

@@ -56,7 +56,6 @@ export default class OperationsServiceRatesIndexController extends Controller {
      */
     @service modalsManager;
 
-
     /**
      * Inject the `hostRouter` service
      *

package/addon/engine.js

@@ -17,6 +17,12 @@ export default class FleetOpsEngine extends Engine {
     setupExtension = function (app, engine, universe) {
         // register menu item in header
         universe.registerHeaderMenuItem('Fleet-Ops', 'console.fleet-ops', { icon: 'route', priority: 0 });
+
+        // register the vehicle panel
+        universe.createRegistry('component:vehicle-panel');
+
+        // register the driver panel
+        universe.createRegistry('component:driver-panel');
     };
 }
 

package/addon/routes/management/drivers/index/details.js

@@ -0,0 +1,9 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+export default class ManagementDriversIndexDetailsRoute extends Route {
+    @service store;
+
+    model({ public_id }) {
+        return this.store.findRecord('driver', public_id);
+    }
+}

package/addon/routes/management/drivers/index/edit.js

@@ -0,0 +1,13 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+export default class ManagementDriversIndexEditRoute extends Route {
+    @service store;
+
+    model({ public_id }) {
+        return this.store.findRecord('driver', public_id);
+    }
+
+    async setupController(controller, model) {
+        controller.driver = model;
+    }
+}

package/addon/routes/management/drivers/index/new.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ManagementDriversIndexNewRoute extends Route {}

package/addon/routes/management/fleets/index/details.js

@@ -0,0 +1,9 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+export default class ManagementFleetsIndexDetailsRoute extends Route {
+    @service store;
+
+    model({ public_id }) {
+        return this.store.findRecord('fleet', public_id);
+    }
+}

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

@@ -0,0 +1,9 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+export default class ManagementFleetsIndexEditRoute extends Route {
+    @service store;
+
+    model({ public_id }) {
+        return this.store.findRecord('fleet', public_id);
+    }
+}

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

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ManagementFleetsIndexNewRoute extends Route {}

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

@@ -18,6 +18,7 @@ export default class ManagementFleetsIndexRoute extends Route {
         internal_id: { refreshModel: true },
         zone: { refreshModel: true },
         service_area: { refreshModel: true },
+        parent_fleet: { refreshModel: true },
         task: { refreshModel: true },
     };
 

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

@@ -0,0 +1,18 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class ManagementVehiclesIndexDetailsRoute extends Route {
+    @service store;
+
+    queryParams = {
+        view: { refreshModel: false },
+    };
+
+    model({ public_id }) {
+        return this.store.findRecord('vehicle', public_id);
+    }
+
+    afterModel(model) {
+        model.loadDriver();
+    }
+}

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

@@ -0,0 +1,14 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class ManagementVehiclesIndexEditRoute extends Route {
+    @service store;
+
+    model({ public_id }) {
+        return this.store.findRecord('vehicle', public_id);
+    }
+
+    afterModel(model) {
+        model.loadDriver();
+    }
+}

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

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ManagementVehiclesIndexNewRoute extends Route {}

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

@@ -14,7 +14,7 @@ export default class OperationsOrdersIndexViewRoute extends Route {
         }
     }
 
-    @action error(error, transition) {
+    @action error(error) {
         this.notifications.serverError(error);
         return this.transitionTo('operations.orders.index');
     }
@@ -59,6 +59,10 @@ export default class OperationsOrdersIndexViewRoute extends Route {
         (async () => {
             for await (let output of channel) {
                 this.refresh();
+
+                if (typeof this.onOrderEvent === 'function') {
+                    this.onOrderEvent(output);
+                }
             }
         })();
 

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

@@ -9,7 +9,7 @@ export default class OperationsServiceRatesIndexEditRoute extends Route {
 
     templateName = 'operations.service-rates.index.new';
 
-    @action error(error, transition) {
+    @action error(error) {
         this.notifications.serverError(error);
         return this.transitionTo('operations.service-rates.index');
     }