@fleetbase/fleetops-engine 0.6.64 → 0.6.66

package/addon/components/work-order/panel-header.hbs

@@ -1,21 +1,23 @@
-<div class="px-4 py-2">
-    <div class="flex flex-1 flex-row items-start justify-between">
-        <div class="flex flex-col">
-            <div class="flex flex-row items-center space-x-2">
-                <h1 class="text-gray-900 dark:text-white font-semibold text-lg">{{or @resource.code @resource.subject}}</h1>
-                <Badge @status={{@resource.status}}>{{smart-humanize @resource.status}}</Badge>
+<div class="px-4 py-2" ...attributes>
+    <div class="flex flex-1 flex-row items-start justify-between gap-3">
+        <div class="flex min-w-0 flex-1 flex-col">
+            <div class="flex min-w-0 flex-row items-center gap-2">
+                <h1 class="truncate text-lg font-semibold text-gray-900 dark:text-white" title={{or @resource.code @resource.subject}}>{{or @resource.code @resource.subject}}</h1>
+                <Badge @status={{@resource.status}} class="flex-shrink-0">{{smart-humanize @resource.status}}</Badge>
             </div>
-            <div class="flex flex-row space-x-3 mt-1">
-                <div class="text-xs text-gray-400 dark:text-gray-500">{{smart-humanize @resource.type}}</div>
+            <div class="mt-1 flex min-w-0 flex-row flex-wrap items-center gap-x-3 gap-y-0.5 text-xs text-gray-400 dark:text-gray-500">
+                {{#if @resource.type}}
+                    <span class="truncate">{{smart-humanize @resource.type}}</span>
+                {{/if}}
                 {{#if @resource.priority}}
-                    <div class="text-xs text-gray-400 dark:text-gray-500">{{t "column.priority"}}: {{smart-humanize @resource.priority}}</div>
+                    <span class="truncate">{{t "column.priority"}}: {{smart-humanize @resource.priority}}</span>
                 {{/if}}
-                {{#if @resource.assignee_name}}
-                    <div class="text-xs text-gray-400 dark:text-gray-500">{{t "column.assignee"}}: {{@resource.assignee_name}}</div>
+                {{#if (or @resource.assignee_name @resource.assignee.name)}}
+                    <span class="truncate">{{t "column.assignee"}}: {{or @resource.assignee_name @resource.assignee.name}}</span>
                 {{/if}}
             </div>
         </div>
-        <div class="next-view-header-right">
+        <div class="next-view-header-right flex-shrink-0 whitespace-nowrap">
             <Layout::Resource::Panel::HeaderActions
                 @resource={{@resource}}
                 @saveTask={{@saveTask}}
@@ -28,4 +30,4 @@
             />
         </div>
     </div>
-</div>
+</div>

package/addon/components/work-order/pill.hbs

@@ -0,0 +1,24 @@
+<Resource::Pill
+    @resource={{(or @workOrder @resource)}}
+    @resourceType="work-order"
+    @title={{@title}}
+    @titleFallback={{@titleFallback}}
+    @subtitle={{@subtitle}}
+    @showOnlineIndicator={{@showOnlineIndicator}}
+    @noPopover={{@noPopover}}
+    @popoverPlacement={{@popoverPlacement}}
+    @static={{@static}}
+    @onClick={{@onClick}}
+    @onView={{@onView}}
+    @anchorClass={{@anchorClass}}
+    @imageClass={{@imageClass}}
+    @imageWrapperClass={{@imageWrapperClass}}
+    @contentWrapperClass={{@contentWrapperClass}}
+    @titleClass={{@titleClass}}
+    @subtitleClass={{@subtitleClass}}
+    @useBlock={{(has-block)}}
+    ...attributes
+    as |resource|
+>
+    {{yield resource}}
+</Resource::Pill>

package/addon/components/work-order/summary.hbs

@@ -0,0 +1 @@
+<Resource::Summary @resource={{(or @workOrder @resource)}} @resourceType="work-order" @onView={{@onView}} @showView={{@showView}} @onClose={{@onClose}} @titleFallback={{@titleFallback}} ...attributes />

package/addon/components/zone/details.hbs

@@ -8,31 +8,12 @@
 
             <div class="field-info-container">
                 <div class="field-name">{{t "zone.fields.description"}}</div>
-                <div class="field-value uppercase">{{n-a @resource.type}}</div>
+                <div class="field-value">{{n-a @resource.description}}</div>
             </div>
         </div>
     </ContentPanel>
 
     <ContentPanel @title={{t "common.map"}} @open={{true}} @wrapperClass="bordered-top">
-        <LeafletMap
-            class="w-full h-48 rounded-md shadow-md border border-gray-200 dark:border-gray-700"
-            @lat={{@resource.firstCoordinatePairLatitude}}
-            @lng={{@resource.firstCoordinatePairLongitude}}
-            @zoom={{12}}
-            @zoomControl={{false}}
-            as |layers|
-        >
-            <layers.tile @url={{leaflet-tile-url}} />
-            <layers.polygon
-                @id={{@resource.id}}
-                @record={{@resource}}
-                @locations={{unwrap-coordinates @resource.leafletCoordinates}}
-                @fillColor={{@resource.color}}
-                @color={{@resource.stroke_color}}
-                as |polygon|
-            >
-                <polygon.tooltip @permanent={{true}} @sticky={{true}}>{{@resource.name}} {{t "resource.zone"}}</polygon.tooltip>
-            </layers.polygon>
-        </LeafletMap>
+        <GeofenceMap @resource={{@resource}} @label={{concat @resource.name " " (t "resource.zone")}} />
     </ContentPanel>
 </div>

package/addon/components/zone/pill.hbs

@@ -0,0 +1,24 @@
+<Resource::Pill
+    @resource={{(or @zone @resource)}}
+    @resourceType="zone"
+    @title={{@title}}
+    @titleFallback={{@titleFallback}}
+    @subtitle={{@subtitle}}
+    @showOnlineIndicator={{@showOnlineIndicator}}
+    @noPopover={{@noPopover}}
+    @popoverPlacement={{@popoverPlacement}}
+    @static={{@static}}
+    @onClick={{@onClick}}
+    @onView={{@onView}}
+    @anchorClass={{@anchorClass}}
+    @imageClass={{@imageClass}}
+    @imageWrapperClass={{@imageWrapperClass}}
+    @contentWrapperClass={{@contentWrapperClass}}
+    @titleClass={{@titleClass}}
+    @subtitleClass={{@subtitleClass}}
+    @useBlock={{(has-block)}}
+    ...attributes
+    as |resource|
+>
+    {{yield resource}}
+</Resource::Pill>

package/addon/components/zone/summary.hbs

@@ -0,0 +1 @@
+<Resource::Summary @resource={{(or @zone @resource)}} @resourceType="zone" @onView={{@onView}} @showView={{@showView}} @onClose={{@onClose}} @titleFallback={{@titleFallback}} ...attributes />

package/addon/controllers/connectivity/devices/index/details/sensors.js

@@ -98,6 +98,8 @@ export default class ConnectivityDevicesIndexDetailsSensorsController extends Co
                 filterParam: 'sensors_type',
                 filterComponent: 'filter/multi-option',
                 filterOptions: fleetOpsOptions('sensorTypes'),
+                filterOptionLabel: 'label',
+                filterOptionValue: 'value',
             },
             {
                 label: 'Value',
@@ -128,6 +130,8 @@ export default class ConnectivityDevicesIndexDetailsSensorsController extends Co
                 filterParam: 'sensors_status',
                 filterComponent: 'filter/multi-option',
                 filterOptions: fleetOpsOptions('sensorStatuses'),
+                filterOptionLabel: 'label',
+                filterOptionValue: 'value',
             },
             {
                 label: 'Last Reading',

package/addon/controllers/connectivity/devices/index/details/vehicle.js

@@ -9,6 +9,7 @@ export default class ConnectivityDevicesIndexDetailsVehicleController extends Co
     @service intl;
     @service mapManager;
     @service vehicleActions;
+    @service trailerActions;
 
     @tracked queryParams = [];
 
@@ -20,6 +21,10 @@ export default class ConnectivityDevicesIndexDetailsVehicleController extends Co
         return this.device?.attachable;
     }
 
+    get isTrailer() {
+        return `${this.device?.attachable_type ?? ''}`.toLowerCase().includes('trailer');
+    }
+
     get positions() {
         return Array.from(this.model?.positions ?? []);
     }
@@ -86,12 +91,18 @@ export default class ConnectivityDevicesIndexDetailsVehicleController extends Co
 
     @action openVehicle() {
         if (this.vehicle?.id) {
+            if (this.isTrailer) {
+                return this.trailerActions.transition.view(this.vehicle);
+            }
             return this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.details', this.vehicle.public_id);
         }
     }
 
     @action openVehiclePositions() {
         if (this.vehicle?.id) {
+            if (this.isTrailer) {
+                return this.hostRouter.transitionTo('console.fleet-ops.management.trailers.index.details.positions', this.vehicle.public_id);
+            }
             return this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.details.positions', this.vehicle.public_id);
         }
     }

package/addon/controllers/connectivity/devices/index/details.js

@@ -17,7 +17,7 @@ export default class ConnectivityDevicesIndexDetailsController extends Controlle
             },
             {
                 route: 'connectivity.devices.index.details.vehicle',
-                label: this.intl.t('resource.vehicle'),
+                label: this.intl.t('device.attachment.asset'),
             },
             {
                 route: 'connectivity.devices.index.details.sensors',
@@ -42,24 +42,7 @@ export default class ConnectivityDevicesIndexDetailsController extends Controlle
                 icon: 'ellipsis-h',
                 iconPrefix: 'fas',
                 renderInPlace: true,
-                items: [
-                    {
-                        text: this.intl.t('device.actions.attach-to-vehicle'),
-                        icon: 'link',
-                        fn: () => this.deviceActions.attachToVehicle(this.model),
-                        permission: 'fleet-ops update device',
-                    },
-                    ...(this.model.attachable_uuid || this.model.attached_to_name || this.model.attachable
-                        ? [
-                              {
-                                  text: this.intl.t('device.actions.detach-from-vehicle'),
-                                  icon: 'unlink',
-                                  fn: () => this.deviceActions.detachFromVehicle(this.model),
-                                  permission: 'fleet-ops update device',
-                              },
-                          ]
-                        : []),
-                ],
+                items: this.deviceActions.attachmentItems(this.model),
             },
         ];
     }

package/addon/controllers/connectivity/devices/index.js

@@ -14,6 +14,7 @@ export default class ConnectivityDevicesIndexController extends Controller {
     @service notifications;
     @service store;
     @service vehicleActions;
+    @service trailerActions;
 
     /** query params */
     @tracked queryParams = [

package/addon/controllers/connectivity/events/index.js

@@ -125,8 +125,6 @@ export default class ConnectivityEventsIndexController extends Controller {
             valuePath: 'device.displayName',
             cellComponent: 'cell/device-identity',
             resourcePath: eventDevice,
-            compact: true,
-            showStatus: false,
             action: this.openDevice,
             permission: 'fleet-ops view device',
             resizable: true,
@@ -141,9 +139,8 @@ export default class ConnectivityEventsIndexController extends Controller {
         {
             label: 'Provider',
             valuePath: 'provider',
-            cellComponent: 'cell/telematic-provider',
+            cellComponent: 'cell/telematic-identity',
             resourcePath: eventTelematic,
-            compact: true,
             action: this.openTelematic,
             permission: 'fleet-ops view telematic',
             resizable: true,

package/addon/controllers/connectivity/fuel-providers/details/index.js

@@ -0,0 +1,6 @@
+import Controller from '@ember/controller';
+import { inject as controller } from '@ember/controller';
+
+export default class FuelIntegrationOverviewController extends Controller {
+    @controller('connectivity.fuel-providers.details') details;
+}

package/addon/controllers/connectivity/fuel-providers/details/matching.js

@@ -0,0 +1,13 @@
+import Controller from '@ember/controller';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+
+export default class ConnectivityFuelProvidersDetailsMatchingController extends Controller {
+    @service hostRouter;
+
+    @action reviewUnmatchedTransactions() {
+        return this.hostRouter.transitionTo('console.fleet-ops.management.fuel-transactions.index', {
+            queryParams: { sync_status: 'unmatched', connection: this.model.id, page: 1 },
+        });
+    }
+}

package/addon/controllers/connectivity/fuel-providers/details/sync.js

@@ -1,18 +1,29 @@
 import Controller from '@ember/controller';
 import { inject as controller } from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { fuelDate } from '../../../../utils/fuel-integration-format';
 
-export default class ConnectivityFuelProvidersIndexDetailsSyncController extends Controller {
+export default class FuelIntegrationSyncController extends Controller {
     @controller('connectivity.fuel-providers.details') details;
-
-    get syncTransactions() {
-        return this.details.syncTransactions;
+    @tracked from;
+    @tracked to;
+    get dateError() {
+        return this.from && this.to && this.from > this.to ? 'Start date must be on or before end date.' : null;
     }
-
-    get lastSyncStateJson() {
-        return JSON.stringify(this.model?.connection?.last_sync_state ?? {}, null, 2);
+    get syncDisabled() {
+        return this.details.syncDisabled || Boolean(this.dateError) || !this.from || !this.to;
     }
-
-    get syncRuns() {
-        return Array.from(this.model?.syncRuns ?? []);
+    @action setDate(field, event) {
+        this[field] = event.target.value;
+    }
+    @action resetDates() {
+        const from = new Date();
+        from.setDate(from.getDate() - Number(this.model?.sync_settings?.window_days || 7));
+        this.from = fuelDate(from).slice(0, 10);
+        this.to = fuelDate(new Date()).slice(0, 10);
+    }
+    @action sync() {
+        if (!this.syncDisabled) return this.details.syncTransactions.perform({ from: this.from, to: this.to });
     }
 }

package/addon/controllers/connectivity/fuel-providers/details/transactions.js

@@ -1,24 +1,13 @@
-import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import FuelTransactionsController from '../../../management/fuel-transactions/index';
 import { action } from '@ember/object';
 
-export default class ConnectivityFuelProvidersIndexDetailsTransactionsController extends Controller {
-    @service hostRouter;
-
+export default class FuelIntegrationTransactionsController extends FuelTransactionsController {
+    queryParams = ['page', 'limit', 'sort', 'query', 'sync_status', 'vehicle', 'transaction_at'];
     get columns() {
-        return [
-            { sticky: true, label: 'Transaction', valuePath: 'provider_transaction_id', cellComponent: 'click-to-copy', resizable: true },
-            { label: 'Status', valuePath: 'sync_status', cellComponent: 'table/cell/status', resizable: true },
-            { label: 'Vehicle', valuePath: 'vehicle_name', resizable: true },
-            { label: 'Station', valuePath: 'station_name', resizable: true },
-            { label: 'Liters', valuePath: 'volume', resizable: true },
-            { label: 'Amount', valuePath: 'amount', cellComponent: 'table/cell/currency', resizable: true },
-            { label: 'Fuel Report', valuePath: 'fuel_report_id', cellComponent: 'click-to-copy', resizable: true },
-            { label: 'Date', valuePath: 'transaction_at', resizable: true },
-        ];
+        return super.columns.filter((column) => column.valuePath !== 'provider');
     }
 
     @action refresh() {
-        return this.hostRouter.refresh();
+        this.target.send('refreshFuelTransactions');
     }
 }

package/addon/controllers/connectivity/fuel-providers/details.js

@@ -1,11 +1,72 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { syncRunView, fuelNumber, fuelMoney } from '../../../utils/fuel-integration-format';
+import { task, timeout } from 'ember-concurrency';
 
 export default class ConnectivityFuelProvidersIndexDetailsController extends Controller {
     @service hostRouter;
     @service fetch;
     @service notifications;
+    @service modalsManager;
+
+    @tracked activity;
+    @tracked activityError;
+
+    get runs() {
+        return (this.activity?.runs ?? []).map(syncRunView);
+    }
+    get latestRun() {
+        return this.runs[0];
+    }
+    get hasPendingSync() {
+        return this.runs.some((run) => run.pending);
+    }
+    get syncDisabled() {
+        return this.hasPendingSync || this.model?.status === 'disabled' || this.syncTransactions.isRunning;
+    }
+    get totals() {
+        return this.activity?.totals;
+    }
+    get metrics() {
+        if (!this.totals) return [];
+        return [
+            { label: 'Imported transactions', value: fuelNumber(this.totals.transactions), icon: 'receipt' },
+            { label: 'Needs matching', value: fuelNumber(this.totals.unmatched), icon: 'link' },
+            { label: 'Fuel reports', value: fuelNumber(this.totals.fuel_reports), icon: 'file-lines' },
+            { label: 'Fuel volume', value: `${fuelNumber(this.totals.liters)} L`, icon: 'gas-pump' },
+        ];
+    }
+    get spend() {
+        return (this.totals?.spend ?? []).map((row) => fuelMoney(row.amount, row.currency)).join(' · ') || 'No spend recorded';
+    }
+    get environmentLabel() {
+        return this.model?.environment === 'sandbox' ? 'Sandbox / test account' : 'Production account';
+    }
+
+    @action async refreshActivity() {
+        try {
+            const id = this.model.id;
+            const activity = await this.fetch.get(`fuel-provider-connections/${id}/activity`);
+            if (this.isDestroying || this.model.id !== id) return;
+            this.activity = activity;
+            this.activityError = null;
+            const state = { ...activity.connection };
+            for (const field of ['last_synced_at', 'last_tested_at']) state[field] = state[field] ? new Date(state[field]) : null;
+            this.model.setProperties(state);
+        } catch (error) {
+            this.activityError = 'Unable to refresh integration activity. Your current view is preserved; try Refresh.';
+        }
+    }
+
+    @task({ restartable: true }) *watchActivity() {
+        do {
+            yield this.refreshActivity();
+            if (!this.hasPendingSync || this.activityError) return;
+            yield timeout(3000);
+        } while (!this.isDestroying);
+    }
 
     get tabs() {
         return [
@@ -13,7 +74,6 @@ export default class ConnectivityFuelProvidersIndexDetailsController extends Con
             { route: 'connectivity.fuel-providers.details.sync', label: 'Sync' },
             { route: 'connectivity.fuel-providers.details.matching', label: 'Matching' },
             { route: 'connectivity.fuel-providers.details.transactions', label: 'Transactions' },
-            { route: 'connectivity.fuel-providers.details.settings', label: 'Settings' },
         ].map((tab) => ({
             ...tab,
             active: this.hostRouter.currentRouteName?.endsWith(tab.route),
@@ -47,21 +107,24 @@ export default class ConnectivityFuelProvidersIndexDetailsController extends Con
         return this.model?.last_sync_state?.summary ?? {};
     }
 
-    @task *testConnection() {
-        try {
-            const result = yield this.fetch.post(`fuel-provider-connections/${this.model.id}/test-connection`);
-            this.notifications.success(result.message ?? 'Fuel integration connection tested.');
-            yield this.hostRouter.refresh();
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
+    @action openConnectionTestDialog() {
+        return this.modalsManager.show('modals/fuel-connection-diagnostics', {
+            title: 'Test Fuel Connection',
+            acceptButtonText: 'Run Test',
+            acceptButtonIcon: 'plug',
+            declineButtonText: 'Close',
+            connection: this.model,
+            onTested: this.refreshActivity,
+        });
     }
 
-    @task *syncTransactions(options = {}) {
+    @task({ drop: true }) *syncTransactions(options = {}) {
+        if (this.hasPendingSync || this.model?.status === 'disabled') return;
         try {
-            yield this.fetch.post(`fuel-provider-connections/${this.model.id}/sync`, { async: true, ...options });
+            yield this.fetch.post(`fuel-provider-connections/${this.model.id}/sync`, { async: true, from: options.from, to: options.to });
             this.notifications.success('Fuel transaction sync queued.');
-            yield this.hostRouter.refresh();
+            yield this.refreshActivity();
+            this.watchActivity.perform();
         } catch (error) {
             this.notifications.serverError(error);
         }

package/addon/controllers/connectivity/fuel-providers/index.js

@@ -10,6 +10,7 @@ export default class ConnectivityFuelProvidersIndexController extends Controller
     @service tableContext;
     @service fuelIntegrationActions;
     @service intl;
+    @service modalsManager;
 
     @tracked queryParams = ['page', 'limit', 'sort', 'query', 'provider', 'status', 'environment'];
     @tracked page = 1;
@@ -59,8 +60,10 @@ export default class ConnectivityFuelProvidersIndexController extends Controller
             {
                 sticky: true,
                 label: 'Integration',
-                valuePath: 'name',
-                cellComponent: 'click-to-copy',
+                valuePath: 'displayName',
+                sortParam: 'name',
+                cellComponent: 'table/cell/anchor',
+                action: this.openConnection,
                 resizable: true,
                 sortable: true,
                 filterable: true,
@@ -87,19 +90,20 @@ export default class ConnectivityFuelProvidersIndexController extends Controller
             },
             {
                 label: 'Last Sync',
-                valuePath: 'last_synced_at',
+                valuePath: 'lastSyncedAt',
+                sortParam: 'last_synced_at',
                 resizable: true,
                 sortable: true,
             },
             {
-                label: 'Imported',
-                valuePath: 'last_sync_state.summary.imported',
+                label: 'New in last sync',
+                valuePath: 'lastImported',
                 resizable: true,
                 sortable: false,
             },
             {
-                label: 'Unmatched',
-                valuePath: 'last_sync_state.summary.unmatched',
+                label: 'Unmatched in last sync',
+                valuePath: 'lastUnmatched',
                 resizable: true,
                 sortable: false,
             },
@@ -144,7 +148,7 @@ export default class ConnectivityFuelProvidersIndexController extends Controller
     }
 
     @action refresh() {
-        this.target.send('refresh');
+        this.target.send('refreshFuelConnections');
     }
 
     @action openConnection(connection) {
@@ -155,21 +159,22 @@ export default class ConnectivityFuelProvidersIndexController extends Controller
         return this.fuelIntegrationActions.transition.edit(connection);
     }
 
-    @action async testConnection(connection) {
-        try {
-            await this.fetch.post(`fuel-provider-connections/${connection.id}/test-connection`);
-            this.notifications.success('Fuel integration connection tested.');
-            this.refresh();
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
+    @action testConnection(connection) {
+        return this.modalsManager.show('modals/fuel-connection-diagnostics', {
+            title: 'Test Fuel Connection',
+            acceptButtonText: 'Run Test',
+            acceptButtonIcon: 'plug',
+            declineButtonText: 'Close',
+            connection,
+            onTested: () => connection.reload(),
+        });
     }
 
     @action async syncConnection(connection) {
         try {
             await this.fetch.post(`fuel-provider-connections/${connection.id}/sync`, { async: true });
             this.notifications.success('Fuel transaction sync queued.');
-            this.refresh();
+            await connection.reload();
         } catch (error) {
             this.notifications.serverError(error);
         }

package/addon/controllers/connectivity/sensors/index.js

@@ -136,9 +136,8 @@ export default class ConnectivitySensorsIndexController extends Controller {
         {
             label: 'Telematic',
             valuePath: 'telematic.provider',
-            cellComponent: 'cell/telematic-provider',
+            cellComponent: 'cell/telematic-identity',
             resourcePath: sensorTelematic,
-            compact: true,
             action: this.openTelematic,
             permission: 'fleet-ops view telematic',
             resizable: true,
@@ -154,7 +153,6 @@ export default class ConnectivitySensorsIndexController extends Controller {
             valuePath: 'device.displayName',
             cellComponent: 'cell/device-identity',
             resourcePath: sensorDevice,
-            showStatus: false,
             action: this.openDevice,
             permission: 'fleet-ops view device',
             resizable: true,