@fleetbase/fleetops-engine 0.6.69 → 0.6.71

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,28 +47,35 @@ 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',
                 onClick: this.fuelReportActions.transition.create,
+                permission: 'fleet-ops create fuel-report',
             },
             {
+                id: 'import',
                 text: this.intl.t('common.import'),
                 type: 'magic',
                 icon: 'upload',
                 onClick: this.fuelReportActions.import,
+                permission: 'fleet-ops import fuel-report',
             },
             {
+                id: 'export',
                 text: this.intl.t('common.export'),
                 icon: 'long-arrow-up',
                 iconClass: 'rotate-icon-45',
                 wrapperClass: 'hidden md:flex',
                 onClick: this.fuelReportActions.export,
+                permission: 'fleet-ops export fuel-report',
             },
         ];
     }
@@ -79,9 +86,11 @@ 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,
+                permission: 'fleet-ops delete fuel-report',
             },
         ];
     }
@@ -90,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',
@@ -102,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',
@@ -116,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',
@@ -132,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',
@@ -149,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',
@@ -159,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,
@@ -168,6 +183,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 filterOptions: ['manual', 'import', 'fuel_provider'],
             },
             {
+                id: 'provider',
                 label: 'Provider',
                 valuePath: 'provider',
                 resizable: true,
@@ -176,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',
@@ -186,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',
@@ -196,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',
@@ -205,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',
@@ -215,6 +235,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -227,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',
@@ -240,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,14 +63,17 @@ 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'),
+                permission: 'fleet-ops list fuel-provider-connection',
             },
         ];
     }
@@ -84,8 +87,10 @@ 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',
             },
         ];
     }
@@ -93,6 +98,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
     get columns() {
         return [
             {
+                id: 'provider-transaction-id',
                 sticky: true,
                 label: 'Transaction',
                 valuePath: 'provider_transaction_id',
@@ -105,6 +111,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 filterComponent: 'filter/string',
             },
             {
+                id: 'provider',
                 label: 'Provider',
                 valuePath: 'provider',
                 resizable: true,
@@ -113,6 +120,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 filterComponent: 'filter/string',
             },
             {
+                id: 'sync-status',
                 label: 'Status',
                 valuePath: 'sync_status',
                 cellComponent: 'fuel-transaction-status',
@@ -123,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',
@@ -137,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',
@@ -166,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',
@@ -175,6 +190,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 resizable: true,
             },
             {
+                id: 'transaction-at',
                 label: 'Date',
                 valuePath: 'transactionAt',
                 sortParam: 'transaction_at',
@@ -185,6 +201,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 filterComponent: 'filter/date',
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -196,14 +213,35 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 sticky: 'right',
                 width: 60,
                 actions: [
-                    { label: 'Review Details', fn: this.openDetails },
-                    { label: 'Open Fuel Report', fn: this.openFuelReport, isVisible: (transaction) => Boolean(transaction.fuel_report_id) },
+                    { 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 },
-                    { label: 'Match to Order', fn: this.matchOrder },
-                    { label: 'Reprocess / Rematch', fn: (transaction) => this.confirmAction('reprocess', transaction) },
-                    { label: 'Ignore Transaction', fn: (transaction) => this.confirmAction('ignored', transaction) },
-                    { label: 'Mark Reviewed', fn: (transaction) => this.confirmAction('reviewed', 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()),

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

@@ -11,7 +11,7 @@ export default class ManagementIssuesIndexController extends Controller {
     @service intl;
 
     /** query params */
-    @tracked queryParams = [
+    @tracked queryParams = this.issueActions.queryParamsFor([
         'page',
         'limit',
         'sort',
@@ -28,7 +28,7 @@ export default class ManagementIssuesIndexController extends Controller {
         'priority',
         'cateogry',
         'type',
-    ];
+    ]);
     @tracked page = 1;
     @tracked limit;
     @tracked sort = '-created_at';
@@ -47,28 +47,35 @@ export default class ManagementIssuesIndexController extends Controller {
     get actionButtons() {
         return [
             {
+                id: 'refresh',
                 icon: 'refresh',
                 onClick: this.issueActions.refresh,
                 helpText: this.intl.t('common.refresh'),
             },
             {
+                id: 'create',
                 text: this.intl.t('common.new'),
                 type: 'primary',
                 icon: 'plus',
                 onClick: this.issueActions.transition.create,
+                permission: 'fleet-ops create issue',
             },
             {
+                id: 'import',
                 text: this.intl.t('common.import'),
                 type: 'magic',
                 icon: 'upload',
                 onClick: this.issueActions.import,
+                permission: 'fleet-ops import issue',
             },
             {
+                id: 'export',
                 text: this.intl.t('common.export'),
                 icon: 'long-arrow-up',
                 iconClass: 'rotate-icon-45',
                 wrapperClass: 'hidden md:flex',
                 onClick: this.issueActions.export,
+                permission: 'fleet-ops export issue',
             },
         ];
     }
@@ -79,9 +86,11 @@ export default class ManagementIssuesIndexController extends Controller {
 
         return [
             {
+                id: 'bulk-delete',
                 label: this.intl.t('common.delete-selected-count', { count: selected.length }),
                 class: 'text-red-500',
                 fn: this.issueActions.bulkDelete,
+                permission: 'fleet-ops delete issue',
             },
         ];
     }
@@ -90,6 +99,7 @@ export default class ManagementIssuesIndexController extends Controller {
     get columns() {
         return [
             {
+                id: 'public-id',
                 sticky: true,
                 label: this.intl.t('column.id'),
                 valuePath: 'public_id',
@@ -100,6 +110,7 @@ export default class ManagementIssuesIndexController extends Controller {
                 sortable: true,
             },
             {
+                id: 'priority',
                 label: this.intl.t('column.priority'),
                 valuePath: 'priority',
                 cellComponent: 'table/cell/status',
@@ -110,6 +121,7 @@ export default class ManagementIssuesIndexController extends Controller {
                 filterOptions: ['low', 'medium', 'high', 'critical', 'scheduled-maintenance', 'operational-suggestion'],
             },
             {
+                id: 'type',
                 label: this.intl.t('column.type'),
                 valuePath: 'type',
                 humanize: true,
@@ -123,6 +135,7 @@ export default class ManagementIssuesIndexController extends Controller {
                 placeholder: 'Select issue type',
             },
             {
+                id: 'category',
                 label: this.intl.t('column.category'),
                 valuePath: 'category',
                 humanize: true,
@@ -136,6 +149,7 @@ export default class ManagementIssuesIndexController extends Controller {
                 placeholder: 'Select issue category',
             },
             {
+                id: 'reporter-name',
                 label: this.intl.t('column.reporter'),
                 valuePath: 'reporter_name',
                 cellComponent: 'table/cell/user-identity',
@@ -151,6 +165,7 @@ export default class ManagementIssuesIndexController extends Controller {
                 model: 'user',
             },
             {
+                id: 'assignee-name',
                 label: this.intl.t('column.assignee'),
                 valuePath: 'assignee_name',
                 cellComponent: 'table/cell/user-identity',
@@ -166,6 +181,7 @@ export default class ManagementIssuesIndexController extends Controller {
                 model: 'user',
             },
             {
+                id: 'driver-name',
                 label: this.intl.t('column.driver'),
                 valuePath: 'driver_name',
                 cellComponent: 'cell/driver-identity',
@@ -182,6 +198,7 @@ export default class ManagementIssuesIndexController extends Controller {
                 model: 'driver',
             },
             {
+                id: 'vehicle-name',
                 label: this.intl.t('column.vehicle'),
                 valuePath: 'vehicle_name',
                 cellComponent: 'cell/vehicle-identity',
@@ -199,6 +216,7 @@ export default class ManagementIssuesIndexController extends Controller {
                 modelNamePath: 'displayName',
             },
             {
+                id: 'status',
                 label: this.intl.t('column.status'),
                 valuePath: 'status',
                 cellComponent: 'table/cell/status',
@@ -209,6 +227,7 @@ export default class ManagementIssuesIndexController extends Controller {
                 filterOptions: ['pending', 'in-progress', 'backlogged', 'requires-update', 'in-review', 're-opened', 'duplicate', 'pending-review', 'escalated', 'completed', 'canceled'],
             },
             {
+                id: 'created-at',
                 label: this.intl.t('column.created-at'),
                 valuePath: 'createdAt',
                 sortParam: 'created_at',
@@ -218,6 +237,7 @@ export default class ManagementIssuesIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'updated-at',
                 label: this.intl.t('column.updated-at'),
                 valuePath: 'updatedAt',
                 sortParam: 'updated_at',
@@ -228,6 +248,7 @@ export default class ManagementIssuesIndexController extends Controller {
                 filterComponent: 'filter/date',
             },
             {
+                id: 'row-actions',
                 label: '',
                 cellComponent: 'table/cell/dropdown',
                 ddButtonText: false,
@@ -240,11 +261,13 @@ export default class ManagementIssuesIndexController extends Controller {
                 width: 60,
                 actions: [
                     {
+                        id: 'view',
                         label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.issue') }),
                         fn: this.issueActions.transition.view,
                         permission: 'fleet-ops view issue',
                     },
                     {
+                        id: 'edit',
                         label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.issue') }),
                         fn: this.issueActions.transition.edit,
                         permission: 'fleet-ops update issue',
@@ -253,6 +276,7 @@ export default class ManagementIssuesIndexController extends Controller {
                         separator: true,
                     },
                     {
+                        id: 'delete',
                         label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.issue') }),
                         fn: this.issueActions.delete,
                         permission: 'fleet-ops delete issue',