@fleetbase/fleetops-engine 0.6.64 → 0.6.66

package/addon/components/entity/pill.hbs

@@ -0,0 +1,24 @@
+<Resource::Pill
+    @resource={{(or @entity @resource)}}
+    @resourceType="entity"
+    @title={{@title}}
+    @titleFallback={{@titleFallback}}
+    @subtitle={{@subtitle}}
+    @showOnlineIndicator={{@showOnlineIndicator}}
+    @noPopover={{@noPopover}}
+    @popoverPlacement={{@popoverPlacement}}
+    @static={{@static}}
+    @onClick={{@onClick}}
+    @onView={{@onView}}
+    @anchorClass={{@anchorClass}}
+    @imageClass={{@imageClass}}
+    @imageWrapperClass={{@imageWrapperClass}}
+    @contentWrapperClass={{@contentWrapperClass}}
+    @titleClass={{@titleClass}}
+    @subtitleClass={{@subtitleClass}}
+    @useBlock={{(has-block)}}
+    ...attributes
+    as |resource|
+>
+    {{yield resource}}
+</Resource::Pill>

package/addon/components/entity/summary.hbs

@@ -0,0 +1 @@
+<Resource::Summary @resource={{(or @entity @resource)}} @resourceType="entity" @onView={{@onView}} @showView={{@showView}} @onClose={{@onClose}} @titleFallback={{@titleFallback}} ...attributes />

package/addon/components/equipment/details.hbs

@@ -83,7 +83,9 @@
             {{#if @resource.is_equipped}}
                 <div class="field-info-container">
                     <div class="field-name">Equipped To</div>
-                    <div class="field-value">{{n-a @resource.equipped_to_name}}</div>
+                    <div class="field-value">
+                        <Attachable::Pill @attachable={{resource-relation @resource "equipable"}} @titleFallback={{n-a @resource.equipped_to_name}} />
+                    </div>
                 </div>
             {{/if}}
         </div>
@@ -121,7 +123,9 @@
             <div class="grid grid-cols-1 lg:grid-cols-2 gap-2 text-xs dark:text-gray-100">
                 <div class="field-info-container">
                     <div class="field-name">Warranty</div>
-                    <div class="field-value">{{n-a @resource.warranty_name}}</div>
+                    <div class="field-value">
+                        <Warranty::Pill @warranty={{resource-relation @resource "warranty"}} @titleFallback={{n-a @resource.warranty_name}} />
+                    </div>
                 </div>
             </div>
         </ContentPanel>

package/addon/components/equipment/form.hbs

@@ -116,6 +116,7 @@
                 <InputGroup @name="Asset">
                     <ModelSelect
                         @modelName={{this.equipableModelName}}
+                        @selectedItemComponent={{if (resource-component "select-option" this.equipableModelName) (component (resource-component "select-option" this.equipableModelName) compact=true)}}
                         @selectedModel={{@resource.equipable}}
                         @placeholder="Select asset to equip on"
                         @triggerClass="form-select form-input"
@@ -125,7 +126,13 @@
                         @disabled={{cannot-write @resource}}
                         as |model|
                     >
-                        {{or model.name model.public_id}}
+                        {{#let (resource-component "select-option" this.equipableModelName) as |selectOption|}}
+                            {{#if selectOption}}
+                                {{component selectOption option=model}}
+                            {{else}}
+                                {{or model.displayName model.name model.public_id}}
+                            {{/if}}
+                        {{/let}}
                     </ModelSelect>
                 </InputGroup>
             {{/if}}
@@ -165,6 +172,7 @@
             <InputGroup @name="Warranty" @wrapperClass="col-span-2">
                 <ModelSelect
                     @modelName="warranty"
+                    @selectedItemComponent={{component "select-option/warranty" compact=true}}
                     @selectedModel={{@resource.warranty}}
                     @placeholder="Select Warranty (optional)"
                     @triggerClass="form-select form-input"
@@ -175,9 +183,7 @@
                     @disabled={{cannot-write @resource}}
                     as |model|
                 >
-                    {{model.policy_number}}
-                    -
-                    {{model.provider}}
+                    <SelectOption::Warranty @option={{model}} />
                 </ModelSelect>
             </InputGroup>
         </div>

package/addon/components/equipment/form.js

@@ -11,20 +11,24 @@ import { task } from 'ember-concurrency';
 const TYPE_TO_MODEL = {
     'fleet-ops:vehicle': 'vehicle',
     'fleet-ops:driver': 'driver',
+    'fleet-ops:trailer': 'trailer',
     'Fleetbase\\FleetOps\\Models\\Vehicle': 'vehicle',
     'Fleetbase\\FleetOps\\Models\\Driver': 'driver',
+    'Fleetbase\\FleetOps\\Models\\Trailer': 'trailer',
     'fleet-ops:equipment': 'equipment',
 };
 
 const TYPE_TO_OPTION_VALUE = {
     'Fleetbase\\FleetOps\\Models\\Vehicle': 'fleet-ops:vehicle',
     'Fleetbase\\FleetOps\\Models\\Driver': 'fleet-ops:driver',
+    'Fleetbase\\FleetOps\\Models\\Trailer': 'fleet-ops:trailer',
 };
 
 export default class EquipmentFormComponent extends Component {
     @service fetch;
     @service currentUser;
     @service notifications;
+    @service intl;
 
     /** Equipment type options. */
     equipmentTypeOptions = ['ppe', 'refrigeration_unit', 'tool', 'liftgate', 'ramp', 'container', 'pallet_jack', 'forklift', 'safety_equipment', 'communication_device', 'other'];
@@ -36,10 +40,13 @@ export default class EquipmentFormComponent extends Component {
      * Polymorphic equipable type options — the asset this equipment is attached to.
      * Each entry has a `value` (stored on the model) and a `label` (displayed in the UI).
      */
-    equipableTypeOptions = [
-        { value: 'fleet-ops:vehicle', label: 'Vehicle' },
-        { value: 'fleet-ops:driver', label: 'Driver' },
-    ];
+    get equipableTypeOptions() {
+        return [
+            { value: 'fleet-ops:vehicle', label: this.intl.t('resource.vehicle') },
+            { value: 'fleet-ops:trailer', label: this.intl.t('resource.trailer') },
+            { value: 'fleet-ops:driver', label: this.intl.t('resource.driver') },
+        ];
+    }
 
     /** Derived Ember Data model name for the currently selected equipable type. */
     @tracked equipableModelName = null;

package/addon/components/equipment/pill.hbs

@@ -0,0 +1,24 @@
+<Resource::Pill
+    @resource={{(or @equipment @resource)}}
+    @resourceType="equipment"
+    @title={{@title}}
+    @titleFallback={{@titleFallback}}
+    @subtitle={{@subtitle}}
+    @showOnlineIndicator={{@showOnlineIndicator}}
+    @noPopover={{@noPopover}}
+    @popoverPlacement={{@popoverPlacement}}
+    @static={{@static}}
+    @onClick={{@onClick}}
+    @onView={{@onView}}
+    @anchorClass={{@anchorClass}}
+    @imageClass={{@imageClass}}
+    @imageWrapperClass={{@imageWrapperClass}}
+    @contentWrapperClass={{@contentWrapperClass}}
+    @titleClass={{@titleClass}}
+    @subtitleClass={{@subtitleClass}}
+    @useBlock={{(has-block)}}
+    ...attributes
+    as |resource|
+>
+    {{yield resource}}
+</Resource::Pill>

package/addon/components/equipment/summary.hbs

@@ -0,0 +1 @@
+<Resource::Summary @resource={{(or @equipment @resource)}} @resourceType="equipment" @onView={{@onView}} @showView={{@showView}} @onClose={{@onClose}} @titleFallback={{@titleFallback}} ...attributes />

package/addon/components/facilitator/pill.hbs

@@ -0,0 +1,24 @@
+<Resource::Pill
+    @resource={{(or @facilitator @resource)}}
+    @resourceType="facilitator"
+    @title={{@title}}
+    @titleFallback={{@titleFallback}}
+    @subtitle={{@subtitle}}
+    @showOnlineIndicator={{@showOnlineIndicator}}
+    @noPopover={{@noPopover}}
+    @popoverPlacement={{@popoverPlacement}}
+    @static={{@static}}
+    @onClick={{@onClick}}
+    @onView={{@onView}}
+    @anchorClass={{@anchorClass}}
+    @imageClass={{@imageClass}}
+    @imageWrapperClass={{@imageWrapperClass}}
+    @contentWrapperClass={{@contentWrapperClass}}
+    @titleClass={{@titleClass}}
+    @subtitleClass={{@subtitleClass}}
+    @useBlock={{(has-block)}}
+    ...attributes
+    as |resource|
+>
+    {{yield resource}}
+</Resource::Pill>

package/addon/components/facilitator/summary.hbs

@@ -0,0 +1 @@
+<Resource::Summary @resource={{(or @facilitator @resource)}} @resourceType="facilitator" @onView={{@onView}} @showView={{@showView}} @onClose={{@onClose}} @titleFallback={{@titleFallback}} ...attributes />

package/addon/components/fleet/details.hbs

@@ -7,11 +7,15 @@
             </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "resource.service-area"}}</div>
-                <div class="field-value">{{n-a this.resource.service_area.name}}</div>
+                <div class="field-value">
+                    <ServiceArea::Pill @serviceArea={{resource-relation this.resource "service_area"}} @titleFallback={{n-a this.resource.service_area.name}} />
+                </div>
             </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "resource.zone"}}</div>
-                <div class="field-value">{{n-a this.resource.zone.name}}</div>
+                <div class="field-value">
+                    <Zone::Pill @zone={{resource-relation this.resource "zone"}} @titleFallback={{n-a this.resource.zone.name}} />
+                </div>
             </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "fleet.fields.task"}}</div>

package/addon/components/fleet/driver-listing.hbs

@@ -14,6 +14,7 @@
             <div class="w-56">
                 <ModelSelect
                     @modelName="driver"
+                    @selectedItemComponent={{component "select-option/driver" compact=true}}
                     @selectedModel={{this.selectedDriver}}
                     @placeholder={{t "fleet.driver-listing.add-driver"}}
                     @triggerClass="form-select form-input form-select-sm form-input-sm"
@@ -22,7 +23,7 @@
                     @onChange={{this.onAddDriver}}
                     as |model|
                 >
-                    {{model.name}}
+                    <SelectOption::Driver @option={{model}} />
                 </ModelSelect>
             </div>
         </div>
@@ -56,17 +57,7 @@
                                 </div>
                             {{/if}}
                             <div class="flex items-center">
-                                <div class="flex flex-row items-start">
-                                    <div class="mr-2">
-                                        <div class="relative">
-                                            <Image src={{driver.photo_url}} alt={{driver.name}} class="w-5 h-5 rounded-md" @fallbackSrc={{config "defaultValues.driverImage"}} />
-                                            <FaIcon @icon="circle" class="absolute right-0 top-0 -mr-1 -mt-1 {{if driver.online 'text-green-500' 'text-yellow-200'}}" />
-                                        </div>
-                                    </div>
-                                    <div>
-                                        <div class="font-semibold">{{driver.name}}</div>
-                                    </div>
-                                </div>
+                                <SelectOption::Driver @option={{driver}} @compact={{true}} />
                             </div>
                         </div>
                         <div class="flex items-center justify-end">

package/addon/components/fleet/form.hbs

@@ -5,6 +5,7 @@
             <InputGroup @name={{t "fleet.fields.parent-fleet"}} @value={{@resource.parent_fleet}}>
                 <ModelSelect
                     @modelName="fleet"
+                    @selectedItemComponent={{component "select-option/fleet" compact=true}}
                     @selectedModel={{@resource.parent_fleet}}
                     @placeholder={{t "fleet.fields.select-parent-fleet"}}
                     @triggerClass="form-select form-input"
@@ -15,12 +16,13 @@
                     @disabled={{cannot-write @resource}}
                     as |model|
                 >
-                    {{model.name}}
+                    <SelectOption::Fleet @option={{model}} />
                 </ModelSelect>
             </InputGroup>
             <InputGroup @name={{t "resource.vendor"}} @value={{@resource.vendor}}>
                 <ModelSelect
                     @modelName="vendor"
+                    @selectedItemComponent={{component "select-option/vendor" compact=true}}
                     @selectedModel={{@resource.vendor}}
                     @placeholder={{t "fleet.fields.select-vendor"}}
                     @triggerClass="form-select form-input"
@@ -31,12 +33,13 @@
                     @disabled={{cannot-write @resource}}
                     as |model|
                 >
-                    {{model.name}}
+                    <SelectOption::Vendor @option={{model}} />
                 </ModelSelect>
             </InputGroup>
             <InputGroup @name={{t "fleet.fields.service-title"}} @value={{@resource.service_area}}>
                 <ModelSelect
                     @modelName="service-area"
+                    @selectedItemComponent={{component "select-option/service-area" compact=true}}
                     @selectedModel={{@resource.service_area}}
                     @placeholder={{t "fleet.fields.select-service"}}
                     @triggerClass="form-select form-input"
@@ -47,13 +50,14 @@
                     @disabled={{cannot-write @resource}}
                     as |model|
                 >
-                    {{model.name}}
+                    <SelectOption::ServiceArea @option={{model}} />
                 </ModelSelect>
             </InputGroup>
             {{#if @resource.service_area}}
                 <InputGroup @name={{t "fleet.fields.zone-title"}} @value={{@resource.zone}}>
                     <ModelSelect
                         @modelName="zone"
+                        @selectedItemComponent={{component "select-option/zone" compact=true}}
                         @selectedModel={{@resource.zone}}
                         @query={{hash service_area_uuid=@resource.service_area.id}}
                         @placeholder={{t "fleet.fields.select-zone"}}
@@ -65,7 +69,7 @@
                         @disabled={{cannot-write @resource}}
                         as |model|
                     >
-                        {{model.name}}
+                        <SelectOption::Zone @option={{model}} />
                     </ModelSelect>
                 </InputGroup>
             {{/if}}

package/addon/components/fleet/pill.hbs

@@ -0,0 +1,24 @@
+<Resource::Pill
+    @resource={{(or @fleet @resource)}}
+    @resourceType="fleet"
+    @title={{@title}}
+    @titleFallback={{@titleFallback}}
+    @subtitle={{@subtitle}}
+    @showOnlineIndicator={{@showOnlineIndicator}}
+    @noPopover={{@noPopover}}
+    @popoverPlacement={{@popoverPlacement}}
+    @static={{@static}}
+    @onClick={{@onClick}}
+    @onView={{@onView}}
+    @anchorClass={{@anchorClass}}
+    @imageClass={{@imageClass}}
+    @imageWrapperClass={{@imageWrapperClass}}
+    @contentWrapperClass={{@contentWrapperClass}}
+    @titleClass={{@titleClass}}
+    @subtitleClass={{@subtitleClass}}
+    @useBlock={{(has-block)}}
+    ...attributes
+    as |resource|
+>
+    {{yield resource}}
+</Resource::Pill>

package/addon/components/fleet/summary.hbs

@@ -0,0 +1 @@
+<Resource::Summary @resource={{(or @fleet @resource)}} @resourceType="fleet" @onView={{@onView}} @showView={{@showView}} @onClose={{@onClose}} @titleFallback={{@titleFallback}} ...attributes />

package/addon/components/fleet/vehicle-listing.hbs

@@ -14,6 +14,7 @@
             <div class="w-56">
                 <ModelSelect
                     @modelName="vehicle"
+                    @selectedItemComponent={{component "select-option/vehicle" compact=true}}
                     @selectedModel={{this.selectedVehicle}}
                     @placeholder={{t "fleet.vehicle-listing.add-vehicle"}}
                     @triggerClass="form-select form-input form-select-sm form-input-sm"
@@ -22,7 +23,7 @@
                     @onChange={{this.onAddVehicle}}
                     as |model|
                 >
-                    {{model.displayName}}
+                    <SelectOption::Vehicle @option={{model}} />
                 </ModelSelect>
             </div>
         </div>
@@ -56,17 +57,7 @@
                                 </div>
                             {{/if}}
                             <div class="flex items-center">
-                                <div class="flex flex-row items-start">
-                                    <div class="mr-2">
-                                        <div class="relative">
-                                            <Image src={{vehicle.photo_url}} alt={{vehicle.name}} class="w-5 h-5 rounded-md" @fallbackSrc={{config "defaultValues.vehicleImage"}} />
-                                            <FaIcon @icon="circle" class="absolute right-0 top-0 -mr-1 -mt-1 {{if vehicle.online 'text-green-500' 'text-yellow-200'}}" />
-                                        </div>
-                                    </div>
-                                    <div>
-                                        <div class="font-semibold">{{vehicle.displayName}}</div>
-                                    </div>
-                                </div>
+                                <SelectOption::Vehicle @option={{vehicle}} @compact={{true}} />
                             </div>
                         </div>
                         <div class="flex items-center justify-end">

package/addon/components/fleet-driver/pill.hbs

@@ -0,0 +1,24 @@
+<Resource::Pill
+    @resource={{(or @fleetDriver @resource)}}
+    @resourceType="fleet-driver"
+    @title={{@title}}
+    @titleFallback={{@titleFallback}}
+    @subtitle={{@subtitle}}
+    @showOnlineIndicator={{@showOnlineIndicator}}
+    @noPopover={{@noPopover}}
+    @popoverPlacement={{@popoverPlacement}}
+    @static={{@static}}
+    @onClick={{@onClick}}
+    @onView={{@onView}}
+    @anchorClass={{@anchorClass}}
+    @imageClass={{@imageClass}}
+    @imageWrapperClass={{@imageWrapperClass}}
+    @contentWrapperClass={{@contentWrapperClass}}
+    @titleClass={{@titleClass}}
+    @subtitleClass={{@subtitleClass}}
+    @useBlock={{(has-block)}}
+    ...attributes
+    as |resource|
+>
+    {{yield resource}}
+</Resource::Pill>

package/addon/components/fleet-driver/summary.hbs

@@ -0,0 +1 @@
+<Resource::Summary @resource={{(or @fleetDriver @resource)}} @resourceType="fleet-driver" @onView={{@onView}} @showView={{@showView}} @onClose={{@onClose}} @titleFallback={{@titleFallback}} ...attributes />

package/addon/components/fleet-driver-listing.hbs

@@ -15,6 +15,7 @@
             {{#if @onAddDriver}}
                 <ModelSelect
                     @modelName="driver"
+                    @selectedItemComponent={{component "select-option/driver" compact=true}}
                     @selectedModel={{@options.selectedDriver}}
                     @placeholder={{t "fleet-driver-listing.add-driver"}}
                     @triggerClass="form-select form-input form-select-sm form-input-sm"
@@ -23,7 +24,7 @@
                     @onChange={{this.onAdd}}
                     as |model|
                 >
-                    {{model.name}}
+                    <SelectOption::Driver @option={{model}} />
                 </ModelSelect>
             {{/if}}
         </div>

package/addon/components/fleet-panel/details.hbs

@@ -7,11 +7,15 @@
             </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "common.service-area"}}</div>
-                <div class="field-value">{{n-a @fleet.service_area.name}}</div>
+                <div class="field-value">
+                    <ServiceArea::Pill @serviceArea={{resource-relation @fleet "service_area"}} @titleFallback={{n-a @fleet.service_area.name}} />
+                </div>
             </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "common.zone"}}</div>
-                <div class="field-value">{{n-a @fleet.zone.name}}</div>
+                <div class="field-value">
+                    <Zone::Pill @zone={{resource-relation @fleet "zone"}} @titleFallback={{n-a @fleet.zone.name}} />
+                </div>
             </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "common.task"}}</div>

package/addon/components/fleet-panel/driver-listing.hbs

@@ -14,6 +14,7 @@
             <div class="w-56">
                 <ModelSelect
                     @modelName="driver"
+                    @selectedItemComponent={{component "select-option/driver" compact=true}}
                     @selectedModel={{this.selectedDriver}}
                     @placeholder={{t "fleet-panel.driver-listing.add-driver"}}
                     @triggerClass="form-select form-input form-select-sm form-input-sm"
@@ -22,7 +23,7 @@
                     @onChange={{this.onAddDriver}}
                     as |model|
                 >
-                    {{model.name}}
+                    <SelectOption::Driver @option={{model}} />
                 </ModelSelect>
             </div>
         </div>
@@ -57,7 +58,7 @@
                                 <div class="flex flex-row items-start">
                                     <div class="mr-2">
                                         <div class="relative">
-                                            <Image src={{driver.photo_url}} alt={{driver.name}} class="w-5 h-5 rounded-md" @fallbackSrc={{config "defaultValues.driverImage"}} />
+                                            <Image src={{resource-image driver.photo_url "driver"}} alt={{driver.name}} class="w-5 h-5 rounded-md" @fallbackSrc={{(placeholder-image "driver")}} />
                                             <FaIcon @icon="circle" class="absolute right-0 top-0 -mr-1 -mt-1 {{if driver.online 'text-green-500' 'text-yellow-200'}}" />
                                         </div>
                                     </div>

package/addon/components/fleet-panel/vehicle-listing.hbs

@@ -14,6 +14,7 @@
             <div class="w-56">
                 <ModelSelect
                     @modelName="vehicle"
+                    @selectedItemComponent={{component "select-option/vehicle" compact=true}}
                     @selectedModel={{this.selectedVehicle}}
                     @placeholder={{t "fleet-panel.vehicle-listing.add-vehicle"}}
                     @triggerClass="form-select form-input form-select-sm form-input-sm"
@@ -22,7 +23,7 @@
                     @onChange={{this.onAddVehicle}}
                     as |model|
                 >
-                    {{model.displayName}}
+                    <SelectOption::Vehicle @option={{model}} />
                 </ModelSelect>
             </div>
         </div>
@@ -57,7 +58,7 @@
                                 <div class="flex flex-row items-start">
                                     <div class="mr-2">
                                         <div class="relative">
-                                            <Image src={{vehicle.photo_url}} alt={{vehicle.name}} class="w-5 h-5 rounded-md" @fallbackSrc={{config "defaultValues.vehicleImage"}} />
+                                            <Image src={{resource-image vehicle.photo_url "vehicle"}} alt={{vehicle.name}} class="w-5 h-5 rounded-md" @fallbackSrc={{(placeholder-image "vehicle")}} />
                                             <FaIcon @icon="circle" class="absolute right-0 top-0 -mr-1 -mt-1 {{if vehicle.online 'text-green-500' 'text-yellow-200'}}" />
                                         </div>
                                     </div>

package/addon/components/fleet-vehicle-listing.hbs

@@ -14,6 +14,7 @@
             {{#if @onAddVehicle}}
                 <ModelSelect
                     @modelName="vehicle"
+                    @selectedItemComponent={{component "select-option/vehicle" compact=true}}
                     @query={{hash assignedFleet=false}}
                     @selectedModel={{@options.selectedVehicle}}
                     @placeholder={{t "fleet-vehicle-listing.add-vehicle"}}
@@ -23,7 +24,7 @@
                     @onChange={{this.onAdd}}
                     as |model|
                 >
-                    {{model.display_name}}
+                    <SelectOption::Vehicle @option={{model}} />
                 </ModelSelect>
             {{/if}}
         </div>