Merge branch 'dev-v0.6.28' of github.com:fleetbase/fleetops into dev-v0.6.28

Author: roncodes

addon/components/layout/fleet-ops-sidebar.js

@@ -25,8 +25,13 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
     }
 
     createMenuItemsFromUniverseRegistry() {
+<<<<<<< HEAD
         const registeredMenuItems = this.registryService.getMenuItems('engine:fleet-ops');
         this.universeMenuPanels = this.registryService.getMenuPanels('engine:fleet-ops');
+=======
+        const registeredMenuItems = this.registryService.getRegistry('engine:fleet-ops');
+        this.universeMenuPanels = this.registryService.getRegistry('engine:fleet-ops:panels');
+>>>>>>> 623fa0c66165ea9b466e06f811d9477f1a8f2380
         this.universeMenuItems = registeredMenuItems.filter((menuItem) => menuItem.section === undefined);
         this.universeSettingsMenuItems = registeredMenuItems.filter((menuItem) => menuItem.section === 'settings');
     }

addon/components/map/drawer.js

@@ -9,7 +9,7 @@ export default class MapDrawerComponent extends Component {
     @service('universe/registry-service') registryService;
 
     get tabs() {
-        const registeredTabs = this.registryService.getMenuItems('fleet-ops:component:map:drawer');
+        const registeredTabs = this.registryService.getRegistry('fleet-ops:component:map:drawer');
         return [
             this.universe._createMenuItem('Vehicles', null, { icon: 'car', component: 'map/drawer/vehicle-listing' }),
             this.universe._createMenuItem('Drivers', null, { icon: 'id-card', component: 'map/drawer/driver-listing' }),

addon/components/map/leaflet-live-map.js

@@ -316,7 +316,7 @@ export default class MapLeafletLiveMapComponent extends Component {
         ].filter(Boolean);
 
         const registry = this.leafletContextmenuManager.createContextMenu('map', map, items);
-        this.registryService.createEvent('fleet-ops:contextmenu:map', 'created', registry, this.leafletContextmenuManager);
+        this.universe.trigger('fleet-ops:contextmenu:map:created', registry, this.leafletContextmenuManager);
 
         return registry;
     }
@@ -342,7 +342,7 @@ export default class MapLeafletLiveMapComponent extends Component {
 
         // create contextmenu registry
         const contextmenuRegistry = this.leafletContextmenuManager.createContextMenu(`zone:${zone.public_id}`, layer, items, { zone });
-        this.registryService.createEvent('fleet-ops:contextmenu:zone', 'created', contextmenuRegistry, this.leafletContextmenuManager);
+        this.universe.trigger('fleet-ops:contextmenu:zone:created', contextmenuRegistry, this.leafletContextmenuManager);
 
         return contextmenuRegistry;
     }
@@ -376,7 +376,11 @@ export default class MapLeafletLiveMapComponent extends Component {
 
         // create contextmenu registry
         const contextmenuRegistry = this.leafletContextmenuManager.createContextMenu(`service-area:${serviceArea.public_id}`, layer, items, { serviceArea });
+<<<<<<< HEAD
         this.registryService.createEvent('fleet-ops:contextmenu:service-area', 'created', contextmenuRegistry, this.leafletContextmenuManager);
+=======
+        this.universe.trigger('fleet-ops:contextmenu:service-area:created', contextmenuRegistry, this.leafletContextmenuManager);
+>>>>>>> 623fa0c66165ea9b466e06f811d9477f1a8f2380
 
         return contextmenuRegistry;
     }
@@ -405,7 +409,7 @@ export default class MapLeafletLiveMapComponent extends Component {
         ];
 
         // append items from universe registry
-        const registeredContextMenuItems = this.registryService.getMenuItems('fleet-ops:contextmenu:driver');
+        const registeredContextMenuItems = this.registryService.getRegistry('fleet-ops:contextmenu:driver');
         if (isArray(registeredContextMenuItems)) {
             items = [
                 ...items,
@@ -428,7 +432,11 @@ export default class MapLeafletLiveMapComponent extends Component {
 
         // create contextmenu registry
         const contextmenuRegistry = this.leafletContextmenuManager.createContextMenu(`driver:${driver.public_id}`, layer, items, { driver });
+<<<<<<< HEAD
         this.registryService.createEvent('fleet-ops:contextmenu:driver', 'created', contextmenuRegistry, this.leafletContextmenuManager);
+=======
+        this.universe.trigger('fleet-ops:contextmenu:driver:created', contextmenuRegistry, this.leafletContextmenuManager);
+>>>>>>> 623fa0c66165ea9b466e06f811d9477f1a8f2380
 
         return contextmenuRegistry;
     }
@@ -453,7 +461,7 @@ export default class MapLeafletLiveMapComponent extends Component {
         ];
 
         // append items from universe registry
-        const registeredContextMenuItems = this.registryService.getMenuItems('fleet-ops:contextmenu:vehicle');
+        const registeredContextMenuItems = this.registryService.getRegistry('fleet-ops:contextmenu:vehicle');
         if (isArray(registeredContextMenuItems)) {
             items = [
                 ...items,
@@ -476,7 +484,7 @@ export default class MapLeafletLiveMapComponent extends Component {
 
         // create contextmenu registry
         const contextmenuRegistry = this.leafletContextmenuManager.createContextMenu(`vehicle:${vehicle.public_id}`, layer, items, { vehicle });
-        this.registryService.createEvent('fleet-ops:contextmenu:vehicle', 'created', contextmenuRegistry, this.leafletContextmenuManager);
+        this.universe.trigger('fleet-ops:contextmenu:vehicle:created', contextmenuRegistry, this.leafletContextmenuManager);
 
         return contextmenuRegistry;
     }

addon/components/order-config-manager.js

@@ -40,7 +40,7 @@ export default class OrderConfigManagerComponent extends Component {
      * @type {Array}
      */
     get tabs() {
-        const registeredTabs = this.registryService.getMenuItems('fleet-ops:component:order-config-manager');
+        const registeredTabs = this.registryService.getRegistry('fleet-ops:component:order-config-manager');
         const defaultTabs = [
             this.universe._createMenuItem(this.intl.t('order-config-manager.tabs.details'), null, { icon: 'circle-info', component: OrderConfigManagerDetailsComponent }),
             this.universe._createMenuItem(this.intl.t('order-config-manager.tabs.custom-fields'), null, { icon: 'rectangle-list', component: OrderConfigManagerCustomFieldsComponent }),

addon/engine.js

@@ -23,10 +23,9 @@ export default class FleetOpsEngine extends Engine {
         externalRoutes,
     };
     setupExtension = function (app, engine, universe) {
-        // Get refactored services from universe facade
-        const menuService = universe.getService('menuService');
-        const widgetService = universe.getService('widgetService');
-        const registryService = universe.getService('registryService');
+        const menuService = universe.getService('universe/menu-service');
+        const widgetService = universe.getService('universe/widget-service');
+        const registryService = universe.getService('universe/registry-service');
 
         // register menu item in header
         menuService.registerHeaderMenuItem('Fleet-Ops', 'console.fleet-ops', { icon: 'route', priority: 0 });

addon/extension.js

@@ -3,9 +3,6 @@ import { MenuItem, MenuPanel, Widget, ExtensionComponent, Hook } from '@fleetbas
 export default function (app, universe) {
     console.log('[FleetOps] Setting up extension...');
 
-    // Get the menuService from the universe facade
-    const menuService = universe.getService('menuService');
-    
-    // Register header menu item using menuService
+    const menuService = universe.getService('universe/menu-service');
     menuService.registerHeaderMenuItem('Fleet-Ops', 'console.fleet-ops', { icon: 'route', priority: 0 });
 }

addon/routes/virtual.js

@@ -13,6 +13,12 @@ export default class VirtualRoute extends Route {
 
     model({ section = null, slug }, transition) {
         const view = this.universe.getViewFromTransition(transition);
-        return this.registryService.lookupMenuItem('engine:fleet-ops', slug, view, section);
+        const items = this.registryService.getRegistry('engine:fleet-ops');
+        return items.find(item => {
+            const slugMatch = item.slug === slug;
+            const viewMatch = !view || item.view === view;
+            const sectionMatch = !section || item.section === section;
+            return slugMatch && viewMatch && sectionMatch;
+        });
     }
 }

addon/utils/setup-customer-portal.js

@@ -6,10 +6,7 @@ import { debug } from '@ember/debug';
 export default function setupCustomerPortal(app, engine, universe) {
     if (!customerPortalInstalled(app)) return;
 
-    // Get extensionManager from universe facade
-    const extensionManager = universe.getService('extensionManager');
-    const menuService = universe.getService('menuService');
-
+    const extensionManager = universe.getService('universe/extension-manager');
     extensionManager.afterBoot(function (u) {
         const portal = u.getEngineInstance('@fleetbase/customer-portal-engine');
         if (!portal) {
@@ -21,14 +18,19 @@ export default function setupCustomerPortal(app, engine, universe) {
         createServiceAlias(engine, portal, ['leaflet-map-manager', 'location', 'movement-tracker', 'leaflet-routing-control', 'order-config-actions', 'order-creation', 'order-validation']);
 
         // Now it's safe to wire menus + renderables that might use those services
-        menuService.registerMenuItems('customer-portal:sidebar', [
+        const menuService = u.getService('universe/menu-service');
+        const registryService = u.getService('universe/registry-service');
+        
+        // Register menu items
+        const menuItems = [
             u._createMenuItem('Orders', 'customer-portal.portal.virtual', {
                 icon: 'boxes-packing',
                 component: createEngineBoundComponent(portal, CustomerOrdersComponent),
             }),
-        ]);
+        ];
+        menuItems.forEach(item => menuService.registerMenuItem('customer-portal:sidebar', item.title, item.route, item));
 
-        u.registerRenderableComponent('@fleetbase/customer-portal-engine', 'customer-portal:admin-settings', CustomerAdminSettingsComponent);
+        registryService.register('customer-portal:admin-settings', '@fleetbase/customer-portal-engine', CustomerAdminSettingsComponent);
     });
 }