Skip to content

Commit cd94fae

Browse files
authored
validate context.interactiveUser before set value (#242)
* validate context.interactiveUser before set value * validate interactive user value * 2.6.97
1 parent 9463e12 commit cd94fae

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

ValueFormatter.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ class ValueDialect {
169169
$user(property) {
170170
const selectAttribute = property || 'id';
171171
let name = this.context.user && this.context.user.name;
172-
if (Object.prototype.hasOwnProperty.call(this.context, 'interactiveUser') === true) {
173-
name = this.context.interactiveUser && this.context.interactiveUser.name;
174-
}
172+
if (this.context.interactiveUser && this.context.interactiveUser.name){
173+
name = this.context.interactiveUser && this.context.interactiveUser.name;
174+
}
175175
if (name == null) {
176176
return null;
177177
}
@@ -696,7 +696,7 @@ class ValueFormatter {
696696
if (typeof val === 'string' && val.startsWith('$$')) {
697697
return this.formatVariable(val);
698698
}
699-
return Promise.resolve(value);
699+
return Promise.resolve(val);
700700
}
701701
if (property.startsWith('$$')) {
702702
return this.formatVariable(value);

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@themost/data",
3-
"version": "2.6.96",
3+
"version": "2.6.97",
44
"description": "MOST Web Framework Codename Blueshift - Data module",
55
"main": "index.js",
66
"types": "index.d.ts",

0 commit comments

Comments
 (0)