@fleetbase/fleetops-engine 0.2.2 → 0.2.4

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

@@ -8,8 +8,7 @@ import { timeout } from 'ember-concurrency';
 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';
+// import Point from '@fleetbase/fleetops-data/utils/geojson/point';
 
 export default class ManagementDriversIndexController extends Controller {
     /**
@@ -496,131 +495,135 @@ export default class ManagementDriversIndexController extends Controller {
      * @param {Object} options
      * @void
      */
-    @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-console.sockets.watch', `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,
-        });
+    @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
      *
@@ -628,89 +631,96 @@ export default class ManagementDriversIndexController extends Controller {
      * @void
      */
     @action createDriver() {
-        const driver = this.store.createRecord('driver', {
-            status: `active`,
-            slug: generateSlug(),
-        });
-
-        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();
-            },
-        });
+        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,
+    //     });
+    // }
+
     /**
-     * Edit a `driver` details
+     * View a `driver` details in modal
      *
-     * @param {DriverModel} driver
+     * @param {VehicleModel} 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,
-        });
+    @action editDriver(driver) {
+        return this.transitionToRoute('management.drivers.index.edit', driver);
     }
-
     /**
      * Delete a `driver` via confirm prompt
      *
@@ -776,7 +786,7 @@ export default class ManagementDriversIndexController extends Controller {
     }
 
     /**
-     * Prompt user to assign a `vehicle` to a `driver`
+     * Prompt user to assign a `driver` to a `driver`
      *
      * @param {DriverModel} driver
      * @param {Object} options
@@ -847,7 +857,7 @@ export default class ManagementDriversIndexController extends Controller {
     @action async viewDriverVehicle(driver, options = {}) {
         this.modalsManager.displayLoader();
 
-        const vehicle = await this.store.findRecord('vehicle', driver.vehicle_uuid);
+        const vehicle = await this.store.queryRecord('vehicle', driver.vehicle_uuid);
 
         this.modalsManager.done().then(() => {
             return this.vehicles.viewVehicle(vehicle, options);

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

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

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

@@ -0,0 +1,77 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+
+export default class ManagementFleetsIndexEditController extends Controller {
+    /**
+     * True if updating service rate.
+     *
+     * @var {Boolean}
+     */
+    @tracked isUpdatingFleet = false;
+
+    /**
+     * Inject the `loader` service
+     *
+     * @var {Service}
+     */
+    @service loader;
+
+    /**
+     * Inject the `notifications` service
+     *
+     * @var {Service}
+     */
+    @service notifications;
+
+    /**
+     * Inject the `hostRouter` service
+     *
+     * @var {Service}
+     */
+    @service hostRouter;
+
+    /**
+     * Inject the `currentUser` service
+     *
+     * @var {Service}
+     */
+    @service store;
+
+    /**
+     * Updates the fleets to server
+     *
+     * @void
+     */
+    @action updateFleet() {
+        const { model } = this;
+
+        console.log(model, model);
+        this.isUpdatingFleet = true;
+        this.loader.showLoader('.overlay-inner-content', 'Updating fleet...');
+
+        try {
+            return model
+                .save()
+                .then((model) => {
+                    return this.transitionToRoute('management.fleets.index').then(() => {
+                        this.notifications.success(`Fleet '${model.name}' updated`);
+                        this.hostRouter.refresh();
+                    });
+                })
+                .catch(this.notifications.serverError)
+                .finally(() => {
+                    this.isUpdatingFleet = false;
+                    this.loader.removeLoader();
+                });
+        } catch (error) {
+            this.isUpdatingFleet = false;
+            this.loader.removeLoader();
+        }
+    }
+
+    @action transitionBack() {
+        return this.transitionToRoute('management.fleets.index');
+    }
+}

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');
+    }
+}