@fleetbase/fleetops-engine 0.6.38 → 0.6.40

package/addon/routes/maintenance/schedules/index.js

@@ -0,0 +1,21 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class MaintenanceSchedulesIndexRoute extends Route {
+    @service store;
+
+    queryParams = {
+        page: { refreshModel: true },
+        limit: { refreshModel: true },
+        sort: { refreshModel: true },
+        query: { refreshModel: true },
+        status: { refreshModel: true },
+        public_id: { refreshModel: true },
+        created_at: { refreshModel: true },
+        updated_at: { refreshModel: true },
+    };
+
+    model(params) {
+        return this.store.query('maintenance-schedule', { ...params });
+    }
+}

package/addon/routes/maintenance/schedules.js

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

package/addon/routes/maintenance/work-orders/index/details.js

@@ -1,3 +1,29 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
-export default class MaintenanceWorkOrdersIndexDetailsRoute extends Route {}
+export default class MaintenanceWorkOrdersIndexDetailsRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+        if (typeof error.message === 'string' && error.message.endsWith('not found')) {
+            return this.hostRouter.transitionTo('maintenance.work-orders.index');
+        }
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops view work-order')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('maintenance.work-orders.index');
+        }
+    }
+
+    model({ public_id }) {
+        return this.store.findRecord('work-order', public_id);
+    }
+}

package/addon/routes/maintenance/work-orders/index/edit.js

@@ -1,3 +1,29 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
-export default class MaintenanceWorkOrdersIndexEditRoute extends Route {}
+export default class MaintenanceWorkOrdersIndexEditRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+        if (typeof error.message === 'string' && error.message.endsWith('not found')) {
+            return this.hostRouter.transitionTo('maintenance.work-orders.index');
+        }
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops update work-order')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('maintenance.work-orders.index');
+        }
+    }
+
+    model({ public_id }) {
+        return this.store.findRecord('work-order', public_id);
+    }
+}

package/addon/routes/management/vehicles/index/details/maintenance-history.js

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

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

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

package/addon/routes/management/vehicles/index/details/work-orders.js

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

package/addon/routes/operations/orchestrator.js

@@ -0,0 +1,23 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+/**
+ * Operations::AllocationRoute
+ *
+ * Entry point for the Dispatcher Workbench at /operations/allocation.
+ * The route performs an ability check and then hands off to the
+ * OrchestratorWorkbench component via the controller.
+ */
+export default class OperationsAllocationRoute extends Route {
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops list order')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops');
+        }
+    }
+}

package/addon/routes/operations/scheduler/fleet-schedule.js

@@ -0,0 +1,28 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class OperationsSchedulerFleetScheduleRoute extends Route {
+    @service store;
+    @service notifications;
+    @service abilities;
+    @service intl;
+    @service hostRouter;
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops list driver')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.operations.scheduler.index');
+        }
+    }
+
+    async model() {
+        return this.store.query('driver', { limit: 200 });
+    }
+
+    setupController(controller, model) {
+        super.setupController(controller, model);
+        controller.drivers = model.toArray();
+        controller.loadScheduleItems.perform();
+        controller.loadScheduleExceptions.perform();
+    }
+}

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

@@ -1,46 +1,68 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import { isValid as isValidDate } from 'date-fns';
-import { isNone } from '@ember/utils';
-// import createFullCalendarEventFromOrder from '../../../utils/create-full-calendar-event-from-order';
-
-const getUnscheduledOrder = (order) => {
-    return isNone(order.scheduled_at);
-};
-
-const getScheduledOrder = (order) => {
-    return isValidDate(order.scheduled_at);
-};
 
+/**
+ * OperationsSchedulerIndexRoute
+ *
+ * Responsibilities:
+ *   1. Access control — redirect if the user cannot list orders.
+ *   2. Initial data loading — fetch active orders and drivers in parallel.
+ *   3. Socket subscription lifecycle — delegate to the controller.
+ *
+ * All post-load logic (filtering, event mapping, conflict detection) lives
+ * in the controller and the SchedulingService.
+ */
 export default class OperationsSchedulerIndexRoute extends Route {
     @service store;
-    @service notifications;
-    @service hostRouter;
     @service abilities;
-    @service intl;
+    @service hostRouter;
 
     beforeModel() {
         if (this.abilities.cannot('fleet-ops list order')) {
-            this.notifications.warning(this.intl.t('common.unauthorized-access'));
-            return this.hostRouter.transitionTo('console.fleet-ops');
+            return this.hostRouter.transitionTo('console.fleet-ops.index');
         }
     }
 
-    model() {
-        return this.store.query('order', { status: 'created', with: ['payload', 'driverAssigned.vehicle'] });
+    async model() {
+        // Load active orders (created, dispatched, active) alongside drivers.
+        // The broader status scope ensures dispatchers see each driver's full
+        // day — not just pre-dispatch orders — enabling accurate conflict
+        // detection and capacity visualisation.
+        const [orders, drivers] = await Promise.all([
+            this.store.query('order', {
+                status: ['created', 'dispatched', 'active'],
+                with: ['payload', 'driverAssigned.vehicle'],
+                limit: 500,
+            }),
+            this.store.query('driver', {
+                with: ['currentShift'],
+                limit: 200,
+            }),
+        ]);
+
+        return { orders, drivers };
     }
 
     setupController(controller, model) {
-        // get orders
-        const orders = model.toArray();
+        super.setupController(controller, model);
+
+        // Set drivers on the controller so the resource timeline can render them.
+        // Orders are read reactively from the Ember Data store via computed getters,
+        // so we do not need to set them explicitly here.
+        controller.set('drivers', model.drivers.toArray());
 
-        // set unscheduled orders
-        controller.unscheduledOrders = orders.filter(getUnscheduledOrder);
+        // Initialise viewDate to the current UTC instant.
+        // @event-calendar/core applies timezoneOffsetMins internally so the
+        // calendar opens on the correct company-local day automatically.
+        controller.set('viewDate', new Date());
 
-        // set scheduled orders
-        controller.scheduledOrders = orders.filter(getScheduledOrder);
+        // Open SocketCluster subscriptions for real-time calendar updates.
+        controller.subscribeToRealTimeUpdates();
+    }
 
-        // // create events from scheduledOrders
-        // controller.events = controller.scheduledOrders.map(createFullCalendarEventFromOrder);
+    resetController(controller) {
+        // Close all socket channels when the dispatcher navigates away
+        // to prevent memory leaks and stale event handlers.
+        controller.unsubscribeFromRealTimeUpdates();
     }
 }

package/addon/routes/operations/scheduler.js

@@ -1,3 +1,16 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
-export default class OperationsSchedulerRoute extends Route {}
+export default class OperationsSchedulerRoute extends Route {
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops list order')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops');
+        }
+    }
+}

package/addon/routes/settings/orchestrator.js

@@ -0,0 +1,27 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+/**
+ * Settings::OrchestratorRoute
+ *
+ * Entry point for the allocation settings page at /settings/order-allocation.
+ * Loads current settings into the controller on entry.
+ */
+export default class SettingsOrchestratorRoute extends Route {
+    @service notifications;
+    @service abilities;
+    @service intl;
+    @service hostRouter;
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops list order')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops');
+        }
+    }
+
+    setupController(controller) {
+        super.setupController(...arguments);
+        controller.loadSettings.perform();
+    }
+}

package/addon/routes/settings/scheduling.js

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

package/addon/routes.js

@@ -14,7 +14,11 @@ export default buildRoutes(function () {
                 this.route('edit', { path: '/edit/:public_id' });
             });
         });
-        this.route('scheduler', function () {});
+        this.route('orchestrator', function () {});
+        this.route('scheduler', function () {
+            this.route('index', { path: '/' });
+            this.route('fleet-schedule');
+        });
         this.route('orders', { path: '/' }, function () {
             this.route('index', { path: '/' }, function () {
                 this.route('new');
@@ -80,6 +84,9 @@ export default buildRoutes(function () {
                     this.route('positions');
                     this.route('devices');
                     this.route('equipment');
+                    this.route('schedules');
+                    this.route('work-orders');
+                    this.route('maintenance-history');
                     this.route('virtual', { path: '/:slug' });
                 });
                 this.route('edit', { path: '/edit/:public_id' });
@@ -181,6 +188,27 @@ export default buildRoutes(function () {
         this.route('tracking');
     });
     this.route('maintenance', function () {
+        this.route('schedules', function () {
+            this.route('index', { path: '/' }, function () {
+                this.route('new');
+                this.route('edit', { path: '/edit/:public_id' });
+                this.route('details', { path: '/:public_id' }, function () {
+                    this.route('index', { path: '/' });
+                    this.route('work-orders');
+                });
+            });
+        });
+
+        this.route('maintenances', function () {
+            this.route('index', { path: '/' }, function () {
+                this.route('new');
+                this.route('edit', { path: '/edit/:public_id' });
+                this.route('details', { path: '/:public_id' }, function () {
+                    this.route('index', { path: '/' });
+                });
+            });
+        });
+
         this.route('work-orders', function () {
             this.route('index', { path: '/' }, function () {
                 this.route('new');
@@ -229,6 +257,8 @@ export default buildRoutes(function () {
         this.route('custom-fields');
         this.route('avatars');
         this.route('routing');
+        this.route('orchestrator');
+        this.route('scheduling');
         this.route('payments', function () {
             this.route('index', { path: '/' });
             this.route('onboard');

package/addon/services/driver-actions.js

@@ -1,9 +1,47 @@
-import ResourceActionService from '@fleetbase/ember-core/services/resource-action';
+import ResourceActionService, { inject as service } from '@fleetbase/ember-core/services/resource-action';
 import leafletIcon from '@fleetbase/ember-core/utils/leaflet-icon';
 import config from 'ember-get-config';
 import { action } from '@ember/object';
+import { isArray } from '@ember/array';
+import { dasherize } from '@ember/string';
 
 export default class DriverActionsService extends ResourceActionService {
+    @service('universe/menu-service') menuService;
+
+    get registeredTabs() {
+        const registeredTabs = this.menuService.getMenuItems('fleet-ops:component:driver:details');
+        return (isArray(registeredTabs) ? registeredTabs : [])
+            .map((tab) => {
+                delete tab.route;
+                if (!tab.key) {
+                    tab.key = tab.id ?? dasherize(tab.label ?? tab.title);
+                }
+                return tab;
+            })
+            .filter((tab) => !tab.component);
+    }
+
+    get panelTabs() {
+        return [
+            {
+                key: 'overview',
+                label: this.intl.t('common.overview'),
+                component: 'driver/details',
+            },
+            {
+                key: 'positions',
+                label: 'Positions',
+                component: 'positions-replay',
+            },
+            {
+                key: 'schedule',
+                label: this.intl.t('common.schedule'),
+                component: 'driver/schedule',
+            },
+            ...this.registeredTabs,
+        ];
+    }
+
     constructor() {
         super(...arguments);
         this.initialize('driver');
@@ -68,12 +106,7 @@ export default class DriverActionsService extends ResourceActionService {
                         },
                     },
                 ],
-                tabs: [
-                    {
-                        label: this.intl.t('common.overview'),
-                        component: 'driver/details',
-                    },
-                ],
+                tabs: this.panelTabs,
                 ...options,
             });
         },

package/addon/services/driver-scheduling.js

@@ -32,7 +32,10 @@ export default class DriverSchedulingService extends Service {
      */
     @task *createSchedule(data) {
         try {
-            const schedule = this.store.createRecord('schedule', data);
+            const schedule = this.store.createRecord('schedule', {
+                timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+                ...data,
+            });
             yield schedule.save();
             this.notifications.success('Schedule created successfully');
             return schedule;

package/addon/services/equipment-actions.js

@@ -1,15 +1,25 @@
-import ResourceActionService from '@fleetbase/ember-core/services/resource-action';
+import ResourceActionService, { inject as service } from '@fleetbase/ember-core/services/resource-action';
 
 export default class EquipmentActionsService extends ResourceActionService {
+    @service currentUser;
+
     constructor() {
         super(...arguments);
-        this.initialize('equipment');
+        this.initialize('equipment', {
+            defaultAttributes: {
+                currency: this.defaultCurrency,
+            },
+        });
+    }
+
+    get defaultCurrency() {
+        return this.currentUser?.company?.currency || 'USD';
     }
 
     transition = {
-        view: (equipment) => this.transitionTo('maintenance.equipments.index.details', equipment),
-        edit: (equipment) => this.transitionTo('maintenance.equipments.index.edit', equipment),
-        create: () => this.transitionTo('maintenance.equipments.index.new'),
+        view: (equipment) => this.transitionTo('maintenance.equipment.index.details', equipment),
+        edit: (equipment) => this.transitionTo('maintenance.equipment.index.edit', equipment),
+        create: () => this.transitionTo('maintenance.equipment.index.new'),
     };
 
     panel = {

package/addon/services/leaflet-map-manager.js

@@ -233,11 +233,20 @@ export default class LeafletMapManagerService extends Service {
         const { router, formatter } = this.leafletRoutingControl.get(routingService);
         const tag = `routing:${Date.now().toString(36)}:${Math.random().toString(36).slice(2, 8)}`;
 
-        const routingControl = new RoutingControl({
+        // Allow callers to suppress the routing control's default waypoint markers
+        // by passing createMarker: () => null in options. This is used by the
+        // orchestrator which renders its own custom div-icon markers via ember-leaflet.
+        const routingControlOptions = {
             router,
             formatter,
             waypoints,
-            markerOptions: {
+            alternativeClassName: 'hidden',
+            addWaypoints: false,
+        };
+        if (typeof options.createMarker === 'function') {
+            routingControlOptions.createMarker = options.createMarker;
+        } else {
+            routingControlOptions.markerOptions = {
                 icon: L.icon({
                     iconUrl: '/assets/images/marker-icon.png',
                     iconRetinaUrl: '/assets/images/marker-icon-2x.png',
@@ -245,10 +254,9 @@ export default class LeafletMapManagerService extends Service {
                     iconSize: [25, 41],
                     iconAnchor: [12, 41],
                 }),
-            },
-            alternativeClassName: 'hidden',
-            addWaypoints: false,
-        }).addTo(map);
+            };
+        }
+        const routingControl = new RoutingControl(routingControlOptions).addTo(map);
 
         // Track routing control
         this.routingControl = routingControl;

package/addon/services/maintenance-actions.js

@@ -1,9 +1,19 @@
-import ResourceActionService from '@fleetbase/ember-core/services/resource-action';
+import ResourceActionService, { inject as service } from '@fleetbase/ember-core/services/resource-action';
 
 export default class MaintenanceActionsService extends ResourceActionService {
+    @service currentUser;
+
     constructor() {
         super(...arguments);
-        this.initialize('maintenance');
+        this.initialize('maintenance', {
+            defaultAttributes: {
+                currency: this.defaultCurrency,
+            },
+        });
+    }
+
+    get defaultCurrency() {
+        return this.currentUser?.company?.currency || 'USD';
     }
 
     transition = {
@@ -19,16 +29,14 @@ export default class MaintenanceActionsService extends ResourceActionService {
                 content: 'maintenance/form',
                 title: this.intl.t('common.create-a-new-resource', { resource: this.intl.t('resource.maintenance')?.toLowerCase() }),
                 useDefaultSaveTask: true,
-                saveOptions: {
-                    callback: this.refresh,
-                },
+                saveOptions: { callback: this.refresh },
                 maintenance,
             });
         },
         edit: (maintenance) => {
             return this.resourceContextPanel.open({
                 content: 'maintenance/form',
-                title: this.intl.t('common.edit-resource-name', { resourceName: maintenance.name }),
+                title: this.intl.t('common.edit-resource-name', { resourceName: maintenance.summary }),
                 useDefaultSaveTask: true,
                 maintenance,
             });
@@ -36,12 +44,7 @@ export default class MaintenanceActionsService extends ResourceActionService {
         view: (maintenance) => {
             return this.resourceContextPanel.open({
                 maintenance,
-                tabs: [
-                    {
-                        label: this.intl.t('common.overview'),
-                        component: 'maintenance/details',
-                    },
-                ],
+                tabs: [{ label: this.intl.t('common.overview'), component: 'maintenance/details' }],
             });
         },
     };
@@ -61,7 +64,7 @@ export default class MaintenanceActionsService extends ResourceActionService {
         edit: (maintenance, options = {}, saveOptions = {}) => {
             return this.modalsManager.show('modals/resource', {
                 resource: maintenance,
-                title: this.intl.t('common.edit-resource-name', { resourceName: maintenance.name }),
+                title: this.intl.t('common.edit-resource-name', { resourceName: maintenance.summary }),
                 acceptButtonText: this.intl.t('common.save-changes'),
                 saveButtonIcon: 'save',
                 component: 'maintenance/form',
@@ -72,7 +75,7 @@ export default class MaintenanceActionsService extends ResourceActionService {
         view: (maintenance, options = {}) => {
             return this.modalsManager.show('modals/resource', {
                 resource: maintenance,
-                title: maintenance.name,
+                title: maintenance.summary,
                 component: 'maintenance/details',
                 ...options,
             });