@fleetbase/fleetops-engine 0.6.50 → 0.6.52

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/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',

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

@@ -0,0 +1,70 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
+
+export default class ManagementFuelTransactionsIndexDetailsController extends Controller {
+    @service fetch;
+    @service notifications;
+    @service hostRouter;
+
+    @tracked vehicleId;
+    @tracked orderId;
+
+    get normalizedPayloadJson() {
+        return JSON.stringify(this.model?.normalized_payload ?? {}, null, 2);
+    }
+
+    get rawPayloadJson() {
+        return JSON.stringify(this.model?.raw_payload ?? {}, null, 2);
+    }
+
+    @action setVehicleId(event) {
+        this.vehicleId = event.target.value;
+    }
+
+    @action setOrderId(event) {
+        this.orderId = event.target.value;
+    }
+
+    @task *matchVehicle() {
+        try {
+            yield this.fetch.post(`fuel-provider-transactions/${this.model.id}/match-vehicle`, { vehicle: this.vehicleId });
+            this.notifications.success('Fuel transaction matched to vehicle.');
+            yield this.hostRouter.refresh();
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task *matchOrder() {
+        try {
+            yield this.fetch.post(`fuel-provider-transactions/${this.model.id}/match-order`, { order: this.orderId });
+            this.notifications.success('Fuel transaction matched to order.');
+            yield this.hostRouter.refresh();
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task *reprocess() {
+        try {
+            yield this.fetch.post(`fuel-provider-transactions/${this.model.id}/reprocess`);
+            this.notifications.success('Fuel transaction reprocessed.');
+            yield this.hostRouter.refresh();
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task *review(status) {
+        try {
+            yield this.fetch.post(`fuel-provider-transactions/${this.model.id}/review`, { status });
+            this.notifications.success(status === 'ignored' ? 'Fuel transaction ignored.' : 'Fuel transaction reviewed.');
+            yield this.hostRouter.refresh();
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+}