validate context.interactiveUser before set value (#242)

* validate context.interactiveUser before set value

* validate interactive user value

* 2.6.97

Author: kbarbounakis

ValueFormatter.js

@@ -169,9 +169,9 @@ class ValueDialect {
   $user(property) {
     const selectAttribute = property || 'id';
     let name = this.context.user && this.context.user.name;
-    if (Object.prototype.hasOwnProperty.call(this.context, 'interactiveUser') === true) {
-      name = this.context.interactiveUser && this.context.interactiveUser.name;
-    }
+      if (this.context.interactiveUser && this.context.interactiveUser.name){
+          name = this.context.interactiveUser && this.context.interactiveUser.name;
+      }
     if (name == null) {
         return null;
     }
@@ -696,7 +696,7 @@ class ValueFormatter {
       if (typeof val === 'string' && val.startsWith('$$')) {
         return this.formatVariable(val);
       }
-      return Promise.resolve(value);
+      return Promise.resolve(val);
     }
     if (property.startsWith('$$')) {
       return this.formatVariable(value);

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@themost/data",
-  "version": "2.6.96",
+  "version": "2.6.97",
   "description": "MOST Web Framework Codename Blueshift - Data module",
   "main": "index.js",
   "types": "index.d.ts",