@fleetbase/fleetops-engine 0.6.51 → 0.6.52

package/addon/controllers/connectivity/telematics/details.js

@@ -0,0 +1,149 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
+
+export default class ConnectivityTelematicsDetailsController extends Controller {
+    @service hostRouter;
+    @service fetch;
+    @service modalsManager;
+    @service notifications;
+
+    get tabs() {
+        return [
+            {
+                route: 'connectivity.telematics.details.index',
+                label: 'Overview',
+            },
+            {
+                route: 'connectivity.telematics.details.devices',
+                label: 'Devices',
+            },
+            {
+                route: 'connectivity.telematics.details.attachments',
+                label: 'Vehicle Attachments',
+            },
+            {
+                route: 'connectivity.telematics.details.sensors',
+                label: 'Sensors',
+            },
+            {
+                route: 'connectivity.telematics.details.events',
+                label: 'Events',
+            },
+            {
+                route: 'connectivity.telematics.details.logs',
+                label: 'Logs',
+            },
+        ].map((tab) => ({
+            ...tab,
+            active: this.isTabActive(tab.route),
+        }));
+    }
+
+    get actionButtons() {
+        return [
+            {
+                icon: 'plug',
+                text: 'Test',
+                onClick: () => this.openConnectionTestDialog(),
+            },
+            {
+                icon: 'satellite-dish',
+                text: 'Discover',
+                onClick: () => this.discoverDevices.perform(),
+                isLoading: this.discoverDevices.isRunning,
+            },
+            {
+                icon: 'cog',
+                fn: () => this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.edit', this.model),
+            },
+        ];
+    }
+
+    get telematicId() {
+        return this.model?.id;
+    }
+
+    isTabActive(routeName) {
+        return this.hostRouter.currentRouteName?.endsWith(routeName);
+    }
+
+    get healthStatus() {
+        switch (this.model?.status) {
+            case 'active':
+            case 'connected':
+                return 'success';
+            case 'synchronizing':
+                return 'info';
+            case 'error':
+            case 'degraded':
+            case 'disconnected':
+                return 'warning';
+            case 'initialized':
+                return 'default';
+            default:
+                return 'default';
+        }
+    }
+
+    get statusLabel() {
+        switch (this.model?.status) {
+            case 'initialized':
+                return 'Not tested';
+            case 'connected':
+                return 'Connected';
+            case 'synchronizing':
+                return 'Syncing';
+            case 'active':
+                return 'Connected';
+            case 'error':
+                return 'Needs attention';
+            case null:
+            case undefined:
+                return 'Unknown';
+            default:
+                return 'Unknown';
+        }
+    }
+
+    get connectionTestLabel() {
+        switch (this.model?.meta?.last_test_result) {
+            case 'success':
+                return 'Verified';
+            case 'failed':
+                return 'Failed';
+            default:
+                return 'Not tested';
+        }
+    }
+
+    get lastSyncAt() {
+        if (this.model?.status === 'synchronizing') {
+            return this.model?.meta?.last_sync_started_at;
+        }
+
+        return this.model?.meta?.last_sync_completed_at;
+    }
+
+    @action openConnectionTestDialog() {
+        this.modalsManager.show('modals/telematic-connection-diagnostics', {
+            title: 'Test Connection',
+            acceptButtonText: 'Run Test',
+            acceptButtonIcon: 'plug',
+            declineButtonText: 'Close',
+            telematic: this.model,
+            onTested: () => this.hostRouter.refresh(),
+        });
+    }
+
+    @task *discoverDevices() {
+        try {
+            const result = yield this.fetch.post(`telematics/${this.telematicId}/discover`);
+            this.notifications.success(result.message ?? 'Device discovery initiated.');
+            yield this.hostRouter.refresh();
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+}

package/addon/controllers/connectivity/telematics/{index/edit.js → edit.js}

@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 
-export default class ConnectivityTelematicsIndexEditController extends Controller {
+export default class ConnectivityTelematicsEditController extends Controller {
     @service hostRouter;
     @service intl;
     @service notifications;
@@ -27,7 +27,7 @@ export default class ConnectivityTelematicsIndexEditController extends Controlle
             this.events.trackResourceUpdated(telematic);
             this.overlay?.close();
 
-            yield this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index.details', telematic);
+            yield this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.details', telematic);
             this.notifications.success(
                 this.intl.t('common.resource-updated-success', {
                     resource: this.intl.t('resource.telematic'),
@@ -52,7 +52,18 @@ export default class ConnectivityTelematicsIndexEditController extends Controlle
             return this.#confirmContinueWithUnsavedChanges(this.model);
         }
 
-        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index.details', this.model);
+        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.details', this.model);
+    }
+
+    @action openConnectionTestDialog() {
+        this.modalsManager.show('modals/telematic-connection-diagnostics', {
+            title: 'Test Connection',
+            acceptButtonText: 'Run Test',
+            acceptButtonIcon: 'plug',
+            declineButtonText: 'Close',
+            telematic: this.model,
+            onTested: () => this.hostRouter.refresh(),
+        });
     }
 
     #confirmContinueWithUnsavedChanges(telematic, options = {}) {
@@ -62,7 +73,7 @@ export default class ConnectivityTelematicsIndexEditController extends Controlle
             acceptButtonText: this.intl.t('common.continue'),
             confirm: async () => {
                 telematic.rollbackAttributes();
-                await this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index.details', telematic);
+                await this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.details', telematic);
             },
             ...options,
         });

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

@@ -1,11 +1,15 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
+import { task } from 'ember-concurrency';
 import fleetOpsOptions from '../../../utils/fleet-ops-options';
 
 export default class ConnectivityTelematicsIndexController extends Controller {
     @service telematicActions;
+    @service fetch;
     @service intl;
+    @service notifications;
+    @tracked providers = [];
 
     /** query params */
     @tracked queryParams = ['name', 'provider', 'status', 'page', 'limit', 'sort', 'query', 'public_id', 'created_at', 'updated_at'];
@@ -17,6 +21,11 @@ export default class ConnectivityTelematicsIndexController extends Controller {
     @tracked provider;
     @tracked status;
 
+    constructor() {
+        super(...arguments);
+        this.loadProviders.perform();
+    }
+
     /** action buttons */
     @tracked actionButtons = [
         {
@@ -59,11 +68,11 @@ export default class ConnectivityTelematicsIndexController extends Controller {
         {
             sticky: true,
             label: 'Provider',
-            valuePath: 'provider',
-            cellComponent: 'table/cell/anchor',
-            cellClassNames: 'uppercase',
+            valuePath: 'name',
+            cellComponent: 'cell/telematic-provider',
             action: this.telematicActions.transition.view,
             permission: 'fleet-ops view telematic',
+            width: 460,
             resizable: true,
             sortable: true,
             filterable: true,
@@ -73,7 +82,8 @@ export default class ConnectivityTelematicsIndexController extends Controller {
         {
             label: this.intl.t('column.status'),
             valuePath: 'status',
-            cellComponent: 'table/cell/status',
+            cellComponent: 'cell/telematic-status',
+            cellClassNames: 'fleetops-provider-connections-cell-middle',
             resizable: true,
             sortable: true,
             filterable: true,
@@ -84,6 +94,7 @@ export default class ConnectivityTelematicsIndexController extends Controller {
             label: this.intl.t('column.created-at'),
             valuePath: 'createdAt',
             sortParam: 'created_at',
+            cellClassNames: 'fleetops-provider-connections-cell-middle',
             resizable: true,
             sortable: true,
             filterable: true,
@@ -93,6 +104,7 @@ export default class ConnectivityTelematicsIndexController extends Controller {
             label: this.intl.t('column.updated-at'),
             valuePath: 'updatedAt',
             sortParam: 'updated_at',
+            cellClassNames: 'fleetops-provider-connections-cell-middle',
             resizable: true,
             sortable: true,
             hidden: true,
@@ -107,7 +119,7 @@ export default class ConnectivityTelematicsIndexController extends Controller {
             ddButtonIcon: 'ellipsis-h',
             ddButtonIconPrefix: 'fas',
             ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.telematic') }),
-            cellClassNames: 'overflow-visible',
+            cellClassNames: 'fleetops-provider-connections-cell-middle overflow-visible',
             wrapperClass: 'flex items-center justify-end mx-2',
             sticky: 'right',
             width: 60,
@@ -137,4 +149,12 @@ export default class ConnectivityTelematicsIndexController extends Controller {
             searchable: false,
         },
     ];
+
+    @task *loadProviders() {
+        try {
+            this.providers = yield this.fetch.get('telematics/providers');
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
 }

package/addon/controllers/connectivity/telematics/{index/new.js → new.js}

@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 
-export default class ConnectivityTelematicsIndexNewController extends Controller {
+export default class ConnectivityTelematicsNewController extends Controller {
     @service telematicActions;
     @service hostRouter;
     @service intl;
@@ -12,6 +12,8 @@ export default class ConnectivityTelematicsIndexNewController extends Controller
     @service events;
     @tracked overlay;
     @tracked telematic = this.telematicActions.createNewInstance();
+    queryParams = ['setupProvider'];
+    @tracked setupProvider;
 
     @task *save(telematic) {
         try {
@@ -20,7 +22,7 @@ export default class ConnectivityTelematicsIndexNewController extends Controller
             this.overlay?.close();
 
             yield this.hostRouter.refresh();
-            yield this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index.details', telematic);
+            yield this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.details', telematic);
             this.notifications.success('Telematic created successfully.');
             this.resetForm();
         } catch (err) {
@@ -31,4 +33,8 @@ export default class ConnectivityTelematicsIndexNewController extends Controller
     @action resetForm() {
         this.telematic = this.telematicActions.createNewInstance();
     }
+
+    @action cancel() {
+        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index');
+    }
 }

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

@@ -1,9 +1,12 @@
 import Controller from '@ember/controller';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 
 export default class ManagementDriverIndexDetailsController extends Controller {
     @service('universe/menu-service') menuService;
+    @service driverActions;
+    @service issueActions;
     @service hostRouter;
     @service intl;
 
@@ -16,22 +19,96 @@ export default class ManagementDriverIndexDetailsController extends Controller {
             },
             {
                 route: 'management.drivers.index.details.positions',
-                label: 'Positions',
+                label: this.intl.t('common.positions'),
             },
             {
                 route: 'management.drivers.index.details.schedule',
                 label: this.intl.t('common.schedule'),
             },
+            {
+                route: 'management.drivers.index.details.activity',
+                label: this.intl.t('common.activity'),
+            },
             ...(isArray(registeredTabs) ? registeredTabs : []),
         ];
     }
 
+    hasAssignedVehicle(driver) {
+        return Boolean(driver?.vehicle_uuid || driver?.vehicle?.id || driver?.vehicle?.uuid || driver?.vehicle_name);
+    }
+
     get actionButtons() {
         return [
             {
                 icon: 'pencil',
                 fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.drivers.index.edit', this.model),
+                permission: 'fleet-ops update driver',
+            },
+            {
+                icon: 'ellipsis-h',
+                iconPrefix: 'fas',
+                renderInPlace: true,
+                items: [
+                    {
+                        text: this.intl.t('driver.actions.assign-order'),
+                        icon: 'clipboard-list',
+                        fn: () => this.driverActions.assignOrder(this.model),
+                        permission: 'fleet-ops assign-order-for driver',
+                    },
+                    ...(Number(this.model.assigned_orders_count) > 0
+                        ? [
+                              {
+                                  text: this.intl.t('driver.actions.unassign-orders'),
+                                  icon: 'user-minus',
+                                  fn: () => this.driverActions.unassignOrders(this.model),
+                                  permission: 'fleet-ops assign-order-for driver',
+                              },
+                          ]
+                        : []),
+                    {
+                        separator: true,
+                    },
+                    {
+                        text: this.intl.t('driver.actions.assign-vehicle'),
+                        icon: 'car',
+                        fn: () => this.driverActions.assignVehicle(this.model),
+                        permission: 'fleet-ops assign-vehicle-for driver',
+                    },
+                    ...(this.hasAssignedVehicle(this.model)
+                        ? [
+                              {
+                                  text: this.intl.t('driver.actions.unassign-vehicle'),
+                                  icon: 'link-slash',
+                                  fn: () => this.driverActions.unassignVehicle(this.model),
+                                  permission: 'fleet-ops assign-vehicle-for driver',
+                              },
+                          ]
+                        : []),
+                    {
+                        separator: true,
+                    },
+                    {
+                        text: this.intl.t('driver.actions.locate-driver'),
+                        icon: 'location-dot',
+                        fn: () => this.driverActions.locate(this.model),
+                        permission: 'fleet-ops view driver',
+                    },
+                    {
+                        text: this.intl.t('driver.actions.create-issue'),
+                        icon: 'triangle-exclamation',
+                        fn: () => this.createIssue(this.model),
+                        permission: 'fleet-ops create issue',
+                    },
+                ],
             },
         ];
     }
+
+    @action createIssue(driver) {
+        this.issueActions.modal.create({
+            driver,
+            driver_uuid: driver.id,
+            title: this.intl.t('driver.prompts.issue-title', { driverName: driver.name }),
+        });
+    }
 }

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

@@ -5,6 +5,7 @@ import { action } from '@ember/object';
 
 export default class ManagementDriversIndexController extends Controller {
     @service driverActions;
+    @service issueActions;
     @service fleetActions;
     @service vendorActions;
     @service vehicleActions;
@@ -47,6 +48,10 @@ export default class ManagementDriversIndexController extends Controller {
     @tracked layout = 'table';
     @tracked table;
 
+    hasAssignedVehicle(driver) {
+        return Boolean(driver?.vehicle_uuid || driver?.vehicle?.id || driver?.vehicle?.uuid || driver?.vehicle_name);
+    }
+
     /** action buttons */
     get actionButtons() {
         return [
@@ -261,11 +266,13 @@ export default class ManagementDriversIndexController extends Controller {
                 actions: [
                     {
                         label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.driver') }),
+                        icon: 'eye',
                         fn: this.driverActions.transition.view,
                         permission: 'fleet-ops view driver',
                     },
                     {
                         label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.driver') }),
+                        icon: 'pencil',
                         fn: this.driverActions.transition.edit,
                         permission: 'fleet-ops update driver',
                     },
@@ -274,24 +281,48 @@ export default class ManagementDriversIndexController extends Controller {
                     },
                     {
                         label: this.intl.t('driver.actions.assign-order'),
+                        icon: 'clipboard-list',
                         fn: this.driverActions.assignOrder,
                         permission: 'fleet-ops assign-order-for driver',
                     },
                     {
                         label: this.intl.t('driver.actions.assign-vehicle'),
+                        icon: 'car',
                         fn: this.driverActions.assignVehicle,
                         permission: 'fleet-ops assign-vehicle-for driver',
                     },
+                    {
+                        label: this.intl.t('driver.actions.unassign-orders'),
+                        icon: 'user-minus',
+                        fn: this.driverActions.unassignOrders,
+                        permission: 'fleet-ops assign-order-for driver',
+                        isVisible: (driver) => Number(driver.assigned_orders_count) > 0,
+                    },
+                    {
+                        label: this.intl.t('driver.actions.unassign-vehicle'),
+                        icon: 'link-slash',
+                        fn: this.driverActions.unassignVehicle,
+                        permission: 'fleet-ops assign-vehicle-for driver',
+                        isVisible: (driver) => this.hasAssignedVehicle(driver),
+                    },
                     {
                         label: this.intl.t('driver.actions.locate-driver'),
+                        icon: 'location-dot',
                         fn: this.driverActions.locate,
                         permission: 'fleet-ops view driver',
                     },
+                    {
+                        label: this.intl.t('driver.actions.create-issue'),
+                        icon: 'triangle-exclamation',
+                        fn: this.createIssue,
+                        permission: 'fleet-ops create issue',
+                    },
                     {
                         separator: true,
                     },
                     {
                         label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.driver') }),
+                        icon: 'trash',
                         fn: this.driverActions.delete,
                         permission: 'fleet-ops delete driver',
                     },
@@ -307,4 +338,12 @@ export default class ManagementDriversIndexController extends Controller {
     @action changeLayout(layout) {
         this.layout = layout;
     }
+
+    @action createIssue(driver) {
+        this.issueActions.modal.create({
+            driver,
+            driver_uuid: driver.id,
+            title: `Issue reported for ${driver.name}`,
+        });
+    }
 }

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

@@ -4,7 +4,9 @@ import { isArray } from '@ember/array';
 
 export default class ManagementFleetsIndexDetailsController extends Controller {
     @service('universe/menu-service') menuService;
+    @service fleetActions;
     @service hostRouter;
+    @service intl;
 
     get tabs() {
         const registeredTabs = this.menuService.getMenuItems('fleet-ops:component:place:details');
@@ -19,7 +21,7 @@ export default class ManagementFleetsIndexDetailsController extends Controller {
             },
             {
                 route: 'management.fleets.index.details.drivers',
-                label: 'Drivers',
+                label: this.intl.t('menu.drivers'),
             },
             ...(isArray(registeredTabs) ? registeredTabs : []),
         ];
@@ -30,6 +32,26 @@ export default class ManagementFleetsIndexDetailsController extends Controller {
             {
                 icon: 'pencil',
                 fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.fleets.index.edit', this.model),
+                permission: 'fleet-ops update fleet',
+            },
+            {
+                icon: 'ellipsis-h',
+                iconPrefix: 'fas',
+                renderInPlace: true,
+                items: [
+                    {
+                        text: this.intl.t('fleet.actions.assign-driver'),
+                        icon: 'user-plus',
+                        fn: () => this.fleetActions.assignDriver(this.model),
+                        permission: 'fleet-ops assign-driver-for fleet',
+                    },
+                    {
+                        text: this.intl.t('fleet.actions.assign-vehicle'),
+                        icon: 'car',
+                        fn: () => this.fleetActions.assignVehicle(this.model),
+                        permission: 'fleet-ops assign-vehicle-for fleet',
+                    },
+                ],
             },
         ];
     }

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

@@ -241,7 +241,12 @@ export default class ManagementFleetsIndexController extends Controller {
                     {
                         label: this.intl.t('fleet.actions.assign-driver'),
                         permission: 'fleet-ops assign-driver-for fleet',
-                        fn: () => {},
+                        fn: this.fleetActions.assignDriver,
+                    },
+                    {
+                        label: this.intl.t('fleet.actions.assign-vehicle'),
+                        permission: 'fleet-ops assign-vehicle-for fleet',
+                        fn: this.fleetActions.assignVehicle,
                     },
                     {
                         separator: true,

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

@@ -8,7 +8,24 @@ export default class ManagementFuelReportsIndexController extends Controller {
     @service intl;
 
     /** query params */
-    @tracked queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'internal_id', 'vehicle', 'driver', 'created_by', 'updated_by', 'status', 'country', 'volume', 'odometer'];
+    @tracked queryParams = [
+        'page',
+        'limit',
+        'sort',
+        'query',
+        'public_id',
+        'internal_id',
+        'vehicle',
+        'driver',
+        'created_by',
+        'updated_by',
+        'status',
+        'source',
+        'provider',
+        'country',
+        'volume',
+        'odometer',
+    ];
     @tracked page = 1;
     @tracked limit;
     @tracked sort = '-created_at';
@@ -20,6 +37,8 @@ export default class ManagementFuelReportsIndexController extends Controller {
     @tracked volume;
     @tracked odometer;
     @tracked status;
+    @tracked source;
+    @tracked provider;
     @tracked table;
 
     /** action buttons */
@@ -130,6 +149,23 @@ export default class ManagementFuelReportsIndexController extends Controller {
                 filterComponent: 'filter/multi-option',
                 filterOptions: ['draft', 'pending-approval', 'approved', 'rejected', 'revised', 'submitted', 'in-review', 'confirmed', 'processed', 'archived', 'cancelled'],
             },
+            {
+                label: 'Source',
+                valuePath: 'source',
+                resizable: true,
+                sortable: false,
+                filterable: true,
+                filterComponent: 'filter/multi-option',
+                filterOptions: ['manual', 'import', 'fuel_provider'],
+            },
+            {
+                label: 'Provider',
+                valuePath: 'provider',
+                resizable: true,
+                sortable: false,
+                filterable: true,
+                filterComponent: 'filter/string',
+            },
             {
                 label: this.intl.t('column.volume'),
                 valuePath: 'volume',