Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[mobile] Fix user name in comments (2)

Browse source
This commit is contained in:
JuliaSvinareva 2021-07-02 17:49:53 +03:00
parent 12c0492c90
commit b154777f5a
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/common/mobile/lib/controller/collaboration/Comments.jsx
View file

@ -44,9 +44,7 @@ const dateToLocaleTimeString = (date) => {
return (date.getMonth() + 1) + '/' + (date.getDate()) + '/' + date.getFullYear() + ' ' + format(date); return (date.getMonth() + 1) + '/' + (date.getDate()) + '/' + date.getFullYear() + ' ' + format(date);
}; };
const parseUserName = name => { const parseUserName = name => {
return ( return AscCommon.UserInfoParser.getParsedName(name);
Common.Utils.String.htmlEncode(AscCommon.UserInfoParser.getParsedName(name))
)
}; };
//end utils //end utils
@ -129,11 +127,13 @@ class CommentsController extends Component {
let user = this.usersStore.searchUserById(data.asc_getUserId()); let user = this.usersStore.searchUserById(data.asc_getUserId());
const name = data.asc_getUserName(); const name = data.asc_getUserName();
const parsedName = parseUserName(name);
changeComment.comment = data.asc_getText(); changeComment.comment = data.asc_getText();
changeComment.userId = data.asc_getUserId(); changeComment.userId = data.asc_getUserId();
changeComment.userName = name; changeComment.userName = name;
changeComment.parsedName = parseUserName(name); changeComment.parsedName = Common.Utils.String.htmlEncode(parsedName);
changeComment.userInitials = this.usersStore.getInitials(parsedName);
changeComment.userColor = (user) ? user.asc_getColor() : null; changeComment.userColor = (user) ? user.asc_getColor() : null;
changeComment.resolved = data.asc_getSolved(); changeComment.resolved = data.asc_getSolved();
changeComment.quote = data.asc_getQuoteText(); changeComment.quote = data.asc_getQuoteText();
@ -158,7 +158,7 @@ class CommentsController extends Component {
ind: i, ind: i,
userId: data.asc_getReply(i).asc_getUserId(), userId: data.asc_getReply(i).asc_getUserId(),
userName: userName, userName: userName,
parsedName: parsedName, parsedName: Common.Utils.String.htmlEncode(parsedName),
userColor: (user) ? user.asc_getColor() : null, userColor: (user) ? user.asc_getColor() : null,
date: dateToLocaleTimeString(dateReply), date: dateToLocaleTimeString(dateReply),
reply: data.asc_getReply(i).asc_getText(), reply: data.asc_getReply(i).asc_getText(),
@ -186,7 +186,7 @@ class CommentsController extends Component {
uid : id, uid : id,
userId : data.asc_getUserId(), userId : data.asc_getUserId(),
userName : userName, userName : userName,
parsedName : parsedName, parsedName : Common.Utils.String.htmlEncode(parsedName),
userColor : (user) ? user.asc_getColor() : null, userColor : (user) ? user.asc_getColor() : null,
date : dateToLocaleTimeString(date), date : dateToLocaleTimeString(date),
quote : data.asc_getQuoteText(), quote : data.asc_getQuoteText(),
@ -224,7 +224,7 @@ class CommentsController extends Component {
ind : i, ind : i,
userId : data.asc_getReply(i).asc_getUserId(), userId : data.asc_getReply(i).asc_getUserId(),
userName : userName, userName : userName,
parsedName : parsedName, parsedName : Common.Utils.String.htmlEncode(parsedName),
userColor : (user) ? user.asc_getColor() : null, userColor : (user) ? user.asc_getColor() : null,
date : dateToLocaleTimeString(date), date : dateToLocaleTimeString(date),
reply : data.asc_getReply(i).asc_getText(), reply : data.asc_getReply(i).asc_getText(),
@ -267,7 +267,7 @@ class AddCommentController extends Component {
} }
const name = parseUserName(this.currentUser.asc_getUserName()); const name = parseUserName(this.currentUser.asc_getUserName());
return { return {
name: name, name: Common.Utils.String.htmlEncode(name),
initials: this.props.users.getInitials(name), initials: this.props.users.getInitials(name),
color: this.currentUser.asc_getColor() color: this.currentUser.asc_getColor()
}; };
@ -311,7 +311,7 @@ class EditCommentController extends Component {
this.currentUser = this.props.users.currentUser; this.currentUser = this.props.users.currentUser;
const name = parseUserName(this.currentUser.asc_getUserName()); const name = parseUserName(this.currentUser.asc_getUserName());
return { return {
name: name, name: Common.Utils.String.htmlEncode(name),
initials: this.props.users.getInitials(name), initials: this.props.users.getInitials(name),
color: this.currentUser.asc_getColor() color: this.currentUser.asc_getColor()
}; };

5
apps/common/mobile/lib/controller/collaboration/Review.jsx
View file

@ -468,13 +468,14 @@ class ReviewChange extends Component {
let change; let change;
let goto = false; let goto = false;
if (arrChangeReview.length > 0) { if (arrChangeReview.length > 0) {
const name = AscCommon.UserInfoParser.getParsedName(arrChangeReview[0].user);
change = { change = {
date: arrChangeReview[0].date, date: arrChangeReview[0].date,
user: arrChangeReview[0].user, user: arrChangeReview[0].user,
userName: Common.Utils.String.htmlEncode(AscCommon.UserInfoParser.getParsedName(arrChangeReview[0].user)), userName: Common.Utils.String.htmlEncode(name),
color: arrChangeReview[0].userColor.get_hex(), color: arrChangeReview[0].userColor.get_hex(),
text: arrChangeReview[0].changeText, text: arrChangeReview[0].changeText,
initials: this.props.users.getInitials(arrChangeReview[0].user), initials: this.props.users.getInitials(name),
editable: arrChangeReview[0].editable editable: arrChangeReview[0].editable
}; };
goto = arrChangeReview[0].goto; goto = arrChangeReview[0].goto;

1
apps/common/mobile/lib/store/comments.js
View file

@ -71,6 +71,7 @@ export class storeComments {
comment.userId = changeComment.userId; comment.userId = changeComment.userId;
comment.userName = changeComment.userName; comment.userName = changeComment.userName;
comment.parsedName = changeComment.parsedName; comment.parsedName = changeComment.parsedName;
comment.userInitials = changeComment.userInitials;
comment.userColor = changeComment.userColor; comment.userColor = changeComment.userColor;
comment.resolved = changeComment.resolved; comment.resolved = changeComment.resolved;
comment.quote = changeComment.quote; comment.quote = changeComment.quote;

2
apps/common/mobile/lib/store/users.js
View file

@ -52,7 +52,7 @@ export class storeUsers {
} }
getInitials (name) { getInitials (name) {
const fio = AscCommon.UserInfoParser.getParsedName(name).split(' '); const fio = name.split(' ');
let initials = fio[0].substring(0, 1).toUpperCase(); let initials = fio[0].substring(0, 1).toUpperCase();
for (let i = fio.length-1; i>0; i--) { for (let i = fio.length-1; i>0; i--) {
if (fio[i][0]!=='(' && fio[i][0]!==')') { if (fio[i][0]!=='(' && fio[i][0]!==')') {