@fleetbase/fleetops-engine 0.3.5 → 0.3.6

package/README.md

@@ -13,10 +13,10 @@ This monorepo contains both the frontend and backend components of the FleetOps
 
 ### Requirements
 
-- PHP 7.3.0 or above
-- Ember.js v3.24 or above
-- Ember CLI v3.24 or above
-- Node.js v14 or above
+* PHP 7.3.0 or above
+* Ember.js v4.8 or above
+* Ember CLI v4.8 or above
+* Node.js v18 or above
 
 ## Structure
 

package/addon/components/admin/navigator-app.hbs

@@ -0,0 +1,5 @@
+<ContentPanel @title="Navigator App" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+    <InputGroup @name="URL">
+        <ClickToCopy>{{this.url}}</ClickToCopy>
+    </InputGroup>
+</ContentPanel>

package/addon/components/admin/navigator-app.js

@@ -0,0 +1,27 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+
+export default class NavigatorAppControlsComponent extends Component {
+    @service fetch;
+    @tracked isLoading = false;
+    @tracked url;
+
+    constructor() {
+        super(...arguments);
+        this.getAppLinkUrl();
+    }
+
+    getAppLinkUrl() {
+        this.isLoading = true;
+
+        return this.fetch
+            .get('fleet-ops/navigator/get-link-app')
+            .then(({ linkUrl }) => {
+                this.url = linkUrl;
+            })
+            .finally(() => {
+                this.isLoading = false;
+            });
+    }
+}

package/addon/components/driver-form-panel.js

@@ -100,25 +100,19 @@ export default class DriverFormPanelComponent extends Component {
 
         contextComponentCallback(this, 'onBeforeSave', driver);
 
-        try {
-            return driver
-                .save()
-                .then((driver) => {
-                    this.notifications.success(`Driver (${driver.name}) saved successfully.`);
-                    contextComponentCallback(this, 'onAfterSave', driver);
-                })
-                .catch((error) => {
-                    this.notifications.serverError(error);
-                })
-                .finally(() => {
-                    this.loader.removeLoader('.next-content-overlay-panel-container ');
-                    this.isLoading = false;
-                });
-        } catch (error) {
-            this.notifications.error(error.message);
-            this.loader.removeLoader('.next-content-overlay-panel-container ');
-            this.isLoading = false;
-        }
+        return driver
+            .save()
+            .then((driver) => {
+                this.notifications.success(`Driver (${driver.name}) saved successfully.`);
+                contextComponentCallback(this, 'onAfterSave', driver);
+            })
+            .catch((error) => {
+                this.notifications.serverError(error);
+            })
+            .finally(() => {
+                this.loader.removeLoader('.next-content-overlay-panel-container ');
+                this.isLoading = false;
+            });
     }
 
     /**

package/addon/components/leaflet-draw-control.js

@@ -1,6 +1,5 @@
 import BaseLayer from 'ember-leaflet/components/base-layer';
 import { computed } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { scheduleOnce } from '@ember/runloop';
 import { classify, camelize } from '@ember/string';
 import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
@@ -75,8 +74,8 @@ export default class LeafletDrawControl extends BaseLayer {
         const showDrawingLayer = getWithDefault(this.args, 'showDrawingLayer', true);
 
         if (this.map && this._layer && this.L.drawLocal) {
-            this.options.edit = assign({ featureGroup: this._layer }, this.options.edit);
-            this.options.draw = assign({}, this.L.drawLocal.draw, this.options.draw);
+            this.options.edit = Object.assign({ featureGroup: this._layer }, this.options.edit);
+            this.options.draw = Object.assign({}, this.L.drawLocal.draw, this.options.draw);
 
             // create draw control
             const drawControl = new this.L.Control.Draw(this.options);

package/addon/components/live-map.js

@@ -1911,7 +1911,8 @@ export default class LiveMapComponent extends Component {
 
                     // from the `get-active-order-coordinates` the responded coordinates will always be [longitude, latitude]
                     // const [latitude, longitude] = extractCoordinates(coordinates.firstObject.coordinates);
-                    const [longitude, latitude] = coordinates.filter((point) => point.cordinates[0] !== 0).firstObject?.coordinates;
+                    const validCoordinates = coordinates.filter((point) => point.cordinates[0] !== 0);
+                    const [longitude, latitude] = getWithDefault(validCoordinates, '0.coordiantes', [0, 0]);
 
                     initialCoordinates.latitude = latitude;
                     initialCoordinates.longitude = longitude;
@@ -1934,10 +1935,12 @@ export default class LiveMapComponent extends Component {
         this.isLoading = true;
 
         return new Promise((resolve) => {
-            const cachedRecords = this.serviceAreas?.getFromCache('serviceAreas', 'service-area');
+            if (this.serviceAreas && typeof this.serviceAreas.getFromCache === 'function') {
+                const cachedRecords = this.serviceAreas.getFromCache('serviceAreas', 'service-area');
 
-            if (cachedRecords) {
-                resolve(cachedRecords);
+                if (cachedRecords) {
+                    resolve(cachedRecords);
+                }
             }
 
             return this.store

package/addon/components/modals/driver-assign-order.hbs

@@ -17,8 +17,8 @@
                                         </div>
                                     </div>
                                     <div class="order-route-location dark:text-gray-100">
-                                        <div>{{or order.payload.waypoints.firstObject.name order.payload.waypoints.firstObject.street1}}</div>
-                                        <div>{{or order.payload.waypoints.firstObject.city order.payload.waypoints.firstObject.postal_code}}</div>
+                                        <div>{{or (get order.payload.waypoints "0.name") (get order.payload.waypoints "0.street1")}}</div>
+                                        <div>{{or (get order.payload.waypoints "0.city") (get order.payload.waypoints "0.postal_code")}}</div>
                                     </div>
                                 </div>
                                 <div class="order-route-stop">

package/addon/components/modals/order-import.hbs

@@ -3,7 +3,7 @@
         {{#if @options.isProcessing}}
             <div class="min-h-56 dropzone w-full rounded px-4 py-8 min-h text-gray-900 dark:text-white text-center flex flex-col items-center justify-center border-2 border-dashed border-gray-200 dark:border-indigo-500">
                 <div class="flex items-center justify-center py-5">
-                    <PageLoader class="text-sm dar:text-gray-100" @loadingMessage="Processing import..." />
+                    <Spinner class="text-sm dark:text-gray-100" @loadingMessage="Processing import..." />
                 </div>
             </div>
         {{else}}
@@ -17,20 +17,20 @@
                         {{/if}}
                     {{else if queue.files.length}}
                         <div class="my-2">
-                            <FaIcon @icon="file-spreadsheet" class="text-indigo-500 mr-2" />
+                            <FaIcon @icon="file-import" class="text-indigo-500 mr-2" />
                             {{pluralize queue.files.length "spreadsheet"}} ready for upload.
                         </div>
                         <div class="my-2">({{queue.progress}}%)</div>
                     {{else}}
                         <h4 class="font-semibold mb-8">
-                            <FaIcon @icon="file-spreadsheet" class="text-indigo-500 mr-2" /> Upload Spreadsheets
+                            <FaIcon @icon="file-import" class="text-indigo-500 mr-2" /> Upload Spreadsheets
                         </h4>
                         <div>
                             {{#if dropzone.supported}}
                                 <p class="text-base font-semibold my-5">Drag and drop spreadsheet files onto this dropzone</p>
                             {{/if}}
 
-                            <UploadButton @buttonText="or select spreadsheets to upload" @type="magic" @name="spreadsheets" @for="spreadsheets" @accept={{join "," @options.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{@options.queueFile}} class="w-72" />
+                            <UploadButton @buttonText="or select spreadsheets to upload" @type="magic" @icon="file-import" @name="spreadsheets" @for="spreadsheets" @accept={{join "," @options.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{@options.queueFile}} class="w-72 justify-center" />
                         </div>
                     {{/if}}
                 </FileDropzone>
@@ -67,7 +67,7 @@
                                                 {{else if (eq column.key "uploadDate")}}
                                                     {{format-date (get file column.valuePath) "d MMM yyyy"}}
                                                 {{else}}
-                                                    <div class="w-44 truncate">{{get file column.valuePath}}</div>
+                                                    <div class="min-w-225px max-w-225px truncate">{{get file column.valuePath}}</div>
                                                 {{/if}}
                                             </td>
                                         {{/each}}

package/addon/components/modals/order-new-activity.hbs

@@ -33,7 +33,7 @@
                             </span>
                         </label>
                         <div>
-                            <Badge @status="default" class="uppercase">{{activity.code}}</Badge>
+                            <Badge @status={{dasherize activity.code}} class="uppercase">{{activity.code}}</Badge>
                         </div>
                     </div>
                 {{/each}}

package/addon/components/order-config/entities-editor.js

@@ -1,7 +1,7 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { action, computed, set, get } from '@ember/object';
+import { action, computed, set } from '@ember/object';
 import { isArray } from '@ember/array';
 import { underscore } from '@ember/string';
 import generateUuid from '@fleetbase/ember-core/utils/generate-uuid';
@@ -96,13 +96,11 @@ export default class OrderConfigEntitiesEditorComponent extends Component {
     }
 
     @action setMetaKeyValue(index, key, { target }) {
-        console.log('setMetaKeyValue()', ...arguments);
         const { orderConfig } = this;
         const { value } = target;
 
-        console.log(value, get(orderConfig, `meta.entities.${index}.meta.${key}`));
-
-        // set(orderConfig, `meta.entities.${index}.meta.${key}`, value);
+        // console.log(value, get(orderConfig, `meta.entities.${index}.meta.${key}`));
+        set(orderConfig, `meta.entities.${index}.meta.${key}`, value);
 
         if (typeof this.args.onEntitiesChanged === 'function') {
             this.args.onEntitiesChanged(orderConfig.meta.entities);

package/addon/components/route-list.hbs

@@ -11,8 +11,8 @@
     {{/if}}
 
     {{#if (gt @order.payload.waypoints.length 2)}}
-        <Button class="border-0 m-0 p-0 shadow-none w-full mb-3" @wrapperClass="w-full" @onClick={{this.toggleWaypointsCollapse}}>
-            <div class="px-3 py-2 w-full bg-yellow-200 text-yellow-900 rounded shadow-sm flex flex-col justify-center items-start">
+        <Button class="btn-reset w-full" @wrapperClass="w-full" @onClick={{this.toggleWaypointsCollapse}}>
+            <div class="px-3 py-2 w-full bg-yellow-200 text-yellow-900 rounded shadow-sm flex flex-col justify-center items-start mb-3">
                 <div class="flex flex-row items-center">
                     <FaIcon @icon="eye" class="mr-2 text-yellow-900" />
                     <span class="font-bold">{{if this.isWaypointsCollapsed "Tap to expand" "Tap to collapse"}}</span>

package/addon/components/vendor-form-panel.js

@@ -81,8 +81,8 @@ export default class VendorFormPanelComponent extends Component {
     constructor() {
         super(...arguments);
         this.vendor = this.args.vendor;
-        this.isEditing = typeof this.vendor.id === 'string';
         applyContextComponentArguments(this);
+        this.isEditing = this.vendor && typeof this.vendor.id === 'string';
     }
 
     /**

package/addon/controllers/application.js

@@ -1,9 +1,9 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { computed, action } from '@ember/object';
 
-export default class ApplicationController extends Controller {
+export default class ApplicationController extends BaseController {
     @service hostRouter;
 
     @tracked routes = ['console.fleet-ops.operations', 'console.fleet-ops.management', 'console.fleet-ops.comms'];

package/addon/controllers/base-controller.js

@@ -0,0 +1,31 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class BaseController extends Controller {
+    /**
+     * Inject the `universe` service
+     *
+     * @var {Service}
+     */
+    @service universe;
+
+    /**
+     * Transitions to a specified route within the '@fleetbase/fleetops-engine' engine.
+     *
+     * This action is a wrapper around the `transitionToEngineRoute` method of the `universe` service (or object),
+     * specifically targeting the '@fleetbase/fleetops-engine'. It allows for easy transitioning to routes
+     * within this engine, abstracting away the need to repeatedly specify the engine name.
+     *
+     * @param {string} route - The route within the '@fleetbase/fleetops-engine' to transition to.
+     * @param {...any} args - Additional arguments to pass to the transitionToEngineRoute method.
+     * @returns {Promise} A Promise that resolves with the result of the transitionToEngineRoute method.
+     *
+     * @example
+     * // To transition to the 'management.fleets.index.new' route within the '@fleetbase/fleetops-engine'
+     * this.transitionToRoute('management.fleets.index.new');
+     */
+    @action transitionToRoute(route, ...args) {
+        return this.universe.transitionToEngineRoute('@fleetbase/fleetops-engine', route, ...args);
+    }
+}

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

@@ -1,8 +1,8 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 
-export default class ManagementContactsIndexDetailsController extends Controller {
+export default class ManagementContactsIndexDetailsController extends BaseController {
     /**
      * The currently active view tab ('details' by default).
      *

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

@@ -1,9 +1,9 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 
-export default class ManagementContactsIndexEditController extends Controller {
+export default class ManagementContactsIndexEditController extends BaseController {
     /**
      * Inject the `hostRouter` service
      *

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

@@ -1,9 +1,9 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 
-export default class ManagementContactsIndexNewController extends Controller {
+export default class ManagementContactsIndexNewController extends BaseController {
     /**
      * Inject the `store` service
      *

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

@@ -1,4 +1,4 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -6,7 +6,7 @@ import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
-export default class ManagementContactsIndexController extends Controller {
+export default class ManagementContactsIndexController extends BaseController {
     /**
      * Inject the `currentUser` service
      *

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

@@ -1,4 +1,4 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 
@@ -8,7 +8,7 @@ import { action } from '@ember/object';
  * @class ManagementDriversIndexDetailsController
  * @extends Controller
  */
-export default class ManagementDriverIndexDetailsController extends Controller {
+export default class ManagementDriverIndexDetailsController extends BaseController {
     /**
      * The currently active view tab ('details' by default).
      *

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

@@ -1,9 +1,9 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 
-export default class ManagementDriversIndexEditController extends Controller {
+export default class ManagementDriversIndexEditController extends BaseController {
     /**
      * Inject the `hostRouter` service
      *
@@ -25,6 +25,13 @@ export default class ManagementDriversIndexEditController extends Controller {
      */
     @tracked overlay;
 
+    /**
+     * The universe service.
+     *
+     * @memberof ManagementDriversIndexEditController
+     */
+    @tracked universe;
+
     /**
      * When exiting the overlay.
      *
@@ -108,4 +115,23 @@ export default class ManagementDriversIndexEditController extends Controller {
             ...options,
         });
     }
+
+    /**
+     * Transitions to a specified route within the '@fleetbase/fleetops-engine' engine.
+     *
+     * This action is a wrapper around the `transitionToEngineRoute` method of the `universe` service (or object),
+     * specifically targeting the '@fleetbase/fleetops-engine'. It allows for easy transitioning to routes
+     * within this engine, abstracting away the need to repeatedly specify the engine name.
+     *
+     * @param {string} route - The route within the '@fleetbase/fleetops-engine' to transition to.
+     * @param {...any} args - Additional arguments to pass to the transitionToEngineRoute method.
+     * @returns {Promise} A Promise that resolves with the result of the transitionToEngineRoute method.
+     *
+     * @example
+     * // To transition to the 'management.fleets.index.new' route within the '@fleetbase/fleetops-engine'
+     * this.transitionToRoute('management.fleets.index.new');
+     */
+    @action _transitionToRoute(route, ...args) {
+        return this.universe.transitionToEngineRoute('@fleetbase/fleetops-engine', route, ...args);
+    }
 }

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

@@ -1,9 +1,9 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 
-export default class ManagementDriversIndexNewController extends Controller {
+export default class ManagementDriversIndexNewController extends BaseController {
     /**
      * Inject the `store` service
      *

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

@@ -1,4 +1,4 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -9,7 +9,7 @@ import { task } from 'ember-concurrency-decorators';
 import extractCoordinates from '@fleetbase/ember-core/utils/extract-coordinates';
 import leafletIcon from '@fleetbase/ember-core/utils/leaflet-icon';
 
-export default class ManagementDriversIndexController extends Controller {
+export default class ManagementDriversIndexController extends BaseController {
     /**
      * Inject the `notifications` service
      *
@@ -132,13 +132,6 @@ export default class ManagementDriversIndexController extends Controller {
      */
     @tracked internal_id;
 
-    /**
-     * The filterable param `drivers_license_number`
-     *
-     * @var {String}
-     */
-    @tracked drivers_license_number;
-
     /**
      * The filterable param `name`
      *
@@ -257,7 +250,13 @@ export default class ManagementDriversIndexController extends Controller {
         {
             label: 'Vendor',
             cellComponent: 'table/cell/anchor',
-            action: this.viewDriverVendor,
+            onClick: async (driver) => {
+                const vendor = await driver.loadVendor();
+
+                if (vendor) {
+                    this.contextPanel.focus(vendor);
+                }
+            },
             valuePath: 'vendor.name',
             modelNamePath: 'name',
             width: '180px',
@@ -510,6 +509,7 @@ export default class ManagementDriversIndexController extends Controller {
     @action viewDriver(driver) {
         return this.transitionToRoute('management.drivers.index.details', driver);
     }
+
     /**
      * Create a new `driver` in modal
      *
@@ -530,6 +530,7 @@ export default class ManagementDriversIndexController extends Controller {
     @action editDriver(driver) {
         return this.transitionToRoute('management.drivers.index.edit', driver);
     }
+
     /**
      * Delete a `driver` via confirm prompt
      *
@@ -655,18 +656,4 @@ export default class ManagementDriversIndexController extends Controller {
             ...options,
         });
     }
-
-    /**
-     * View information about the driver vendor
-     *
-     * @param {DriverModel} driver
-     * @void
-     */
-    @action async viewDriverVendor(driver) {
-        const vendor = await driver.loadVendor();
-
-        if (vendor) {
-            this.contextPanel.focus(vendor);
-        }
-    }
 }

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

@@ -1,4 +1,4 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 
@@ -8,7 +8,7 @@ import { action } from '@ember/object';
  * @class ManagementFleetsIndexDetailsController
  * @extends Controller
  */
-export default class ManagementFleetsIndexDetailsController extends Controller {
+export default class ManagementFleetsIndexDetailsController extends BaseController {
     /**
      * The currently active view tab ('details' by default).
      *

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

@@ -1,9 +1,9 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 
-export default class ManagementFleetsIndexEditController extends Controller {
+export default class ManagementFleetsIndexEditController extends BaseController {
     /**
      * Inject the `hostRouter` service
      *

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

@@ -1,9 +1,9 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 
-export default class ManagementFleetsIndexNewController extends Controller {
+export default class ManagementFleetsIndexNewController extends BaseController {
     /**
      * Inject the `store` service
      *

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

@@ -1,4 +1,4 @@
-import Controller, { inject as controller } from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -6,14 +6,7 @@ import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
-export default class ManagementFleetsIndexController extends Controller {
-    /**
-     * Inject the `operations.zones.index` controller
-     *
-     * @var {Controller}
-     */
-    @controller('operations.zones.index') zones;
-
+export default class ManagementFleetsIndexController extends BaseController {
     /**
      * Inject the `notifications` service
      *
@@ -56,6 +49,13 @@ export default class ManagementFleetsIndexController extends Controller {
      */
     @service hostRouter;
 
+    /**
+     * Inject the `universe` service
+     *
+     * @var {Service}
+     */
+    @service universe;
+
     /**
      * Inject the `filters` service
      *

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

@@ -1,4 +1,4 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
@@ -8,7 +8,7 @@ import { inject as service } from '@ember/service';
  * @class ManagementFuelReportsIndexDetailsController
  * @extends Controller
  */
-export default class ManagementFuelReportsIndexDetailsController extends Controller {
+export default class ManagementFuelReportsIndexDetailsController extends BaseController {
     @service hostRouter;
 
     /**

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

@@ -1,9 +1,9 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 
-export default class ManagementFuelReportsIndexEditController extends Controller {
+export default class ManagementFuelReportsIndexEditController extends BaseController {
     /**
      * Inject the `hostRouter` service
      *

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

@@ -1,9 +1,9 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 
-export default class ManagementFuelReportsIndexNewController extends Controller {
+export default class ManagementFuelReportsIndexNewController extends BaseController {
     /**
      * Inject the `store` service
      *