@fleetbase/fleetops-engine 0.6.49 → 0.6.51

package/addon/components/widget/revenue-trend.js

@@ -3,6 +3,8 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
+import getCurrency from '@fleetbase/ember-ui/utils/get-currency';
+import formatMoney from '@fleetbase/ember-accounting/utils/format-money';
 
 const PERIODS = ['7d', '30d', '90d'];
 
@@ -22,17 +24,88 @@ export default class WidgetRevenueTrendComponent extends Component {
         this.load.perform();
     }
 
+    get currencyCode() {
+        return this.data?.summary?.currency ?? 'USD';
+    }
+
+    get currency() {
+        return getCurrency(this.currencyCode) ?? getCurrency('USD');
+    }
+
+    get currencyDivisor() {
+        const precision = Number(this.currency?.precision ?? 2);
+
+        return precision > 0 ? 10 ** precision : 1;
+    }
+
+    get chartDatasets() {
+        return (
+            this.data?.datasets?.map((dataset) => {
+                if (!this.isRevenueDataset(dataset)) {
+                    return dataset;
+                }
+
+                return {
+                    ...dataset,
+                    data: dataset.data?.map((value) => this.normalizeRevenueValue(value)) ?? [],
+                };
+            }) ?? []
+        );
+    }
+
+    isRevenueDataset(dataset) {
+        return dataset?.label === 'Revenue' || dataset?.yAxisID === 'y';
+    }
+
+    normalizeRevenueValue(value) {
+        const numericValue = Number(value);
+
+        if (!Number.isFinite(numericValue)) {
+            return value;
+        }
+
+        return numericValue / this.currencyDivisor;
+    }
+
+    formatChartCurrency(value) {
+        const numericValue = Number(value);
+
+        if (!Number.isFinite(numericValue)) {
+            return value;
+        }
+
+        return formatMoney(numericValue, this.currency.symbol, this.currency.precision, this.currency.thousandSeparator, this.currency.decimalSeparator);
+    }
+
     get chartOptions() {
         return {
             responsive: true,
             maintainAspectRatio: false,
             plugins: {
                 legend: { display: false },
-                tooltip: { mode: 'index', intersect: false },
+                tooltip: {
+                    mode: 'index',
+                    intersect: false,
+                    callbacks: {
+                        label: (context) => {
+                            if (this.isRevenueDataset(context.dataset)) {
+                                return `Revenue: ${this.formatChartCurrency(context.parsed?.y ?? context.raw)}`;
+                            }
+
+                            return `${context.dataset?.label ?? 'Value'}: ${context.parsed?.y ?? context.raw}`;
+                        },
+                    },
+                },
             },
             scales: {
                 x: { grid: { display: false } },
-                y: { beginAtZero: true, ticks: { precision: 0 } },
+                y: {
+                    beginAtZero: true,
+                    ticks: {
+                        precision: this.currency.precision,
+                        callback: (value) => this.formatChartCurrency(value),
+                    },
+                },
             },
             elements: { point: { radius: 0, hoverRadius: 4 } },
         };

package/addon/controllers/management/contacts/customers/details.js

@@ -1,19 +1,37 @@
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
+import { isArray } from '@ember/array';
 
 export default class ManagementContactsCustomersDetailsController extends Controller {
+    @service('universe/menu-service') menuService;
+    @service customerActions;
     @service hostRouter;
-    @tracked tabs = [
-        {
-            route: 'management.contacts.customers.details.index',
-            label: 'Overview',
-        },
-    ];
-    @tracked actionButtons = [
-        {
-            icon: 'pencil',
-            fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.contacts.customers.edit', this.model),
-        },
-    ];
+    @service intl;
+
+    get tabs() {
+        const registeredTabs = this.menuService.getMenuItems('fleet-ops:component:customer:details');
+        return [
+            {
+                route: 'management.contacts.index.details.index',
+                label: 'Overview',
+            },
+            ...(isArray(registeredTabs) ? registeredTabs : []),
+        ];
+    }
+
+    get actionButtons() {
+        const buttons = [
+            {
+                icon: 'pencil',
+                fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.contacts.customers.edit', this.model),
+            },
+        ];
+
+        const accountActionButton = this.customerActions.accountActionButton(this.model);
+        if (accountActionButton) {
+            buttons.push(accountActionButton);
+        }
+
+        return buttons;
+    }
 }

package/addon/controllers/management/contacts/customers.js

@@ -4,6 +4,10 @@ import { inject as service } from '@ember/service';
 export default class ManagementContactsCustomersController extends ManagementContactsIndexController {
     @service('customerActions') contactActions;
 
+    get customerActions() {
+        return this.contactActions;
+    }
+
     /** columns */
     get columns() {
         return [
@@ -13,7 +17,7 @@ export default class ManagementContactsCustomersController extends ManagementCon
                 valuePath: 'name',
 
                 cellComponent: 'table/cell/media-name',
-                action: this.contactActions.transition.view,
+                action: this.customerActions.transition.view,
                 permission: 'fleet-ops view contact',
                 resizable: true,
                 sortable: true,
@@ -75,7 +79,7 @@ export default class ManagementContactsCustomersController extends ManagementCon
                 label: this.intl.t('column.address'),
                 valuePath: 'address',
                 cellComponent: 'table/cell/anchor',
-                action: this.contactActions.viewPlace,
+                action: this.customerActions.viewPlace,
 
                 resizable: true,
                 sortable: true,
@@ -118,20 +122,27 @@ export default class ManagementContactsCustomersController extends ManagementCon
                 actions: [
                     {
                         label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.customer') }),
-                        fn: this.contactActions.transition.view,
+                        icon: 'eye',
+                        fn: this.customerActions.transition.view,
                         permission: 'fleet-ops view contact',
                     },
                     {
                         label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.customer') }),
-                        fn: this.contactActions.transition.edit,
+                        icon: 'pencil',
+                        fn: this.customerActions.transition.edit,
                         permission: 'fleet-ops update contact',
                     },
                     {
                         separator: true,
                     },
+                    ...this.customerActions.accountRowActionItems(),
+                    {
+                        separator: true,
+                    },
                     {
                         label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.customer') }),
-                        fn: this.contactActions.delete,
+                        icon: 'trash',
+                        fn: this.customerActions.delete,
                         permission: 'fleet-ops delete contact',
                     },
                 ],

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

@@ -1,19 +1,37 @@
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
+import { isArray } from '@ember/array';
 
 export default class ManagementContactsIndexDetailsController extends Controller {
+    @service('universe/menu-service') menuService;
+    @service contactActions;
     @service hostRouter;
-    @tracked tabs = [
-        {
-            route: 'management.contacts.index.details.index',
-            label: 'Overview',
-        },
-    ];
-    @tracked actionButtons = [
-        {
-            icon: 'pencil',
-            fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.contacts.index.edit', this.model),
-        },
-    ];
+    @service intl;
+
+    get tabs() {
+        const registeredTabs = this.menuService.getMenuItems('fleet-ops:component:contact:details');
+        return [
+            {
+                route: 'management.contacts.index.details.index',
+                label: 'Overview',
+            },
+            ...(isArray(registeredTabs) ? registeredTabs : []),
+        ];
+    }
+
+    get actionButtons() {
+        const buttons = [
+            {
+                icon: 'pencil',
+                fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.contacts.index.edit', this.model),
+            },
+        ];
+
+        const accountActionButton = this.contactActions.accountActionButton(this.model);
+        if (accountActionButton) {
+            buttons.push(accountActionButton);
+        }
+
+        return buttons;
+    }
 }

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

@@ -168,19 +168,26 @@ export default class ManagementContactsIndexController extends Controller {
                 actions: [
                     {
                         label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.contact') }),
+                        icon: 'eye',
                         fn: this.contactActions.transition.view,
                         permission: 'fleet-ops view contact',
                     },
                     {
                         label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.contact') }),
+                        icon: 'pencil',
                         fn: this.contactActions.transition.edit,
                         permission: 'fleet-ops update contact',
                     },
                     {
                         separator: true,
                     },
+                    ...this.contactActions.accountRowActionItems(),
+                    {
+                        separator: true,
+                    },
                     {
                         label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.contact') }),
+                        icon: 'trash',
                         fn: this.contactActions.delete,
                         permission: 'fleet-ops delete contact',
                     },

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

@@ -4,16 +4,62 @@ import { inject as service } from '@ember/service';
 
 export default class ManagementIssuesIndexDetailsController extends Controller {
     @service hostRouter;
+    @service issueActions;
+
     @tracked tabs = [
         {
             route: 'management.issues.index.details.index',
             label: 'Overview',
         },
     ];
-    @tracked actionButtons = [
-        {
-            icon: 'pencil',
-            fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.issues.index.edit', this.model),
-        },
-    ];
+
+    get isClosed() {
+        return ['closed', 'resolved', 'completed'].includes(this.model?.status);
+    }
+
+    get actionButtons() {
+        const workflowItems = [
+            {
+                label: 'Change Status',
+                icon: 'arrows-rotate',
+                fn: () => this.issueActions.openStatusModal(this.model, { onSaved: () => this.refreshIssue() }),
+            },
+            {
+                label: 'Assign Issue',
+                icon: 'user-check',
+                fn: () => this.issueActions.openAssignModal(this.model, { onSaved: () => this.refreshIssue() }),
+            },
+        ];
+
+        if (this.isClosed) {
+            workflowItems.push({
+                label: 'Re-open Issue',
+                icon: 'rotate-left',
+                fn: () => this.issueActions.confirmReopenIssue(this.model, { onSaved: () => this.refreshIssue() }),
+            });
+        } else {
+            workflowItems.push({
+                label: 'Close Issue',
+                icon: 'circle-check',
+                class: 'text-green-600 dark:text-green-400',
+                fn: () => this.issueActions.openCloseIssueModal(this.model, { onSaved: () => this.refreshIssue() }),
+            });
+        }
+
+        return [
+            {
+                icon: 'pencil',
+                fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.issues.index.edit', this.model),
+            },
+            {
+                icon: 'ellipsis',
+                type: 'default',
+                items: workflowItems,
+            },
+        ];
+    }
+
+    refreshIssue() {
+        return this.model?.reload?.();
+    }
 }

package/addon/controllers/management/vehicles/index/new.js

@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 
-const DEFAULT_PROPERTIES = { status: 'active' };
+const DEFAULT_PROPERTIES = { status: 'available' };
 
 export default class ManagementVehiclesIndexNewController extends Controller {
     @service store;

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

@@ -9,6 +9,10 @@ export default class ManagementVendorsIndexDetailsController extends Controller
             route: 'management.vendors.index.details.index',
             label: 'Overview',
         },
+        {
+            route: 'management.vendors.index.details.personnel',
+            label: 'Personnel',
+        },
     ];
     @tracked actionButtons = [
         {

package/addon/controllers/operations/orders/index/details.js

@@ -1,5 +1,6 @@
 import Controller, { inject as controller } from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 import { task } from 'ember-concurrency';
@@ -19,6 +20,7 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
     @tracked routingControl;
     @tracked routingCompleted = false;
     @tracked realtimeOrderPublicId = null;
+    @tracked proofReloadToken = 0;
 
     get routePoints() {
         return buildRoutePointsFromPayload(this.model?.payload);
@@ -97,16 +99,14 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
                         disabled: this.model.status === 'canceled',
                         fn: () =>
                             this.orderActions.updateActivity(this.model, {
-                                onFinish: () => {
-                                    this.refresh.perform();
-                                },
+                                onFinish: this.handleActivityModalFinish,
                             }),
                     },
                     {
-                        text: 'Unassign driver',
-                        icon: 'user-xmark',
-                        disabled: this.model.status === 'canceled' || !this.model.driver_assigned,
-                        fn: () => this.orderActions.unassignDriver(this.model),
+                        text: this.model.has_driver_assigned ? 'Unassign driver' : 'Assign driver',
+                        icon: this.model.has_driver_assigned ? 'user-xmark' : 'edit',
+                        disabled: this.model.has_driver_assigned ? !this.model.hasActiveStatus || !this.model.driver_assigned : !this.model.hasActiveStatus,
+                        fn: () => (this.model.has_driver_assigned ? this.orderActions.unassignDriver(this.model) : this.orderActions.assignDriver(this.model)),
                     },
                     {
                         text: 'View order label',
@@ -154,6 +154,14 @@ export default class OperationsOrdersIndexDetailsController extends Controller {
         ];
     }
 
+    @action handleActivityModalFinish(options) {
+        this.refresh.perform();
+
+        if (options?.proofCreated) {
+            this.proofReloadToken++;
+        }
+    }
+
     @task *refresh() {
         try {
             yield this.hostRouter.refresh();

package/addon/controllers/operations/orders/index.js

@@ -271,7 +271,7 @@ export default class OperationsOrdersIndexController extends Controller {
             },
             {
                 label: this.intl.t('column.transaction'),
-                cellComponent: 'table/cell/base',
+                cellComponent: 'table/cell/currency',
                 valuePath: 'transaction_amount',
                 resizable: true,
                 hidden: true,
@@ -385,6 +385,20 @@ export default class OperationsOrdersIndexController extends Controller {
                         permission: 'fleet-ops dispatch order',
                         isVisible: (order) => order.canBeDispatched,
                     },
+                    {
+                        label: this.intl.t('common.assign-driver'),
+                        icon: 'edit',
+                        fn: this.orderActions.assignDriver,
+                        permission: 'fleet-ops update order',
+                        isVisible: (order) => !order.has_driver_assigned,
+                    },
+                    {
+                        label: this.intl.t('common.unassign-driver'),
+                        icon: 'edit',
+                        fn: this.orderActions.unassignDriver,
+                        permission: 'fleet-ops update order',
+                        isVisible: (order) => order.has_driver_assigned,
+                    },
                     {
                         label: this.intl.t('common.cancel-resource', { resource: this.intl.t('resource.order') }),
                         icon: 'ban',

package/addon/extension.js

@@ -117,6 +117,9 @@ export default {
         // Create registries
         this.createRegistries(registryService);
 
+        // // Register console home guidance
+        // this.registerHomeComponents(registryService);
+
         // Setup customer portal
         const isCustomerPortalInstalled = universe.extensionManager.isInstalled('@fleetbase/customer-portal-engine');
         if (isCustomerPortalInstalled) {
@@ -216,13 +219,23 @@ export default {
                 category: 'Analytics',
                 default: false,
             }),
+            new Widget({
+                id: 'fleet-ops-live-fleet-widget',
+                name: 'Live Fleet Map',
+                description: 'Real-time driver positions and active routes.',
+                icon: 'map-location-dot',
+                component: new ExtensionComponent('@fleetbase/fleetops-engine', 'widget/live-fleet'),
+                grid_options: { w: 8, h: 11, minW: 8, minH: 8 },
+                category: 'Maps',
+                default: true,
+            }),
             new Widget({
                 id: 'fleet-ops-revenue-trend-widget',
                 name: 'Revenue Trend',
                 description: 'Revenue over time with period comparison.',
                 icon: 'chart-line',
                 component: new ExtensionComponent('@fleetbase/fleetops-engine', 'widget/revenue-trend'),
-                grid_options: { w: 6, h: 6, minW: 5, minH: 5 },
+                grid_options: { w: 4, h: 11, minW: 4, minH: 8 },
                 category: 'Analytics',
                 default: true,
             }),
@@ -254,7 +267,7 @@ export default {
                 component: new ExtensionComponent('@fleetbase/fleetops-engine', 'widget/top-drivers'),
                 grid_options: { w: 6, h: 6, minW: 5, minH: 5 },
                 category: 'Analytics',
-                default: false,
+                default: true,
             }),
             new Widget({
                 id: 'fleet-ops-fuel-efficiency-widget',
@@ -296,21 +309,15 @@ export default {
                 category: 'Analytics',
                 default: false,
             }),
-            new Widget({
-                id: 'fleet-ops-live-fleet-widget',
-                name: 'Live Fleet Map',
-                description: 'Real-time driver positions and active routes.',
-                icon: 'map-location-dot',
-                component: new ExtensionComponent('@fleetbase/fleetops-engine', 'widget/live-fleet'),
-                grid_options: { w: 12, h: 10, minW: 8, minH: 8 },
-                category: 'Maps',
-                default: true,
-            }),
         ];
 
         widgetService.registerWidgets('dashboard', widgets);
     },
 
+    registerHomeComponents(registryService) {
+        registryService.registerRenderableComponent('console:home:before-dashboard', new ExtensionComponent('@fleetbase/fleetops-engine', 'home/getting-started-guidance'));
+    },
+
     createRegistries(registryService) {
         registryService.createRegistries([
             'engine:fleet-ops',

package/addon/helpers/format-duration.js

@@ -1,38 +1 @@
-import { helper } from '@ember/component/helper';
-
-export function formatDurationValue(seconds) {
-    const value = Number(seconds);
-
-    if (!Number.isFinite(value)) {
-        return '0s';
-    }
-
-    const totalSeconds = Math.max(0, Math.ceil(value));
-    const days = Math.floor(totalSeconds / 86400);
-    const hours = Math.floor((totalSeconds % 86400) / 3600);
-    const minutes = Math.floor((totalSeconds % 3600) / 60);
-    const remainingSeconds = totalSeconds % 60;
-    const parts = [];
-
-    if (days) {
-        parts.push(`${days}d`);
-    }
-
-    if (hours) {
-        parts.push(`${hours}h`);
-    }
-
-    if (!days && minutes) {
-        parts.push(`${minutes}m`);
-    }
-
-    if (!days && !hours && parts.length < 2 && remainingSeconds) {
-        parts.push(`${remainingSeconds}s`);
-    }
-
-    return parts.length ? parts.join(' ') : '0s';
-}
-
-export default helper(function formatDuration([seconds]) {
-    return formatDurationValue(seconds);
-});
+export { default, formatDurationValue } from '@fleetbase/ember-ui/helpers/format-duration';

package/addon/helpers/place-address-html.js

@@ -1,6 +1,6 @@
 import { helper } from '@ember/component/helper';
 import placeAddressHtml from '../utils/place-address-html';
 
-export default helper(function placeAddressHtmlHelper([place]) {
-    return placeAddressHtml(place);
+export default helper(function placeAddressHtmlHelper([place], hash = {}) {
+    return placeAddressHtml(place, hash);
 });

package/addon/initializers/load-leaflet-assets.js

@@ -1,15 +1,14 @@
-import loadLeafletPlugins from '@fleetbase/ember-ui/utils/load-leaflet-plugins';
+import { debug } from '@ember/debug';
+import ensureLeafletPluginsReady from '../utils/leaflet-plugin-loader';
 
 export function initialize() {
     let waitForLeaflet = setInterval(() => {
         let leafletLoaded = window.L !== undefined;
         if (leafletLoaded) {
-            loadLeafletPlugins({
-                scripts: ['leaflet.contextmenu.js', 'leaflet.draw-src.js'],
-                stylesheets: ['leaflet.contextmenu.css', 'leaflet.draw.css'],
-                globalIndicatorKey: 'fleetopsLeafletPluginsLoaded',
-            });
             clearInterval(waitForLeaflet);
+            ensureLeafletPluginsReady().catch((error) => {
+                debug(error.message);
+            });
         }
     }, 100);
 }

package/addon/initializers/patch-ember-leaflet-tooltip-layer.js

@@ -0,0 +1,51 @@
+import TooltipLayer from 'ember-leaflet/components/tooltip-layer';
+
+function hasMethod(object, methodName) {
+    return typeof object?.[methodName] === 'function';
+}
+
+export function initialize() {
+    const prototype = TooltipLayer?.prototype;
+    if (!prototype || prototype.__fleetopsTooltipLayerPatched) {
+        return;
+    }
+
+    const addToContainer = prototype.addToContainer;
+    const removeFromContainer = prototype.removeFromContainer;
+    const removePopupListeners = prototype._removePopupListeners;
+
+    prototype.addToContainer = function () {
+        const parentLayer = this.args?.parent?._layer;
+        if (!this._layer || !hasMethod(parentLayer, 'bindTooltip')) {
+            return;
+        }
+
+        return addToContainer.call(this);
+    };
+
+    prototype.removeFromContainer = function () {
+        const parentLayer = this.args?.parent?._layer;
+        if (!hasMethod(parentLayer, 'unbindTooltip')) {
+            return;
+        }
+
+        return removeFromContainer.call(this);
+    };
+
+    prototype._removePopupListeners = function () {
+        const parentMap = this.args?.parent?._layer?._map;
+        if (!hasMethod(parentMap, 'removeEventListener')) {
+            return;
+        }
+
+        return removePopupListeners.call(this);
+    };
+
+    Object.defineProperty(prototype, '__fleetopsTooltipLayerPatched', {
+        value: true,
+    });
+}
+
+export default {
+    initialize,
+};

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

@@ -28,6 +28,6 @@ export default class ManagementIssuesIndexDetailsRoute extends Route {
     };
 
     model({ public_id }) {
-        return this.store.queryRecord('issue', { public_id, single: true, with: ['driver', 'vehicle', 'assignee', 'reporter'] });
+        return this.store.queryRecord('issue', { public_id, single: true, with: ['driver', 'vehicle', 'assignee', 'reporter', 'order', 'files'] });
     }
 }