@fleetbase/fleetops-engine 0.6.19 → 0.6.21

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

@@ -1,18 +1,21 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
+import fleetOpsOptions from '../../../utils/fleet-ops-options';
 
 export default class ConnectivityTelematicsIndexController extends Controller {
     @service telematicActions;
     @service intl;
 
     /** query params */
-    @tracked queryParams = ['name', 'page', 'limit', 'sort', 'query', 'public_id', 'created_at', 'updated_at'];
+    @tracked queryParams = ['name', 'provider', 'status', 'page', 'limit', 'sort', 'query', 'public_id', 'created_at', 'updated_at'];
     @tracked page = 1;
     @tracked limit;
     @tracked sort = '-created_at';
     @tracked public_id;
     @tracked name;
+    @tracked provider;
+    @tracked status;
 
     /** action buttons */
     @tracked actionButtons = [
@@ -54,25 +57,32 @@ export default class ConnectivityTelematicsIndexController extends Controller {
     /** columns */
     @tracked columns = [
         {
-            label: this.intl.t('column.name'),
-            valuePath: 'name',
-            width: '180px',
+            label: 'Provider',
+            valuePath: 'provider',
             cellComponent: 'table/cell/anchor',
             cellClassNames: 'uppercase',
             action: this.telematicActions.transition.view,
             permission: 'fleet-ops view telematic',
-            hidden: true,
             resizable: true,
             sortable: true,
             filterable: true,
             filterParam: 'name',
             filterComponent: 'filter/string',
         },
+        {
+            label: this.intl.t('column.status'),
+            valuePath: 'status',
+            cellComponent: 'table/cell/status',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterComponent: 'filter/multi-option',
+            filterOptions: fleetOpsOptions('telematicStatuses'),
+        },
         {
             label: this.intl.t('column.created-at'),
             valuePath: 'createdAt',
             sortParam: 'created_at',
-            width: '10%',
             resizable: true,
             sortable: true,
             filterable: true,
@@ -82,7 +92,6 @@ export default class ConnectivityTelematicsIndexController extends Controller {
             label: this.intl.t('column.updated-at'),
             valuePath: 'updatedAt',
             sortParam: 'updated_at',
-            width: '10%',
             resizable: true,
             sortable: true,
             hidden: true,
@@ -96,18 +105,18 @@ export default class ConnectivityTelematicsIndexController extends Controller {
             ddButtonText: false,
             ddButtonIcon: 'ellipsis-h',
             ddButtonIconPrefix: 'fas',
-            ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.Telematic') }),
+            ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.telematic') }),
             cellClassNames: 'overflow-visible',
             wrapperClass: 'flex items-center justify-end mx-2',
             width: '10%',
             actions: [
                 {
-                    label: this.intl.t('column.view-details'),
+                    label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.telematic') }),
                     fn: this.telematicActions.transition.view,
                     permission: 'fleet-ops view telematic',
                 },
                 {
-                    label: this.intl.t('column.edit-place'),
+                    label: this.intl.t('common.edit-resource', { resource: this.intl.t('resource.telematic') }),
                     fn: this.telematicActions.transition.edit,
                     permission: 'fleet-ops update telematic',
                 },
@@ -115,7 +124,7 @@ export default class ConnectivityTelematicsIndexController extends Controller {
                     separator: true,
                 },
                 {
-                    label: this.intl.t('column.delete'),
+                    label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.telematic') }),
                     fn: this.telematicActions.delete,
                     permission: 'fleet-ops delete telematic',
                 },

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

@@ -1,27 +1,32 @@
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 
 export default class ManagementFleetsIndexDetailsController extends Controller {
     @service hostRouter;
-    @tracked tabs = [
-        {
-            route: 'management.fleets.index.details.index',
-            label: 'Overview',
-        },
-        {
-            route: 'management.fleets.index.details.vehicles',
-            label: 'Vehicles',
-        },
-        {
-            route: 'management.fleets.index.details.drivers',
-            label: 'Drivers',
-        },
-    ];
-    @tracked actionButtons = [
-        {
-            icon: 'pencil',
-            fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.fleets.index.edit', this.model),
-        },
-    ];
+
+    get tabs() {
+        return [
+            {
+                route: 'management.fleets.index.details.index',
+                label: 'Overview',
+            },
+            {
+                route: 'management.fleets.index.details.vehicles',
+                label: 'Vehicles',
+            },
+            {
+                route: 'management.fleets.index.details.drivers',
+                label: 'Drivers',
+            },
+        ];
+    }
+
+    get actionButtons() {
+        return [
+            {
+                icon: 'pencil',
+                fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.fleets.index.edit', this.model),
+            },
+        ];
+    }
 }

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

@@ -10,12 +10,15 @@ export default class ManagementFleetsIndexEditController extends Controller {
     @service notifications;
     @service modalsManager;
     @tracked overlay;
-    @tracked actionButtons = [
-        {
-            icon: 'eye',
-            fn: this.view,
-        },
-    ];
+
+    get actionButtons() {
+        return [
+            {
+                icon: 'eye',
+                fn: this.view,
+            },
+        ];
+    }
 
     @task *save(fleet) {
         try {

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

@@ -1,19 +1,27 @@
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 
 export default class ManagementVehiclesIndexDetailsController extends Controller {
     @service hostRouter;
-    @tracked tabs = [
-        {
-            route: 'management.vehicles.index.details.index',
-            label: 'Overview',
-        },
-    ];
-    @tracked actionButtons = [
-        {
-            icon: 'pencil',
-            fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.edit', this.model),
-        },
-    ];
+
+    get tabs() {
+        return [
+            {
+                route: 'management.vehicles.index.details.index',
+                label: 'Overview',
+            },
+            {
+                route: 'management.vehicles.index.details.positions',
+                label: 'Positions',
+            },
+        ];
+    }
+    get actionButtons() {
+        return [
+            {
+                icon: 'pencil',
+                fn: () => this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.edit', this.model),
+            },
+        ];
+    }
 }

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

@@ -66,8 +66,10 @@ export default class OperationsOrdersIndexNewController extends Controller {
             this.universe.trigger('fleet-ops.order.creating', order);
 
             // Save custom field values
-            const { created: customFieldValues } = yield order.cfManager.saveTo(order);
-            order.custom_field_values.pushObjects(customFieldValues);
+            if (order.cfManager) {
+                const { created: customFieldValues } = yield order.cfManager.saveTo(order);
+                order.custom_field_values.pushObjects(customFieldValues);
+            }
 
             // Save order
             const createdOrder = yield order.save();

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

@@ -63,57 +63,62 @@ export default class OperationsOrdersIndexController extends Controller {
     @tracked without_driver;
     @tracked status;
     @tracked type;
+    @tracked orderConfig;
     @tracked bulkSearchValue = '';
     @tracked bulk_query = '';
     @tracked layout = 'map';
 
     /** action buttons */
-    @tracked actionButtons = [
-        {
-            icon: 'refresh',
-            onClick: this.orderActions.refresh,
-            helpText: this.intl.t('common.refresh'),
-        },
-        {
-            text: this.intl.t('common.new'),
-            type: 'primary',
-            icon: 'plus',
-            onClick: this.orderActions.transition.create,
-        },
-        {
-            text: this.intl.t('common.export'),
-            icon: 'long-arrow-up',
-            iconClass: 'rotate-icon-45',
-            wrapperClass: 'hidden md:flex',
-            onClick: this.orderActions.export,
-        },
-    ];
+    get actionButtons() {
+        return [
+            {
+                icon: 'refresh',
+                onClick: this.orderActions.refresh,
+                helpText: this.intl.t('common.refresh'),
+            },
+            {
+                text: this.intl.t('common.new'),
+                type: 'primary',
+                icon: 'plus',
+                onClick: this.orderActions.transition.create,
+            },
+            {
+                text: this.intl.t('common.export'),
+                icon: 'long-arrow-up',
+                iconClass: 'rotate-icon-45',
+                wrapperClass: 'hidden md:flex',
+                onClick: this.orderActions.export,
+            },
+        ];
+    }
 
     /** bulk actions */
-    @tracked bulkActions = [
-        {
-            label: this.intl.t('common.cancel-resource', { resource: this.intl.t('resource.orders') }),
-            icon: 'ban',
-            fn: this.orderActions.bulkCancel,
-        },
-        {
-            label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.orders') }),
-            icon: 'trash',
-            class: 'text-red-500',
-            fn: this.orderActions.bulkDelete,
-        },
-        { separator: true },
-        {
-            label: this.intl.t('common.dispatch-orders'),
-            icon: 'rocket',
-            fn: this.orderActions.bulkDispatch,
-        },
-        {
-            label: this.intl.t('common.assign-driver'),
-            icon: 'user-plus',
-            fn: this.orderActions.bulkAssignDriver,
-        },
-    ];
+    get bulkActions() {
+        return [
+            {
+                label: this.intl.t('common.cancel-resource', { resource: this.intl.t('resource.orders') }),
+                icon: 'ban',
+                fn: this.orderActions.bulkCancel,
+            },
+            {
+                label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.orders') }),
+                icon: 'trash',
+                class: 'text-red-500',
+                fn: this.orderActions.bulkDelete,
+            },
+            { separator: true },
+            {
+                label: this.intl.t('common.dispatch-orders'),
+                icon: 'rocket',
+                fn: this.orderActions.bulkDispatch,
+            },
+            {
+                label: this.intl.t('common.assign-driver'),
+                icon: 'user-plus',
+                fn: this.orderActions.bulkAssignDriver,
+            },
+        ];
+    }
 
     /** columns */
     get columns() {
@@ -366,7 +371,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 ddButtonText: false,
                 ddButtonIcon: 'ellipsis-h',
                 ddButtonIconPrefix: 'fas',
-                ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.Order') }),
+                ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.order') }),
                 cellClassNames: 'overflow-visible',
                 wrapperClass: 'flex items-center justify-end mx-2',
                 width: '12%',

package/addon/controllers/settings/custom-fields.js

@@ -33,6 +33,12 @@ export default class SettingsCustomFieldsController extends Controller {
                 label: 'Place',
                 groups: [],
             },
+            {
+                model: 'entity',
+                type: 'fleet-ops:entity',
+                label: 'Entity',
+                groups: [],
+            },
             {
                 model: 'fleet',
                 type: 'fleet-ops:fleet',

package/addon/helpers/get-fleet-ops-option-label.js

@@ -0,0 +1,11 @@
+import { helper } from '@ember/component/helper';
+import fleetOpsOptions from '../utils/fleet-ops-options';
+
+export function getFleetOpsOptionLabel(optionsKey, value) {
+    const allOptions = fleetOpsOptions(optionsKey);
+    return allOptions.find((opt) => opt.value === value)?.label ?? null;
+}
+
+export default helper(function getFleetOpsOptionLabelHelper([optionsKey, value]) {
+    return getFleetOpsOptionLabel(optionsKey, value);
+});

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

@@ -1,3 +1,29 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
-export default class ConnectivityDevicesIndexDetailsRoute extends Route {}
+export default class ConnectivityDevicesIndexDetailsRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+        if (typeof error.message === 'string' && error.message.endsWith('not found')) {
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.devices.index');
+        }
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops view device')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.devices.index');
+        }
+    }
+
+    model({ public_id }) {
+        return this.store.findRecord('device', public_id);
+    }
+}

package/addon/routes/connectivity/devices/index/edit.js

@@ -1,3 +1,29 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
-export default class ConnectivityDevicesIndexEditRoute extends Route {}
+export default class ConnectivityDevicesIndexEditRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+        if (typeof error.message === 'string' && error.message.endsWith('not found')) {
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.devices.index');
+        }
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops update device')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.devices.index');
+        }
+    }
+
+    model({ public_id }) {
+        return this.store.findRecord('device', public_id);
+    }
+}

package/addon/routes/connectivity/sensors/index/details.js

@@ -1,3 +1,29 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
-export default class ConnectivitySensorsIndexDetailsRoute extends Route {}
+export default class ConnectivitySensorsIndexDetailsRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+        if (typeof error.message === 'string' && error.message.endsWith('not found')) {
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.sensors.index');
+        }
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops view sensor')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.sensors.index');
+        }
+    }
+
+    model({ public_id }) {
+        return this.store.findRecord('sensor', public_id);
+    }
+}

package/addon/routes/connectivity/sensors/index/edit.js

@@ -1,3 +1,29 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
-export default class ConnectivitySensorsIndexEditRoute extends Route {}
+export default class ConnectivitySensorsIndexEditRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+        if (typeof error.message === 'string' && error.message.endsWith('not found')) {
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.sensors.index');
+        }
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops update sensor')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.sensors.index');
+        }
+    }
+
+    model({ public_id }) {
+        return this.store.findRecord('sensor', public_id);
+    }
+}

package/addon/routes/connectivity/telematics/index/details.js

@@ -1,3 +1,29 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
-export default class ConnectivityTelematicsIndexDetailsRoute extends Route {}
+export default class ConnectivityTelematicsIndexDetailsRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+        if (typeof error.message === 'string' && error.message.endsWith('not found')) {
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index');
+        }
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops view telematic')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index');
+        }
+    }
+
+    model({ public_id }) {
+        return this.store.findRecord('telematic', public_id);
+    }
+}

package/addon/routes/connectivity/telematics/index/edit.js

@@ -1,3 +1,29 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
-export default class ConnectivityTelematicsIndexEditRoute extends Route {}
+export default class ConnectivityTelematicsIndexEditRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+        if (typeof error.message === 'string' && error.message.endsWith('not found')) {
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index');
+        }
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops update telematic')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.telematics.index');
+        }
+    }
+
+    model({ public_id }) {
+        return this.store.findRecord('telematic', public_id);
+    }
+}

package/addon/routes/management/vehicles/index/details/positions.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ManagementVehiclesIndexDetailsPositionsRoute extends Route {}

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

@@ -30,9 +30,6 @@ export default class OperationsOrdersIndexRoute extends Route {
         before: { refreshModel: true },
         type: { refreshModel: true },
         layout: { refreshModel: false },
-        drawerOpen: { refreshModel: false },
-        drawerTab: { refreshModel: false },
-        orderPanelOpen: { refreshModel: false },
     };
 
     model(params) {

package/addon/routes.js

@@ -71,6 +71,7 @@ export default buildRoutes(function () {
                 this.route('new');
                 this.route('details', { path: '/:public_id' }, function () {
                     this.route('index', { path: '/' });
+                    this.route('positions');
                 });
                 this.route('edit', { path: '/edit/:public_id' });
             });