@fleetbase/fleetops-engine 0.6.48 → 0.6.50

package/addon/components/order/details/tracking.hbs

@@ -45,93 +45,122 @@
                 </div>
             {{/if}}
 
-            <div class="tracking-intelligence__eta-grid">
-                <div class="tracking-intelligence-cell tracking-intelligence-cell--accent">
-                    <div class="tracking-intelligence-cell__label">
-                        Smart adjusted ETA
-                        <span class="tracking-intelligence-tag">Live</span>
+            {{#if this.lifecycleMessage}}
+                <div class="tracking-intelligence-alert">
+                    <div class="tracking-intelligence-alert__icon"><FaIcon @icon={{this.lifecycleMessageIcon}} @size="xs" /></div>
+                    <div class="min-w-0">
+                        <div class="tracking-intelligence-alert__title">{{this.lifecycleMessageTitle}}</div>
+                        <div class="tracking-intelligence-alert__body">{{this.lifecycleMessage}}</div>
                     </div>
-                    <div class="tracking-intelligence-cell__value">
-                        {{#if this.hasSmartAdjustedEta}}
-                            {{format-duration this.smartAdjustedEtaSeconds}}
-                        {{else}}
-                            {{this.smartAdjustedEtaUnavailableLabel}}
-                        {{/if}}
+                </div>
+            {{/if}}
+
+            {{#if this.showStartEta}}
+                <div class="tracking-intelligence__eta-grid">
+                    <div class="tracking-intelligence-cell tracking-intelligence-cell--accent">
+                        <div class="tracking-intelligence-cell__label">
+                            Estimated start
+                            <span class="tracking-intelligence-tag">Pre-start</span>
+                        </div>
+                        <div class="tracking-intelligence-cell__value">
+                            {{#if this.hasStartEta}}
+                                {{format-duration this.startEtaSeconds}}
+                            {{else}}
+                                Pending start
+                            {{/if}}
+                        </div>
+                        <div class="tracking-intelligence-cell__sub">Based on the assigned driver route to the first stop</div>
                     </div>
-                    <div class="tracking-intelligence-cell__sub">Based on provider route and driver signal</div>
                 </div>
-                <div class="tracking-intelligence-cell">
-                    <div class="tracking-intelligence-cell__label">Reported ETA</div>
-                    <div class="tracking-intelligence-cell__value {{if this.isReportedEtaUntrusted 'tracking-intelligence-cell__value--muted'}}">
-                        {{#if this.hasDisplayedReportedEta}}
-                            {{format-duration this.displayedReportedEtaSeconds}}
-                        {{else}}
-                            {{this.etaUnavailableLabel}}
-                        {{/if}}
+            {{else if this.showLiveEta}}
+                <div class="tracking-intelligence__eta-grid">
+                    <div class="tracking-intelligence-cell tracking-intelligence-cell--accent">
+                        <div class="tracking-intelligence-cell__label">
+                            Smart adjusted ETA
+                            <span class="tracking-intelligence-tag">Live</span>
+                        </div>
+                        <div class="tracking-intelligence-cell__value">
+                            {{#if this.hasSmartAdjustedEta}}
+                                {{format-duration this.smartAdjustedEtaSeconds}}
+                            {{else}}
+                                {{this.smartAdjustedEtaUnavailableLabel}}
+                            {{/if}}
+                        </div>
+                        <div class="tracking-intelligence-cell__sub">Based on provider route and driver signal</div>
+                    </div>
+                    <div class="tracking-intelligence-cell">
+                        <div class="tracking-intelligence-cell__label">Reported ETA</div>
+                        <div class="tracking-intelligence-cell__value {{if this.isReportedEtaUntrusted 'tracking-intelligence-cell__value--muted'}}">
+                            {{#if this.hasDisplayedReportedEta}}
+                                {{format-duration this.displayedReportedEtaSeconds}}
+                            {{else}}
+                                {{this.etaUnavailableLabel}}
+                            {{/if}}
+                        </div>
+                        <div class="tracking-intelligence-cell__sub {{if this.isReportedEtaUntrusted 'tracking-intelligence-cell__sub--warn'}}">{{this.reportedEtaWarning}}</div>
                     </div>
-                    <div class="tracking-intelligence-cell__sub {{if this.isReportedEtaUntrusted 'tracking-intelligence-cell__sub--warn'}}">{{this.reportedEtaWarning}}</div>
                 </div>
-            </div>
 
-            <div class="tracking-intelligence-confidence">
-                <div class="tracking-intelligence-confidence__label">ETA confidence</div>
-                <div class="tracking-intelligence-confidence__segments {{this.confidenceToneClass}}">
-                    {{#each this.confidenceSegments as |segment|}}
-                        <span class="{{if segment.lit 'is-lit'}}"></span>
-                    {{/each}}
+                <div class="tracking-intelligence-confidence">
+                    <div class="tracking-intelligence-confidence__label">ETA confidence</div>
+                    <div class="tracking-intelligence-confidence__segments {{this.confidenceToneClass}}">
+                        {{#each this.confidenceSegments as |segment|}}
+                            <span class="{{if segment.lit 'is-lit'}}"></span>
+                        {{/each}}
+                    </div>
+                    <div class="tracking-intelligence-confidence__value">{{this.confidencePercent}}%</div>
+                </div>
+
+                <div class="tracking-intelligence-destination">
+                    <div class="tracking-intelligence-destination__marker">{{this.activeStopMarkerLabel}}</div>
+                    <div class="min-w-0 flex-1">
+                        <div class="tracking-intelligence-destination__label">{{this.activeStopLabel}}</div>
+                        <div class="tracking-intelligence-destination__address">{{n-a @resource.tracker_data.active_stop.address}}</div>
+                        <div class="tracking-intelligence-destination__eta">
+                            ETA:
+                            <strong>
+                                {{#if this.hasActiveEta}}
+                                    {{format-duration this.activeEtaSeconds}}
+                                {{else}}
+                                    {{this.etaUnavailableLabel}}
+                                {{/if}}
+                            </strong>
+                        </div>
+                    </div>
                 </div>
-                <div class="tracking-intelligence-confidence__value">{{this.confidencePercent}}%</div>
-            </div>
 
-            <div class="tracking-intelligence-destination">
-                <div class="tracking-intelligence-destination__marker">{{this.activeStopMarkerLabel}}</div>
-                <div class="min-w-0 flex-1">
-                    <div class="tracking-intelligence-destination__label">{{this.activeStopLabel}}</div>
-                    <div class="tracking-intelligence-destination__address">{{n-a @resource.tracker_data.active_stop.address}}</div>
-                    <div class="tracking-intelligence-destination__eta">
-                        ETA:
+                <div class="tracking-intelligence-distance">
+                    <div class="tracking-intelligence-distance__row">
+                        <span>Reported total</span>
                         <strong>
-                            {{#if this.hasActiveEta}}
-                                {{format-duration this.activeEtaSeconds}}
+                            {{#if this.hasRemainingDistance}}
+                                {{format-meters @resource.tracker_data.route.distance_m}}
                             {{else}}
-                                {{this.etaUnavailableLabel}}
+                                -
                             {{/if}}
                         </strong>
+                        <div class="tracking-intelligence-distance__bar">
+                            <span style={{this.totalProgressStyle}}></span>
+                        </div>
                     </div>
-                </div>
-            </div>
-
-            <div class="tracking-intelligence-distance">
-                <div class="tracking-intelligence-distance__row">
-                    <span>Reported total</span>
-                    <strong>
-                        {{#if this.hasRemainingDistance}}
-                            {{format-meters @resource.tracker_data.route.distance_m}}
-                        {{else}}
-                            -
-                        {{/if}}
-                    </strong>
-                    <div class="tracking-intelligence-distance__bar">
-                        <span style={{this.totalProgressStyle}}></span>
-                    </div>
-                </div>
-                <div class="tracking-intelligence-distance__row">
-                    <span>Between stops</span>
-                    <strong>
-                        {{#if this.hasCurrentLegDistance}}
-                            {{format-meters this.currentLeg.distance_m}}
-                        {{else}}
-                            -
-                        {{/if}}
-                    </strong>
-                    <div class="tracking-intelligence-distance__bar tracking-intelligence-distance__bar--secondary">
-                        <span style={{this.currentLegProgressStyle}}></span>
+                    <div class="tracking-intelligence-distance__row">
+                        <span>Between stops</span>
+                        <strong>
+                            {{#if this.hasCurrentLegDistance}}
+                                {{format-meters this.currentLeg.distance_m}}
+                            {{else}}
+                                -
+                            {{/if}}
+                        </strong>
+                        <div class="tracking-intelligence-distance__bar tracking-intelligence-distance__bar--secondary">
+                            <span style={{this.currentLegProgressStyle}}></span>
+                        </div>
                     </div>
+                    <div class="tracking-intelligence-distance__foot">Provider context:
+                        {{this.providerLabel}}
+                        route</div>
                 </div>
-                <div class="tracking-intelligence-distance__foot">Provider context:
-                    {{this.providerLabel}}
-                    route</div>
-            </div>
+            {{/if}}
 
             <details class="tracking-intelligence-diagnostics">
                 <summary>

package/addon/components/order/details/tracking.js

@@ -34,15 +34,150 @@ export default class OrderDetailsTrackingComponent extends Component {
         return Boolean(this.trackerData);
     }
 
+    get lifecycle() {
+        return this.trackerData?.lifecycle ?? {};
+    }
+
+    get lifecycleMode() {
+        if (this.lifecycle.mode) {
+            return this.lifecycle.mode;
+        }
+
+        const status = this.statusCode;
+
+        if (['completed', 'canceled'].includes(status)) {
+            return status;
+        }
+
+        if (!this.hasAssignedDriver) {
+            return 'unassigned';
+        }
+
+        if (!this.hasOrderStarted && status === 'dispatched') {
+            return 'dispatched';
+        }
+
+        if (!this.hasOrderStarted) {
+            return 'pre_start';
+        }
+
+        return 'active';
+    }
+
+    get statusCode() {
+        return String(this.lifecycle.status ?? this.args.resource?.status ?? 'created').toLowerCase();
+    }
+
+    get hasOrderStarted() {
+        return Boolean(this.lifecycle.has_started ?? this.args.resource?.started ?? this.args.resource?.started_at ?? this.statusCode === 'started');
+    }
+
+    get showLiveEta() {
+        if (this.lifecycle.show_live_eta !== undefined) {
+            return Boolean(this.lifecycle.show_live_eta);
+        }
+
+        return this.hasOrderStarted && !this.isTerminalLifecycle;
+    }
+
+    get showStartEta() {
+        if (this.lifecycle.show_start_eta !== undefined) {
+            return Boolean(this.lifecycle.show_start_eta);
+        }
+
+        return this.lifecycleMode === 'dispatched' && this.hasStartEta;
+    }
+
+    get isTerminalLifecycle() {
+        return Boolean(this.lifecycle.is_terminal ?? ['completed', 'canceled'].includes(this.statusCode));
+    }
+
+    get isPreStartLifecycle() {
+        return ['created', 'pre_start'].includes(this.lifecycleMode);
+    }
+
+    get isDispatchedLifecycle() {
+        return this.lifecycleMode === 'dispatched';
+    }
+
+    get lifecycleMessage() {
+        if (this.lifecycleMode === 'unassigned') {
+            return null;
+        }
+
+        return this.lifecycle.message ?? this.defaultLifecycleMessage;
+    }
+
+    get defaultLifecycleMessage() {
+        if (this.statusCode === 'completed') {
+            return 'Order has been completed.';
+        }
+
+        if (this.statusCode === 'canceled') {
+            return 'Order has been canceled.';
+        }
+
+        if (this.isDispatchedLifecycle) {
+            return 'Order has been dispatched. Estimated start is based on the assigned driver route to the first stop.';
+        }
+
+        if (this.isPreStartLifecycle) {
+            return 'Live ETA will begin once the order is started.';
+        }
+
+        return null;
+    }
+
+    get lifecycleMessageTitle() {
+        switch (this.lifecycleMode) {
+            case 'completed':
+                return 'Order completed';
+            case 'canceled':
+                return 'Order canceled';
+            case 'dispatched':
+                return 'Order dispatched';
+            case 'pre_start':
+            case 'created':
+                return 'Tracking pending start';
+            default:
+                return null;
+        }
+    }
+
+    get lifecycleMessageIcon() {
+        switch (this.lifecycleMode) {
+            case 'completed':
+                return 'circle-check';
+            case 'canceled':
+                return 'ban';
+            case 'dispatched':
+                return 'route';
+            default:
+                return 'clock';
+        }
+    }
+
+    get startEtaSeconds() {
+        return this.trackerData?.eta?.start_seconds;
+    }
+
+    get hasStartEta() {
+        return this.startEtaSeconds !== null && this.startEtaSeconds !== undefined;
+    }
+
     get activeEtaSeconds() {
         return this.trackerData?.eta?.active_stop_seconds;
     }
 
     get hasActiveEta() {
-        return this.activeEtaSeconds !== null && this.activeEtaSeconds !== undefined;
+        return this.showLiveEta && this.activeEtaSeconds !== null && this.activeEtaSeconds !== undefined;
     }
 
     get smartAdjustedEtaSeconds() {
+        if (!this.showLiveEta) {
+            return null;
+        }
+
         return (
             this.firstPositiveNumber(this.activeEtaSeconds) ??
             this.firstPositiveNumber(this.trackerData?.route?.duration_in_traffic_s) ??
@@ -69,7 +204,7 @@ export default class OrderDetailsTrackingComponent extends Component {
     }
 
     get hasCompletionEta() {
-        return Boolean(this.trackerData?.eta?.completion_at);
+        return this.showLiveEta && Boolean(this.trackerData?.eta?.completion_at);
     }
 
     get hasRemainingDistance() {
@@ -249,6 +384,10 @@ export default class OrderDetailsTrackingComponent extends Component {
     }
 
     get displayedReportedEtaSeconds() {
+        if (!this.showLiveEta) {
+            return null;
+        }
+
         return (
             this.firstPositiveNumber(this.reportedEtaSeconds) ??
             this.firstPositiveNumber(this.activeEtaSeconds) ??
@@ -269,6 +408,10 @@ export default class OrderDetailsTrackingComponent extends Component {
             return false;
         }
 
+        if (!this.showLiveEta) {
+            return false;
+        }
+
         return !trackerData?.driver?.location || trackerData?.insights?.is_location_stale || trackerData.fallback_provider || (trackerData.confidence && trackerData.confidence !== 'high');
     }
 
@@ -402,6 +545,10 @@ export default class OrderDetailsTrackingComponent extends Component {
             return null;
         }
 
+        if (this.isTerminalLifecycle || this.isPreStartLifecycle || this.isDispatchedLifecycle) {
+            return null;
+        }
+
         if (!this.hasAssignedDriver) {
             return 'Assign a driver to start live tracking and improve ETA accuracy.';
         }

package/addon/components/order/form/details.hbs

@@ -1,6 +1,6 @@
 <ContentPanel @title="Details" @open={{true}} @wrapperClass="bordered-top">
     <div class="grid grid-cols-1 lg:grid-cols-2 gap-2">
-        <InputGroup @name={{t "order.fields.order-type"}} @helpText={{t "order.fields.order-type-help-text"}}>
+        <InputGroup @name={{t "order.fields.order-type"}} @helpText={{t "order.fields.order-type-help-text"}} @required={{true}}>
             <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
                 <PowerSelect
                     @options={{this.orderConfigActions.allOrderConfigs}}
@@ -160,7 +160,7 @@
         </InputGroup>
 
         {{#if (and @resource.pod_required (not @resource.facilitator.isIntegratedVendor))}}
-            <InputGroup @name={{t "order.fields.proof-delivery"}} @helpText={{t "order.fields.proof-delivery-help-text"}}>
+            <InputGroup @name={{t "order.fields.proof-delivery"}} @helpText={{t "order.fields.proof-delivery-help-text"}} @required={{true}}>
                 <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
                     <PowerSelect
                         @options={{get-fleet-ops-options "podOptions"}}
@@ -279,4 +279,4 @@
     </div>
 </ContentPanel>
 
-<Order::Form::CustomFields @resource={{@resource}} @customFields={{this.customFields}} />
+<Order::Form::CustomFields @resource={{@resource}} @customFields={{this.customFields}} />

package/addon/components/order/form/documents.js

@@ -35,12 +35,19 @@ export default class OrderFormDocumentsComponent extends Component {
 
         try {
             this.uploadQueue.pushObject(file);
+            const uploadOptions = {
+                path: 'uploads/fleet-ops/order-files',
+                type: 'order_file',
+            };
+
+            if (!this.args.resource.isNew) {
+                uploadOptions.subject_uuid = this.args.resource.id;
+                uploadOptions.subject_type = 'fleet-ops:order';
+            }
+
             yield this.fetch.uploadFile.perform(
                 file,
-                {
-                    path: 'uploads/fleet-ops/order-files',
-                    type: 'order_file',
-                },
+                uploadOptions,
                 (uploadedFile) => {
                     this.args.resource.files.pushObject(uploadedFile);
                     this.uploadQueue.removeObject(file);