@fleetbase/fleetops-engine 0.6.65 → 0.6.66

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

@@ -1,5 +1,8 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
+import { get } from '@ember/object';
+import { buildIdentityStub } from '../../../utils/identity-cell-resource';
+import relationValue from '../../../utils/relation-value';
 import { tracked } from '@glimmer/tracking';
 import fleetOpsOptions from '../../../utils/fleet-ops-options';
 
@@ -87,12 +90,10 @@ export default class ManagementFleetsIndexController extends Controller {
             },
             {
                 label: this.intl.t('column.service-area'),
-                cellComponent: 'table/cell/anchor',
-                action: async (fleet) => {
-                    const serviceArea = await fleet.get('service_area');
-                    this.serviceAreaActions.modal.view(serviceArea);
-                },
+                cellComponent: 'cell/service-area-identity',
                 permission: 'fleet-ops view service-area',
+                resourcePath: (fleet) =>
+                    relationValue(fleet, 'service_area') ?? buildIdentityStub(fleet, { type: 'service-area', name: get(fleet, 'service_area.name'), load: () => fleet.get('service_area') }),
                 valuePath: 'service_area.name',
                 resizable: true,
                 filterable: true,
@@ -103,12 +104,9 @@ export default class ManagementFleetsIndexController extends Controller {
             },
             {
                 label: this.intl.t('column.parent-fleet'),
-                cellComponent: 'table/cell/anchor',
+                cellComponent: 'cell/fleet-identity',
                 permission: 'fleet-ops view fleet',
-                action: async (fleet) => {
-                    const parentFleet = await fleet.get('parent_fleet');
-                    this.fleetActions.modal.view(parentFleet);
-                },
+                resourcePath: (fleet) => relationValue(fleet, 'parent_fleet'),
                 valuePath: 'parent_fleet.name',
                 resizable: true,
                 filterable: true,
@@ -119,12 +117,9 @@ export default class ManagementFleetsIndexController extends Controller {
             },
             {
                 label: this.intl.t('column.vendor'),
-                cellComponent: 'table/cell/anchor',
+                cellComponent: 'cell/vendor-identity',
                 permission: 'fleet-ops view vendor',
-                action: async (fleet) => {
-                    const vendor = await fleet.get('vendor');
-                    this.vendorActions.modal.view(vendor);
-                },
+                resourcePath: (fleet) => relationValue(fleet, 'vendor') ?? buildIdentityStub(fleet, { type: 'vendor', name: get(fleet, 'vendor.name'), load: () => fleet.get('vendor') }),
                 valuePath: 'vendor.name',
                 resizable: true,
                 hidden: true,
@@ -136,12 +131,9 @@ export default class ManagementFleetsIndexController extends Controller {
             },
             {
                 label: this.intl.t('column.zone'),
-                cellComponent: 'table/cell/anchor',
+                cellComponent: 'cell/zone-identity',
                 permission: 'fleet-ops view zone',
-                action: async (fleet) => {
-                    const zone = await fleet.get('zone');
-                    this.zoneActions.modal.view(zone);
-                },
+                resourcePath: (fleet) => relationValue(fleet, 'zone') ?? buildIdentityStub(fleet, { type: 'zone', name: get(fleet, 'zone.name'), load: () => fleet.get('zone') }),
                 valuePath: 'zone.name',
                 resizable: true,
                 filterable: true,

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

@@ -1,5 +1,6 @@
 import Controller from '@ember/controller';
-import { get } from '@ember/object';
+import { buildIdentityStub } from '../../../utils/identity-cell-resource';
+import relationValue from '../../../utils/relation-value';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
@@ -103,6 +104,9 @@ export default class ManagementFuelReportsIndexController extends Controller {
             {
                 label: this.intl.t('column.reporter'),
                 valuePath: 'reporter_name',
+                cellComponent: 'table/cell/user-identity',
+                resourcePath: (fuelReport) =>
+                    relationValue(fuelReport, 'reporter') ?? buildIdentityStub(fuelReport, { type: 'user', nameKey: 'reporter_name', load: () => fuelReport.get('reporter') }),
                 resizable: true,
                 sortable: true,
                 filterable: true,
@@ -116,35 +120,9 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 valuePath: 'driver_name',
                 cellComponent: 'cell/driver-identity',
                 permission: 'fleet-ops view driver',
-                action: async (driver) => {
-                    const resolvedDriver = driver?.loadResource ? await driver.loadResource() : driver;
-
-                    if (resolvedDriver) {
-                        this.fuelReportActions.driverActions.panel.view(resolvedDriver);
-                    }
-                },
+                action: this.fuelReportActions.driverActions.panel.view,
                 emptyText: '-',
-                showStatusBadge: true,
-                resourcePath: (fuelReport) => {
-                    const driver = get(fuelReport, 'driver');
-
-                    if (driver) {
-                        return driver;
-                    }
-
-                    const driverName = get(fuelReport, 'driver_name');
-
-                    if (driverName) {
-                        return {
-                            id: get(fuelReport, 'driver_uuid'),
-                            name: driverName,
-                            display_name: driverName,
-                            loadResource: () => fuelReport.loadDriver?.(),
-                        };
-                    }
-
-                    return null;
-                },
+                resourcePath: (fuelReport) => relationValue(fuelReport, 'driver') ?? buildIdentityStub(fuelReport, { type: 'driver', load: () => fuelReport.loadDriver?.() }),
                 resizable: true,
                 sortable: true,
                 filterable: true,
@@ -158,37 +136,9 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 valuePath: 'vehicle_name',
                 cellComponent: 'cell/vehicle-identity',
                 permission: 'fleet-ops view vehicle',
-                action: async (vehicle) => {
-                    const resolvedVehicle = vehicle?.loadResource ? await vehicle.loadResource() : vehicle;
-
-                    if (resolvedVehicle) {
-                        this.fuelReportActions.vehicleActions.panel.view(resolvedVehicle);
-                    }
-                },
+                action: this.fuelReportActions.vehicleActions.panel.view,
                 emptyText: '-',
-                showStatusBadge: true,
-                resourcePath: (fuelReport) => {
-                    const vehicle = get(fuelReport, 'vehicle');
-
-                    if (vehicle) {
-                        return vehicle;
-                    }
-
-                    const vehicleName = get(fuelReport, 'vehicle_name');
-
-                    if (vehicleName) {
-                        return {
-                            id: get(fuelReport, 'vehicle_uuid'),
-                            displayName: vehicleName,
-                            display_name: vehicleName,
-                            name: vehicleName,
-                            vehicle_number: get(fuelReport, 'vehicle_uuid'),
-                            loadResource: () => fuelReport.loadVehicle?.(),
-                        };
-                    }
-
-                    return null;
-                },
+                resourcePath: (fuelReport) => relationValue(fuelReport, 'vehicle') ?? buildIdentityStub(fuelReport, { type: 'vehicle', load: () => fuelReport.loadVehicle?.() }),
                 resizable: true,
                 sortable: true,
                 filterable: true,

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

@@ -1,70 +1,73 @@
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
+import { loadTransactionOrder, openTransactionAction, purchaseGroups } from '../../../../utils/fuel-transaction';
+import { buildIdentityStub } from '../../../../utils/identity-cell-resource';
+import relationValue from '../../../../utils/relation-value';
 
 export default class ManagementFuelTransactionsIndexDetailsController extends Controller {
-    @service fetch;
-    @service notifications;
+    @service modalsManager;
     @service hostRouter;
+    @service store;
 
-    @tracked vehicleId;
-    @tracked orderId;
-
-    get normalizedPayloadJson() {
-        return JSON.stringify(this.model?.normalized_payload ?? {}, null, 2);
+    get purchaseGroups() {
+        return purchaseGroups(this.model);
     }
 
-    get rawPayloadJson() {
-        return JSON.stringify(this.model?.raw_payload ?? {}, null, 2);
-    }
+    /**
+     * The linked records as the pills want them: the loaded relation when the
+     * store has it, otherwise a stub that carries the name the transaction
+     * knows and loads the record on hover or click.
+     */
+    get vehicleResource() {
+        const transaction = this.model;
 
-    @action setVehicleId(event) {
-        this.vehicleId = event.target.value;
-    }
+        if (!transaction?.vehicle_uuid && !transaction?.vehicle_name) {
+            return null;
+        }
 
-    @action setOrderId(event) {
-        this.orderId = event.target.value;
+        return (
+            relationValue(transaction, 'vehicle') ??
+            buildIdentityStub(transaction, { type: 'vehicle', name: transaction.vehicle_name ?? 'Linked vehicle', load: () => transaction.get('vehicle') })
+        );
     }
 
-    @task *matchVehicle() {
-        try {
-            yield this.fetch.post(`fuel-provider-transactions/${this.model.id}/match-vehicle`, { vehicle: this.vehicleId });
-            this.notifications.success('Fuel transaction matched to vehicle.');
-            yield this.hostRouter.refresh();
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
-    }
+    get orderResource() {
+        const transaction = this.model;
 
-    @task *matchOrder() {
-        try {
-            yield this.fetch.post(`fuel-provider-transactions/${this.model.id}/match-order`, { order: this.orderId });
-            this.notifications.success('Fuel transaction matched to order.');
-            yield this.hostRouter.refresh();
-        } catch (error) {
-            this.notifications.serverError(error);
+        if (!transaction?.order_uuid) {
+            return null;
         }
+
+        const order = relationValue(transaction, 'order');
+
+        return (
+            (order?.id === transaction.order_uuid ? order : null) ??
+            this.store.peekRecord('order', transaction.order_uuid) ??
+            buildIdentityStub(transaction, {
+                type: 'order',
+                name: transaction.trip_number ?? 'Linked order',
+                load: () => loadTransactionOrder(this.store, transaction),
+            })
+        );
     }
 
-    @task *reprocess() {
-        try {
-            yield this.fetch.post(`fuel-provider-transactions/${this.model.id}/reprocess`);
-            this.notifications.success('Fuel transaction reprocessed.');
-            yield this.hostRouter.refresh();
-        } catch (error) {
-            this.notifications.serverError(error);
+    get fuelReportResource() {
+        const transaction = this.model;
+
+        if (!transaction?.fuel_report_id) {
+            return null;
         }
+
+        return (
+            relationValue(transaction, 'fuel_report') ?? buildIdentityStub(transaction, { type: 'fuel-report', name: transaction.fuel_report_id, load: () => transaction.get('fuel_report') })
+        );
     }
 
-    @task *review(status) {
-        try {
-            yield this.fetch.post(`fuel-provider-transactions/${this.model.id}/review`, { status });
-            this.notifications.success(status === 'ignored' ? 'Fuel transaction ignored.' : 'Fuel transaction reviewed.');
-            yield this.hostRouter.refresh();
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
+    @action confirmAction(mode) {
+        return openTransactionAction(this.modalsManager, mode, this.model);
+    }
+    @action openFuelReport() {
+        if (this.model.fuel_report_id) return this.hostRouter.transitionTo('console.fleet-ops.management.fuel-reports.index.details', this.model.fuel_report_id);
     }
 }

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

@@ -2,11 +2,13 @@ import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
+import { buildIdentityStub } from '../../../utils/identity-cell-resource';
+import relationValue from '../../../utils/relation-value';
+import { openTransactionAction } from '../../../utils/fuel-transaction';
 
 export default class ManagementFuelTransactionsIndexController extends Controller {
     @service tableContext;
-    @service fetch;
+    @service modalsManager;
     @service notifications;
     @service hostRouter;
 
@@ -22,6 +24,14 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
     @tracked transaction_at;
     @tracked table;
 
+    get viewingDetails() {
+        return this.hostRouter.currentRouteName?.endsWith('management.fuel-transactions.index.details');
+    }
+
+    get hasFilters() {
+        return Boolean(this.query || this.provider || this.sync_status || this.vehicle || this.transaction_at);
+    }
+
     get hasRecords() {
         return Array.from(this.model ?? []).length > 0;
     }
@@ -66,7 +76,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
     }
 
     @action refresh() {
-        this.target.send('refresh');
+        this.target.send('refreshTransactions');
     }
 
     get bulkActions() {
@@ -75,7 +85,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
         return [
             {
                 label: `Reprocess ${selected.length} selected`,
-                fn: () => selected.forEach((transaction) => this.reprocessTransaction.perform(transaction)),
+                fn: () => this.confirmAction('reprocess', selected),
             },
         ];
     }
@@ -86,7 +96,8 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 sticky: true,
                 label: 'Transaction',
                 valuePath: 'provider_transaction_id',
-                cellComponent: 'click-to-copy',
+                cellComponent: 'cell/fuel-provider-transaction-identity',
+                action: this.openDetails,
                 resizable: true,
                 sortable: true,
                 filterable: true,
@@ -104,7 +115,7 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
             {
                 label: 'Status',
                 valuePath: 'sync_status',
-                cellComponent: 'table/cell/status',
+                cellComponent: 'fuel-transaction-status',
                 resizable: true,
                 sortable: true,
                 filterable: true,
@@ -114,6 +125,9 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
             {
                 label: 'Vehicle',
                 valuePath: 'vehicle_name',
+                cellComponent: 'cell/vehicle-identity',
+                permission: 'fleet-ops view vehicle',
+                resourcePath: (transaction) => relationValue(transaction, 'vehicle') ?? buildIdentityStub(transaction, { type: 'vehicle', load: () => transaction.get('vehicle') }),
                 resizable: true,
                 sortable: false,
                 filterable: true,
@@ -154,8 +168,10 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
             {
                 label: 'Fuel Report',
                 valuePath: 'fuel_report_id',
-                cellComponent: 'table/cell/anchor',
-                action: this.openFuelReport,
+                cellComponent: 'cell/fuel-report-identity',
+                resourcePath: (transaction) =>
+                    relationValue(transaction, 'fuel_report') ??
+                    buildIdentityStub(transaction, { type: 'fuel-report', nameKey: 'fuel_report_id', load: () => transaction.get('fuel_report') }),
                 resizable: true,
             },
             {
@@ -181,13 +197,13 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
                 width: 60,
                 actions: [
                     { label: 'Review Details', fn: this.openDetails },
-                    { label: 'Open Fuel Report', fn: this.openFuelReport },
+                    { label: 'Open Fuel Report', fn: this.openFuelReport, isVisible: (transaction) => Boolean(transaction.fuel_report_id) },
                     { separator: true },
                     { label: 'Match to Vehicle', fn: this.matchVehicle },
                     { label: 'Match to Order', fn: this.matchOrder },
-                    { label: 'Reprocess / Rematch', fn: (transaction) => this.reprocessTransaction.perform(transaction) },
-                    { label: 'Ignore Transaction', fn: (transaction) => this.markReviewed.perform(transaction, 'ignored') },
-                    { label: 'Mark Reviewed', fn: (transaction) => this.markReviewed.perform(transaction, 'reviewed') },
+                    { 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) },
                 ],
                 sortable: false,
                 filterable: false,
@@ -211,30 +227,14 @@ export default class ManagementFuelTransactionsIndexController extends Controlle
     }
 
     @action matchVehicle(transaction) {
-        return this.hostRouter.transitionTo('console.fleet-ops.management.fuel-transactions.index.details', transaction);
+        return this.confirmAction('vehicle', transaction);
     }
 
     @action matchOrder(transaction) {
-        return this.hostRouter.transitionTo('console.fleet-ops.management.fuel-transactions.index.details', transaction);
+        return this.confirmAction('order', transaction);
     }
 
-    @task *reprocessTransaction(transaction) {
-        try {
-            yield this.fetch.post(`fuel-provider-transactions/${transaction.id}/reprocess`);
-            this.notifications.success('Fuel transaction reprocessed.');
-            this.target.send('refresh');
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
-    }
-
-    @task *markReviewed(transaction, status) {
-        try {
-            yield this.fetch.post(`fuel-provider-transactions/${transaction.id}/review`, { status });
-            this.notifications.success(status === 'ignored' ? 'Fuel transaction ignored.' : 'Fuel transaction marked reviewed.');
-            this.target.send('refresh');
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
+    @action confirmAction(mode, transactions) {
+        return openTransactionAction(this.modalsManager, mode, transactions, this.refresh);
     }
 }