@fleetbase/fleetops-engine 0.6.56 → 0.6.57

package/addon/components/vehicle/card.hbs

@@ -1,10 +1,16 @@
 <Layout::Resource::Card ...attributes as |Card|>
     <Card.header class="{{@headerClass}}">
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:header:start" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
         <div class="font-semibold w-full truncate">{{or @resource.name @resource.yearMakeModel}}</div>
-        <div class="text-gray-300 dark:text-gray-500 text-sm w-full truncate">{{or @resource.plate_number @resource.vin @resource.serial_number @resource.call_sign @resource.public_id}}</div>
+        <div class="text-gray-400 dark:text-gray-500 text-sm w-full truncate">{{or @resource.plate_number @resource.vin @resource.serial_number @resource.call_sign @resource.public_id}}</div>
         {{#if (has-block "header")}}
             {{yield to="header"}}
         {{/if}}
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:header:end" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
     </Card.header>
     <Card.body class={{@bodyClass}}>
         <Image src={{@resource.photo_url}} class="card-img-lg" />
@@ -13,16 +19,22 @@
         {{/if}}
     </Card.body>
     <Card.footer class={{@footerClass}}>
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:footer:start" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
         <div class="flex flex-row items-center space-x-1">
             <Button @icon="eye" @size="xs" @onClick={{fn this.vehicleActions.transition.view @resource}} />
             <Button @icon="pencil" @size="xs" @onClick={{fn this.vehicleActions.transition.edit @resource}} />
             <Button @icon="trash" @size="xs" @type="danger" @onClick={{fn this.vehicleActions.delete @resource}} />
         </div>
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:footer:end" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
         {{#if (has-block "footer")}}
             {{yield to="footer"}}
         {{/if}}
         <div class="mt-1.5">
-            <div class="text-gray-300 dark:text-gray-500 text-xs">Last Modified: {{@resource.updatedAt}}</div>
+            <div class="text-gray-400 dark:text-gray-500 text-xs">Last Modified: {{@resource.updatedAt}}</div>
         </div>
     </Card.footer>
 </Layout::Resource::Card>

package/addon/components/vehicle/form.hbs

@@ -1,4 +1,8 @@
 <div class="form-wrapper" ...attributes>
+    <RegistryYield @registry="fleet-ops:component:vehicle:form:start" as |RegistryComponent|>
+        <RegistryComponent @resource={{@resource}} @controller={{this.controller}} @permission={{get-write-permission @resource}} />
+    </RegistryYield>
+
     {{! DETAILS / IDENTIFICATION }}
     <ContentPanel @title={{t "common.details"}} @open={{true}} @wrapperClass="bordered-top">
         <div class="flex flex-row space-x-3 mb-3">
@@ -128,6 +132,10 @@
         </RegistryYield>
     </ContentPanel>
 
+    <RegistryYield @registry="fleet-ops:component:vehicle:form:after-details" as |RegistryComponent|>
+        <RegistryComponent @resource={{@resource}} @controller={{this.controller}} @permission={{get-write-permission @resource}} />
+    </RegistryYield>
+
     {{! MEASUREMENT & UNITS / ODOMETER }}
     <ContentPanel @title="Measurement & Units" @open={{true}} @wrapperClass="bordered-top">
         <div class="grid grid-cols-1 gap-2 lg:grid-cols-2 lg:gap-2 no-input-group-padding text-xs">
@@ -608,4 +616,8 @@
     <ContentPanel @title={{t "common.metadata"}} @open={{true}} @wrapperClass="bordered-top">
         <MetadataEditor @value={{@resource.meta}} @onChange={{fn (mut @resource.meta)}} />
     </ContentPanel>
-</div>
+
+    <RegistryYield @registry="fleet-ops:component:vehicle:form:end" as |RegistryComponent|>
+        <RegistryComponent @resource={{@resource}} @controller={{this.controller}} @permission={{get-write-permission @resource}} />
+    </RegistryYield>
+</div>

package/addon/controllers/settings/map.js

@@ -90,6 +90,10 @@ export default class SettingsMapController extends Controller {
                 this.mapManager.setActiveProvider(this.mapProvider);
             }
 
+            if (this.mapProvider === 'google' && typeof this.mapManager?.applyViewSettingsFromSettings === 'function') {
+                yield this.mapManager.applyViewSettingsFromSettings();
+            }
+
             this.notifications.success(this.intl.t('settings.map.settings-saved'));
         } catch (error) {
             this.notifications.serverError(error);

package/addon/extension.js

@@ -116,6 +116,7 @@ export default {
 
         // Create registries
         this.createRegistries(registryService);
+        registryService.registerRenderableComponent('ai:action-preview:fleet-ops.create_order', new ExtensionComponent('@fleetbase/fleetops-engine', 'ai/create-order-preview'));
 
         // // Register console home guidance
         // this.registerHomeComponents(registryService);
@@ -368,6 +369,13 @@ export default {
             'fleet-ops:component:place:form:details',
             'fleet-ops:component:vehicle:form',
             'fleet-ops:component:vehicle:form:details',
+            'fleet-ops:component:vehicle:form:after-details',
+            'fleet-ops:component:vehicle:form:start',
+            'fleet-ops:component:vehicle:form:end',
+            'fleet-ops:component:vehicle:card:header:start',
+            'fleet-ops:component:vehicle:card:header:end',
+            'fleet-ops:component:vehicle:card:footer:start',
+            'fleet-ops:component:vehicle:card:footer:end',
             'fleet-ops:component:vendor:form:edit',
             'fleet-ops:component:vendor:form:edit:details',
             'fleet-ops:component:vendor:form:create',
@@ -392,6 +400,12 @@ export default {
             'fleet-ops:contextmenu:driver',
             'fleet-ops:component:order:details',
             'fleet-ops:component:order:form',
+            'fleet-ops:component:order:form:start',
+            'fleet-ops:component:order:form:end',
+            'fleet-ops:component:order:form:details',
+            'fleet-ops:component:order:form:details:start',
+            'fleet-ops:component:order:form:details:end',
+            'fleet-ops:component:order:form:details:after-details',
             'fleet-ops:component:order:form:payload:entity',
             'fleet-ops:component:order:form:payload:entity:form',
             'fleet-ops:template:settings:routing',

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

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

package/addon/services/map-adapter/google.js

@@ -62,6 +62,16 @@ const DEFAULT_GOOGLE_MAP_STYLES = [
     },
 ];
 
+function buildGoogleMapStyles({ showTransitLayer = false, googleOptions = {} } = {}) {
+    const baseStyles = showTransitLayer ? DEFAULT_GOOGLE_MAP_STYLES.filter((style) => style.featureType !== 'transit') : DEFAULT_GOOGLE_MAP_STYLES;
+
+    if (googleOptions.styles === undefined) {
+        return baseStyles;
+    }
+
+    return [...baseStyles, ...googleOptions.styles];
+}
+
 function buildWaypointMarkerContent(label, color) {
     const wrapper = document.createElement('div');
     wrapper.className = 'fleetops-map-marker';
@@ -166,7 +176,10 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
         const { AdvancedMarkerElement } = await googleMaps.maps.importLibrary('marker');
         this._advancedMarkerElementClass = AdvancedMarkerElement;
         const mergedGoogleOptions = options.googleOptions ?? {};
-        const mergedMapStyles = mergedGoogleOptions.styles === undefined ? DEFAULT_GOOGLE_MAP_STYLES : [...DEFAULT_GOOGLE_MAP_STYLES, ...mergedGoogleOptions.styles];
+        const mergedMapStyles = buildGoogleMapStyles({
+            showTransitLayer: options.showTransitLayer,
+            googleOptions: mergedGoogleOptions,
+        });
         const mapId = options.mapId ?? mergedGoogleOptions.mapId ?? this.#getConfig()?.googleMaps?.mapId ?? this.#getConfig()?.GOOGLE_MAPS_MAP_ID ?? null;
         this._supportsAdvancedMarkers = Boolean(mapId && mapId !== 'FLEETOPS_MAP');
 
@@ -182,7 +195,7 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
             styles: mergedMapStyles,
         });
 
-        this.#syncGoogleLayers(options);
+        await this.applyViewSettings(options);
         await this.#initDrawingManager();
 
         debug('[GoogleMapsAdapter] Map initialized');
@@ -252,6 +265,47 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
         google.maps.event.trigger(this._map, 'resize');
     }
 
+    async applyViewSettings(options = {}) {
+        if (!this._map) return;
+
+        const googleMaps = window.google;
+        const { TrafficLayer, TransitLayer } = await googleMaps.maps.importLibrary('maps');
+        const mapTypeId = options.mapTypeId ?? googleMaps.maps.MapTypeId.ROADMAP;
+        const showTrafficLayer = Boolean(options.showTrafficLayer);
+        const showTransitLayer = Boolean(options.showTransitLayer);
+        const googleOptions = options.googleOptions ?? {};
+
+        this._map.setMapTypeId?.(mapTypeId);
+        this._map.setOptions?.({
+            styles: buildGoogleMapStyles({
+                showTransitLayer,
+                googleOptions,
+            }),
+        });
+
+        if (showTrafficLayer) {
+            if (!this._trafficLayer) {
+                this._trafficLayer = new TrafficLayer();
+            }
+            this._trafficLayer.setMap(this._map);
+        } else if (this._trafficLayer) {
+            this._trafficLayer.setMap(null);
+            this._trafficLayer = null;
+        }
+
+        if (showTransitLayer) {
+            if (!this._transitLayer) {
+                this._transitLayer = new TransitLayer();
+            }
+            this._transitLayer.setMap(this._map);
+        } else if (this._transitLayer) {
+            this._transitLayer.setMap(null);
+            this._transitLayer = null;
+        }
+
+        debug(`[GoogleMapsAdapter] Applied view settings: mapTypeId=${mapTypeId}, traffic=${showTrafficLayer}, transit=${showTransitLayer}`);
+    }
+
     // ─── Viewport ──────────────────────────────────────────────────────────────
 
     setCenter(lat, lng, zoom) {
@@ -1195,20 +1249,6 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
         }
     }
 
-    #syncGoogleLayers(options = {}) {
-        if (!this._map) return;
-
-        if (options.showTrafficLayer) {
-            this._trafficLayer = new google.maps.TrafficLayer();
-            this._trafficLayer.setMap(this._map);
-        }
-
-        if (options.showTransitLayer) {
-            this._transitLayer = new google.maps.TransitLayer();
-            this._transitLayer.setMap(this._map);
-        }
-    }
-
     #ensureDrawToolbar() {
         if (this._drawControlEl || !this._map) return;
 

package/addon/services/map-manager.js

@@ -170,6 +170,18 @@ export default class MapManagerService extends Service {
         this.adapter?.invalidateSize();
     }
 
+    @action applyViewSettingsFromSettings() {
+        if (this.providerName !== 'google' || typeof this.adapter?.applyViewSettings !== 'function') {
+            return;
+        }
+
+        return this.adapter.applyViewSettings({
+            mapTypeId: this.mapSettings.googleMapsMapType,
+            showTrafficLayer: this.mapSettings.showGoogleMapsTrafficLayer,
+            showTransitLayer: this.mapSettings.showGoogleMapsTransitLayer,
+        });
+    }
+
     /**
      * Set the live map component reference.
      *