@fleetbase/fleetops-engine 0.6.69 → 0.6.71

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

@@ -9,7 +9,7 @@
                     @onChange={{perform this.selectOrderConfig}}
                     @placeholder={{t "order.fields.order-type-placeholder"}}
                     @triggerClass="form-select form-input"
-                    @disabled={{cannot-write @resource}}
+                    @disabled={{or (cannot-write @resource) this.orderTypeLocked}}
                     as |orderConfig|
                 >
                     <SelectOption::OrderConfig @option={{orderConfig}} />
@@ -17,8 +17,19 @@
             </div>
         </InputGroup>
 
+        {{#if this.profileDetailFields}}
+            <div class="contents">
+                <LazyEngineComponent @component={{this.profileDetailFields}} as |ProfileDetailFields|>
+                    <ProfileDetailFields @resource={{@resource}} @order={{@resource}} @profile={{this.profile}} />
+                </LazyEngineComponent>
+            </div>
+        {{/if}}
+
+        {{#if this.show.internalId}}
         <InputGroup @name={{t "order.fields.internal-id"}} @value={{@resource.internal_id}} @helpText={{t "order.fields.internal-id-help-text"}} @disabled={{cannot-write @resource}} />
+        {{/if}}
 
+        {{#if this.show.schedule}}
         <InputGroup>
             <InputLabel @labelText={{t "order.fields.schedule"}} @helpText={{t "order.fields.schedule-help-text"}} />
             <DateTimeInput
@@ -30,7 +41,9 @@
                 @disabled={{or @resource.dispatched (cannot-write @resource)}}
             />
         </InputGroup>
+        {{/if}}
 
+        {{#if this.show.customer}}
         <InputGroup @name={{t "order.fields.customer"}} @helpText={{t "order.fields.customer-help-text"}}>
             <ModelSelect
                 @modelName="customer"
@@ -48,7 +61,9 @@
                 <SelectOption::Customer @option={{model}} />
             </ModelSelect>
         </InputGroup>
+        {{/if}}
 
+        {{#if this.show.facilitator}}
         <InputGroup @name={{t "order.fields.facilitator"}} @helpText={{t "order.fields.facilitator-help-text"}}>
             <ModelSelect
                 @modelName="facilitator"
@@ -66,8 +81,9 @@
                 <SelectOption::Facilitator @option={{model}} />
             </ModelSelect>
         </InputGroup>
+        {{/if}}
 
-        {{#if (and @resource.facilitator.isIntegratedVendor @resource.facilitator.service_types.length)}}
+        {{#if (and this.show.serviceType @resource.facilitator.isIntegratedVendor @resource.facilitator.service_types.length)}}
             <InputGroup @name={{t "order.fields.service-type"}} @helpText={{concat (t "order.fields.service-type-help-text") @resource.facilitator.name "."}}>
                 <Select
                     class="w-full"
@@ -82,6 +98,7 @@
             </InputGroup>
         {{/if}}
 
+        {{#if this.show.driver}}
         <InputGroup @name={{t "order.fields.assign-driver"}} @helpText={{t "order.fields.assign-driver-help-text"}}>
             <ModelSelect
                 @modelName="driver"
@@ -101,7 +118,9 @@
                 <SelectOption::Driver @option={{model}} />
             </ModelSelect>
         </InputGroup>
+        {{/if}}
 
+        {{#if this.show.vehicle}}
         <InputGroup @name={{t "order.fields.assign-vehicle"}} @helpText={{t "order.fields.assign-vehicle-help-text"}}>
             <ModelSelect
                 @modelName="vehicle"
@@ -120,8 +139,9 @@
                 <SelectOption::Vehicle @option={{model}} />
             </ModelSelect>
         </InputGroup>
+        {{/if}}
 
-        {{#if (and @resource.pod_required (not @resource.facilitator.isIntegratedVendor))}}
+        {{#if (and this.show.pod @resource.pod_required (not @resource.facilitator.isIntegratedVendor))}}
             <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
@@ -142,7 +162,7 @@
             </InputGroup>
         {{/if}}
 
-        {{#if @resource.adhoc}}
+        {{#if (and this.show.adhoc @resource.adhoc)}}
             <div>
                 <InputGroup
                     @name={{t "order.fields.adhoc-ping"}}
@@ -158,6 +178,7 @@
             </div>
         {{/if}}
 
+        {{#if this.show.adhoc}}
         <div class="lg:col-span-2">
             <InputGroup @wrapperClass="pt-2">
                 <Toggle
@@ -170,7 +191,9 @@
                 />
             </InputGroup>
         </div>
+        {{/if}}
 
+        {{#if this.show.dispatch}}
         <div class="lg:col-span-2">
             <InputGroup @wrapperClass="pt-1">
                 <Toggle
@@ -183,7 +206,9 @@
                 />
             </InputGroup>
         </div>
+        {{/if}}
 
+        {{#if this.show.pod}}
         <div class="lg:col-span-2">
             <InputGroup @wrapperClass="pt-1">
                 <Toggle
@@ -196,6 +221,7 @@
                 />
             </InputGroup>
         </div>
+        {{/if}}
 
         <RegistryYield @registry="fleet-ops:component:order:form:details" as |RegistryComponent|>
             <RegistryComponent @order={{@resource}} @resource={{@resource}} />

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

@@ -13,6 +13,7 @@ export default class OrderFormDetailsComponent extends Component {
     @service leafletMapManager;
     @service leafletLayerVisibilityManager;
     @service currentUser;
+    @service orderPresentation;
     @tracked customFields;
 
     constructor() {
@@ -20,6 +21,40 @@ export default class OrderFormDetailsComponent extends Component {
         this.orderConfigActions.loadAll.perform();
     }
 
+    /** The presentation profile applying to the order's current config, if any. */
+    get profile() {
+        return this.orderPresentation.profileFor(this.args.resource);
+    }
+
+    /** Extension fields rendered inside the details grid when a profile applies. */
+    get profileDetailFields() {
+        return this.profile?.form?.detailFields ?? null;
+    }
+
+    /** A persisted order keeps its profiled order type; reclassification is not supported. */
+    get orderTypeLocked() {
+        return Boolean(this.profile) && this.args.resource?.isNew === false;
+    }
+
+    /** Field visibility; everything is visible unless a presentation profile hides it. */
+    get show() {
+        const hidden = this.args.hiddenFields ?? this.orderPresentation.hiddenFieldsFor(this.args.resource);
+        const visible = (key) => !hidden.includes(key);
+
+        return {
+            internalId: visible('internal-id'),
+            schedule: visible('schedule'),
+            customer: visible('customer'),
+            facilitator: visible('facilitator'),
+            serviceType: visible('service-type'),
+            driver: visible('driver'),
+            vehicle: visible('vehicle'),
+            pod: visible('pod'),
+            adhoc: visible('adhoc'),
+            dispatch: visible('dispatch'),
+        };
+    }
+
     get integratedVendorServiceType() {
         return this.args.resource?.type;
     }
@@ -38,12 +73,23 @@ export default class OrderFormDetailsComponent extends Component {
 
     @task *selectOrderConfig(orderConfig) {
         if (!orderConfig) return;
+        const previousProfile = this.orderPresentation.profileFor(this.args.resource);
         this.args.resource.setProperties({
             order_config_uuid: orderConfig.id,
             order_config: orderConfig,
             type: orderConfig.key,
         });
         this.args.resource.payload.set('type', orderConfig.key);
+
+        // Let presentation profiles clean up or prepare the draft when the order type changes.
+        const nextProfile = this.orderPresentation.profileFor(this.args.resource);
+        if (previousProfile && previousProfile !== nextProfile && typeof previousProfile.release === 'function') {
+            previousProfile.release(this.args.resource);
+        }
+        if (nextProfile && nextProfile !== previousProfile) {
+            this.orderPresentation.prepare(this.args.resource);
+        }
+
         this.requestServiceQuoteRefresh('details.order_config.changed');
 
         try {

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

@@ -1,7 +1,9 @@
-<ContentPanel @title={{t "order.fields.route"}} @open={{true}} @wrapperClass="bordered-top">
+<ContentPanel @title={{or this.profileTitle (t "order.fields.route")}} @open={{true}} @wrapperClass="bordered-top">
     <div class="flex flex-row items-center justify-between mb-4">
         <div class="flex">
-            <Toggle @isToggled={{this.multipleWaypoints}} @onToggle={{this.toggleWaypoints}} @label={{t "order.fields.route-label"}} />
+            {{#if this.allowsMultipleWaypoints}}
+                <Toggle @isToggled={{this.multipleWaypoints}} @onToggle={{this.toggleWaypoints}} @label={{t "order.fields.route-label"}} />
+            {{/if}}
         </div>
         <div class="flex flex-1 justify-end space-x-2">
             {{#if this.multipleWaypoints}}

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

@@ -22,6 +22,7 @@ export default class OrderFormRouteComponent extends Component {
     @service notifications;
     @service placeActions;
     @service orderCreation;
+    @service orderPresentation;
     @tracked multipleWaypoints = false;
     @tracked routingControl;
     @tracked route;
@@ -35,6 +36,16 @@ export default class OrderFormRouteComponent extends Component {
         }
     }
 
+    /** A presentation profile may hide multi-drop routing and rename the route panel. */
+    get allowsMultipleWaypoints() {
+        const hidden = this.args.hiddenFields ?? this.orderPresentation.hiddenFieldsFor(this.args.resource);
+        return !hidden.includes('multiple-waypoints');
+    }
+
+    get profileTitle() {
+        return this.orderPresentation.profileFor(this.args.resource)?.form?.titles?.route ?? null;
+    }
+
     get coordinates() {
         return this.routePoints.map(({ place }) => [place.latitude, place.longitude]);
     }

package/addon/components/order/form.hbs

@@ -16,6 +16,18 @@
                 RegistryYieldEnd=(component "registry-yield" registry="fleet-ops:component:order:form:end" order=@resource)
             )
         }}
+    {{else if this.profile}}
+        {{#each this.profileSections key="key" as |section|}}
+            {{#if section.native}}
+                {{#let (component section.componentName resource=@resource hiddenFields=this.hiddenFields) as |NativeSection|}}
+                    <NativeSection />
+                {{/let}}
+            {{else}}
+                <LazyEngineComponent @component={{section.component}} as |ProfileSection|>
+                    <ProfileSection @resource={{@resource}} @order={{@resource}} @controller={{@controller}} @profile={{this.profile}} @hiddenFields={{this.hiddenFields}} />
+                </LazyEngineComponent>
+            {{/if}}
+        {{/each}}
     {{else}}
         <RegistryYield @registry="fleet-ops:component:order:form:start" as |RegistryComponent|>
             <RegistryComponent @order={{@resource}} @resource={{@resource}} />

package/addon/components/order/form.js

@@ -11,6 +11,7 @@ export default class OrderFormComponent extends Component {
     @service customFieldsRegistry;
     @service mapManager;
     @service currentUser;
+    @service orderPresentation;
     @tracked customFields;
 
     constructor() {
@@ -18,6 +19,19 @@ export default class OrderFormComponent extends Component {
         this.orderConfigActions.loadAll.perform();
     }
 
+    /** The extension presentation profile applying to this order's config, if any. */
+    get profile() {
+        return this.orderPresentation.profileFor(this.args.resource);
+    }
+
+    get profileSections() {
+        return this.orderPresentation.renderableSectionsFor(this.profile, 'form');
+    }
+
+    get hiddenFields() {
+        return this.orderPresentation.hiddenFieldsFor(this.args.resource);
+    }
+
     @action selectFacilitator(model) {
         this.args.resource.set('facilitator', model);
         this.args.resource.set('driver', null);
@@ -32,7 +46,13 @@ export default class OrderFormComponent extends Component {
         });
         this.args.resource.payload.set('type', orderConfig.key);
 
-        this.customFields = yield this.customFieldsRegistry.loadSubjectCustomFields.perform(orderConfig);
+        // loadSubjectCustomFields rejects when the custom fields cannot be loaded (ember-core 0.3.25).
+        try {
+            this.customFields = yield this.customFieldsRegistry.loadSubjectCustomFields.perform(orderConfig);
+        } catch (err) {
+            this.customFields = undefined;
+            debug('Unable to load order custom fields: ' + err.message);
+        }
     }
 
     @task *selectDriver(driver) {

package/addon/components/order/kanban.js

@@ -13,7 +13,9 @@ export default class OrderKanbanComponent extends Component {
     @service fetch;
     @service notifications;
     @service intl;
+    @service store;
     @tracked statuses = [];
+    @tracked orderConfigRecord = null;
     @tracked orders = this.args.orders ?? [];
     @tracked orderConfig = this.args.orderConfig ?? null;
 
@@ -23,6 +25,11 @@ export default class OrderKanbanComponent extends Component {
     };
 
     get columns() {
+        const lifecycleColumns = this.#lifecycleColumns();
+        if (lifecycleColumns) {
+            return lifecycleColumns;
+        }
+
         const start = this.#defaultStatuses.start ?? [];
         const end = this.#defaultStatuses.end ?? [];
         const loaded = isArray(this.statuses) ? this.statuses : [];
@@ -112,6 +119,64 @@ export default class OrderKanbanComponent extends Component {
         this.loadStatuses.perform();
     }
 
+    /**
+     * Columns for an order config with a configured lifecycle (`meta.lifecycle`): the flow's own
+     * activities in graph order from the initial activity, titled with their status labels.
+     * No default dispatch columns are injected. Returns null for configs without a lifecycle.
+     */
+    #lifecycleColumns() {
+        const config = this.orderConfigRecord;
+        const lifecycle = config?.meta?.lifecycle;
+        const flow = config?.flow;
+        if (!lifecycle || !flow || typeof flow !== 'object') {
+            return null;
+        }
+
+        const activities = Object.values(flow).filter((activity) => activity && activity.code);
+        const byKeyOrCode = new Map();
+        for (const activity of activities) {
+            byKeyOrCode.set(activity.key ?? activity.code, activity);
+            byKeyOrCode.set(activity.code, activity);
+        }
+
+        // Breadth-first walk from the initial activity, then any activities not reachable from it.
+        const ordered = [];
+        const seen = new Set();
+        const queue = [byKeyOrCode.get(lifecycle.initial)].filter(Boolean);
+        while (queue.length) {
+            const activity = queue.shift();
+            if (seen.has(activity.code)) continue;
+            seen.add(activity.code);
+            ordered.push(activity);
+            for (const child of activity.activities ?? []) {
+                const next = byKeyOrCode.get(typeof child === 'string' ? child : (child?.key ?? child?.code));
+                if (next && !seen.has(next.code)) queue.push(next);
+            }
+        }
+        for (const activity of activities.sort((a, b) => (a.sequence ?? 0) - (b.sequence ?? 0))) {
+            if (!seen.has(activity.code)) {
+                seen.add(activity.code);
+                ordered.push(activity);
+            }
+        }
+
+        // Keep orders whose status is not part of the flow visible rather than silently dropping them.
+        const columns = ordered.map((activity) => ({ id: activity.code, title: this.#activityTitle(activity) }));
+        for (const status of isArray(this.statuses) ? this.statuses : []) {
+            if (status && !seen.has(status)) {
+                seen.add(status);
+                columns.push({ id: status, title: titleize(smartHumanize(status)) });
+            }
+        }
+
+        return columns.map((column, index) => ({ ...column, position: index, cards: this.#getOrdersByStatus(column.id, this.orders) }));
+    }
+
+    #activityTitle(activity) {
+        const label = typeof activity.status === 'string' ? activity.status.trim() : '';
+        return label && !label.includes('{') ? label : titleize(smartHumanize(activity.code));
+    }
+
     #getOrdersByStatus(status, orders = []) {
         let filteredOrders = orders.filter((order) => order.status === status);
         if (this.orderConfig) {
@@ -125,6 +190,13 @@ export default class OrderKanbanComponent extends Component {
         const params = {};
         if (this.orderConfig) params.order_config_uuid = this.orderConfig;
 
+        try {
+            this.orderConfigRecord = this.orderConfig ? yield this.store.findRecord('order-config', this.orderConfig) : null;
+        } catch (err) {
+            this.orderConfigRecord = null;
+            debug('Unable to load order config for board: ' + err.message);
+        }
+
         try {
             const statuses = yield this.fetch.get('orders/statuses', params);
             this.statuses = isArray(statuses) ? statuses : [];

package/addon/components/order-config-manager/activity-flow.js

@@ -34,7 +34,17 @@ export default class OrderConfigManagerActivityFlowComponent extends Component {
      * An array of activity codes that should not be modified.
      * @type {Array.<string>}
      */
-    @tracked immutableActivities = ['created', 'dispatched', 'started'];
+    /**
+     * Activities that cannot be edited or removed. Configs with their own lifecycle
+     * (`meta.lifecycle`) are not bound to the default dispatch activities.
+     */
+    get immutableActivities() {
+        return this.lifecycle ? [] : ['created', 'dispatched', 'started'];
+    }
+
+    get lifecycle() {
+        return this.config?.meta?.lifecycle ?? null;
+    }
 
     /**
      * The configuration data for the activity flow.
@@ -180,6 +190,12 @@ export default class OrderConfigManagerActivityFlowComponent extends Component {
         this.clearGraph({
             onAfter: () => {
                 this.flow = {};
+                // A configured lifecycle resets to its saved flow, never to the default dispatch flow.
+                if (this.lifecycle && this.config?.flow && Object.keys(this.config.flow).length) {
+                    this.deserializeFlow(this.config.flow);
+                    return;
+                }
+
                 const defaultActivities = this.getDefaultActivities();
                 this.addActivityToGraph(defaultActivities);
             },
@@ -361,7 +377,7 @@ export default class OrderConfigManagerActivityFlowComponent extends Component {
             }
         });
 
-        const rootCode = getOrderConfigFlowRootCode(deserializedFlow);
+        const rootCode = getOrderConfigFlowRootCode(deserializedFlow, this.lifecycle?.initial);
         if (rootCode && deserializedFlow[rootCode]) {
             this.addDeserializedActivityToGraph(deserializedFlow[rootCode]);
         }
@@ -439,6 +455,10 @@ export default class OrderConfigManagerActivityFlowComponent extends Component {
      * and creates links from the parent to each child. It then calls itself to add any children of the current child activities.
      * Finally, it repositions all child activities to maintain visual consistency.
      *
+     * A flow is a graph, not a tree: an activity may be reachable from several parents, and a
+     * configured lifecycle can loop back (e.g. active -> extended -> active). An activity that is
+     * already on the graph only gets a link from this parent; it is never placed or walked twice.
+     *
      * @param {Object} parentActivity - The parent activity to which child activities will be added.
      * @param {Array} [childActivities=[]] - An array of child activity objects to be added. Defaults to an empty array.
      */
@@ -447,6 +467,11 @@ export default class OrderConfigManagerActivityFlowComponent extends Component {
             return;
         }
         childActivities.forEach((childActivityObject) => {
+            if (childActivityObject.get('node')) {
+                this.addLinkToGraph(parentActivity, childActivityObject);
+                return;
+            }
+
             const childPositionals = this.getActivityPositioning(childActivityObject, parentActivity);
             const childActivity = this.createActivityNode(childActivityObject, childPositionals);
             childActivity.set('parentId', parentActivity.get('id'));
@@ -823,16 +848,26 @@ export default class OrderConfigManagerActivityFlowComponent extends Component {
         const addButton = this.createAddActivityButton(activity, { x: width });
         let tools = [];
 
-        if (activity.get('code') === 'created' || activity.get('code') === 'dispatched') {
-            tools = [];
-        }
+        const code = activity.get('code');
+        const canUpdate = this.abilities.can('fleet-ops update order-config');
 
-        if (activity.get('code') === 'started' && this.abilities.can('fleet-ops update order-config')) {
-            tools = [addButton];
-        }
+        if (this.lifecycle) {
+            // The configured initial activity is the root: it can gain children but not be removed.
+            if (canUpdate) {
+                tools = code === this.lifecycle.initial ? [addButton] : [removeButton, addButton];
+            }
+        } else {
+            if (code === 'created' || code === 'dispatched') {
+                tools = [];
+            }
+
+            if (code === 'started' && canUpdate) {
+                tools = [addButton];
+            }
 
-        if (!this.immutableActivities.includes(activity.get('code')) && this.abilities.can('fleet-ops update order-config')) {
-            tools = [removeButton, addButton];
+            if (!this.immutableActivities.includes(code) && canUpdate) {
+                tools = [removeButton, addButton];
+            }
         }
 
         const activityNodeView = activityNode.findView(this.paper);