@fleetbase/fleetops-engine 0.3.1 → 0.3.3

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

@@ -3,11 +3,8 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
-import { isArray } from '@ember/array';
-import { capitalize } from '@ember/string';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
-import apiUrl from '@fleetbase/ember-core/utils/api-url';
 
 export default class ManagementVendorsIndexController extends Controller {
     /**
@@ -133,6 +130,7 @@ export default class ManagementVendorsIndexController extends Controller {
             valuePath: 'name',
             width: '180px',
             cellComponent: 'table/cell/media-name',
+            mediaPath: 'logo_url',
             action: this.viewVendor,
             resizable: true,
             sortable: true,
@@ -305,24 +303,6 @@ export default class ManagementVendorsIndexController extends Controller {
         this.query = value;
     }
 
-    /**
-     * Bulk deletes selected `driver` via confirm prompt
-     *
-     * @param {Array} selected an array of selected models
-     * @void
-     */
-    @action bulkDeleteVendors() {
-        const selected = this.table.selectedRows;
-
-        this.crud.bulkDelete(selected, {
-            modelNamePath: `name`,
-            acceptButtonText: 'Delete Vendors',
-            onSuccess: () => {
-                return this.hostRouter.refresh();
-            },
-        });
-    }
-
     /**
      * Toggles dialog to export `vendor`
      *
@@ -336,225 +316,29 @@ export default class ManagementVendorsIndexController extends Controller {
      * View a `vendor` details in modal
      *
      * @param {VendorModel} vendor
-     * @param {Object} options
      * @void
      */
-    @action viewVendor(vendor, options) {
-        const isIntegratedVendor = vendor.get('type') === 'integrated-vendor';
-
-        this.modalsManager.show('modals/vendor-details', {
-            title: vendor.name,
-            titleComponent: 'modal/title-with-buttons',
-            acceptButtonText: 'Done',
-            hideDeclineButton: true,
-            headerButtons: [
-                {
-                    icon: 'cog',
-                    iconPrefix: 'fas',
-                    type: 'link',
-                    size: 'xs',
-                    options: [
-                        {
-                            title: 'Edit Vendor',
-                            action: () => {
-                                this.modalsManager.done().then(() => {
-                                    return this.editVendor(vendor, {
-                                        onFinish: () => {
-                                            this.viewVendor(vendor);
-                                        },
-                                    });
-                                });
-                            },
-                        },
-                        {
-                            title: 'Delete Vendor',
-                            action: () => {
-                                this.modalsManager.done().then(() => {
-                                    return this.deleteVendor(vendor, {
-                                        onDecline: () => {
-                                            this.viewVendor(vendor);
-                                        },
-                                    });
-                                });
-                            },
-                        },
-                    ],
-                },
-            ],
-            isIntegratedVendor,
-            vendor,
-            ...options,
-        });
+    @action viewVendor(vendor) {
+        return this.transitionToRoute('management.vendors.index.details', vendor);
     }
 
     /**
      * Create a new `vendor` in modal
      *
-     * @param {Object} options
      * @void
      */
     @action async createVendor() {
-        const vendor = this.store.createRecord('vendor', { status: 'active' });
-        const supportedIntegratedVendors = await this.fetch.get('integrated-vendors/supported');
-
-        return this.editVendor(vendor, {
-            title: 'New Vendor',
-            acceptButtonText: 'Confirm & Create',
-            acceptButtonIcon: 'check',
-            acceptButtonIconPrefix: 'fas',
-            action: 'select',
-            supportedIntegratedVendors,
-            selectedIntegratedVendor: null,
-            integratedVendor: null,
-            selectIntegratedVendor: (integratedVendor) => {
-                this.modalsManager.setOption('selectedIntegratedVendor', integratedVendor);
-
-                const { credential_params, option_params } = integratedVendor;
-
-                // create credentials object
-                const credentials = {};
-                if (isArray(integratedVendor.credential_params)) {
-                    for (let i = 0; i < integratedVendor.credential_params.length; i++) {
-                        const param = integratedVendor.credential_params.objectAt(i);
-                        credentials[param] = null;
-                    }
-                }
-
-                // create options object
-                const options = {};
-                if (isArray(integratedVendor.option_params)) {
-                    for (let i = 0; i < integratedVendor.option_params.length; i++) {
-                        const param = integratedVendor.option_params.objectAt(i);
-                        options[param.key] = null;
-                    }
-                }
-
-                const vendor = this.store.createRecord('integrated-vendor', {
-                    provider: integratedVendor.code,
-                    webhook_url: apiUrl(`listeners/${integratedVendor.code}`),
-                    credentials: {},
-                    options: {},
-                    credential_params,
-                    option_params,
-                });
-
-                this.modalsManager.setOption('integratedVendor', vendor);
-            },
-            successNotification: (vendor) => `New vendor '${vendor.name}' successfully created.`,
-        });
+        return this.transitionToRoute('management.vendors.index.new');
     }
 
     /**
      * Edit a `vendor` details
      *
      * @param {VendorModel} vendor
-     * @param {Object} options
      * @void
      */
-    @action editVendor(vendor, options = {}) {
-        const editVendorOptions = options;
-        const isIntegratedVendor = vendor.get('type') === 'integrated-vendor';
-
-        this.modalsManager.show('modals/vendor-form', {
-            title: isIntegratedVendor ? 'Integrated Vendor Settings' : 'Edit Vendor',
-            acceptButtonText: 'Save Changes',
-            acceptButtonIcon: 'save',
-            declineButtonIcon: 'times',
-            declineButtonIconPrefix: 'fas',
-            isIntegratedVendor,
-            vendor,
-            showAdvancedOptions: false,
-            isEditingCredentials: false,
-            toggleCredentialsReset: () => {
-                const isEditingCredentials = this.modalsManager.getOption('isEditingCredentials');
-
-                if (isEditingCredentials) {
-                    this.modalsManager.setOption('isEditingCredentials', false);
-                } else {
-                    this.modalsManager.setOption('isEditingCredentials', true);
-                }
-            },
-            toggleAdvancedOptions: () => {
-                const showAdvancedOptions = this.modalsManager.getOption('showAdvancedOptions');
-
-                if (showAdvancedOptions) {
-                    this.modalsManager.setOption('showAdvancedOptions', false);
-                } else {
-                    this.modalsManager.setOption('showAdvancedOptions', true);
-                }
-            },
-            selectAddress: (place) => {
-                vendor.setProperties({
-                    place_uuid: place.id,
-                    place: place,
-                    country: place.country,
-                });
-            },
-            editAddress: () => {
-                return this.editVendorPlace(vendor, {
-                    onFinish: () => {
-                        this.editVendor(vendor, editVendorOptions);
-                    },
-                });
-            },
-            newAddress: () => {
-                return this.createVendorPlace(vendor, {
-                    onConfirm: (place) => {
-                        vendor.set('place_uuid', place.id);
-                        vendor.save();
-                    },
-                    onFinish: () => {
-                        this.modalsManager.done().then(() => {
-                            this.editVendor(vendor, editVendorOptions);
-                        });
-                    },
-                });
-            },
-            confirm: (modal) => {
-                modal.startLoading();
-
-                const isAddingIntegratedVendor = modal.getOption('action') !== undefined && modal.getOption('integratedVendor')?.isNew;
-
-                if (isAddingIntegratedVendor) {
-                    const integratedVendor = modal.getOption('integratedVendor');
-
-                    return integratedVendor
-                        .save()
-                        .then((integratedVendor) => {
-                            this.notifications.success(`Successfully added ${capitalize(integratedVendor.provider)} new integrated vendor`);
-
-                            return this.hostRouter.refresh();
-                        })
-                        .catch((error) => {
-                            this.notifications.serverError(error, {
-                                clearDuration: 600 * 6,
-                            });
-                        })
-                        .finally(() => {
-                            modal.stopLoading();
-                        });
-                }
-
-                return vendor
-                    .save()
-                    .then((vendor) => {
-                        if (typeof options.successNotification === 'function') {
-                            this.notifications.success(options.successNotification(vendor));
-                        } else {
-                            this.notifications.success(options.successNotification || `${vendor.name} details updated.`);
-                        }
-
-                        return this.hostRouter.refresh();
-                    })
-                    .catch((error) => {
-                        this.notifications.serverError(error);
-                    })
-                    .finally(() => {
-                        modal.stopLoading();
-                    });
-            },
-            ...options,
-        });
+    @action editVendor(vendor) {
+        return this.transitionToRoute('management.vendors.index.edit', vendor);
     }
 
     /**
@@ -575,19 +359,20 @@ export default class ManagementVendorsIndexController extends Controller {
     }
 
     /**
-     * View information about the vendors place
+     * Bulk deletes selected `vendor` via confirm prompt
      *
-     * @param {VendorModel} vendor
-     * @param {Object} options
+     * @param {Array} selected an array of selected models
      * @void
      */
-    @action async viewVendorPlace(vendor, options = {}) {
-        this.modalsManager.displayLoader();
-
-        const place = await this.store.findRecord('place', vendor.place_uuid);
+    @action bulkDeleteVendors() {
+        const selected = this.table.selectedRows;
 
-        this.modalsManager.done().then(() => {
-            return this.places.viewPlace(place, options);
+        this.crud.bulkDelete(selected, {
+            modelNamePath: `name`,
+            acceptButtonText: 'Delete Vendors',
+            onSuccess: () => {
+                return this.hostRouter.refresh();
+            },
         });
     }
 
@@ -595,33 +380,44 @@ export default class ManagementVendorsIndexController extends Controller {
      * View information about the vendors place
      *
      * @param {VendorModel} vendor
-     * @param {Object} options
      * @void
      */
-    @action async editVendorPlace(vendor, options = {}) {
-        this.modalsManager.displayLoader();
+    @action async viewVendorPlace(vendor) {
+        const place = await this.store.findRecord('place', vendor.place_uuid);
 
-        const place = await this.store.findRecord('place', vendor.get('place_uuid'));
-        await this.modalsManager.done({ skipCallbacks: true });
+        if (place) {
+            this.contextPanel.focus(place);
+        }
+    }
 
-        this.modalsManager.done({ skipCallbacks: true }).then(() => {
-            return this.places.editPlace(place, options);
-        });
+    /**
+     * Edit a vendor's current place
+     *
+     * @param {VendorModel} vendor
+     * @void
+     */
+    @action async editVendorPlace(vendor) {
+        const place = await this.store.findRecord('place', vendor.place_uuid);
+
+        if (place) {
+            this.contextPanel.focus(place, 'editing');
+        }
     }
 
     /**
-     * View information about the vendors place
+     * Create a new place for a vendor.
      *
-     * @param {DriverModel} driver
-     * @param {Object} options
+     * @param {VendorModel} vendor
      * @void
      */
-    @action async createVendorPlace(vendor, options = {}) {
-        this.modalsManager.displayLoader();
-        await this.modalsManager.done();
+    @action async createVendorPlace(vendor) {
+        const place = this.store.createRecord('place');
 
-        this.modalsManager.done().then(() => {
-            return this.places.createPlace(options);
+        this.contextPanel.focus(place, 'editing', {
+            onAfterSave: (place) => {
+                vendor.set('place_uuid', place.id);
+                vendor.save();
+            },
         });
     }
 }

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

@@ -1,4 +1,4 @@
-import Controller, { inject as controller } from '@ember/controller';
+import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -9,20 +9,6 @@ import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
 export default class OperationsOrdersIndexController extends Controller {
-    /**
-     * Injection of the `ManagementDriversIndexController` controller
-     *
-     * @memberof OperationsOrdersIndexController
-     */
-    @controller('management.drivers.index') driversController;
-
-    /**
-     * Injection of the `ManagementFleetIndexController` controller
-     *
-     * @memberof OperationsOrdersIndexController
-     */
-    @controller('management.fleets.index') fleetController;
-
     /**
      * Inject the `currentUser` service
      *
@@ -266,6 +252,13 @@ export default class OperationsOrdersIndexController extends Controller {
      */
     @tracked leafletMap;
 
+    /**
+     * Reference to the drawer context API.
+     *
+     * @type {Object}
+     */
+    @tracked drawer;
+
     /**
      * Current layout type (e.g., 'map', 'table', 'kanban', 'analytics')
      *
@@ -722,6 +715,27 @@ export default class OperationsOrdersIndexController extends Controller {
         this.liveMap = liveMap;
     }
 
+    /**
+     * Sets the drawer component context api.
+     *
+     * @param {Object} drawerApi
+     * @memberof OperationsOrdersIndexController
+     */
+    @action setDrawerContext(drawerApi) {
+        this.drawer = drawerApi;
+    }
+
+    /**
+     * Toggles the LiveMap drawer component.
+     *
+     * @memberof OperationsOrdersIndexController
+     */
+    @action onPressLiveMapDrawerToggle() {
+        if (this.drawer) {
+            this.drawer.toggleMinimize();
+        }
+    }
+
     /**
      * Exports all orders.
      * @action

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

@@ -1,31 +1,26 @@
 import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import { format, isValid as isValidDate } from 'date-fns';
+import createFullCalendarEventFromOrder from '../../../utils/create-full-calendar-event-from-order';
 
 export default class OperationsSchedulerIndexController extends Controller {
     @service modalsManager;
     @service notifications;
-
-    @computed('model.@each.scheduled_at') get scheduledOrders() {
-        return this.model.filter((order) => isValidDate(order.scheduled_at));
-    }
-
-    @computed('model.@each.scheduled_at') get unscheduledOrders() {
-        return this.model.filter((order) => !order.scheduled_at);
-    }
-
-    @computed('scheduledOrders.@each.scheduled_at') get events() {
-        return this.scheduledOrders.map((order) => ({
-            id: order.id,
-            title: `${order.scheduledAtTime} - ${order.public_id}`,
-            start: order.scheduled_at,
-            allDay: true,
-        }));
+    @service store;
+    @service hostRouter;
+    @tracked scheduledOrders = [];
+    @tracked unscheduledOrders = [];
+    @tracked events = [];
+
+    @action setCalendarApi(calendar) {
+        this.calendar = calendar;
     }
 
-    @action viewEvent(order, eventClickInfo) {
-        const { event } = eventClickInfo;
+    @action viewEvent(order) {
+        // get the event from the calendar
+        let event = this.calendar.getEventById(order.id);
 
         this.modalsManager.show('modals/order-event', {
             title: `Scheduling for ${order.public_id}`,
@@ -34,7 +29,7 @@ export default class OperationsSchedulerIndexController extends Controller {
             hideDeclineButton: true,
             order,
             reschedule: (date) => {
-                if (typeof date?.toDate === 'function') {
+                if (date && typeof date.toDate === 'function') {
                     date = date.toDate();
                 }
 
@@ -51,15 +46,27 @@ export default class OperationsSchedulerIndexController extends Controller {
                 }
 
                 return order.save().then((order) => {
-                    this.notifications.success(`'${order.public_id}' has been updated.`);
+                    // remove event from calendar
+                    if (event) {
+                        event.remove();
+                    }
 
-                    // update event props
-                    event?.setProp('title', order.eventTitle);
+                    if (order.scheduled_at) {
+                        // notify order has been scheduled
+                        this.notifications.success(`Order '${order.public_id}' has been scheduled at ${order.scheduledAt}.`);
+                        // add event to calendar
+                        event = this.calendar.addEvent(createFullCalendarEventFromOrder(order));
+                    } else {
+                        this.notifications.info(`Order '${order.public_id}' has been unscheduled.`);
+                    }
 
-                    // remove event from calendar if unscheduled
-                    if (!order.scheduled_at || !isValidDate(order.scheduled_at)) {
-                        event.remove();
+                    // update event props
+                    if (event && typeof event.setProp === 'function') {
+                        event.setProp('title', order.eventTitle);
                     }
+
+                    // refresh route
+                    this.hostRouter.refresh();
                 });
             },
         });
@@ -80,7 +87,9 @@ export default class OperationsSchedulerIndexController extends Controller {
         const order = this.store.peekRecord('order', data.id);
 
         order.set('scheduled_at', date);
-        order.save();
+        return order.save().then(() => {
+            this.hostRouter.refresh();
+        });
     }
 
     @action receivedEvent(eventReceivedInfo) {
@@ -88,7 +97,9 @@ export default class OperationsSchedulerIndexController extends Controller {
         const order = this.store.peekRecord('order', event.id);
 
         // update event props
-        event?.setProp('title', order.eventTitle);
+        if (typeof event.setProp === 'function') {
+            event.setProp('title', order.eventTitle);
+        }
     }
 
     @action rescheduleEventFromDrag(eventDropInfo) {
@@ -102,9 +113,13 @@ export default class OperationsSchedulerIndexController extends Controller {
 
         // set and save order props
         order.set('scheduled_at', isValidDate(newDate) ? newDate : start);
-        order.save();
+        order.save().then(() => {
+            this.hostRouter.refresh();
+        });
 
         // update event props
-        event?.setProp('title', order.eventTitle);
+        if (typeof event.setProp === 'function') {
+            event.setProp('title', order.eventTitle);
+        }
     }
 }

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

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

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

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

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

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

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

@@ -18,6 +18,6 @@ export default class ManagementContactsIndexRoute extends Route {
     };
 
     model(params) {
-        return this.store.query('contact', { ...params });
+        return this.store.query('contact', params);
     }
 }

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

@@ -4,6 +4,6 @@ export default class ManagementFleetsIndexDetailsRoute extends Route {
     @service store;
 
     model({ public_id }) {
-        return this.store.findRecord('fleet', public_id);
+        return this.store.queryRecord('fleet', { public_id, single: true, with: ['parent_fleet', 'service_area', 'zone'] });
     }
 }

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

@@ -4,6 +4,6 @@ export default class ManagementFleetsIndexEditRoute extends Route {
     @service store;
 
     model({ public_id }) {
-        return this.store.findRecord('fleet', public_id);
+        return this.store.queryRecord('fleet', { public_id, single: true, with: ['parent_fleet', 'service_area', 'zone'] });
     }
 }

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

@@ -23,6 +23,6 @@ export default class ManagementFleetsIndexRoute extends Route {
     };
 
     model(params) {
-        return this.store.query('fleet', { ...params });
+        return this.store.query('fleet', { ...params, with: ['parent_fleet', 'service_area', 'zone'] });
     }
 }

package/addon/routes/management/fuel-reports/index/details.js

@@ -0,0 +1,14 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class ManagementFuelReportsIndexDetailsRoute extends Route {
+    @service store;
+
+    queryParams = {
+        view: { refreshModel: false },
+    };
+
+    model({ public_id }) {
+        return this.store.queryRecord('fuel-report', { public_id, single: true, with: ['driver', 'vehicle', 'reporter'] });
+    }
+}

package/addon/routes/management/fuel-reports/index/edit.js

@@ -0,0 +1,10 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class ManagementFuelReportsIndexEditRoute extends Route {
+    @service store;
+
+    model({ public_id }) {
+        return this.store.queryRecord('fuel-report', { public_id, single: true, with: ['driver', 'vehicle', 'reporter'] });
+    }
+}

package/addon/routes/management/fuel-reports/index/new.js

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

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

@@ -14,10 +14,12 @@ export default class ManagementFuelReportsIndexRoute extends Route {
         limit: { refreshModel: true },
         sort: { refreshModel: true },
         query: { refreshModel: true },
+        vehicle: { refreshModel: true },
+        driver: { refreshModel: true },
         status: { refreshModel: true },
     };
 
     model(params) {
-        return this.store.query('fuel-report', { ...params });
+        return this.store.query('fuel-report', { ...params, with: ['driver', 'vehicle', 'reporter'] });
     }
 }