@fleetbase/fleetops-engine 0.6.70 → 0.6.72

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

@@ -15,7 +15,22 @@ export default class ManagementFleetsIndexController extends Controller {
     @service intl;
 
     /** query params */
-    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'zone', 'service_area', 'parent_fleet', 'vendor', 'created_by', 'updated_by', 'status', 'task', 'name'];
+    @tracked queryParams = this.fleetActions.queryParamsFor([
+        'page',
+        'limit',
+        'sort',
+        'query',
+        'public_id',
+        'zone',
+        'service_area',
+        'parent_fleet',
+        'vendor',
+        'created_by',
+        'updated_by',
+        'status',
+        'task',
+        'name',
+    ]);
     @tracked page = 1;
     @tracked limit;
     @tracked sort = '-created_at';
@@ -33,11 +48,13 @@ export default class ManagementFleetsIndexController extends Controller {
     get actionButtons() {
         return [
             {
+                id: 'refresh',
                 icon: 'refresh',
                 onClick: this.fleetActions.refresh,
                 helpText: this.intl.t('common.refresh'),
             },
             {
+                id: 'create',
                 text: this.intl.t('common.new'),
                 type: 'primary',
                 icon: 'plus',
@@ -45,6 +62,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 permission: 'fleet-ops create fleet',
             },
             {
+                id: 'import',
                 text: this.intl.t('common.import'),
                 type: 'magic',
                 icon: 'upload',
@@ -52,6 +70,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 permission: 'fleet-ops import fleet',
             },
             {
+                id: 'export',
                 text: this.intl.t('common.export'),
                 icon: 'long-arrow-up',
                 iconClass: 'rotate-icon-45',
@@ -68,6 +87,7 @@ export default class ManagementFleetsIndexController extends Controller {
 
         return [
             {
+                id: 'bulk-delete',
                 label: this.intl.t('common.delete-selected-count', { count: selected.length }),
                 class: 'text-red-500',
                 fn: this.fleetActions.bulkDelete,
@@ -80,6 +100,7 @@ export default class ManagementFleetsIndexController extends Controller {
     get columns() {
         return [
             {
+                id: 'name',
                 sticky: true,
                 label: this.intl.t('column.name'),
                 valuePath: 'name',
@@ -93,6 +114,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'service-area-name',
                 label: this.intl.t('column.service-area'),
                 cellComponent: 'cell/service-area-identity',
                 permission: 'fleet-ops view service-area',
@@ -107,6 +129,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 model: 'service-area',
             },
             {
+                id: 'parent-fleet-name',
                 label: this.intl.t('column.parent-fleet'),
                 cellComponent: 'cell/fleet-identity',
                 permission: 'fleet-ops view fleet',
@@ -120,6 +143,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 model: 'fleet',
             },
             {
+                id: 'vendor-name',
                 label: this.intl.t('column.vendor'),
                 cellComponent: 'cell/vendor-identity',
                 permission: 'fleet-ops view vendor',
@@ -134,6 +158,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 model: 'vendor',
             },
             {
+                id: 'zone-name',
                 label: this.intl.t('column.zone'),
                 cellComponent: 'cell/zone-identity',
                 permission: 'fleet-ops view zone',
@@ -147,6 +172,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 model: 'zone',
             },
             {
+                id: 'public-id',
                 label: this.intl.t('column.id'),
                 valuePath: 'public_id',
                 cellComponent: 'click-to-copy',
@@ -158,6 +184,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'drivers-count',
                 label: this.intl.t('column.manpower'),
                 valuePath: 'drivers_count',
                 resizable: true,
@@ -165,6 +192,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 filterable: false,
             },
             {
+                id: 'drivers-online-count',
                 label: this.intl.t('column.active-manpower'),
                 valuePath: 'drivers_online_count',
                 hidden: true,
@@ -173,6 +201,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 filterable: false,
             },
             {
+                id: 'task',
                 label: this.intl.t('column.task'),
                 valuePath: 'task',
                 cellComponent: 'table/cell/base',
@@ -182,6 +211,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'status',
                 label: this.intl.t('column.status'),
                 valuePath: 'status',
                 cellComponent: 'table/cell/status',
@@ -194,6 +224,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 filterOptions: fleetOpsOptions('fleetStatuses'),
             },
             {
+                id: 'created-at',
                 label: this.intl.t('column.created-at'),
                 valuePath: 'createdAt',
                 sortParam: 'created_at',
@@ -203,6 +234,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'updated-at',
                 label: this.intl.t('column.updated-at'),
                 valuePath: 'updatedAt',
                 sortParam: 'updated_at',
@@ -213,6 +245,7 @@ export default class ManagementFleetsIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -225,21 +258,25 @@ export default class ManagementFleetsIndexController extends Controller {
                 width: 60,
                 actions: [
                     {
+                        id: 'view',
                         label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.fleet') }),
                         fn: this.fleetActions.transition.view,
                         permission: 'fleet-ops view fleet',
                     },
                     {
+                        id: 'edit',
                         label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.fleet') }),
                         fn: this.fleetActions.transition.edit,
                         permission: 'fleet-ops update fleet',
                     },
                     {
+                        id: 'assign-driver',
                         label: this.intl.t('fleet.actions.assign-driver'),
                         permission: 'fleet-ops assign-driver-for fleet',
                         fn: this.fleetActions.assignDriver,
                     },
                     {
+                        id: 'assign-vehicle',
                         label: this.intl.t('fleet.actions.assign-vehicle'),
                         permission: 'fleet-ops assign-vehicle-for fleet',
                         fn: this.fleetActions.assignVehicle,
@@ -248,6 +285,7 @@ export default class ManagementFleetsIndexController extends Controller {
                         separator: true,
                     },
                     {
+                        id: 'delete',
                         label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.fleet') }),
                         fn: this.fleetActions.delete,
                         permission: 'fleet-ops delete fleet',

package/addon/controllers/management/fuel-reports/index.js

@@ -10,7 +10,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
     @service intl;
 
     /** query params */
-    @tracked queryParams = [
+    @tracked queryParams = this.fuelReportActions.queryParamsFor([
         'page',
         'limit',
         'sort',
@@ -27,7 +27,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
         'country',
         'volume',
         'odometer',
-    ];
+    ]);
     @tracked page = 1;
     @tracked limit;
     @tracked sort = '-created_at';
@@ -47,11 +47,13 @@ export default class ManagementFuelReportsIndexController extends Controller {
     get actionButtons() {
         return [
             {
+                id: 'refresh',
                 icon: 'refresh',
                 onClick: this.fuelReportActions.refresh,
                 helpText: this.intl.t('common.refresh'),
             },
             {
+                id: 'create',
                 text: this.intl.t('common.new'),
                 type: 'primary',
                 icon: 'plus',
@@ -59,6 +61,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 permission: 'fleet-ops create fuel-report',
             },
             {
+                id: 'import',
                 text: this.intl.t('common.import'),
                 type: 'magic',
                 icon: 'upload',
@@ -66,6 +69,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 permission: 'fleet-ops import fuel-report',
             },
             {
+                id: 'export',
                 text: this.intl.t('common.export'),
                 icon: 'long-arrow-up',
                 iconClass: 'rotate-icon-45',
@@ -82,6 +86,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
 
         return [
             {
+                id: 'bulk-delete',
                 label: this.intl.t('common.delete-selected-count', { count: selected.length }),
                 class: 'text-red-500',
                 fn: this.fuelReportActions.bulkDelete,
@@ -94,6 +99,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
     get columns() {
         return [
             {
+                id: 'public-id',
                 sticky: true,
                 label: this.intl.t('column.id'),
                 valuePath: 'public_id',
@@ -106,6 +112,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'reporter-name',
                 label: this.intl.t('column.reporter'),
                 valuePath: 'reporter_name',
                 cellComponent: 'table/cell/user-identity',
@@ -120,6 +127,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 model: 'user',
             },
             {
+                id: 'driver-name',
                 label: this.intl.t('column.driver'),
                 valuePath: 'driver_name',
                 cellComponent: 'cell/driver-identity',
@@ -136,6 +144,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 model: 'driver',
             },
             {
+                id: 'vehicle-name',
                 label: this.intl.t('column.vehicle'),
                 valuePath: 'vehicle_name',
                 cellComponent: 'cell/vehicle-identity',
@@ -153,6 +162,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 modelNamePath: 'displayName',
             },
             {
+                id: 'status',
                 label: this.intl.t('column.status'),
                 valuePath: 'status',
                 cellComponent: 'table/cell/status',
@@ -163,6 +173,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 filterOptions: ['draft', 'pending-approval', 'approved', 'rejected', 'revised', 'submitted', 'in-review', 'confirmed', 'processed', 'archived', 'cancelled'],
             },
             {
+                id: 'source',
                 label: 'Source',
                 valuePath: 'source',
                 resizable: true,
@@ -172,6 +183,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 filterOptions: ['manual', 'import', 'fuel_provider'],
             },
             {
+                id: 'provider',
                 label: 'Provider',
                 valuePath: 'provider',
                 resizable: true,
@@ -180,6 +192,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'volume',
                 label: this.intl.t('column.volume'),
                 valuePath: 'volume',
                 cellComponent: 'click-to-copy',
@@ -190,6 +203,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'odometer',
                 label: this.intl.t('column.odometer'),
                 valuePath: 'odometer',
                 cellComponent: 'click-to-copy',
@@ -200,6 +214,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 filterComponent: 'filter/string',
             },
             {
+                id: 'created-at',
                 label: this.intl.t('column.created-at'),
                 valuePath: 'createdAt',
                 sortParam: 'created_at',
@@ -209,6 +224,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'updated-at',
                 label: this.intl.t('column.updated-at'),
                 valuePath: 'updatedAt',
                 sortParam: 'updated_at',
@@ -219,6 +235,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -231,11 +248,13 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 width: 60,
                 actions: [
                     {
+                        id: 'view',
                         label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.fuel-report') }),
                         fn: this.fuelReportActions.transition.view,
                         permission: 'fleet-ops view fuel-report',
                     },
                     {
+                        id: 'edit',
                         label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.fuel-report') }),
                         fn: this.fuelReportActions.transition.edit,
                         permission: 'fleet-ops update fuel-report',
@@ -244,6 +263,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                         separator: true,
                     },
                     {
+                        id: 'delete',
                         label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.fuel-report') }),
                         fn: this.fuelReportActions.delete,
                         permission: 'fleet-ops delete fuel-report',

package/addon/controllers/management/fuel-transactions/index.js

@@ -63,11 +63,13 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
     get actionButtons() {
         return [
             {
+                id: 'refresh',
                 icon: 'refresh',
                 onClick: this.refresh,
                 helpText: 'Refresh',
             },
             {
+                id: 'fuel-integrations',
                 icon: 'gas-pump',
                 text: 'Fuel Integrations',
                 onClick: () => this.hostRouter.transitionTo('console.fleet-ops.connectivity.fuel-providers.index'),
@@ -85,6 +87,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
 
         return [
             {
+                id: 'bulk-reprocess',
                 label: `Reprocess ${selected.length} selected`,
                 fn: () => this.confirmAction('reprocess', selected),
                 permission: 'fleet-ops update fuel-provider-transaction',
@@ -95,6 +98,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
     get columns() {
         return [
             {
+                id: 'provider-transaction-id',
                 sticky: true,
                 label: 'Transaction',
                 valuePath: 'provider_transaction_id',
@@ -107,6 +111,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 filterComponent: 'filter/string',
             },
             {
+                id: 'provider',
                 label: 'Provider',
                 valuePath: 'provider',
                 resizable: true,
@@ -115,6 +120,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 filterComponent: 'filter/string',
             },
             {
+                id: 'sync-status',
                 label: 'Status',
                 valuePath: 'sync_status',
                 cellComponent: 'fuel-transaction-status',
@@ -125,6 +131,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 filterOptions: ['imported', 'matched', 'unmatched', 'reviewed', 'ignored', 'duplicate', 'error'],
             },
             {
+                id: 'vehicle-name',
                 label: 'Vehicle',
                 valuePath: 'vehicle_name',
                 cellComponent: 'cell/vehicle-identity',
@@ -139,28 +146,33 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 modelNamePath: 'displayName',
             },
             {
+                id: 'vehicle-card-id',
                 label: 'Card / Internal',
                 valuePath: 'vehicle_card_id',
                 resizable: true,
             },
             {
+                id: 'trip-number',
                 label: 'Trip',
                 valuePath: 'trip_number',
                 resizable: true,
                 hidden: true,
             },
             {
+                id: 'station-name',
                 label: 'Station',
                 valuePath: 'station_name',
                 resizable: true,
             },
             {
+                id: 'volume',
                 label: 'Liters',
                 valuePath: 'volume',
                 resizable: true,
                 sortable: true,
             },
             {
+                id: 'amount',
                 label: 'Amount',
                 valuePath: 'amount',
                 cellComponent: 'table/cell/currency',
@@ -168,6 +180,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 sortable: true,
             },
             {
+                id: 'fuel-report-id',
                 label: 'Fuel Report',
                 valuePath: 'fuel_report_id',
                 cellComponent: 'cell/fuel-report-identity',
@@ -177,6 +190,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 resizable: true,
             },
             {
+                id: 'transaction-at',
                 label: 'Date',
                 valuePath: 'transactionAt',
                 sortParam: 'transaction_at',
@@ -187,6 +201,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 filterComponent: 'filter/date',
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -198,14 +213,35 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 sticky: 'right',
                 width: 60,
                 actions: [
-                    { label: 'Review Details', fn: this.openDetails, permission: 'fleet-ops view fuel-provider-transaction' },
-                    { label: 'Open Fuel Report', fn: this.openFuelReport, isVisible: (transaction) => Boolean(transaction.fuel_report_id), permission: 'fleet-ops view fuel-report' },
+                    { id: 'open-details', label: 'Review Details', fn: this.openDetails, permission: 'fleet-ops view fuel-provider-transaction' },
+                    {
+                        id: 'open-fuel-report',
+                        label: 'Open Fuel Report',
+                        fn: this.openFuelReport,
+                        isVisible: (transaction) => Boolean(transaction.fuel_report_id),
+                        permission: 'fleet-ops view fuel-report',
+                    },
                     { separator: true },
-                    { label: 'Match to Vehicle', fn: this.matchVehicle, permission: 'fleet-ops update fuel-provider-transaction' },
-                    { label: 'Match to Order', fn: this.matchOrder, permission: 'fleet-ops update fuel-provider-transaction' },
-                    { label: 'Reprocess / Rematch', fn: (transaction) => this.confirmAction('reprocess', transaction), permission: 'fleet-ops update fuel-provider-transaction' },
-                    { label: 'Ignore Transaction', fn: (transaction) => this.confirmAction('ignored', transaction), permission: 'fleet-ops review fuel-provider-transaction' },
-                    { label: 'Mark Reviewed', fn: (transaction) => this.confirmAction('reviewed', transaction), permission: 'fleet-ops review fuel-provider-transaction' },
+                    { id: 'match-vehicle', label: 'Match to Vehicle', fn: this.matchVehicle, permission: 'fleet-ops update fuel-provider-transaction' },
+                    { id: 'match-order', label: 'Match to Order', fn: this.matchOrder, permission: 'fleet-ops update fuel-provider-transaction' },
+                    {
+                        id: 'reprocess',
+                        label: 'Reprocess / Rematch',
+                        fn: (transaction) => this.confirmAction('reprocess', transaction),
+                        permission: 'fleet-ops update fuel-provider-transaction',
+                    },
+                    {
+                        id: 'ignore',
+                        label: 'Ignore Transaction',
+                        fn: (transaction) => this.confirmAction('ignored', transaction),
+                        permission: 'fleet-ops review fuel-provider-transaction',
+                    },
+                    {
+                        id: 'mark-reviewed',
+                        label: 'Mark Reviewed',
+                        fn: (transaction) => this.confirmAction('reviewed', transaction),
+                        permission: 'fleet-ops review fuel-provider-transaction',
+                    },
                 ],
                 sortable: false,
                 filterable: false,

package/addon/controllers/management/issues/index/details.js

@@ -20,6 +20,7 @@ export default class ManagementIssuesIndexDetailsController extends Controller {
                 fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.issues.index.edit', this.model),
             },
             {
+                id: 'more',
                 icon: 'ellipsis',
                 type: 'default',
                 items: this.issueActions.workflowItems(this.model, () => this.refreshIssue()),