@fleetbase/fleetops-engine 0.4.17 → 0.4.18

package/addon/components/order-config-manager/details.js

@@ -81,16 +81,25 @@ export default class OrderConfigManagerDetailsComponent extends Component {
             title: this.intl.t('fleet-ops.component.order-config-manager.details.delete.delete-title'),
             body: this.intl.t('fleet-ops.component.order-config-manager.details.delete.delete-body-message'),
             acceptButtonText: this.intl.t('fleet-ops.component.order-config-manager.details.delete.confirm-delete'),
-            confirm: () => {
+            confirm: (modal) => {
                 if (typeof this.args.onConfigDeleting === 'function') {
                     this.args.onConfigDeleting(this.config);
                 }
 
-                return this.config.destroyRecord().then(() => {
-                    if (typeof this.args.onConfigDeleted === 'function') {
-                        this.args.onConfigDeleted(this.config);
-                    }
-                });
+                modal.startLoading();
+                return this.config
+                    .destroyRecord()
+                    .then(() => {
+                        if (typeof this.args.onConfigDeleted === 'function') {
+                            this.args.onConfigDeleted(this.config);
+                        }
+                    })
+                    .catch((error) => {
+                        this.notifications.serverError(error);
+                    })
+                    .finally(() => {
+                        modal.done();
+                    });
             },
         });
     }

package/addon/components/order-config-manager.js

@@ -5,6 +5,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
+import { dasherize } from '@ember/string';
 import { task } from 'ember-concurrency-decorators';
 import isModel from '@fleetbase/ember-core/utils/is-model';
 import getModelName from '@fleetbase/ember-core/utils/get-model-name';
@@ -156,14 +157,26 @@ export default class OrderConfigManagerComponent extends Component {
                 }
 
                 modal.startLoading();
-                return orderConfig.save().then((newOrderConfig) => {
-                    this.notifications.success(this.intl.t('fleet-ops.component.order-config-manager.create-success-message'));
-                    this.loadOrderConfigs.perform({
-                        onAfter: () => {
-                            this.selectConfig(newOrderConfig);
-                        },
+                orderConfig.set('key', dasherize(orderConfig.name));
+                orderConfig
+                    .save()
+                    .then((newOrderConfig) => {
+                        this.notifications.success(this.intl.t('fleet-ops.component.order-config-manager.create-success-message'));
+                        this.loadOrderConfigs.perform({
+                            onAfter: () => {
+                                this.selectConfig(newOrderConfig);
+                            },
+                        });
+                        modal.done();
+                    })
+                    .catch((error) => {
+                        modal.stopLoading();
+                        this.notifications.serverError(error);
                     });
-                });
+            },
+            decline: (modal) => {
+                orderConfig.destroyRecord();
+                modal.done();
             },
         });
     }

package/addon/controllers/operations/order-config.js

@@ -1,6 +1,7 @@
 import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import isModel from '@fleetbase/ember-core/utils/is-model';
 
 export default class OperationsOrderConfigController extends Controller {
     @tracked tab = 'details';
@@ -26,7 +27,7 @@ export default class OperationsOrderConfigController extends Controller {
      * @memberof OperationsOrderConfigController
      */
     @action onConfigChanged(config) {
-        this.config = config.id;
+        this.config = isModel(config) ? config.id : null;
     }
 
     /**

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.17",
+    "version": "0.4.18",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.11",
+        "fleetbase/core-api": "^1.4.12",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",
@@ -45,7 +45,7 @@
     "autoload": {
         "psr-4": {
             "Fleetbase\\FleetOps\\": "server/src/",
-            "Fleetbase\\FleetOps\\Seeders\\": "seeders/"
+            "Fleetbase\\FleetOps\\Seeders\\": "server/seeders/"
         }
     },
     "autoload-dev": {

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.4.17",
+    "version": "0.4.18",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.4.17",
+    "version": "0.4.18",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -42,9 +42,9 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.2.5",
+        "@fleetbase/ember-core": "^0.2.6",
         "@fleetbase/ember-ui": "^0.2.11",
-        "@fleetbase/fleetops-data": "^0.1.12",
+        "@fleetbase/fleetops-data": "^0.1.13",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",