Merge remote-tracking branch 'origin/next' into HEAD

webresto · May 31, 2024 · c83d3be · c83d3be
2 parents 1b8a274 + df95655
commit c83d3be
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/libs/DialogBox.ts b/libs/DialogBox.ts
@@ -43,7 +43,7 @@ export class DialogBox {
     // Check JsonSchema
     if(!validate(dialog)) {
       sails.log.error(`${dialog} not match with config schema`)
-      sails.log.error(validate.errors)
+      sails.log.error(JSON.stringify(validate.errors, null, 2))
       throw `DialogBox config not valid`
     }
 

diff --git a/models/Order.js b/models/Order.js
@@ -1556,16 +1556,19 @@ function isValidDelivery(delivery) {
         typeof delivery.allowed === 'boolean' &&
         typeof delivery.message === 'string') {
         if (!delivery.cost && !delivery.item) {
-            sails.log.error(`Check delivery error delivery is not valid:  !delivery.cost && !delivery.item`);
+            sails.log.error(`Check delivery error delivery is not valid:  (delivery.cost and delivery.item not defined) :`, delivery);
+            sails.log.error(console.trace());
             return false;
         }
         else {
             if (delivery.cost && typeof delivery.cost !== "number") {
                 sails.log.error(`Check delivery error delivery is not valid:  delivery.cost not number`);
+                sails.log.error(console.trace());
                 return false;
             }
             if (delivery.item && typeof delivery.item !== "string") {
                 sails.log.error(`Check delivery error delivery is not valid:  delivery.item not string`);
+                sails.log.error(console.trace());
                 return false;
             }
         }

diff --git a/models/Order.ts b/models/Order.ts
@@ -1870,16 +1870,19 @@ function isValidDelivery(delivery: Delivery): boolean {
   ) {
 
     if (!delivery.cost && !delivery.item) {
-      sails.log.error(`Check delivery error delivery is not valid:  !delivery.cost && !delivery.item`)
+      sails.log.error(`Check delivery error delivery is not valid:  (delivery.cost and delivery.item not defined) :`, delivery)
+      sails.log.error(console.trace())
       return false
     } else {
       if (delivery.cost && typeof delivery.cost !== "number") {
         sails.log.error(`Check delivery error delivery is not valid:  delivery.cost not number`)
+        sails.log.error(console.trace())
         return false
       }
 
       if (delivery.item && typeof delivery.item !== "string") {
         sails.log.error(`Check delivery error delivery is not valid:  delivery.item not string`)
+        sails.log.error(console.trace())
         return false
       }
     }

diff --git a/models/Settings.ts b/models/Settings.ts
@@ -287,13 +287,13 @@ let Model = {
       // undefined if value is from input, null if value is from origSettings
       if (settingsSetInput.value !== undefined && settingsSetInput.value !== null && !validate(settingsSetInput.value)) {
         let mErr = 'AJV Validation Error: Value does not match the schema, see logs for more info';
-        sails.log.error(mErr, validate.errors);
+        sails.log.error(mErr, JSON.stringify(validate.errors, null, 2));
         throw mErr
       }
 
       if (settingsSetInput.defaultValue !== undefined && settingsSetInput.defaultValue !== null && !validate(settingsSetInput.defaultValue)) {
         let mErr = 'AJV Validation Error: DefaultValue does not match the schema, see logs for more info';
-        sails.log.error(mErr, validate.errors);
+        sails.log.error(mErr, JSON.stringify(validate.errors, null, 2));
         throw mErr
       }
     }