@fleetbase/fleetops-engine 0.6.44 → 0.6.46

package/addon/routes/operations/orchestrator.js

@@ -13,6 +13,19 @@ export default class OperationsAllocationRoute extends Route {
     @service hostRouter;
     @service abilities;
     @service intl;
+    @service sidebar;
+    @service mapManager;
+
+    activate() {
+        this.sidebar.hide();
+    }
+
+    deactivate() {
+        this.sidebar.show();
+        this.mapManager.setMapInstance?.(null);
+        this.mapManager.setLivemap?.(null);
+        this.mapManager.setActiveProvider?.(this.mapManager.getConfiguredProvider?.() ?? 'leaflet');
+    }
 
     beforeModel() {
         if (this.abilities.cannot('fleet-ops list order')) {

package/addon/routes/operations/orders/index/details/virtual.js

@@ -19,5 +19,6 @@ export default class OperationsOrdersIndexDetailsVirtualRoute extends Route {
     setupController(controller) {
         super.setupController(...arguments);
         controller.resource = this.modelFor('operations.orders.index.details');
+        controller.detailsController = this.controllerFor('operations.orders.index.details');
     }
 }

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

@@ -7,33 +7,27 @@ export default class OperationsOrdersIndexDetailsRoute extends Route {
     @service store;
     @service hostRouter;
     @service orderSocketEvents;
-    @service leafletMapManager;
+    @service mapManager;
     @service abilities;
-    @service universe;
     @service intl;
+    @service sidebar;
 
     @action willTransition(transition) {
         const fromName = transition.from?.name;
         const toName = transition.to?.name;
+        const orderDetailsRoute = 'console.fleet-ops.operations.orders.index.details';
+        const isRefreshWithinSameDetailsRoute = fromName?.startsWith(orderDetailsRoute) && toName?.startsWith(orderDetailsRoute) && fromName === toName;
 
-        // only cleanup when actually leaving this route (not intra-route changes)
-        if (fromName && fromName !== toName) {
-            const controller = this.controllerFor('operations.orders.index.details');
-            const rc = controller.routingControl;
-
-            // Put back sidebar
-            if (this.universe.sidebarContext) {
-                this.universe.sidebarContext.show();
-            }
-
-            // stop listening for events
-            this.orderSocketEvents.stop(controller.model);
+        if (isRefreshWithinSameDetailsRoute) {
+            return true;
+        }
 
-            // cleanup guards
-            if (rc) {
-                this.leafletMapManager.removeRoutingControl(rc);
-                controller.routingControl = undefined;
-            }
+        // only cleanup when leaving the order details route tree entirely
+        const isLeavingOrderDetails = fromName?.startsWith(orderDetailsRoute) && !toName?.startsWith(orderDetailsRoute);
+        if (isLeavingOrderDetails) {
+            const controller = this.controllerFor('operations.orders.index.details');
+            controller.teardownRealtime();
+            controller.teardownRoutingControls();
         }
 
         return true;
@@ -44,6 +38,14 @@ export default class OperationsOrdersIndexDetailsRoute extends Route {
         return this.hostRouter.transitionTo('console.fleet-ops.operations.orders.index');
     }
 
+    activate() {
+        this.sidebar.hide();
+    }
+
+    deactivate() {
+        this.sidebar.show();
+    }
+
     beforeModel() {
         if (this.abilities.cannot('fleet-ops view order')) {
             this.notifications.warning(this.intl.t('common.unauthorized-access'));
@@ -55,14 +57,35 @@ export default class OperationsOrdersIndexDetailsRoute extends Route {
         return this.store.queryRecord('order', {
             public_id,
             single: true,
-            with: ['payload', 'driverAssigned', 'orderConfig', 'customer', 'facilitator', 'trackingStatuses', 'trackingNumber', 'purchaseRate', 'comments', 'files'],
+            with: [
+                'payload',
+                'driverAssigned',
+                'orderConfig',
+                'customer',
+                'facilitator',
+                'trackingStatuses',
+                'trackingNumber',
+                'purchaseRate',
+                'purchaseRate.serviceQuote',
+                'purchaseRate.serviceQuote.items',
+                'comments',
+                'files',
+            ],
         });
     }
 
-    async afterModel(order) {
-        await order.loadTrackingActivity();
-        if (order.meta?._index_resource) {
-            await order.reload();
+    async setupController(controller, model) {
+        super.setupController(...arguments);
+
+        // Change layout to map
+        controller.index?.changeLayout?.('map');
+
+        // load activity and reload order if lightweight payload
+        await model.loadTrackingActivity();
+        if (model.meta?._index_resource) {
+            await model.reload();
         }
+
+        await controller.setupDetailsSession();
     }
 }

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

@@ -7,6 +7,7 @@ export default class OperationsOrdersIndexNewRoute extends Route {
     @service hostRouter;
     @service abilities;
     @service intl;
+    @service sidebar;
 
     @action willTransition() {
         if (this.controller) {
@@ -14,6 +15,14 @@ export default class OperationsOrdersIndexNewRoute extends Route {
         }
     }
 
+    activate() {
+        this.sidebar.hide();
+    }
+
+    deactivate() {
+        this.sidebar.show();
+    }
+
     beforeModel() {
         if (this.abilities.cannot('fleet-ops create order')) {
             this.notifications.warning(this.intl.t('common.unauthorized-access'));

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

@@ -3,7 +3,6 @@ import { inject as service } from '@ember/service';
 
 export default class OperationsOrdersIndexRoute extends Route {
     @service store;
-    @service leafletMapManager;
 
     queryParams = {
         page: { refreshModel: true },

package/addon/routes/settings/map.js

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

package/addon/routes.js

@@ -257,6 +257,7 @@ export default buildRoutes(function () {
         this.route('custom-fields');
         this.route('avatars');
         this.route('routing');
+        this.route('map');
         this.route('orchestrator');
         this.route('scheduling');
         this.route('payments', function () {

package/addon/services/entity-actions.js

@@ -3,7 +3,7 @@ import ResourceActionService from '@fleetbase/ember-core/services/resource-actio
 export default class EntityActionsService extends ResourceActionService {
     constructor() {
         super(...arguments);
-        this.initialize('entity', { defaultAttributes: {} });
+        this.initialize('entity', { defaultAttributes: { type: 'entity' } });
     }
 
     modal = {

package/addon/services/equipment-actions.js

@@ -1,7 +1,9 @@
-import ResourceActionService, { inject as service } from '@fleetbase/ember-core/services/resource-action';
+import ResourceActionService from '@fleetbase/ember-core/services/resource-action';
 
 export default class EquipmentActionsService extends ResourceActionService {
-    @service currentUser;
+    get defaultCurrency() {
+        return this.currentUser?.company?.currency || this.currentUser.currency || 'USD';
+    }
 
     constructor() {
         super(...arguments);
@@ -12,10 +14,6 @@ export default class EquipmentActionsService extends ResourceActionService {
         });
     }
 
-    get defaultCurrency() {
-        return this.currentUser?.company?.currency || 'USD';
-    }
-
     transition = {
         view: (equipment) => this.transitionTo('maintenance.equipment.index.details', equipment),
         edit: (equipment) => this.transitionTo('maintenance.equipment.index.edit', equipment),

package/addon/services/geofence-event-bus.js

@@ -1,4 +1,5 @@
 import Service from '@ember/service';
+import { isArray } from '@ember/array';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -154,7 +155,7 @@ export default class GeofenceEventBusService extends Service {
 
     @action
     seedEvents(events = []) {
-        this.events = Array.isArray(events) ? events.slice(0, this.MAX_EVENTS).map((event) => ({ ...event, isNew: false })) : [];
+        this.events = isArray(events) ? events.slice(0, this.MAX_EVENTS).map((event) => ({ ...event, isNew: false })) : [];
     }
 
     /**