@fleetbase/fleetops-engine 0.6.69 → 0.6.71

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

@@ -16,7 +16,7 @@ export default class ManagementVehiclesIndexController extends Controller {
     @service appCache;
 
     /** query params */
-    @tracked queryParams = [
+    @tracked queryParams = this.vehicleActions.queryParamsFor([
         'page',
         'limit',
         'sort',
@@ -38,7 +38,7 @@ export default class ManagementVehiclesIndexController extends Controller {
         'has_trailer',
         'has_driver',
         'has_device',
-    ];
+    ]);
     @tracked query = null;
     @tracked page = 1;
     @tracked limit;
@@ -68,6 +68,7 @@ export default class ManagementVehiclesIndexController extends Controller {
     get actionButtons() {
         return [
             {
+                id: 'more',
                 component: 'dropdown-button',
                 icon: 'display',
                 size: 'xs',
@@ -93,28 +94,35 @@ export default class ManagementVehiclesIndexController extends Controller {
                 helpText: 'Change the layout',
             },
             {
+                id: 'refresh',
                 icon: 'refresh',
                 onClick: this.vehicleActions.refresh,
                 helpText: this.intl.t('common.refresh'),
             },
             {
+                id: 'create',
                 text: this.intl.t('common.new'),
                 type: 'primary',
                 icon: 'plus',
                 onClick: this.vehicleActions.transition.create,
+                permission: 'fleet-ops create vehicle',
             },
             {
+                id: 'import',
                 text: this.intl.t('common.import'),
                 type: 'magic',
                 icon: 'upload',
                 onClick: this.vehicleActions.import,
+                permission: 'fleet-ops import vehicle',
             },
             {
+                id: 'export',
                 text: this.intl.t('common.export'),
                 icon: 'long-arrow-up',
                 iconClass: 'rotate-icon-45',
                 wrapperClass: 'hidden md:flex',
                 onClick: this.vehicleActions.export,
+                permission: 'fleet-ops export vehicle',
             },
         ];
     }
@@ -125,9 +133,11 @@ export default class ManagementVehiclesIndexController extends Controller {
 
         return [
             {
+                id: 'bulk-delete',
                 label: this.intl.t('common.delete-selected-count', { count: selected.length }),
                 class: 'text-red-500',
                 fn: this.vehicleActions.bulkDelete,
+                permission: 'fleet-ops delete vehicle',
             },
         ];
     }
@@ -147,6 +157,7 @@ export default class ManagementVehiclesIndexController extends Controller {
     get columns() {
         return [
             {
+                id: 'display-name',
                 sticky: true,
                 label: this.intl.t('column.name'),
                 valuePath: 'displayName',
@@ -161,6 +172,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterParam: 'name',
             },
             {
+                id: 'plate-number',
                 label: this.intl.t('column.plate-number'),
                 valuePath: 'plate_number',
                 cellComponent: 'table/cell/base',
@@ -172,6 +184,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterParam: 'plate_number',
             },
             {
+                id: 'internal-id',
                 label: this.intl.t('column.internal-id'),
                 valuePath: 'internal_id',
                 cellComponent: 'table/cell/base',
@@ -184,6 +197,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterParam: 'internal_id',
             },
             {
+                id: 'driver-name',
                 label: this.intl.t('column.driver-assigned'),
                 cellComponent: 'cell/driver-identity',
                 permission: 'fleet-ops view driver',
@@ -199,6 +213,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 model: 'driver',
             },
             {
+                id: 'trailers',
                 label: this.intl.t('resource.trailers'),
                 valuePath: 'trailers',
                 cellComponent: 'cell/resource-list',
@@ -212,6 +227,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 modelNamePath: 'displayName',
             },
             {
+                id: 'devices',
                 label: this.intl.t('resource.devices'),
                 valuePath: 'devices',
                 cellComponent: 'cell/resource-list',
@@ -225,6 +241,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 modelNamePath: 'displayName',
             },
             {
+                id: 'public-id',
                 label: this.intl.t('column.id'),
                 valuePath: 'public_id',
                 cellComponent: 'click-to-copy',
@@ -234,6 +251,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'make',
                 label: this.intl.t('column.make'),
                 valuePath: 'make',
                 cellComponent: 'table/cell/base',
@@ -245,6 +263,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'model',
                 label: this.intl.t('column.model'),
                 valuePath: 'model',
                 cellComponent: 'table/cell/base',
@@ -256,6 +275,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'year',
                 label: this.intl.t('column.year'),
                 valuePath: 'year',
                 cellComponent: 'table/cell/base',
@@ -266,6 +286,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'vendor-name',
                 label: this.intl.t('column.vendor'),
                 cellComponent: 'cell/vendor-identity',
                 permission: 'fleet-ops view vendor',
@@ -283,6 +304,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 model: 'vendor',
             },
             {
+                id: 'status',
                 label: this.intl.t('column.status'),
                 valuePath: 'status',
                 cellComponent: 'table/cell/status',
@@ -293,6 +315,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterFetchOptions: 'vehicles/statuses',
             },
             {
+                id: 'created-at',
                 label: this.intl.t('column.created-at'),
                 valuePath: 'createdAt',
                 sortParam: 'created_at',
@@ -304,6 +327,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'updated-at',
                 label: this.intl.t('column.updated-at'),
                 valuePath: 'updatedAt',
                 sortParam: 'updated_at',
@@ -347,6 +371,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                 filterParam: 'has_device',
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -359,26 +384,31 @@ export default class ManagementVehiclesIndexController extends Controller {
                 width: 60,
                 actions: [
                     {
+                        id: 'view',
                         label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.vehicle') }),
                         fn: this.vehicleActions.transition.view,
                         permission: 'fleet-ops view vehicle',
                     },
                     {
+                        id: 'edit',
                         label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.vehicle') }),
                         fn: this.vehicleActions.transition.edit,
                         permission: 'fleet-ops update vehicle',
                     },
                     {
+                        id: 'locate',
                         label: this.intl.t('vehicle.actions.locate-vehicle'),
                         fn: this.vehicleActions.locate,
                         permission: 'fleet-ops view vehicle',
                     },
                     {
+                        id: 'attach-device',
                         label: this.intl.t('vehicle.actions.attach-device'),
                         fn: this.vehicleActions.attachDevice,
                         permission: 'fleet-ops update vehicle',
                     },
                     {
+                        id: 'unassign-orders',
                         label: this.intl.t('vehicle.actions.unassign-orders'),
                         fn: this.vehicleActions.unassignOrders,
                         permission: 'fleet-ops update vehicle',
@@ -388,21 +418,25 @@ export default class ManagementVehiclesIndexController extends Controller {
                         separator: true,
                     },
                     {
+                        id: 'schedule-maintenance',
                         label: this.intl.t('vehicle.actions.schedule-maintenance'),
                         fn: this.vehicleActions.scheduleMaintenance,
                         permission: 'fleet-ops create maintenance-schedule',
                     },
                     {
+                        id: 'create-work-order',
                         label: this.intl.t('vehicle.actions.create-work-order'),
                         fn: this.vehicleActions.createWorkOrder,
                         permission: 'fleet-ops create work-order',
                     },
                     {
+                        id: 'log-maintenance',
                         label: this.intl.t('vehicle.actions.log-maintenance'),
                         fn: this.vehicleActions.logMaintenance,
                         permission: 'fleet-ops create maintenance',
                     },
                     {
+                        id: 'create-issue',
                         label: this.intl.t('vehicle.actions.create-issue'),
                         fn: this.createIssue,
                         permission: 'fleet-ops create issue',
@@ -411,6 +445,7 @@ export default class ManagementVehiclesIndexController extends Controller {
                         separator: true,
                     },
                     {
+                        id: 'delete',
                         label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.vehicle') }),
                         fn: this.vehicleActions.delete,
                         permission: 'fleet-ops delete vehicle',

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,28 +77,35 @@ 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',
                 onClick: this.vendorActions.transition.create,
+                permission: 'fleet-ops create vendor',
             },
             {
+                id: 'import',
                 text: this.intl.t('common.import'),
                 type: 'magic',
                 icon: 'upload',
                 onClick: this.vendorActions.import,
+                permission: 'fleet-ops import vendor',
             },
             {
+                id: 'export',
                 text: this.intl.t('common.export'),
                 icon: 'long-arrow-up',
                 iconClass: 'rotate-icon-45',
                 wrapperClass: 'hidden md:flex',
                 onClick: this.vendorActions.export,
+                permission: 'fleet-ops export vendor',
             },
         ];
     }
@@ -106,9 +116,11 @@ 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,
+                permission: 'fleet-ops delete vendor',
             },
         ];
     }
@@ -117,6 +129,7 @@ export default class ManagementVendorsIndexController extends Controller {
     get columns() {
         return [
             {
+                id: 'name',
                 sticky: true,
                 label: this.intl.t('column.name'),
                 valuePath: 'name',
@@ -130,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',
@@ -139,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',
@@ -148,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',
@@ -158,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',
@@ -168,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',
@@ -178,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',
@@ -190,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,
@@ -200,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',
@@ -212,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',
@@ -221,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',
@@ -231,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',
@@ -243,6 +267,7 @@ export default class ManagementVendorsIndexController extends Controller {
                 filterOptions: fleetOpsOptions('vendorStatuses'),
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -255,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',
@@ -268,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,8 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
     @service hostRouter;
     @service universe;
     @service sidebar;
+    @service orderPresentation;
+    @service abilities;
     @tracked routingControl;
     @tracked routingCompleted = false;
     @tracked realtimeOrderPublicId = null;
@@ -83,45 +85,70 @@ 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.model.status === 'canceled',
+                        disabled: this.isClosed,
+                        permission: 'fleet-ops update order',
                         fn: () => this.orderActions.editOrderDetails(this.model),
                     },
                     {
+                        id: 'update-activity',
                         text: 'Update activity',
                         icon: 'signal',
-                        disabled: this.model.status === 'canceled',
+                        disabled: this.isClosed,
+                        permission: 'fleet-ops update order',
                         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',
                         disabled: this.model.has_driver_assigned ? !this.model.hasActiveStatus || !this.model.driver_assigned : !this.model.hasActiveStatus,
                         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',
                         fn: () => this.orderActions.viewLabel(this.model),
                     },
                     {
                         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),
@@ -130,16 +157,20 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
                         separator: true,
                     },
                     {
+                        id: 'cancel',
                         text: 'Cancel order',
                         icon: 'ban',
                         class: 'text-danger',
-                        disabled: this.model.status === 'canceled',
+                        disabled: this.isClosed,
+                        permission: 'fleet-ops cancel order',
                         fn: () => this.orderActions.cancel(this.model),
                     },
                     {
+                        id: 'delete',
                         text: 'Delete order',
                         icon: 'trash',
                         class: 'text-danger',
+                        permission: 'fleet-ops delete order',
                         fn: () =>
                             this.orderActions.delete(this.model, {
                                 taskOptions: {
@@ -149,9 +180,34 @@ 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) }));
+    }
+
+    /**
+     * The panel header dropdown renders `items` as-is and ignores `permission`, so items the
+     * user is not permitted to use are removed here, along with any separators left dangling.
+     */
+    permittedMenuItems(items = []) {
+        const permitted = items.filter((item) => !item.permission || this.abilities.can(item.permission));
+        const result = permitted.reduce((list, item) => {
+            if (item.separator && (list.length === 0 || list[list.length - 1].separator)) {
+                return list;
+            }
+
+            list.push(item);
+            return list;
+        }, []);
+
+        if (result.length && result[result.length - 1].separator) {
+            result.pop();
+        }
+
+        return result;
     }
 
     @action handleActivityModalFinish(options) {