@fleetbase/fleetops-engine 0.6.17 → 0.6.19

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

@@ -1,61 +1,19 @@
-import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
+import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 
-/**
- * Controller for managing the details view within the "Management -> Vehicles -> Index" route.
- *
- * @class ManagementVehiclesIndexDetailsController
- * @extends Controller
- */
-export default class ManagementVehiclesIndexDetailsController extends BaseController {
-    /**
-     * The currently active view tab ('details' by default).
-     *
-     * @type {String}
-     * @tracked
-     */
-    @tracked view = 'details';
-
-    /**
-     * An array of query parameters to be serialized in the URL.
-     *
-     * @type {String[]}
-     * @tracked
-     */
-    @tracked queryParams = ['view'];
-
-    /**
-     * Transitions back to the "management.vehicles.index" route.
-     *
-     * @method
-     * @action
-     * @returns {Transition} The transition object representing the route change.
-     */
-    @action transitionBack() {
-        return this.transitionToRoute('management.vehicles.index');
-    }
-
-    /**
-     * Transitions to the edit view for a specific vehicle.
-     *
-     * @method
-     * @param {VehicleModel} vehicle - The vehicle to be edited.
-     * @action
-     * @returns {Transition} The transition object representing the route change.
-     */
-    @action onEdit(vehicle) {
-        return this.transitionToRoute('management.vehicles.index.edit', vehicle);
-    }
-
-    /**
-     * Updates the active view tab.
-     *
-     * @method
-     * @param {String} tab - The name of the tab to activate.
-     * @action
-     */
-    @action onTabChanged(tab) {
-        this.view = tab;
-    }
+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),
+        },
+    ];
 }

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

@@ -1,116 +1,63 @@
-import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
+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 ManagementVehiclesIndexEditController extends BaseController {
-    /**
-     * Inject the `hostRouter` service
-     *
-     * @memberof ManagementVehiclesIndexEditController
-     */
+export default class ManagementVehiclesIndexEditController extends Controller {
     @service hostRouter;
-
-    /**
-     * Inject the `hostRouter` service
-     *
-     * @memberof ManagementVehiclesIndexEditController
-     */
-    @service modalsManager;
-
-    /**
-     * Inject the `intl` service
-     *
-     * @memberof intl
-     */
     @service intl;
-
-    /**
-     * The overlay component context.
-     *
-     * @memberof ManagementVehiclesIndexEditController
-     */
+    @service notifications;
+    @service modalsManager;
     @tracked overlay;
+    @tracked actionButtons = [
+        {
+            icon: 'eye',
+            fn: this.view,
+        },
+    ];
 
-    /**
-     * When exiting the overlay.
-     *
-     * @return {Transition}
-     * @memberof ManagementVehiclesIndexEditController
-     */
-    @action transitionBack(vehicle) {
-        // check if vehicle record has been edited and prompt for confirmation
-        if (vehicle.hasDirtyAttributes) {
-            return this.confirmContinueWithUnsavedChanges(vehicle, {
-                confirm: () => {
-                    vehicle.rollbackAttributes();
-                    return this.transitionToRoute('management.vehicles.index');
-                },
-            });
-        }
-
-        return this.transitionToRoute('management.vehicles.index');
-    }
+    @task *save(vehicle) {
+        try {
+            yield vehicle.save();
+            this.overlay?.close();
 
-    /**
-     * Set the overlay component context object.
-     *
-     * @param {OverlayContext} overlay
-     * @memberof ManagementVehiclesIndexEditController
-     */
-    @action setOverlayContext(overlay) {
-        this.overlay = overlay;
+            yield this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.details', vehicle);
+            this.notifications.success(
+                this.intl.t('common.resource-updated-success', {
+                    resource: this.intl.t('resource.vehicle'),
+                    resourceName: vehicle.display_name,
+                })
+            );
+        } catch (err) {
+            this.notifications.serverError(err);
+        }
     }
 
-    /**
-     * When vehicle details button is clicked in overlay.
-     *
-     * @param {VehicleModel} vehicle
-     * @return {Promise}
-     * @memberof ManagementVehiclesIndexEditController
-     */
-    @action onViewDetails(vehicle) {
-        // check if vehicle record has been edited and prompt for confirmation
-        if (vehicle.hasDirtyAttributes) {
-            return this.confirmContinueWithUnsavedChanges(vehicle);
+    @action cancel() {
+        if (this.model.hasDirtyAttributes) {
+            return this.#confirmContinueWithUnsavedChanges(this.model);
         }
 
-        return this.transitionToRoute('management.vehicles.index.details', vehicle);
+        return this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index');
     }
 
-    /**
-     * Trigger a route refresh and focus the new vehicle created.
-     *
-     * @param {VehicleModel} vehicle
-     * @return {Promise}
-     * @memberof ManagementVehiclesIndexEditController
-     */
-    @action onAfterSave(vehicle) {
-        if (this.overlay) {
-            this.overlay.close();
+    @action view() {
+        if (this.model.hasDirtyAttributes) {
+            return this.#confirmContinueWithUnsavedChanges(this.model);
         }
 
-        this.hostRouter.refresh();
-        return this.transitionToRoute('management.vehicles.index.details', vehicle);
+        return this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.details', this.model);
     }
 
-    /**
-     * Prompts the user to confirm if they wish to continue with unsaved changes.
-     *
-     * @method
-     * @param {VehicleModel} vehicle - The vehicle object with unsaved changes.
-     * @param {Object} [options={}] - Additional options for configuring the modal.
-     * @returns {Promise} A promise that resolves when the user confirms, and transitions to a new route.
-     * @memberof ManagementVehiclesIndexEditController
-     */
-    confirmContinueWithUnsavedChanges(vehicle, options = {}) {
+    #confirmContinueWithUnsavedChanges(vehicle, options = {}) {
         return this.modalsManager.confirm({
-            title: this.intl.t('fleet-ops.management.drivers.index.edit.title'),
-            body: this.intl.t('fleet-ops.management.vehicles.index.edit.body'),
-            acceptButtonText: this.intl.t('fleet-ops.management.drivers.index.edit.button'),
-            confirm: () => {
+            title: this.intl.t('common.continue-without-saving'),
+            body: this.intl.t('common.continue-without-saving-prompt', { resource: this.intl.t('resource.vehicle') }),
+            acceptButtonText: this.intl.t('common.continue'),
+            confirm: async () => {
                 vehicle.rollbackAttributes();
-                return this.transitionToRoute('management.vehicles.index.details', vehicle);
+                await this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.details', vehicle);
             },
             ...options,
         });

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

@@ -1,95 +1,39 @@
-import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
+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 ManagementVehiclesIndexNewController extends BaseController {
-    /**
-     * Inject the `store` service
-     *
-     * @memberof ManagementVehiclesIndexNewController
-     */
-    @service store;
+const DEFAULT_PROPERTIES = { status: 'active' };
 
-    /**
-     * Inject the `hostRouter` service
-     *
-     * @memberof ManagementVehiclesIndexNewController
-     */
+export default class ManagementVehiclesIndexNewController extends Controller {
+    @service store;
     @service hostRouter;
-
-    /**
-     * Inject the `hostRouter` service
-     *
-     * @memberof ManagementVehiclesIndexNewController
-     */
-    @service modalsManager;
-
-    /**
-     * Inject the `intl` service
-     *
-     * @memberof intl
-     */
     @service intl;
-
-    /**
-     * The overlay component context.
-     *
-     * @memberof ManagementVehiclesIndexNewController
-     */
+    @service notifications;
     @tracked overlay;
-
-    /**
-     * The vehicle being created.
-     *
-     * @var {VehicleModel}
-     */
-    @tracked vehicle = this.store.createRecord('vehicle', { status: 'active' });
-
-    /**
-     * Set the overlay component context object.
-     *
-     * @param {OverlayContext} overlay
-     * @memberof ManagementVehiclesIndexNewController
-     */
-    @action setOverlayContext(overlay) {
-        this.overlay = overlay;
-    }
-
-    /**
-     * When exiting the overlay.
-     *
-     * @return {Transition}
-     * @memberof ManagementVehiclesIndexNewController
-     */
-    @action transitionBack() {
-        return this.transitionToRoute('management.vehicles.index');
-    }
-
-    /**
-     * Trigger a route refresh and focus the new vehicle created.
-     *
-     * @param {VehicleModel} vehicle
-     * @return {Promise}
-     * @memberof ManagementVehiclesIndexNewController
-     */
-    @action onAfterSave(vehicle) {
-        if (this.overlay) {
-            this.overlay.close();
-        }
-
-        this.hostRouter.refresh();
-        return this.transitionToRoute('management.vehicles.index.details', vehicle).then(() => {
+    @tracked vehicle = this.store.createRecord('vehicle', DEFAULT_PROPERTIES);
+
+    @task *save(vehicle) {
+        try {
+            yield vehicle.save();
+            this.overlay?.close();
+
+            yield this.hostRouter.refresh();
+            yield this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.details', vehicle);
+            this.notifications.success(
+                this.intl.t('common.resource-created-success-name', {
+                    resource: this.intl.t('resource.vehicle'),
+                    resourceName: vehicle.display_name,
+                })
+            );
             this.resetForm();
-        });
+        } catch (err) {
+            this.notifications.serverError(err);
+        }
     }
 
-    /**
-     * Resets the form with a new vehicle record
-     *
-     * @memberof ManagementVehiclesIndexNewController
-     */
-    resetForm() {
-        this.vehicle = this.store.createRecord('vehicle', { status: 'active' });
+    @action resetForm() {
+        this.vehicle = this.store.createRecord('vehicle', DEFAULT_PROPERTIES);
     }
 }