Skip to content

comments: unresolve thread only if all is resolved #15766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JaumePujantell merged 1 commit into from
May 15, 2026
+50 −41
Merged

comments: unresolve thread only if all is resolved #15766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 14 additions & 41 deletions browser/src/canvas/sections/CommentListSection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,29 +1526,22 @@ export class CommentSection extends CanvasSectionObject {
return (index === undefined) ? -1 : index;
}

public isThreadResolved (annotation: any): boolean {
// If comment has children.
if (annotation.sectionProperties.children.length > 0) {
for (var i = 0; i < annotation.sectionProperties.children.length; i++) {
if (annotation.sectionProperties.children[i].sectionProperties.data.resolved !== 'true')
return false;
}
return true;
}
// If it has a parent.
else if (annotation.sectionProperties.data.parent !== '0') {
var index = this.getSubRootIndexOf(annotation.sectionProperties.data.parent);
var comment = this.sectionProperties.commentList[index];
if (comment.sectionProperties.data.resolved !== 'true')
private isSubThreadResolved(annotation: Comment): boolean {
if (annotation.sectionProperties.data.resolved !== 'true')
return false;
for (let i = 0; i < annotation.sectionProperties.children.length; i++) {
if (!this.isSubThreadResolved(annotation.sectionProperties.children[i]))
return false;
else if (comment.sectionProperties.children.length > 0) {
for (var i = 0; i < comment.sectionProperties.children.length; i++) {
if (comment.sectionProperties.children[i].sectionProperties.data.resolved !== 'true')
return false;
}
return true;
}
}
return true;
}

public isThreadResolved(annotation: Comment): boolean {
if (annotation.isRootComment())
return this.isSubThreadResolved(annotation);
const index = this.getRootIndexOf(annotation.sectionProperties.data.parent);
const top_comment = this.sectionProperties.commentList[index];
return this.isSubThreadResolved(top_comment);
}

private initializeContextMenus (): void {
Expand Down Expand Up @@ -2611,26 +2604,6 @@ export class CommentSection extends CanvasSectionObject {
return index;
}

// Returns the sub-root comment index of given id
private getSubRootIndexOf (id: any): number {
var index = this.getIndexOf(id);

if (index !== -1)
{
var comment = this.sectionProperties.commentList[index];
var parentId = comment.sectionProperties.data.parent;

while (index >= 0) {
if (this.sectionProperties.commentList[index].sectionProperties.data.id !== parentId && this.sectionProperties.commentList[index].sectionProperties.data.parent !== '0')
index--;
else
break;
}
}

return index;
}

public setViewResolved (state: boolean): void {
this.sectionProperties.showResolved = state;

Expand Down
36 changes: 36 additions & 0 deletions cypress_test/integration_tests/desktop/writer/annotation_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,42 @@ describe(['tagdesktop'], 'Annotation Tests', function() {
});
});

it('Resolve/Unresolve Thread on partially resolved thread', function () {
desktopHelper.insertComment();
cy.cGet('#comment-container-1').should('exist');

// Reply to create a thread (root id 1, reply id 2).
cy.cGet('#comment-annotation-menu-1').click();
cy.cGet('body').contains('.context-menu-item', 'Reply').click();
cy.cGet('#annotation-reply-textarea-1').type('reply text');
cy.cGet('#annotation-reply-1').click();
cy.cGet('#annotation-content-area-2').should('contain', 'reply text');

// Resolve only the reply, leaving the root unresolved.
cy.cGet('#comment-annotation-menu-2').click();
cy.cGet('body').contains('.context-menu-item', 'Resolve').click();
cy.cGet('#comment-container-2 .cool-annotation-content-resolved').should('have.text', 'Resolved');
cy.cGet('#comment-container-1 .cool-annotation-content-resolved').should('have.text', '');

// Root menu must offer 'Resolve Thread' since the thread is not fully resolved.
cy.cGet('#comment-annotation-menu-1').click();
cy.cGet('body').contains('.context-menu-item', 'Resolve Thread').should('be.visible');
cy.cGet('body').contains('.context-menu-item', 'Unresolve Thread').should('not.exist');
cy.cGet('body').contains('.context-menu-item', 'Resolve Thread').click();

// All comments in the thread are now resolved.
cy.cGet('#comment-container-1 .cool-annotation-content-resolved').should('have.text', 'Resolved');
cy.cGet('#comment-container-2 .cool-annotation-content-resolved').should('have.text', 'Resolved');

// Root menu now offers 'Unresolve Thread'.
cy.cGet('#comment-annotation-menu-1').click();
cy.cGet('body').contains('.context-menu-item', 'Unresolve Thread').should('be.visible');
cy.cGet('body').contains('.context-menu-item', 'Unresolve Thread').click();

// All comments in the thread are unresolved again.
cy.cGet('#comment-container-1 .cool-annotation-content-resolved').should('have.text', '');
cy.cGet('#comment-container-2 .cool-annotation-content-resolved').should('have.text', '');
});
});

describe(['tagdesktop'], 'Collapsed Annotation Tests', function() {
Expand Down
Loading