@fleetbase/fleetops-engine 0.6.68 → 0.6.70

package/RELEASE.md

@@ -1,21 +1,56 @@
-> v0.6.68 ~ "Telematics sync status and SASCO fuel"
+> v0.6.70 ~ "Telematics data retention"
 
 ---
 ## What's New
-- **SASCO is a native fuel provider.** Connect a SASCO B2B account alongside PetroApp to import fuel transactions, with sandbox and production environments, amounts in SAR, driver name and phone, and receipt images. Transactions are matched to vehicles by plate.
-- **"Sync Devices" works while telematics polling is running.** A manual sync requested while a scheduled sweep is queued or running is recorded and completed by the next sweep, instead of failing with "already queued or running".
-- **Telematics connection status stays current.** Each completed scheduled sweep updates the connection status and last sync time, so a connection that has recovered no longer shows "Needs attention" or an old last sync date.
+- **Telematics Data settings.** A new Fleet-Ops → Settings → Telematics Data page lets each organization decide how long telemetry is kept: device events, raw event payloads, positions, processed and quarantined delivery envelopes, and sync run diagnostics. Administrators set system-wide defaults from the admin console (Fleet-Ops Config → Telematics Data). A value of 0 keeps rows forever.
+- **Scheduled retention sweep.** `fleetops:prune-telematics-data` runs every fifteen minutes and applies each organization's policy in bounded batches, so a large backlog is drained gradually without stalling ingestion. Defaults: events 30 days, raw payloads stripped after 7 days, positions 90 days, processed deliveries 24 hours, quarantined deliveries 7 days, sync runs 7 days.
+- **Storage usage and on-demand cleanup.** The settings page shows rows, oldest row and estimated size per table for your organization, and "Run cleanup now" queues an immediate retention run.
 
 ---
 ## Fixes
-- Manual telematics sync requests can no longer stay queued or failed indefinitely after their job is lost; the next scheduled sweep completes them.
-- Fuel provider environment labels and sync run details no longer refer to PetroApp for other providers.
+- Device events no longer store the raw provider unit twice. `payload` keeps the raw unit; `meta` holds only the normalized block (speed, heading, odometer, ignition, fuel level, timing). New event rows are roughly half the size.
+- Telemetry-driven saves (device, event, position, vehicle, sensors) no longer write to the activity log on every poll. Organizations that want them can enable "Log telemetry activity" in Telematics Data settings. Manual edits are logged as before.
+- Delivery inbox and sync run retention moved from the drain command into the retention sweep; `fleetops:drain-telematic-inbox` now only recovers deliveries and finishes interrupted runs.
+
+---
+## Upgrade notes
+- New indexes on `device_events (company_uuid, created_at)`, `positions (company_uuid, created_at)` and `telematic_sync_runs (telematic_uuid, updated_at)`; on very large tables run `php artisan migrate` in a maintenance window.
+- Retention is enabled by default. Existing rows older than the defaults are removed over successive runs after upgrading; set the values to 0 before upgrading if you need to keep history indefinitely.
+- Deleting rows frees space inside the database files, not on disk. Run `OPTIMIZE TABLE` off-peak to return space to the operating system.
+- Run `php artisan fleetbase:create-permissions` to register the `telematics-settings` permission and the Telematics Settings Manager policy and role.
+
+---
+## Testing
+- Backend tests cover the retention policy layering and clamping, the prune command (per-company policies, compaction, inbox tables via connections, orphans, batch caps, dry runs, filters, locking), the settings and storage usage endpoints, the index migrations, the on-demand job, and the meta and activity-log changes to ingestion.
+- Ember tests cover the settings route guard, the settings controller, and the admin defaults component.
+> v0.6.70 ~ "Order reporting and a cleaner default dashboard"
+
+---
+## What's New
+- **Report on orders, their items and tracking.** The report builder can answer questions like "Which products sold the most this month?" and "What did orders total this month?".
+  - Orders expose their ID and Internal ID, and relationships for tracking (tracking number, region, latest status), Order Config, Customer Vendor, Created By, Purchase Rate › Service Quote and Payload Return.
+  - `Payload` exposes its items with name, SKU, price, dimensions, metadata and destination. Select an item column for one row per item, or group by one to summarise per product.
+  - Summary columns count orders distinctly, so they stay correct when item rows are selected. Distance, duration and transaction amount have totals and averages.
+  - `meta` has no fixed shape, so no column assumes a key in it. Read keys with a computed column, for example `CAST(JSON_UNQUOTE(JSON_EXTRACT(payload.entities.meta, '$.quantity')) AS DECIMAL(15,2))`.
+  - Column labels drop the table name ("Type", not "Order Type"). Distance and duration are labelled in meters and seconds, and money columns are marked "(minor units)".
+- **A cleaner default dashboard.** Fleet-Ops widgets declare their place on the default dashboard: Radar first, then Active Orders and Drivers Online, a full-width Live Fleet map, and Revenue Trend, Top Drivers and Maintenance side by side.
+- **Live Fleet widget cards match the live map.** Clicking a driver or vehicle on the widget map shows the same card as **Operations › Live Map**.
+
+---
+## Fixes
+- Custom field values on fuel reports and service areas are saved. They were dropped because the save hooks read the snake_case payload root, while the console sends `fuelReport` and `serviceArea`.
+- The report schema no longer references 13 columns and join keys that don't exist: driver name, email and phone and the driver's vehicle, the vehicle's driver, and the fuel report cost, odometer and date. Transaction summaries sum `transaction.amount`.
+- Every report table, and the item join, leaves soft-deleted rows out on core-api v1.6.64 and later.
+
+---
+## Dependencies
+- Order items, JSON totals and soft deletes in reports need `fleetbase/core-api` v1.6.64. The schema still registers on older versions.
+- The report builder and the default dashboard order ship in `@fleetbase/ember-ui` v0.4.4.
 
 ---
 ## Testing
-- Backend tests cover manual syncs during scheduled sweeps, stale failure recovery, partial sweeps, and adoption of abandoned requests.
-- SASCO provider tests cover login, token caching, re-login after a 401, connection tests, pagination limits, error handling and transaction normalization.
-- `docs/TELEMATICS_QUEUES.md` now documents that dedicated telematics workers must share the queue worker's image and `APP_KEY`, with verification commands and troubleshooting.
+- Every declared report column and join key was checked against the database schema, and order reports were run against real storefront orders on MySQL in strict mode.
+- Tests cover the report schema at 100% line coverage, the Live Fleet map cards and the default dashboard order.
 
 ---
 ## Need help?

package/addon/components/admin/telematics-settings.hbs

@@ -0,0 +1,143 @@
+<div class="space-y-6">
+    <InfoBlock @type="info" @icon="circle-info" class="mb-4">
+        Configure telematics retention policy and activity logging for all organizations. Organizations can choose device event and position history retention within these limits from Fleet-Ops &rsaquo; Settings &rsaquo; Telematics.
+        A maximum takes precedence over organization preferences, inherited defaults and requests to keep history forever. Reducing a maximum can delete existing history at the next cleanup.
+    </InfoBlock>
+
+    <ContentPanel @title="System Device Events Retention Policy" @open={{true}} @wrapperClass="bordered-classic">
+        <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <InputGroup @name="Default Device Event Retention (days)" @helpText="Retention for organizations that inherit the system default. 0 keeps history forever, subject to the maximum below.">
+                <Input @type="number" @value={{this.eventRetentionDays}} min="0" max="3650" class="form-input w-full" />
+            </InputGroup>
+            <InputGroup @name="Maximum Device Event Retention (days)" @helpText="The longest any organization can keep device events. 0 sets no maximum and allows organizations to keep history forever.">
+                <Input @type="number" @value={{this.maxEventRetentionDays}} min="0" max="3650" class="form-input w-full" />
+            </InputGroup>
+        </div>
+    </ContentPanel>
+
+    <ContentPanel @title="System Position History Retention Policy" @open={{true}} @wrapperClass="bordered-classic">
+        <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <InputGroup @name="Default Position History Retention (days)" @helpText="Retention for organizations that inherit the system default. 0 keeps history forever, subject to the maximum below.">
+                <Input @type="number" @value={{this.positionRetentionDays}} min="0" max="3650" class="form-input w-full" />
+            </InputGroup>
+            <InputGroup @name="Maximum Position History Retention (days)" @helpText="The longest any organization can keep vehicle and trailer positions. 0 sets no maximum and allows organizations to keep history forever.">
+                <Input @type="number" @value={{this.maxPositionRetentionDays}} min="0" max="3650" class="form-input w-full" />
+            </InputGroup>
+        </div>
+    </ContentPanel>
+
+    <ContentPanel @title="System Device Event Raw Payload Retention" @open={{true}} @wrapperClass="bordered-classic">
+        <InputGroup @name="Device Event Raw Payload Retention (days)" @helpText="Remove raw provider payloads from retained device events across all organizations after this many days. 0 disables compaction. This does not change how long the event history itself is kept.">
+            <Input @type="number" @value={{this.eventCompactAfterDays}} min="0" max="3650" class="form-input w-full" />
+        </InputGroup>
+    </ContentPanel>
+
+    <ContentPanel @title="System Delivery Inbox and Sync Run Retention Policy" @open={{true}} @wrapperClass="bordered-classic">
+        <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <InputGroup @name="Processed Delivery Retention (hours)" @helpText="Delete processed delivery envelopes across all organizations after this many hours. 0 keeps them forever.">
+                <Input @type="number" @value={{this.processedRetentionHours}} min="0" max="720" class="form-input w-full" />
+            </InputGroup>
+            <InputGroup @name="Quarantined Delivery Retention (days)" @helpText="Delete quarantined delivery envelopes across all organizations after this many days. 0 keeps them forever.">
+                <Input @type="number" @value={{this.quarantineRetentionDays}} min="0" max="365" class="form-input w-full" />
+            </InputGroup>
+            <InputGroup @name="Sync Run Diagnostics Retention (days)" @helpText="Delete finished sync run diagnostics across all organizations after this many days. 0 keeps them forever.">
+                <Input @type="number" @value={{this.syncRunRetentionDays}} min="0" max="365" class="form-input w-full" />
+            </InputGroup>
+        </div>
+    </ContentPanel>
+
+    <ContentPanel @title="System Telemetry Activity Logging" @open={{true}} @wrapperClass="bordered-classic">
+        <Toggle
+            @label="Log Telemetry Activity"
+            @helpText="Write telemetry-driven device, event and vehicle saves to the activity log for all organizations. Every poll can add several activity rows per device."
+            @isToggled={{this.logTelemetryActivity}}
+            @onToggle={{fn (mut this.logTelemetryActivity)}}
+        />
+    </ContentPanel>
+
+    <div class="flex justify-end">
+        <Button
+            @type="primary"
+            @size="sm"
+            @icon="save"
+            @text="Save System Policy"
+            @onClick={{perform this.saveSettings}}
+            @disabled={{or this.saveSettings.isRunning this.loadSettings.isRunning (not this.settingsLoaded)}}
+            @isLoading={{or this.saveSettings.isRunning this.loadSettings.isRunning}}
+        />
+    </div>
+
+    <ContentPanel @title={{t "settings.telematics.storage-usage"}} @open={{true}} @wrapperClass="bordered-classic">
+        <p class="mb-3 text-sm text-gray-600 dark:text-gray-300">
+            Storage usage includes telematics data across all organizations. Cleanup applies system-wide, using the saved system policy and each organization's history preferences within that policy.
+        </p>
+        <div class="flex items-center justify-end gap-2 mb-3">
+            <Button
+                @size="xs"
+                @icon="rotate"
+                @text={{t "settings.telematics.refresh"}}
+                @onClick={{perform this.loadUsage}}
+                @disabled={{this.loadUsage.isRunning}}
+                @isLoading={{this.loadUsage.isRunning}}
+            />
+            <Button
+                @type="danger"
+                @size="xs"
+                @icon="broom"
+                @text={{t "settings.telematics.run-cleanup"}}
+                @onClick={{this.confirmRunCleanup}}
+                @disabled={{or this.runCleanup.isRunning this.loadSettings.isRunning this.saveSettings.isRunning (not this.settingsLoaded)}}
+                @isLoading={{this.runCleanup.isRunning}}
+            />
+        </div>
+        {{#if this.usageRows.length}}
+            <div class="overflow-x-auto">
+                <table class="w-full text-sm">
+                    <thead>
+                        <tr class="text-left text-xs uppercase text-gray-500 dark:text-gray-400">
+                            <th class="py-2 pr-3">{{t "settings.telematics.table"}}</th>
+                            <th class="py-2 pr-3 text-right">{{t "settings.telematics.rows"}}</th>
+                            <th class="py-2 pr-3 text-right">{{t "settings.telematics.estimated-size"}}</th>
+                            <th class="py-2 pl-6 text-right whitespace-nowrap">{{t "settings.telematics.oldest"}}</th>
+                        </tr>
+                    </thead>
+                    <tbody class="divide-y divide-gray-100 dark:divide-gray-700">
+                        {{#each this.usageRows as |row|}}
+                            <tr class="text-gray-800 dark:text-gray-100">
+                                <td class="py-2 pr-3">
+                                    <div class="font-medium">{{row.label}}</div>
+                                    {{#if row.raw_payload_rows}}
+                                        <div class="text-xs text-gray-500 dark:text-gray-400">
+                                            {{t "settings.telematics.raw-payload-rows" count=(format-number row.raw_payload_rows) compactable=(format-number row.compactable_rows)}}
+                                        </div>
+                                    {{/if}}
+                                </td>
+                                <td class="py-2 pr-3 text-right">
+                                    {{#if (eq row.rows null)}}
+                                        {{t "settings.telematics.not-available"}}
+                                    {{else if row.rows_estimated}}
+                                        {{t "settings.telematics.estimated-rows" count=(format-number row.rows)}}
+                                    {{else}}
+                                        {{format-number row.rows}}
+                                    {{/if}}
+                                </td>
+                                <td class="py-2 pr-3 text-right">{{#if (or row.estimated_bytes (eq row.estimated_bytes 0))}}{{format-bytes row.estimated_bytes}}{{else}}{{t "settings.telematics.not-available"}}{{/if}}</td>
+                                <td class="py-2 pl-6 text-right text-xs whitespace-nowrap">{{#if row.oldest}}{{row.oldest}}{{else}}{{t "settings.telematics.not-available"}}{{/if}}</td>
+                            </tr>
+                        {{/each}}
+                    </tbody>
+                </table>
+            </div>
+            <p class="mt-3 text-xs text-gray-500 dark:text-gray-400">{{t "settings.telematics.space-reclaim-note"}}</p>
+        {{else if this.loadUsage.isRunning}}
+            <div class="flex items-center justify-center py-8">
+                <Spinner />
+            </div>
+        {{else}}
+            <div class="text-center py-8 text-sm text-gray-400 dark:text-gray-500">
+                {{t "settings.telematics.usage-unavailable"}}
+            </div>
+        {{/if}}
+    </ContentPanel>
+    <Spacer @height="200px" />
+</div>

package/addon/components/admin/telematics-settings.js

@@ -0,0 +1,145 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { task, timeout } from 'ember-concurrency';
+
+/**
+ * System-wide telematics policy, storage diagnostics and operational controls.
+ */
+export default class AdminTelematicsSettingsComponent extends Component {
+    @service fetch;
+    @service notifications;
+    @service intl;
+    @service modalsManager;
+    @tracked eventRetentionDays = 30;
+    @tracked maxEventRetentionDays = 0;
+    @tracked eventCompactAfterDays = 7;
+    @tracked positionRetentionDays = 90;
+    @tracked maxPositionRetentionDays = 0;
+    @tracked processedRetentionHours = 24;
+    @tracked quarantineRetentionDays = 7;
+    @tracked syncRunRetentionDays = 7;
+    @tracked logTelemetryActivity = false;
+    @tracked settingsLoaded = false;
+    @tracked usage = null;
+
+    constructor() {
+        super(...arguments);
+        this.loadSettings.perform();
+        this.loadUsage.perform();
+    }
+
+    @task({ drop: true }) *loadSettings() {
+        try {
+            const settings = yield this.fetch.get('fleet-ops/settings/admin-telematics-settings');
+            this.applySettings(settings);
+            this.settingsLoaded = true;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task({ drop: true }) *saveSettings() {
+        if (!this.settingsLoaded) {
+            return;
+        }
+
+        try {
+            const settings = yield this.fetch.post('fleet-ops/settings/admin-telematics-settings', this.settingsPayload);
+            this.applySettings(settings);
+            this.notifications.success('System telematics settings saved.');
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    /** Load system-wide storage usage across all organizations. */
+    @task({ drop: true }) *loadUsage() {
+        const abortController = new AbortController();
+        const requestTimeout = setTimeout(() => abortController.abort(), 30000);
+
+        try {
+            // Pass the signal as request data; fetch.get options do not forward it.
+            const usage = yield this.fetch.request('fleet-ops/settings/telematics-storage-usage?include_payload_counts=0', 'GET', { signal: abortController.signal });
+            if (usage?.scope !== 'system') {
+                throw new Error(this.intl.t('settings.telematics.usage-unavailable'));
+            }
+            this.usage = usage;
+        } catch (error) {
+            this.notifications.serverError(abortController.signal.aborted ? new Error(this.intl.t('settings.telematics.usage-unavailable')) : error);
+        } finally {
+            clearTimeout(requestTimeout);
+            abortController.abort();
+        }
+    }
+
+    /** Queue cleanup for all organizations using the saved policy. */
+    @task({ drop: true }) *runCleanup() {
+        try {
+            const cleanup = yield this.fetch.post('fleet-ops/settings/telematics-retention/run');
+            if (cleanup?.scope !== 'system') {
+                throw new Error(this.intl.t('settings.telematics.cleanup-unavailable'));
+            }
+            this.notifications.success(this.intl.t('settings.telematics.cleanup-queued'));
+            yield timeout(5000);
+            yield this.loadUsage.perform();
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @action confirmRunCleanup() {
+        return this.modalsManager.confirm({
+            title: this.intl.t('settings.telematics.run-cleanup'),
+            body: this.intl.t('settings.telematics.run-cleanup-confirm'),
+            acceptButtonText: this.intl.t('settings.telematics.run-cleanup'),
+            acceptButtonIcon: 'broom',
+            onConfirm: () => this.runCleanup.perform(),
+        });
+    }
+
+    get usageRows() {
+        const tables = this.usage?.tables ?? {};
+
+        return ['device_events', 'positions', 'telematic_deliveries', 'telematic_sync_runs']
+            .filter((table) => tables[table])
+            .map((table) => ({ table, label: this.intl.t(`settings.telematics.tables.${table}`), ...tables[table] }));
+    }
+
+    get settingsPayload() {
+        return {
+            event_retention_days: this.toInteger(this.eventRetentionDays),
+            max_event_retention_days: this.maxEventRetentionDays,
+            event_compact_after_days: this.toInteger(this.eventCompactAfterDays),
+            position_retention_days: this.toInteger(this.positionRetentionDays),
+            max_position_retention_days: this.maxPositionRetentionDays,
+            processed_retention_hours: this.toInteger(this.processedRetentionHours),
+            quarantine_retention_days: this.toInteger(this.quarantineRetentionDays),
+            sync_run_retention_days: this.toInteger(this.syncRunRetentionDays),
+            log_telemetry_activity: Boolean(this.logTelemetryActivity),
+        };
+    }
+
+    applySettings(settings = {}) {
+        if (!Object.prototype.hasOwnProperty.call(settings ?? {}, 'max_event_retention_days') || !Object.prototype.hasOwnProperty.call(settings ?? {}, 'max_position_retention_days')) {
+            throw new Error(this.intl.t('settings.telematics.settings-unavailable'));
+        }
+
+        this.eventRetentionDays = settings.event_retention_days ?? this.eventRetentionDays;
+        this.maxEventRetentionDays = settings.max_event_retention_days ?? this.maxEventRetentionDays;
+        this.eventCompactAfterDays = settings.event_compact_after_days ?? this.eventCompactAfterDays;
+        this.positionRetentionDays = settings.position_retention_days ?? this.positionRetentionDays;
+        this.maxPositionRetentionDays = settings.max_position_retention_days ?? this.maxPositionRetentionDays;
+        this.processedRetentionHours = settings.processed_retention_hours ?? this.processedRetentionHours;
+        this.quarantineRetentionDays = settings.quarantine_retention_days ?? this.quarantineRetentionDays;
+        this.syncRunRetentionDays = settings.sync_run_retention_days ?? this.syncRunRetentionDays;
+        this.logTelemetryActivity = settings.log_telemetry_activity ?? this.logTelemetryActivity;
+    }
+
+    toInteger(value) {
+        const number = parseInt(value, 10);
+
+        return Number.isFinite(number) && number > 0 ? number : 0;
+    }
+}

package/addon/components/contact/form.hbs

@@ -30,11 +30,22 @@
                 <Input @value={{@resource.title}} @type="text" class="w-full form-input" placeholder={{t "common.title"}} disabled={{cannot-write @resource}} />
             </InputGroup>
             <InputGroup @name={{t "common.email"}}>
-                <Input @value={{@resource.email}} @type="text" class="w-full form-input" placeholder={{t "common.email"}} disabled={{cannot-write @resource}} />
+                <Input
+                    @value={{@resource.email}}
+                    @type="text"
+                    class="w-full form-input"
+                    placeholder={{t "common.email"}}
+                    disabled={{or (cannot-write @resource) @resource.is_staff_linked}}
+                />
             </InputGroup>
             <InputGroup @name={{t "common.phone"}}>
-                <PhoneInput @value={{@resource.phone}} @onInput={{fn (mut @resource.phone)}} class="form-input w-full" disabled={{cannot-write @resource}} />
+                <PhoneInput @value={{@resource.phone}} @onInput={{fn (mut @resource.phone)}} class="form-input w-full" disabled={{or (cannot-write @resource) @resource.is_staff_linked}} />
             </InputGroup>
+            {{#if @resource.is_staff_linked}}
+                <div class="lg:col-span-2 -mt-1 mb-2 text-xs text-gray-500 dark:text-gray-400" data-test-staff-linked-helper>{{t "profile-account.staff-linked-helper"}}</div>
+            {{else if @resource.isNew}}
+                <ProfileIdentityHint @email={{@resource.email}} @phone={{@resource.phone}} @type="contact" class="lg:col-span-2" />
+            {{/if}}
             <InputGroup @name={{t "common.internal-id"}}>
                 <Input @value={{@resource.internal_id}} @type="text" class="w-full form-input" placeholder={{t "common.internal-id"}} disabled={{cannot-write @resource}} />
             </InputGroup>

package/addon/components/customer/details.hbs

@@ -1,20 +1,4 @@
 <div class="details-wrapper" ...attributes>
-    <ContentPanel @title={{t "customer.fields.user-account"}} @open={{true}} @wrapperClass="bordered-top">
-        <div class="grid grid-cols-2 gap-2 text-xs dark:text-gray-100">
-            <div class="field-info-container md:col-span-3">
-                <div class="field-name">{{t "common.name"}}</div>
-                <div class="field-value">{{n-a @resource.name}}</div>
-            </div>
-            <div class="field-info-container">
-                <div class="field-name">{{t "common.email"}}</div>
-                <ClickToCopy @value={{@resource.email}} class="field-value">{{n-a @resource.email}}</ClickToCopy>
-            </div>
-            <div class="field-info-container">
-                <div class="field-name">{{t "common.phone"}}</div>
-                <ClickToCopy @value={{@resource.phone}} class="field-value">{{n-a @resource.phone}}</ClickToCopy>
-            </div>
-        </div>
-    </ContentPanel>
     <ContentPanel @title={{t "common.details"}} @open={{true}} @wrapperClass="bordered-top">
         <div class="grid grid-cols-2 gap-2 text-xs dark:text-gray-100">
             <div class="field-info-container">
@@ -30,7 +14,7 @@
                 <ClickToCopy @value={{@resource.email}} class="field-value">{{n-a @resource.email}}</ClickToCopy>
             </div>
             <div class="field-info-container">
-                <div class="field-name">{{t "common.email"}}</div>
+                <div class="field-name">{{t "common.phone"}}</div>
                 <ClickToCopy @value={{@resource.phone}} class="field-value">{{n-a @resource.phone}}</ClickToCopy>
             </div>
             <div class="field-info-container">
@@ -47,5 +31,21 @@
             </div>
         </div>
     </ContentPanel>
+    <ContentPanel @title={{t "customer.fields.addresses"}} @open={{true}} @wrapperClass="bordered-top">
+        {{#if @resource.places.length}}
+            <div class="space-y-2 text-xs dark:text-gray-100">
+                {{#each @resource.places as |place|}}
+                    <div class="flex items-center justify-between gap-2">
+                        <Place::Pill @place={{place}} @subtitle={{place.address}} />
+                        {{#if (eq place.id @resource.place_uuid)}}
+                            <Badge @status="info" @hideStatusDot={{true}}>{{t "customer.fields.primary-address"}}</Badge>
+                        {{/if}}
+                    </div>
+                {{/each}}
+            </div>
+        {{else}}
+            <div class="text-xs text-gray-500 dark:text-gray-400">{{t "customer.fields.no-addresses"}}</div>
+        {{/if}}
+    </ContentPanel>
     <CustomField::Yield @subject={{@resource}} @viewMode={{true}} @wrapperClass="bordered-top" />
 </div>

package/addon/components/customer/form.hbs

@@ -37,11 +37,22 @@
                 <Input @value={{@resource.title}} @type="text" class="w-full form-input" placeholder={{t "common.title"}} disabled={{cannot-write @resource}} />
             </InputGroup>
             <InputGroup @name={{t "common.email"}}>
-                <Input @value={{@resource.email}} @type="text" class="w-full form-input" placeholder={{t "common.email"}} disabled={{cannot-write @resource}} />
+                <Input
+                    @value={{@resource.email}}
+                    @type="text"
+                    class="w-full form-input"
+                    placeholder={{t "common.email"}}
+                    disabled={{or (cannot-write @resource) @resource.is_staff_linked}}
+                />
             </InputGroup>
             <InputGroup @name={{t "common.phone"}}>
-                <PhoneInput @value={{@resource.phone}} @onInput={{fn (mut @resource.phone)}} class="form-input w-full" disabled={{cannot-write @resource}} />
+                <PhoneInput @value={{@resource.phone}} @onInput={{fn (mut @resource.phone)}} class="form-input w-full" disabled={{or (cannot-write @resource) @resource.is_staff_linked}} />
             </InputGroup>
+            {{#if @resource.is_staff_linked}}
+                <div class="lg:col-span-2 -mt-1 mb-2 text-xs text-gray-500 dark:text-gray-400" data-test-staff-linked-helper>{{t "profile-account.staff-linked-helper"}}</div>
+            {{else if @resource.isNew}}
+                <ProfileIdentityHint @email={{@resource.email}} @phone={{@resource.phone}} @type="customer" class="lg:col-span-2" />
+            {{/if}}
             <InputGroup @name={{t "common.internal-id"}}>
                 <Input @value={{@resource.internal_id}} @type="text" class="w-full form-input" placeholder={{t "common.internal-id"}} disabled={{cannot-write @resource}} />
             </InputGroup>

package/addon/components/customer/form.js

@@ -1,71 +1,15 @@
 import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 
 export default class CustomerFormComponent extends Component {
     @service customerActions;
-    @service store;
     @service fetch;
     @service currentUser;
     @service notifications;
-    @service modalsManager;
     @service('universe/extension-manager') extensionManager;
 
-    @tracked userAccountActionButtons = [
-        {
-            icon: 'user-plus',
-            size: 'xs',
-            permission: 'iam create user',
-            onClick: async () => {
-                // Load IAM engine for user-form modal component
-                await this.extensionManager.ensureEngineLoaded('@fleetbase/iam-engine');
-
-                const user = this.store.createRecord('user', {
-                    status: 'pending',
-                    type: 'user',
-                });
-
-                this.modalsManager.show('modals/user-form', {
-                    title: 'Create a new user',
-                    user,
-                    formPermission: 'iam create user',
-                    uploadNewPhoto: (file) => {
-                        this.fetch.uploadFile.perform(
-                            file,
-                            {
-                                path: `uploads/${this.currentUser.companyId}/users/${user.slug}`,
-                                subject_uui: user.id,
-                                subject_type: 'user',
-                                type: 'user_photo',
-                            },
-                            (uploadedFile) => {
-                                user.setProperties({
-                                    avatar_uuid: uploadedFile.id,
-                                    avatar_url: uploadedFile.url,
-                                    avatar: uploadedFile,
-                                });
-                            }
-                        );
-                    },
-                    confirm: async (modal) => {
-                        modal.startLoading();
-
-                        try {
-                            await user.save();
-                            this.notifications.success('New user created successfully!');
-                            modal.done();
-                        } catch (error) {
-                            this.notifications.serverError(error);
-                            modal.stopLoading();
-                        }
-                    },
-                });
-            },
-        },
-    ];
-
     get showWelcomeEmailOption() {
         return this.args.resource?.isNew && this.extensionManager.isInstalled('@fleetbase/customer-portal-engine');
     }

package/addon/components/driver/details.hbs

@@ -1,23 +1,18 @@
 <div class="details-wrapper" ...attributes>
-    <ContentPanel @title={{t "driver.fields.user-account"}} @open={{true}} @wrapperClass="bordered-top">
-        <div class="grid grid-cols-2 gap-2 text-xs dark:text-gray-100">
+    <ContentPanel @title={{t "common.details"}} @open={{true}} @wrapperClass="bordered-top">
+        <div class="grid grid-cols-1 md:grid-cols-3 gap-2 text-xs dark:text-gray-100">
             <div class="field-info-container md:col-span-3">
                 <div class="field-name">{{t "common.name"}}</div>
                 <div class="field-value">{{n-a @resource.name}}</div>
             </div>
-            <div class="field-info-container">
-                <div class="field-name">{{t "common.email"}}</div>
-                <ClickToCopy @value={{@resource.email}} class="field-value">{{n-a @resource.email}}</ClickToCopy>
-            </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "common.phone"}}</div>
                 <ClickToCopy @value={{@resource.phone}} class="field-value">{{n-a @resource.phone}}</ClickToCopy>
             </div>
-        </div>
-    </ContentPanel>
-
-    <ContentPanel @title={{t "driver.fields.driver-details"}} @open={{true}} @wrapperClass="bordered-top">
-        <div class="grid grid-cols-2 gap-2 text-xs dark:text-gray-100">
+            <div class="field-info-container md:col-span-2">
+                <div class="field-name">{{t "common.email"}}</div>
+                <ClickToCopy @value={{@resource.email}} class="field-value">{{n-a @resource.email}}</ClickToCopy>
+            </div>
             <div class="field-info-container">
                 <div class="field-name">{{t "common.id"}}</div>
                 <ClickToCopy @value={{@resource.public_id}} class="field-value">{{n-a @resource.public_id}}</ClickToCopy>
@@ -30,28 +25,27 @@
                 <div class="field-name">{{t "driver.fields.driver-license"}}</div>
                 <div class="field-value">{{n-a @resource.drivers_license_number}}</div>
             </div>
-            <div class="field-info-container">
+            <div class="field-info-container md:col-span-3">
                 <div class="field-name">{{t "driver.fields.license-expiry"}}</div>
                 <div class="field-value">{{n-a (format-date-fns @resource.license_expiry)}}</div>
             </div>
             <div class="field-info-container">
-                <div class="field-name">{{t "resource.vendor"}}</div>
+                <div class="field-name">{{t "resource.vehicle"}}</div>
                 <div class="field-value">
-                    <Vendor::Pill @vendor={{resource-relation @resource "vendor"}} @titleFallback={{n-a @resource.vendor_name}} />
+                    <Vehicle::Pill @vehicle={{resource-relation @resource "vehicle"}} @titleFallback={{n-a @resource.vehicle_name (t "driver.fields.no-vehicle-assigned")}} />
                 </div>
             </div>
-            <div class="field-info-container">
-                <div class="field-name">{{t "resource.vehicle"}}</div>
+            <div class="field-info-container md:col-span-2">
+                <div class="field-name">{{t "resource.vendor"}}</div>
                 <div class="field-value">
-                    <Vehicle::Pill @vehicle={{resource-relation @resource "vehicle"}} @titleFallback={{n-a @resource.vehicle_name (t "driver.fields.no-vehicle-assigned")}} />
+                    <Vendor::Pill @vendor={{resource-relation @resource "vendor"}} @titleFallback={{n-a @resource.vendor_name}} />
                 </div>
             </div>
-            <div class="col-span-3"></div>
             <div class="field-info-container">
                 <div class="field-name">{{t "common.city"}}</div>
                 <div class="field-value">{{n-a @resource.city}}</div>
             </div>
-            <div class="field-info-container">
+            <div class="field-info-container md:col-span-2">
                 <div class="field-name">{{t "common.country"}}</div>
                 <div class="field-value">
                     <CountryName @country={{@resource.country}} />