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

Merge pull request #967 from ONLYOFFICE/feature/access-to-comments

Browse source 
Feature/access to comments
This commit is contained in:
Julia Radzhabova 2021-07-12 19:26:59 +03:00 committed by GitHub
parent d6eba21f36 278b3dd3cf
commit 60f2c149e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 45 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,7 @@ class CommentsController extends Component {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
/** coauthoring begin **/ /** coauthoring begin **/
const isLiveCommenting = LocalStorage.getBool(`${window.editorType}-mobile-settings-livecomment`, true); const isLiveCommenting = LocalStorage.getBool(`${window.editorType}-mobile-settings-livecomment`, true);
const resolved = LocalStorage.getBool(`${window.editorType}-settings-resolvedcomment`, true); const resolved = LocalStorage.getBool(`${window.editorType}-settings-resolvedcomment`);
this.storeApplicationSettings.changeDisplayComments(isLiveCommenting); this.storeApplicationSettings.changeDisplayComments(isLiveCommenting);
this.storeApplicationSettings.changeDisplayResolved(resolved); this.storeApplicationSettings.changeDisplayResolved(resolved);
isLiveCommenting ? api.asc_showComments(resolved) : api.asc_hideComments(); isLiveCommenting ? api.asc_showComments(resolved) : api.asc_hideComments();
@ -139,8 +139,9 @@ class CommentsController extends Component {
changeComment.quote = data.asc_getQuoteText(); changeComment.quote = data.asc_getQuoteText();
changeComment.time = date.getTime(); changeComment.time = date.getTime();
changeComment.date = dateToLocaleTimeString(date); changeComment.date = dateToLocaleTimeString(date);
changeComment.editable = this.appOptions.canEditComments || (data.asc_getUserId() === this.curUserId); changeComment.editable = (this.appOptions.canEditComments || (data.asc_getUserId() === this.curUserId)) && AscCommon.UserInfoParser.canEditComment(name);
changeComment.removable = this.appOptions.canDeleteComments || (data.asc_getUserId() === this.curUserId); changeComment.removable = (this.appOptions.canDeleteComments || (data.asc_getUserId() === this.curUserId)) && AscCommon.UserInfoParser.canDeleteComment(name);
changeComment.hide = !AscCommon.UserInfoParser.canViewComment(name);
let dateReply = null; let dateReply = null;
const replies = []; const replies = [];
@ -164,8 +165,8 @@ class CommentsController extends Component {
reply: data.asc_getReply(i).asc_getText(), reply: data.asc_getReply(i).asc_getText(),
time: dateReply.getTime(), time: dateReply.getTime(),
userInitials: this.usersStore.getInitials(parsedName), userInitials: this.usersStore.getInitials(parsedName),
editable: this.appOptions.canEditComments || (data.asc_getReply(i).asc_getUserId() === this.curUserId), editable: (this.appOptions.canEditComments || (data.asc_getReply(i).asc_getUserId() === this.curUserId)) && AscCommon.UserInfoParser.canEditComment(userName),
removable: this.appOptions.canDeleteComments || (data.asc_getReply(i).asc_getUserId() === this.curUserId) removable: (this.appOptions.canDeleteComments || (data.asc_getReply(i).asc_getUserId() === this.curUserId)) && AscCommon.UserInfoParser.canDeleteComment(userName)
}); });
} }
changeComment.replies = replies; changeComment.replies = replies;
@ -197,8 +198,9 @@ class CommentsController extends Component {
replies : [], replies : [],
groupName : (groupName && groupName.length>1) ? groupName[1] : null, groupName : (groupName && groupName.length>1) ? groupName[1] : null,
userInitials : this.usersStore.getInitials(parsedName), userInitials : this.usersStore.getInitials(parsedName),
editable : this.appOptions.canEditComments || (data.asc_getUserId() === this.curUserId), editable : (this.appOptions.canEditComments || (data.asc_getUserId() === this.curUserId)) && AscCommon.UserInfoParser.canEditComment(userName),
removable : this.appOptions.canDeleteComments || (data.asc_getUserId() === this.curUserId) removable : (this.appOptions.canDeleteComments || (data.asc_getUserId() === this.curUserId)) && AscCommon.UserInfoParser.canDeleteComment(userName),
hide : !AscCommon.UserInfoParser.canViewComment(userName),
}; };
if (comment) { if (comment) {
const replies = this.readSDKReplies(data); const replies = this.readSDKReplies(data);
@ -230,8 +232,8 @@ class CommentsController extends Component {
reply : data.asc_getReply(i).asc_getText(), reply : data.asc_getReply(i).asc_getText(),
time : date.getTime(), time : date.getTime(),
userInitials : this.usersStore.getInitials(parsedName), userInitials : this.usersStore.getInitials(parsedName),
editable : this.appOptions.canEditComments || (data.asc_getReply(i).asc_getUserId() === this.curUserId), editable : (this.appOptions.canEditComments || (data.asc_getReply(i).asc_getUserId() === this.curUserId)) && AscCommon.UserInfoParser.canEditComment(userName),
removable : this.appOptions.canDeleteComments || (data.asc_getReply(i).asc_getUserId() === this.curUserId) removable : (this.appOptions.canDeleteComments || (data.asc_getReply(i).asc_getUserId() === this.curUserId)) && AscCommon.UserInfoParser.canDeleteComment(userName)
}); });
} }
} }
@ -493,6 +495,7 @@ class ViewCommentsController extends Component {
}); });
} }
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
api.asc_showComments(this.props.storeApplicationSettings.isResolvedComments);
api.asc_changeComment(comment.uid, ascComment); api.asc_changeComment(comment.uid, ascComment);
if(!this.props.storeApplicationSettings.isResolvedComments) { if(!this.props.storeApplicationSettings.isResolvedComments) {

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

@ -80,6 +80,7 @@ export class storeComments {
comment.editable = changeComment.editable; comment.editable = changeComment.editable;
comment.removable = changeComment.removable; comment.removable = changeComment.removable;
comment.replies = changeComment.replies; comment.replies = changeComment.replies;
comment.hide =changeComment.hide;
} }
} }

15
apps/common/mobile/lib/view/collaboration/Comments.jsx
View file

@ -148,9 +148,9 @@ const CommentActions = ({comment, onCommentMenuClick, opened, openActionComment}
<ActionsGroup> <ActionsGroup>
{comment && <Fragment> {comment && <Fragment>
{comment.editable && <ActionsButton onClick={() => {onCommentMenuClick('editComment', comment);}}>{_t.textEdit}</ActionsButton>} {comment.editable && <ActionsButton onClick={() => {onCommentMenuClick('editComment', comment);}}>{_t.textEdit}</ActionsButton>}
{!comment.resolved ? {!comment.resolved && comment.editable ?
<ActionsButton onClick={() => {onCommentMenuClick('resolve', comment);}}>{_t.textResolve}</ActionsButton> : <ActionsButton onClick={() => {onCommentMenuClick('resolve', comment);}}>{_t.textResolve}</ActionsButton> :
<ActionsButton onClick={() => {onCommentMenuClick('resolve', comment);}}>{_t.textReopen}</ActionsButton> comment.editable && <ActionsButton onClick={() => {onCommentMenuClick('resolve', comment);}}>{_t.textReopen}</ActionsButton>
} }
<ActionsButton onClick={() => {onCommentMenuClick('addReply', comment);}}>{_t.textAddReply}</ActionsButton> <ActionsButton onClick={() => {onCommentMenuClick('addReply', comment);}}>{_t.textAddReply}</ActionsButton>
{comment.removable && <ActionsButton color='red' onClick={() => {onCommentMenuClick('deleteComment', comment);}}>{_t.textDeleteComment}</ActionsButton>} {comment.removable && <ActionsButton color='red' onClick={() => {onCommentMenuClick('deleteComment', comment);}}>{_t.textDeleteComment}</ActionsButton>}
@ -635,7 +635,7 @@ const ViewComments = ({storeComments, storeAppOptions, onCommentMenuClick, onRes
const viewMode = !storeAppOptions.canComments; const viewMode = !storeAppOptions.canComments;
const comments = storeComments.groupCollectionFilter || storeComments.collectionComments; const comments = storeComments.groupCollectionFilter || storeComments.collectionComments;
const sortComments = comments.length > 0 ? [...comments].sort((a, b) => a.time > b.time ? 1 : -1) : null; const sortComments = comments.length > 0 ? [...comments].sort((a, b) => a.time > b.time ? -1 : 1) : null;
const [clickComment, setComment] = useState(); const [clickComment, setComment] = useState();
const [commentActionsOpened, openActionComment] = useState(false); const [commentActionsOpened, openActionComment] = useState(false);
@ -659,6 +659,7 @@ const ViewComments = ({storeComments, storeAppOptions, onCommentMenuClick, onRes
<List className='comment-list'> <List className='comment-list'>
{sortComments.map((comment, indexComment) => { {sortComments.map((comment, indexComment) => {
return ( return (
!comment.hide &&
<ListItem key={`comment-${indexComment}`} onClick={e => { <ListItem key={`comment-${indexComment}`} onClick={e => {
!e.target.closest('.comment-menu') && !e.target.closest('.reply-menu') ? showComment(comment) : null}}> !e.target.closest('.comment-menu') && !e.target.closest('.reply-menu') ? showComment(comment) : null}}>
<div slot='header' className='comment-header'> <div slot='header' className='comment-header'>
@ -671,7 +672,7 @@ const ViewComments = ({storeComments, storeAppOptions, onCommentMenuClick, onRes
</div> </div>
{!viewMode && {!viewMode &&
<div className='right'> <div className='right'>
<div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'} /></div> {comment.editable && <div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'} /></div> }
<div className='comment-menu' <div className='comment-menu'
onClick={() => {setComment(comment); openActionComment(true);}} onClick={() => {setComment(comment); openActionComment(true);}}
><Icon icon='icon-menu-comment'/></div> ><Icon icon='icon-menu-comment'/></div>
@ -699,7 +700,7 @@ const ViewComments = ({storeComments, storeAppOptions, onCommentMenuClick, onRes
<div className='reply-date'>{reply.date}</div> <div className='reply-date'>{reply.date}</div>
</div> </div>
</div> </div>
{!viewMode && {!viewMode && reply.editable &&
<div className='right'> <div className='right'>
<div className='reply-menu' <div className='reply-menu'
onClick={() => {setComment(comment); setReply(reply); openActionReply(true);}} onClick={() => {setComment(comment); setReply(reply); openActionReply(true);}}
@ -800,7 +801,7 @@ const CommentList = inject("storeComments", "storeAppOptions")(observer(({storeC
</div> </div>
{!viewMode && {!viewMode &&
<div className='right'> <div className='right'>
<div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'} /></div> {comment.editable && <div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'}/></div>}
<div className='comment-menu' <div className='comment-menu'
onClick={() => {openActionComment(true);}} onClick={() => {openActionComment(true);}}
><Icon icon='icon-menu-comment'/></div> ><Icon icon='icon-menu-comment'/></div>
@ -828,7 +829,7 @@ const CommentList = inject("storeComments", "storeAppOptions")(observer(({storeC
<div className='reply-date'>{reply.date}</div> <div className='reply-date'>{reply.date}</div>
</div> </div>
</div> </div>
{!viewMode && {!viewMode && reply.editable &&
<div className='right'> <div className='right'>
<div className='reply-menu' <div className='reply-menu'
onClick={() => {setReply(reply); openActionReply(true);}} onClick={() => {setReply(reply); openActionReply(true);}}

5
apps/common/mobile/resources/less/comments.less
View file

@ -56,8 +56,11 @@
padding-right: 16px; padding-right: 16px;
.right { .right {
display: flex; display: flex;
justify-content: space-between; justify-content: flex-end;
width: 70px; width: 70px;
.comment-resolve {
margin-right: 10px;
}
} }
} }
.reply-header { .reply-header {

2
apps/documenteditor/mobile/src/controller/settings/ApplicationSettings.jsx
View file

@ -51,7 +51,7 @@ class ApplicationSettingsController extends Component {
} }
switchDisplayResolved(value) { switchDisplayResolved(value) {
const displayComments = LocalStorage.getBool("de-mobile-settings-livecomment"); const displayComments = LocalStorage.getBool("de-mobile-settings-livecomment",true);
if (displayComments) { if (displayComments) {
Common.EditorApi.get().asc_showComments(value); Common.EditorApi.get().asc_showComments(value);
LocalStorage.setBool("de-settings-resolvedcomment", value); LocalStorage.setBool("de-settings-resolvedcomment", value);

8
apps/documenteditor/mobile/src/store/appOptions.js
View file

@ -113,6 +113,7 @@ export class storeAppOptions {
this.canComments = this.canComments && !((typeof (this.customization) == 'object') && this.customization.comments===false); this.canComments = this.canComments && !((typeof (this.customization) == 'object') && this.customization.comments===false);
this.canViewComments = this.canComments || !((typeof (this.customization) == 'object') && this.customization.comments===false); this.canViewComments = this.canComments || !((typeof (this.customization) == 'object') && this.customization.comments===false);
this.canEditComments = this.isOffline || !(typeof (this.customization) == 'object' && this.customization.commentAuthorOnly); this.canEditComments = this.isOffline || !(typeof (this.customization) == 'object' && this.customization.commentAuthorOnly);
this.canDeleteComments= this.isOffline || !permissions.deleteCommentAuthorOnly;
this.canChat = this.canLicense && !this.isOffline && !((typeof (this.customization) == 'object') && this.customization.chat === false); this.canChat = this.canLicense && !this.isOffline && !((typeof (this.customization) == 'object') && this.customization.chat === false);
this.canEditStyles = this.canLicense && this.canEdit; this.canEditStyles = this.canLicense && this.canEdit;
this.canPrint = (permissions.print !== false); this.canPrint = (permissions.print !== false);
@ -134,8 +135,11 @@ export class storeAppOptions {
if ( this.isLightVersion ) { if ( this.isLightVersion ) {
this.canUseHistory = this.canReview = this.isReviewOnly = false; this.canUseHistory = this.canReview = this.isReviewOnly = false;
} }
this.canUseReviewPermissions = this.canLicense && (!!permissions.reviewGroups || this.customization
this.canUseReviewPermissions = this.canLicense && this.customization && this.customization.reviewPermissions && (typeof (this.customization.reviewPermissions) == 'object'); && this.customization.reviewPermissions && (typeof (this.customization.reviewPermissions) == 'object'));
this.canUseCommentPermissions = this.canLicense && !!permissions.commentGroups;
this.canUseReviewPermissions && AscCommon.UserInfoParser.setReviewPermissions(permissions.reviewGroups, this.customization.reviewPermissions);
this.canUseCommentPermissions && AscCommon.UserInfoParser.setCommentPermissions(permissions.commentGroups);
} }
setCanViewReview (value) { setCanViewReview (value) {
this.canViewReview = value; this.canViewReview = value;

7
apps/presentationeditor/mobile/src/store/appOptions.js
View file

@ -91,6 +91,7 @@ export class storeAppOptions {
this.canComments = this.canComments && !((typeof (this.customization) == 'object') && this.customization.comments===false); this.canComments = this.canComments && !((typeof (this.customization) == 'object') && this.customization.comments===false);
this.canViewComments = this.canComments || !((typeof (this.customization) == 'object') && this.customization.comments===false); this.canViewComments = this.canComments || !((typeof (this.customization) == 'object') && this.customization.comments===false);
this.canEditComments = this.isOffline || !(typeof (this.customization) == 'object' && this.customization.commentAuthorOnly); this.canEditComments = this.isOffline || !(typeof (this.customization) == 'object' && this.customization.commentAuthorOnly);
this.canDeleteComments= this.isOffline || !permissions.deleteCommentAuthorOnly;
this.canChat = this.canLicense && !this.isOffline && !((typeof (this.customization) == 'object') && this.customization.chat === false); this.canChat = this.canLicense && !this.isOffline && !((typeof (this.customization) == 'object') && this.customization.chat === false);
this.canEditStyles = this.canLicense && this.canEdit; this.canEditStyles = this.canLicense && this.canEdit;
this.canPrint = (permissions.print !== false); this.canPrint = (permissions.print !== false);
@ -104,6 +105,10 @@ export class storeAppOptions {
this.canBranding = params.asc_getCustomization(); this.canBranding = params.asc_getCustomization();
this.canBrandingExt = params.asc_getCanBranding() && (typeof this.customization == 'object'); this.canBrandingExt = params.asc_getCanBranding() && (typeof this.customization == 'object');
this.canUseReviewPermissions = this.canLicense && this.customization && this.customization.reviewPermissions && (typeof (this.customization.reviewPermissions) == 'object'); this.canUseReviewPermissions = this.canLicense && (!!permissions.reviewGroups || this.customization
&& this.customization.reviewPermissions && (typeof (this.customization.reviewPermissions) == 'object'));
this.canUseCommentPermissions = this.canLicense && !!permissions.commentGroups;
this.canUseReviewPermissions && AscCommon.UserInfoParser.setReviewPermissions(permissions.reviewGroups, this.customization.reviewPermissions);
this.canUseCommentPermissions && AscCommon.UserInfoParser.setCommentPermissions(permissions.commentGroups);
} }
} }

2
apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx
View file

@ -49,7 +49,7 @@ class ApplicationSettingsController extends Component {
onChangeDisplayResolved(value) { onChangeDisplayResolved(value) {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
let displayComments = LocalStorage.getBool("sse-mobile-settings-livecomment"); let displayComments = LocalStorage.getBool("sse-mobile-settings-livecomment",true);
if (displayComments) { if (displayComments) {
api.asc_showComments(value); api.asc_showComments(value);

7
apps/spreadsheeteditor/mobile/src/store/appOptions.js
View file

@ -91,6 +91,7 @@ export class storeAppOptions {
this.canComments = this.canComments && !((typeof (this.customization) == 'object') && this.customization.comments===false); this.canComments = this.canComments && !((typeof (this.customization) == 'object') && this.customization.comments===false);
this.canViewComments = this.canComments || !((typeof (this.customization) == 'object') && this.customization.comments===false); this.canViewComments = this.canComments || !((typeof (this.customization) == 'object') && this.customization.comments===false);
this.canEditComments = this.isOffline || !(typeof (this.customization) == 'object' && this.customization.commentAuthorOnly); this.canEditComments = this.isOffline || !(typeof (this.customization) == 'object' && this.customization.commentAuthorOnly);
this.canDeleteComments= this.isOffline || !permissions.deleteCommentAuthorOnly;
this.canChat = this.canLicense && !this.isOffline && !((typeof (this.customization) == 'object') && this.customization.chat === false); this.canChat = this.canLicense && !this.isOffline && !((typeof (this.customization) == 'object') && this.customization.chat === false);
this.canPrint = (permissions.print !== false); this.canPrint = (permissions.print !== false);
this.isRestrictedEdit = !this.isEdit && this.canComments; this.isRestrictedEdit = !this.isEdit && this.canComments;
@ -99,6 +100,10 @@ export class storeAppOptions {
this.canDownload = permissions.download !== false; this.canDownload = permissions.download !== false;
this.canBranding = params.asc_getCustomization(); this.canBranding = params.asc_getCustomization();
this.canBrandingExt = params.asc_getCanBranding() && (typeof this.customization == 'object'); this.canBrandingExt = params.asc_getCanBranding() && (typeof this.customization == 'object');
this.canUseReviewPermissions = this.canLicense && this.customization && this.customization.reviewPermissions && (typeof (this.customization.reviewPermissions) == 'object'); this.canUseReviewPermissions = this.canLicense && (!!permissions.reviewGroups || this.customization
&& this.customization.reviewPermissions && (typeof (this.customization.reviewPermissions) == 'object'));
this.canUseCommentPermissions = this.canLicense && !!permissions.commentGroups;
this.canUseReviewPermissions && AscCommon.UserInfoParser.setReviewPermissions(permissions.reviewGroups, this.customization.reviewPermissions);
this.canUseCommentPermissions && AscCommon.UserInfoParser.setCommentPermissions(permissions.commentGroups);
} }
} }