@fleetbase/fleetops-engine 0.3.4 → 0.3.6

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

@@ -1,4 +1,5 @@
-import Controller, { inject as controller } from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
+import { inject as controller } from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action, computed, setProperties, set, get } from '@ember/object';
@@ -13,6 +14,7 @@ import isNotEmpty from '@fleetbase/ember-core/utils/is-not-empty';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
 import groupBy from '@fleetbase/ember-core/utils/macros/group-by';
 import extractCoordinates from '@fleetbase/ember-core/utils/extract-coordinates';
+import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
 
 L.Bounds.prototype.intersects = function (bounds) {
     var min = this.min,
@@ -25,10 +27,7 @@ L.Bounds.prototype.intersects = function (bounds) {
     return xIntersects && yIntersects;
 };
 
-export default class OperationsOrdersIndexNewController extends Controller {
-    @controller('management.places.index') placesController;
-    @controller('management.contacts.index') contactsController;
-    @controller('management.vendors.index') vendorsController;
+export default class OperationsOrdersIndexNewController extends BaseController {
     @controller('operations.orders.index') ordersController;
 
     /**
@@ -87,6 +86,13 @@ export default class OperationsOrdersIndexNewController extends Controller {
      */
     @service store;
 
+    /**
+     * Inject the `contextPanel` service
+     *
+     * @var {Service}
+     */
+    @service contextPanel;
+
     /**
      * Inject the `universe` service
      *
@@ -132,7 +138,6 @@ export default class OperationsOrdersIndexNewController extends Controller {
     @tracked routeProfile = 'driving';
     @tracked routeProfileOptions = ['driving', 'bycicle', 'walking'];
     @tracked podOptions = ['scan', 'signature'];
-    @tracked isViewingRoutePreview = false;
     @tracked isCsvImportedOrder = false;
     @tracked routePreviewArray = [];
     @tracked previewRouteControl;
@@ -229,11 +234,6 @@ export default class OperationsOrdersIndexNewController extends Controller {
 
             if (importId) {
                 const entities = this.entities.filter((entity) => entity._import_id === importId);
-
-                // if (entities.length === 0) {
-                //     return;
-                // }
-
                 const group = {
                     importId,
                     waypoint,
@@ -289,8 +289,15 @@ export default class OperationsOrdersIndexNewController extends Controller {
                     // trigger event that fleet-ops created an order
                     this.universe.trigger('fleet-ops.order.created', order);
 
+                    // get engine route prefix
+                    let engineMountPoint = this.universe.getEngineMountPoint('@fleetbase/fleetops-engine');
+
+                    if (!engineMountPoint.endsWith('.')) {
+                        engineMountPoint = engineMountPoint + '.';
+                    }
+
                     // transition to order view
-                    return this.transitionToRoute('operations.orders.index.view', order).then(() => {
+                    return this.hostRouter.transitionTo(`${engineMountPoint}operations.orders.index.view`, order).then(() => {
                         this.notifications.success(`New Order ${order.public_id} Created`);
                         this.loader.removeLoader();
                         this.resetForm();
@@ -337,11 +344,7 @@ export default class OperationsOrdersIndexNewController extends Controller {
                 { name: 'Type', valuePath: 'extension', key: 'type' },
                 { name: 'File Name', valuePath: 'name', key: 'fileName' },
                 { name: 'File Size', valuePath: 'size', key: 'fileSize' },
-                {
-                    name: 'Upload Date',
-                    valuePath: 'blob.lastModifiedDate',
-                    key: 'uploadDate',
-                },
+                { name: 'Upload Date', valuePath: 'file.lastModifiedDate', key: 'uploadDate' },
                 { name: '', valuePath: '', key: 'delete' },
             ],
             acceptedFileTypes: ['application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv'],
@@ -367,7 +370,7 @@ export default class OperationsOrdersIndexNewController extends Controller {
                         this.fetch.uploadFile.perform(
                             file,
                             {
-                                path: `uploads/order-imports/${this.currentUser.companyId}`,
+                                path: `uploads/fleet-ops/order-imports/${this.currentUser.companyId}`,
                                 type: `order_import`,
                             },
                             (uploadedFile) => {
@@ -396,7 +399,6 @@ export default class OperationsOrdersIndexNewController extends Controller {
                 this.modalsManager.setOption('isProcessing', true);
 
                 const files = uploadedFiles.map((file) => file.id);
-
                 let results;
 
                 try {
@@ -405,28 +407,21 @@ export default class OperationsOrdersIndexNewController extends Controller {
                     return this.notifications.serverError(error);
                 }
 
-                // import places
-                if (isArray(results?.places)) {
-                    this.isMultipleDropoffOrder = true;
+                const places = get(results, 'places');
+                const entities = get(results, 'entities');
 
-                    // map into place models
-                    const waypoints = results.places.map((_place) => {
+                if (isArray(places)) {
+                    this.isMultipleDropoffOrder = true;
+                    this.waypoints = places.map((_place) => {
                         const place = this.store.createRecord('place', _place);
-
                         return this.store.createRecord('waypoint', { place });
                     });
-
-                    this.waypoints = waypoints;
                 }
 
-                // import entities
-                if (isArray(results?.entities)) {
-                    // map into entity models
-                    const entities = results.entities.map((entity) => {
+                if (isArray(entities)) {
+                    this.entities = entities.map((entity) => {
                         return this.store.createRecord('entity', entity);
                     });
-
-                    this.entities = entities;
                 }
 
                 this.notifications.success('Import completed.');
@@ -436,8 +431,6 @@ export default class OperationsOrdersIndexNewController extends Controller {
             },
             decline: (modal) => {
                 this.modalsManager.setOption('uploadQueue', []);
-                this.fileQueue.flush();
-
                 modal.done();
             },
         });
@@ -448,7 +441,7 @@ export default class OperationsOrdersIndexNewController extends Controller {
 
         if (on) {
             const company = this.store.peekRecord('company', this.currentUser.companyId);
-            this.order.adhoc_distance = company?.options?.fleetops?.adhoc_distance ?? defaultDistanceInMeters;
+            this.order.adhoc_distance = getWithDefault(company, 'options.fleetops.adhoc_distance', defaultDistanceInMeters);
         } else {
             this.order.adhoc_distance = defaultDistanceInMeters;
         }
@@ -493,10 +486,13 @@ export default class OperationsOrdersIndexNewController extends Controller {
         }
     }
 
-    @action newPlace() {
-        if (this.placesController) {
-            return this.placesController.createPlace();
-        }
+    @action createPlace() {
+        const place = this.store.createRecord('place');
+        this.contextPanel.focus(place, 'editing');
+    }
+
+    @action editPlace(place) {
+        this.contextPanel.focus(place, 'editing');
     }
 
     @action async getQuotes(service) {
@@ -1293,11 +1289,23 @@ export default class OperationsOrdersIndexNewController extends Controller {
         const type = await this.modalsManager.userSelectOption('Select facilitator type', ['contact', 'vendor']);
 
         if (type === 'vendor') {
-            return this.vendorsController.createVendor();
+            const vendor = this.store.createRecord('vendor', { type: 'facilitator', status: 'active' });
+            return this.contextPanel.focus(vendor, 'editing', {
+                onAfterSave: (vendor) => {
+                    this.setOrderFacilitator(vendor);
+                    this.contextPanel.clear();
+                },
+            });
         }
 
         if (type === 'contact') {
-            return this.contactsController.createContact();
+            const contact = this.store.createRecord('contact', { type: 'facilitator', status: 'active' });
+            return this.contextPanel.focus(contact, 'editing', {
+                onAfterSave: (contact) => {
+                    this.setOrderFacilitator(contact);
+                    this.contextPanel.clear();
+                },
+            });
         }
     }
 
@@ -1305,11 +1313,23 @@ export default class OperationsOrdersIndexNewController extends Controller {
         const type = await this.modalsManager.userSelectOption('Select customer type', ['contact', 'vendor']);
 
         if (type === 'vendor') {
-            return this.vendorsController.createVendor();
+            const vendor = this.store.createRecord('vendor', { type: 'customer', status: 'active' });
+            return this.contextPanel.focus(vendor, 'editing', {
+                onAfterSave: (vendor) => {
+                    this.setOrderCustomer(vendor);
+                    this.contextPanel.clear();
+                },
+            });
         }
 
         if (type === 'contact') {
-            return this.contactsController.createContact();
+            const contact = this.store.createRecord('contact', { type: 'customer', status: 'active' });
+            return this.contextPanel.focus(contact, 'editing', {
+                onAfterSave: (contact) => {
+                    this.setOrderCustomer(contact);
+                    this.contextPanel.clear();
+                },
+            });
         }
     }
 

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

@@ -1,4 +1,5 @@
-import Controller, { inject as controller } from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
+import { inject as controller } from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action, computed } from '@ember/object';
@@ -10,7 +11,7 @@ import groupBy from '@fleetbase/ember-core/utils/macros/group-by';
 import findClosestWaypoint from '@fleetbase/ember-core/utils/find-closest-waypoint';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
 
-export default class OperationsOrdersIndexViewController extends Controller {
+export default class OperationsOrdersIndexViewController extends BaseController {
     /**
      * Inject the `operations.orders.index` controller
      *
@@ -220,7 +221,7 @@ export default class OperationsOrdersIndexViewController extends Controller {
         this.ordersController.setLayoutMode('map');
 
         // create initial setup function which runs 600ms after invoked
-        const setup = (ms = 500) => {
+        const setup = (ms = 600) => {
             return later(
                 this,
                 () => {
@@ -237,7 +238,13 @@ export default class OperationsOrdersIndexViewController extends Controller {
 
         // create a display order route only function
         const displayOrderRoute = () => {
-            return this.displayOrderRoute();
+            return later(
+                this,
+                () => {
+                    return this.displayOrderRoute();
+                },
+                300
+            );
         };
 
         // re-display order routes when livemap has coordinates

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

@@ -1,4 +1,4 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -8,7 +8,7 @@ import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
-export default class OperationsOrdersIndexController extends Controller {
+export default class OperationsOrdersIndexController extends BaseController {
     /**
      * Inject the `currentUser` service
      *

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

@@ -1,11 +1,11 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 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 {
+export default class OperationsSchedulerIndexController extends BaseController {
     @service modalsManager;
     @service notifications;
     @service store;

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

@@ -36,24 +36,18 @@ export default class OperationsServiceRatesIndexEditController extends Operation
         this.isUpdatingServiceRate = true;
         this.loader.showLoader('.overlay-inner-content', { loadingMessage: 'Updating service rate...' });
 
-        try {
-            return serviceRate
-                .save()
-                .then((serviceRate) => {
-                    return this.transitionToRoute('operations.service-rates.index').then(() => {
-                        this.notifications.success(`Service rate '${serviceRate.service_name}' updated`);
-                        this.resetForm();
-                        this.hostRouter.refresh();
-                    });
-                })
-                .catch(this.notifications.serverError)
-                .finally(() => {
-                    this.isUpdatingServiceRate = false;
-                    this.loader.removeLoader();
+        return serviceRate
+            .save()
+            .then((serviceRate) => {
+                return this.transitionToRoute('operations.service-rates.index').then(() => {
+                    this.notifications.success(`Service rate '${serviceRate.service_name}' updated`);
+                    this.resetForm();
                 });
-        } catch (error) {
-            this.isUpdatingServiceRate = false;
-            this.loader.removeLoader();
-        }
+            })
+            .catch(this.notifications.serverError)
+            .finally(() => {
+                this.isUpdatingServiceRate = false;
+                this.loader.removeLoader();
+            });
     }
 }

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

@@ -1,10 +1,10 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action, computed } from '@ember/object';
 import { isBlank } from '@ember/utils';
 
-export default class OperationsServiceRatesIndexNewController extends Controller {
+export default class OperationsServiceRatesIndexNewController extends BaseController {
     /**
      * Inject the `currentUser` service
      *
@@ -296,27 +296,21 @@ export default class OperationsServiceRatesIndexNewController extends Controller
         this.isCreatingServiceRate = true;
         this.loader.showLoader('.overlay-inner-content', { loadingMessage: 'Creating service rate...' });
 
-        try {
-            return serviceRate
-                .save()
-                .then((serviceRate) => {
-                    return this.transitionToRoute('operations.service-rates.index').then(() => {
-                        this.notifications.success(`New Service Rate ${serviceRate.service_name} Created`);
-                        this.resetForm();
-                        this.hostRouter.refresh();
-                    });
-                })
-                .catch((error) => {
-                    this.notifications.serverError(error);
-                })
-                .finally(() => {
-                    this.isCreatingServiceRate = false;
-                    this.loader.removeLoader();
+        return serviceRate
+            .save()
+            .then((serviceRate) => {
+                return this.transitionToRoute('operations.service-rates.index').then(() => {
+                    this.notifications.success(`New Service Rate ${serviceRate.service_name} Created`);
+                    this.resetForm();
                 });
-        } catch (error) {
-            this.isCreatingServiceRate = false;
-            this.loader.removeLoader();
-        }
+            })
+            .catch((error) => {
+                this.notifications.serverError(error);
+            })
+            .finally(() => {
+                this.isCreatingServiceRate = false;
+                this.loader.removeLoader();
+            });
     }
 
     /**

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

@@ -1,4 +1,4 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -6,7 +6,7 @@ import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
-export default class OperationsServiceRatesIndexController extends Controller {
+export default class OperationsServiceRatesIndexController extends BaseController {
     /**
      * Inject the `currentUser` service
      *
@@ -228,6 +228,13 @@ export default class OperationsServiceRatesIndexController extends Controller {
         this.query = value;
     }
 
+    /**
+     * Reload layout view.
+     */
+    @action reload() {
+        return this.hostRouter.refresh();
+    }
+
     /**
      * Toggles dialog to export `service-rate`
      *

package/addon/engine.js

@@ -4,6 +4,7 @@ import Resolver from 'ember-resolver';
 import config from './config/environment';
 import services from '@fleetbase/ember-core/exports/services';
 import AdminVisibilityControlsComponent from './components/admin/visibility-controls';
+import NavigatorAppControlsComponent from './components/admin/navigator-app';
 
 const { modulePrefix } = config;
 const externalRoutes = ['console', 'extensions'];
@@ -28,6 +29,11 @@ export default class FleetOpsEngine extends Engine {
                     icon: 'eye',
                     component: AdminVisibilityControlsComponent,
                 },
+                {
+                    title: 'Navigator Apps',
+                    icon: 'key',
+                    component: NavigatorAppControlsComponent,
+                },
             ],
             {
                 slug: 'fleet-ops',

package/addon/helpers/waypoint-label.js

@@ -1 +1,6 @@
-export { default, waypointLabel } from '@fleetbase/console/helpers/waypoint-label';
+import { helper } from '@ember/component/helper';
+import waypointLabelUtil from '../utils/waypoint-label';
+
+export default helper(function waypointLabel([index]) {
+    return waypointLabelUtil(index);
+});

package/addon/routes/application.js

@@ -1,29 +1,18 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import getResourceNameFromTransition from '@fleetbase/ember-core/utils/get-resource-name-from-transition';
 
 export default class ApplicationRoute extends Route {
     @service loader;
     @service fetch;
 
-    loading(transition) {
-        const resourceName = this.getResouceName(transition);
+    @action loading(transition) {
+        const resourceName = getResourceNameFromTransition(transition);
         this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: resourceName ? `Loading ${resourceName}...` : `Loading...` });
     }
 
     model() {
         return this.fetch.get('fleet-ops/settings/visibility');
     }
-
-    getResouceName(transition) {
-        const { to } = transition;
-
-        if (typeof to.name === 'string') {
-            let routePathSegments = to.name.split('.');
-            let resourceName = routePathSegments[3];
-
-            return resourceName;
-        }
-
-        return null;
-    }
 }

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

@@ -1,14 +1,11 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { action, set } from '@ember/object';
+import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
 
 export default class ManagementContactsIndexRoute extends Route {
     @service store;
 
-    /**
-     * Queryable parameters
-     *
-     * @var {Object}
-     */
     queryParams = {
         page: { refreshModel: true },
         limit: { refreshModel: true },
@@ -25,6 +22,13 @@ export default class ManagementContactsIndexRoute extends Route {
         updatedAt: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('contact', params);
     }

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

@@ -1,9 +1,10 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { action, set } from '@ember/object';
+import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
 
 export default class ManagementDriversIndexRoute extends Route {
     @service store;
-    @service intl;
 
     queryParams = {
         page: { refreshModel: true },
@@ -28,8 +29,11 @@ export default class ManagementDriversIndexRoute extends Route {
         'within[where]': { refreshModel: true, replace: true },
     };
 
-    beforeModel() {
-        this.intl.setLocale(['en-us']);
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
     }
 
     model(params) {

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

@@ -1,14 +1,11 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { action, set } from '@ember/object';
+import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
 
 export default class ManagementFleetsIndexRoute extends Route {
     @service store;
 
-    /**
-     * Queryable parameters
-     *
-     * @var {Object}
-     */
     queryParams = {
         page: { refreshModel: true },
         limit: { refreshModel: true },
@@ -28,6 +25,13 @@ export default class ManagementFleetsIndexRoute extends Route {
         updatedAt: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('fleet', { ...params, with: ['parent_fleet', 'service_area', 'zone'] });
     }

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

@@ -1,14 +1,11 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { action, set } from '@ember/object';
+import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
 
 export default class ManagementFuelReportsIndexRoute extends Route {
     @service store;
 
-    /**
-     * Queryable parameters
-     *
-     * @var {Object}
-     */
     queryParams = {
         page: { refreshModel: true },
         limit: { refreshModel: true },
@@ -25,6 +22,13 @@ export default class ManagementFuelReportsIndexRoute extends Route {
         odometer: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('fuel-report', { ...params, with: ['driver', 'vehicle', 'reporter'] });
     }

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

@@ -1,14 +1,11 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { action, set } from '@ember/object';
+import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
 
 export default class ManagementIssuesIndexRoute extends Route {
     @service store;
 
-    /**
-     * Queryable parameters
-     *
-     * @var {Object}
-     */
     queryParams = {
         page: { refreshModel: true },
         limit: { refreshModel: true },
@@ -26,6 +23,13 @@ export default class ManagementIssuesIndexRoute extends Route {
         createdAt: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('issue', { ...params, with: ['driver', 'vehicle', 'assignee', 'reporter'] });
     }