5htp-core 0.3.9-1 → 0.3.9-3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.3.9-1",
+	"version": "0.3.9-3",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/src/common/validation/validators.ts

@@ -124,7 +124,8 @@ export default class SchemaValidators {
         const checkChoice = ( choice: any ) => {
 
             // Choice object = extract value
-            if (typeof choice === 'object' && ('value' in choice) && typeof choice.value !== 'object')
+            //  We check for choice objec via the label prop, as the value can be undefined (and so, not transmitted)
+            if (typeof choice === 'object' && ('label' in choice) && typeof choice.label === 'string' && typeof choice.value !== 'object')
                 choice = choice.value;
 
             // If choices list rpovided, check if the choice is in the choices list

package/src/server/app/container/config.ts

@@ -88,13 +88,8 @@ export default class ConfigParser {
         // We assume that when we run 5htp dev, we're in local
         // Otherwise, we're in production environment (docker)
         console.log("[app] Using environment:", process.env.NODE_ENV);
-        return process.env.NODE_ENV === 'development' ? {
-            name: 'local',
-            profile: 'dev'
-        } : {
-            name: 'server',
-            profile: 'prod',
-        }
+        const envFileName = this.appDir + '/env.yaml';
+        return this.loadYaml( envFileName );
     }
 
     public identity() {