@fleetbase/fleetops-engine 0.6.70 → 0.6.71

package/addon/controllers/management/vendors/index.js

@@ -13,7 +13,7 @@ export default class ManagementVendorsIndexController extends Controller {
     @service appCache;
 
     /** query params */
-    @tracked queryParams = [
+    @tracked queryParams = this.vendorActions.queryParamsFor([
         'page',
         'limit',
         'sort',
@@ -30,7 +30,7 @@ export default class ManagementVendorsIndexController extends Controller {
         'country',
         'address',
         'website_url',
-    ];
+    ]);
     @tracked page = 1;
     @tracked limit;
     @tracked sort = '-created_at';
@@ -55,16 +55,19 @@ export default class ManagementVendorsIndexController extends Controller {
     get actionButtons() {
         return [
             {
+                id: 'more',
                 component: 'dropdown-button',
                 icon: 'display',
                 size: 'xs',
                 items: [
                     {
+                        id: 'table-view',
                         label: this.intl.t('common.table-view'),
                         icon: 'table-list',
                         onClick: () => this.setLayout('table'),
                     },
                     {
+                        id: 'grid-view',
                         label: this.intl.t('common.grid-view'),
                         icon: 'grip',
                         onClick: () => this.setLayout('grid'),
@@ -74,11 +77,13 @@ export default class ManagementVendorsIndexController extends Controller {
                 helpText: this.intl.t('common.change-layout'),
             },
             {
+                id: 'refresh',
                 icon: 'refresh',
                 onClick: this.vendorActions.refresh,
                 helpText: this.intl.t('common.refresh'),
             },
             {
+                id: 'create',
                 text: this.intl.t('common.new'),
                 type: 'primary',
                 icon: 'plus',
@@ -86,6 +91,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 permission: 'fleet-ops create vendor',
             },
             {
+                id: 'import',
                 text: this.intl.t('common.import'),
                 type: 'magic',
                 icon: 'upload',
@@ -93,6 +99,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 permission: 'fleet-ops import vendor',
             },
             {
+                id: 'export',
                 text: this.intl.t('common.export'),
                 icon: 'long-arrow-up',
                 iconClass: 'rotate-icon-45',
@@ -109,6 +116,7 @@ export default class ManagementVendorsIndexController extends Controller {
 
         return [
             {
+                id: 'bulk-delete',
                 label: this.intl.t('common.delete-selected-count', { count: selected.length }),
                 class: 'text-red-500',
                 fn: this.vendorActions.bulkDelete,
@@ -121,6 +129,7 @@ export default class ManagementVendorsIndexController extends Controller {
     get columns() {
         return [
             {
+                id: 'name',
                 sticky: true,
                 label: this.intl.t('column.name'),
                 valuePath: 'name',
@@ -134,6 +143,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'public-id',
                 label: this.intl.t('column.id'),
                 valuePath: 'public_id',
                 cellComponent: 'click-to-copy',
@@ -143,6 +153,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'internal-id',
                 label: this.intl.t('column.internal-id'),
                 valuePath: 'internal_id',
                 cellComponent: 'click-to-copy',
@@ -152,6 +163,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'email',
                 label: this.intl.t('column.email'),
                 valuePath: 'email',
                 cellComponent: 'click-to-copy',
@@ -162,6 +174,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'website-url',
                 label: this.intl.t('column.website-url'),
                 valuePath: 'website_url',
                 cellComponent: 'click-to-copy',
@@ -172,6 +185,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'phone',
                 label: this.intl.t('column.phone'),
                 valuePath: 'phone',
                 cellComponent: 'click-to-copy',
@@ -182,6 +196,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'address',
                 label: this.intl.t('column.address'),
                 valuePath: 'address',
                 cellComponent: 'cell/place-identity',
@@ -194,6 +209,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'pretty-type',
                 label: this.intl.t('column.type'),
                 valuePath: 'prettyType',
                 humanize: true,
@@ -204,6 +220,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'country',
                 label: this.intl.t('column.country'),
                 valuePath: 'country',
                 cellComponent: 'table/cell/base',
@@ -216,6 +233,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterParam: 'country',
             },
             {
+                id: 'created-at',
                 label: this.intl.t('column.created-at'),
                 valuePath: 'createdAt',
                 sortParam: 'created_at',
@@ -225,6 +243,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'updated-at',
                 label: this.intl.t('column.updated-at'),
                 valuePath: 'updatedAt',
                 sortParam: 'updated_at',
@@ -235,6 +254,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'status',
                 label: this.intl.t('column.status'),
                 valuePath: 'status',
                 cellComponent: 'table/cell/status',
@@ -247,6 +267,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterOptions: fleetOpsOptions('vendorStatuses'),
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -259,11 +280,13 @@ export default class ManagementVendorsIndexController extends Controller {
                 width: 60,
                 actions: [
                     {
+                        id: 'view',
                         label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.vendor') }),
                         fn: this.vendorActions.transition.view,
                         permission: 'fleet-ops view vendor',
                     },
                     {
+                        id: 'edit',
                         label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.vendor') }),
                         fn: this.vendorActions.transition.edit,
                         permission: 'fleet-ops update vendor',
@@ -272,6 +295,7 @@ export default class ManagementVendorsIndexController extends Controller {
                         separator: true,
                     },
                     {
+                        id: 'delete',
                         label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.vendor') }),
                         fn: this.vendorActions.delete,
                         permission: 'fleet-ops delete vendor',

package/addon/controllers/operations/orders/index/details.js

@@ -17,6 +17,7 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
     @service hostRouter;
     @service universe;
     @service sidebar;
+    @service orderPresentation;
     @service abilities;
     @tracked routingControl;
     @tracked routingCompleted = false;
@@ -84,28 +85,46 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
         ];
     }
 
+    /** True when the order reached a terminal activity (default or configured lifecycle). */
+    get isClosed() {
+        const status = this.model.status;
+        const lifecycle = this.model.order_config?.meta?.lifecycle;
+        if (!lifecycle) {
+            return status === 'canceled';
+        }
+
+        // Matches OrderConfig::getTerminalActivityCodes(): `terminal` plus the configured completed and canceled codes.
+        const terminal = [...(Array.isArray(lifecycle.terminal) ? lifecycle.terminal : []), lifecycle.completed, lifecycle.canceled].filter(Boolean);
+        return status === 'canceled' || terminal.includes(status);
+    }
+
     get actionButtons() {
+        const isHidden = (id) => this.orderPresentation.isHidden(this.model, 'actions', id);
+
         return [
             {
                 items: [
                     {
+                        id: 'edit-order-details',
                         text: 'Edit details',
                         icon: 'pencil',
+                        disabled: this.isClosed,
                         permission: 'fleet-ops update order',
-                        disabled: this.model.status === 'canceled',
                         fn: () => this.orderActions.editOrderDetails(this.model),
                     },
                     {
+                        id: 'update-activity',
                         text: 'Update activity',
                         icon: 'signal',
+                        disabled: this.isClosed,
                         permission: 'fleet-ops update order',
-                        disabled: this.model.status === 'canceled',
                         fn: () =>
                             this.orderActions.updateActivity(this.model, {
                                 onFinish: this.handleActivityModalFinish,
                             }),
                     },
                     {
+                        id: this.model.has_driver_assigned ? 'unassign-driver' : 'assign-driver',
                         text: this.model.has_driver_assigned ? 'Unassign driver' : 'Assign driver',
                         icon: this.model.has_driver_assigned ? 'user-xmark' : 'edit',
                         permission: 'fleet-ops assign-driver-for order',
@@ -113,6 +132,7 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
                         fn: () => (this.model.has_driver_assigned ? this.orderActions.unassignDriver(this.model) : this.orderActions.assignDriver(this.model)),
                     },
                     {
+                        id: 'view-label',
                         text: 'View order label',
                         icon: 'file-invoice',
                         permission: 'fleet-ops view order',
@@ -122,11 +142,13 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
                         separator: true,
                     },
                     {
+                        id: 'listen-to-socket-channel',
                         text: 'Listen to socket channel',
                         icon: 'headphones',
                         fn: () => this.hostRouter.transitionTo('console.developers.sockets.view', `order.${this.model.public_id}`),
                     },
                     {
+                        id: 'view-metadata',
                         text: 'View metadata',
                         icon: 'table',
                         fn: () => this.orderActions.viewMetadata(this.model),
@@ -135,14 +157,16 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
                         separator: true,
                     },
                     {
+                        id: 'cancel',
                         text: 'Cancel order',
                         icon: 'ban',
                         class: 'text-danger',
+                        disabled: this.isClosed,
                         permission: 'fleet-ops cancel order',
-                        disabled: this.model.status === 'canceled',
                         fn: () => this.orderActions.cancel(this.model),
                     },
                     {
+                        id: 'delete',
                         text: 'Delete order',
                         icon: 'trash',
                         class: 'text-danger',
@@ -156,7 +180,10 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
                                 },
                             }),
                     },
-                ].filter(Boolean),
+                ]
+                    .filter(Boolean)
+                    .filter((item) => !item.id || !isHidden(item.id))
+                    .filter((item, index, items) => !(item.separator && (index === 0 || items[index - 1]?.separator))),
             },
         ].map((actionButton) => ({ ...actionButton, items: this.permittedMenuItems(actionButton.items) }));
     }

package/addon/controllers/operations/orders/index.js

@@ -7,6 +7,7 @@ import relationValue from '../../../utils/relation-value';
 
 export default class OperationsOrdersIndexController extends Controller {
     @service orderActions;
+    @service orderPresentation;
     @service driverActions;
     @service vehicleActions;
     @service store;
@@ -18,7 +19,7 @@ export default class OperationsOrdersIndexController extends Controller {
     @service intl;
 
     /** query params */
-    @tracked queryParams = [
+    @tracked queryParams = this.orderActions.queryParamsFor([
         'page',
         'limit',
         'sort',
@@ -46,7 +47,7 @@ export default class OperationsOrdersIndexController extends Controller {
         'drawerOpen',
         'drawerTab',
         'orderPanelOpen',
-    ];
+    ]);
     @tracked page = 1;
     @tracked limit;
     @tracked sort = '-created_at';
@@ -77,11 +78,13 @@ export default class OperationsOrdersIndexController extends Controller {
     get actionButtons() {
         return [
             {
+                id: 'refresh',
                 icon: 'refresh',
                 onClick: this.orderActions.refresh,
                 helpText: this.intl.t('common.refresh'),
             },
             {
+                id: 'create',
                 text: this.intl.t('common.new'),
                 type: 'primary',
                 icon: 'plus',
@@ -89,6 +92,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 permission: 'fleet-ops create order',
             },
             {
+                id: 'export',
                 text: this.intl.t('common.export'),
                 icon: 'long-arrow-up',
                 iconClass: 'rotate-icon-45',
@@ -97,6 +101,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 permission: 'fleet-ops export order',
             },
             {
+                id: 'import-orders',
                 text: this.intl.t('common.import'),
                 icon: 'file-import',
                 wrapperClass: 'hidden md:flex',
@@ -110,12 +115,14 @@ export default class OperationsOrdersIndexController extends Controller {
     get bulkActions() {
         return [
             {
+                id: 'bulk-cancel',
                 label: this.intl.t('common.cancel-resource', { resource: this.intl.t('resource.orders') }),
                 icon: 'ban',
                 fn: this.orderActions.bulkCancel,
                 permission: 'fleet-ops cancel order',
             },
             {
+                id: 'bulk-delete',
                 label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.orders') }),
                 icon: 'trash',
                 class: 'text-red-500',
@@ -124,12 +131,14 @@ export default class OperationsOrdersIndexController extends Controller {
             },
             { separator: true },
             {
+                id: 'bulk-dispatch',
                 label: this.intl.t('common.dispatch-orders'),
                 icon: 'rocket',
                 fn: this.orderActions.bulkDispatch,
                 permission: 'fleet-ops dispatch order',
             },
             {
+                id: 'bulk-assign-driver',
                 label: this.intl.t('common.assign-drivers'),
                 icon: 'user-plus',
                 fn: this.orderActions.bulkAssignDriver,
@@ -142,6 +151,7 @@ export default class OperationsOrdersIndexController extends Controller {
     get columns() {
         return [
             {
+                id: 'public-id',
                 sticky: true,
                 label: this.intl.t('column.id'),
                 valuePath: 'public_id',
@@ -155,6 +165,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'payload-waypoints-length',
                 label: this.intl.t('column.route-type'),
                 valuePath: 'payload.waypoints.length',
                 cellComponent: 'cell/order-route-type',
@@ -162,6 +173,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 resizable: true,
             },
             {
+                id: 'internal-id',
                 label: this.intl.t('column.internal-id'),
                 valuePath: 'internal_id',
                 cellComponent: 'click-to-copy',
@@ -174,6 +186,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 filterComponentPlaceholder: this.intl.t('order.placeholders.filter-internal-id'),
             },
             {
+                id: 'payload-public-id',
                 label: this.intl.t('column.payload'),
                 valuePath: 'payload.public_id',
                 cellComponent: 'cell/payload-identity',
@@ -186,6 +199,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'driver-assigned',
                 label: this.intl.t('column.driver-assigned'),
                 cellComponent: 'cell/driver-identity',
                 valuePath: 'driver_assigned',
@@ -203,6 +217,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 model: 'driver',
             },
             {
+                id: 'pickup-name',
                 label: this.intl.t('column.pickup'),
                 valuePath: 'pickupName',
                 cellComponent: 'cell/place-identity',
@@ -219,6 +234,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 model: 'place',
             },
             {
+                id: 'dropoff-name',
                 label: this.intl.t('column.dropoff'),
                 valuePath: 'dropoffName',
                 cellComponent: 'cell/place-identity',
@@ -234,6 +250,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 model: 'place',
             },
             {
+                id: 'customer-name',
                 label: this.intl.t('column.customer'),
                 valuePath: 'customer.name',
                 cellComponent: 'cell/customer-identity',
@@ -248,6 +265,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 model: 'customer',
             },
             {
+                id: 'vehicle-assigned-display-name',
                 label: this.intl.t('column.vehicle-assigned'),
                 cellComponent: 'cell/vehicle-identity',
                 valuePath: 'vehicle_assigned.display_name',
@@ -271,6 +289,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 model: 'vehicle',
             },
             {
+                id: 'facilitator-name',
                 label: this.intl.t('column.facilitator'),
                 valuePath: 'facilitator.name',
                 cellComponent: 'cell/facilitator-identity',
@@ -285,6 +304,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 model: 'vendor',
             },
             {
+                id: 'scheduled-at',
                 label: this.intl.t('column.scheduled-at'),
                 valuePath: 'scheduledAt',
                 sortParam: 'scheduled_at',
@@ -295,6 +315,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'item-count',
                 label: this.intl.t('column.items'),
                 cellComponent: 'table/cell/base',
                 valuePath: 'item_count',
@@ -302,6 +323,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 hidden: true,
             },
             {
+                id: 'transaction-amount',
                 label: this.intl.t('column.transaction'),
                 cellComponent: 'table/cell/currency',
                 valuePath: 'transaction_amount',
@@ -310,6 +332,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 sortable: true,
             },
             {
+                id: 'tracking-number-tracking-number',
                 label: this.intl.t('column.tracking'),
                 valuePath: 'tracking_number.tracking_number',
                 cellComponent: 'click-to-copy',
@@ -319,6 +342,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'type',
                 label: this.intl.t('column.type'),
                 valuePath: 'type',
                 resizable: true,
@@ -330,6 +354,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 filterComponentPlaceholder: 'Filter by order config',
             },
             {
+                id: 'status',
                 label: this.intl.t('column.status'),
                 valuePath: 'status',
                 cellComponent: 'table/cell/status',
@@ -340,6 +365,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 fetchUri: 'orders/statuses',
             },
             {
+                id: 'created-at',
                 label: this.intl.t('column.created-at'),
                 valuePath: 'createdAt',
                 sortParam: 'created_at',
@@ -350,6 +376,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'updated-at',
                 label: this.intl.t('column.updated-at'),
                 valuePath: 'updatedAt',
                 sortParam: 'updated_at',
@@ -361,6 +388,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'created-by-name',
                 label: this.intl.t('column.created-by'),
                 valuePath: 'created_by_name',
                 cellComponent: 'table/cell/user-identity',
@@ -374,6 +402,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 model: 'user',
             },
             {
+                id: 'updated-by-name',
                 label: this.intl.t('column.updated-by'),
                 valuePath: 'updated_by_name',
                 cellComponent: 'table/cell/user-identity',
@@ -397,6 +426,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 hidden: true,
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -407,14 +437,16 @@ export default class OperationsOrdersIndexController extends Controller {
                 wrapperClass: 'flex items-center justify-end mx-2',
                 sticky: 'right',
                 width: 60,
-                actions: [
+                actions: this.withPresentationProfile([
                     {
+                        id: 'view',
                         label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.order') }),
                         icon: 'eye',
                         fn: this.orderActions.transition.view,
                         permission: 'fleet-ops view order',
                     },
                     {
+                        id: 'dispatch',
                         label: this.intl.t('common.dispatch-order'),
                         icon: 'paper-plane',
                         fn: this.orderActions.dispatch,
@@ -422,6 +454,7 @@ export default class OperationsOrdersIndexController extends Controller {
                         isVisible: (order) => order.canBeDispatched,
                     },
                     {
+                        id: 'assign-driver',
                         label: this.intl.t('common.assign-driver'),
                         icon: 'edit',
                         fn: this.orderActions.assignDriver,
@@ -429,6 +462,7 @@ export default class OperationsOrdersIndexController extends Controller {
                         isVisible: (order) => !order.has_driver_assigned,
                     },
                     {
+                        id: 'unassign-driver',
                         label: this.intl.t('common.unassign-driver'),
                         icon: 'edit',
                         fn: this.orderActions.unassignDriver,
@@ -436,6 +470,7 @@ export default class OperationsOrdersIndexController extends Controller {
                         isVisible: (order) => order.has_driver_assigned,
                     },
                     {
+                        id: 'cancel',
                         label: this.intl.t('common.cancel-resource', { resource: this.intl.t('resource.order') }),
                         icon: 'ban',
                         fn: this.orderActions.cancel,
@@ -445,12 +480,13 @@ export default class OperationsOrdersIndexController extends Controller {
                         separator: true,
                     },
                     {
+                        id: 'delete',
                         label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.order') }),
                         icon: 'trash',
                         fn: this.orderActions.delete,
                         permission: 'fleet-ops delete order',
                     },
-                ],
+                ]),
                 sortable: false,
                 filterable: false,
                 resizable: false,
@@ -459,6 +495,25 @@ export default class OperationsOrdersIndexController extends Controller {
         ];
     }
 
+    /**
+     * Hides the row actions an order's presentation profile lists in `hidden.actions`, by id,
+     * the same way the details panel does.
+     */
+    withPresentationProfile(actions) {
+        return actions.map((item) => {
+            if (!item.id) {
+                return item;
+            }
+
+            const isVisible = item.isVisible;
+            const builtInVisible = (order, ...rest) => (typeof isVisible === 'function' ? isVisible(order, ...rest) : isVisible !== false);
+            return {
+                ...item,
+                isVisible: (order, ...rest) => !this.orderPresentation.isHidden(order, 'actions', item.id) && builtInVisible(order, ...rest),
+            };
+        });
+    }
+
     constructor() {
         super(...arguments);
         this.orderSocketEvents.startCompany();