Skip to content
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.

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

SF-3083 Resolve icon should change when editing resolved note #2964

Merged
merged 1 commit into from
Jan 23, 2025

Conversation

pmachapman
Copy link
Collaborator

@pmachapman pmachapman commented Jan 19, 2025

This PR makes it so that editing a resolved note will un-resolve that note thread.


This change is Reviewable

@pmachapman pmachapman added the will require testing PR should not be merged until testers confirm testing is complete label Jan 19, 2025
Copy link

codecov bot commented Jan 19, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.08%. Comparing base (98b0adc) to head (09022e1).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2964      +/-   ##
==========================================
+ Coverage   82.06%   82.08%   +0.02%     
==========================================
  Files         544      544              
  Lines       31630    31637       +7     
  Branches     5124     5125       +1     
==========================================
+ Hits        25956    25969      +13     
+ Misses       4917     4913       -4     
+ Partials      757      755       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pmachapman pmachapman marked this pull request as ready for review January 19, 2025 23:43
@RaymondLuong3 RaymondLuong3 self-assigned this Jan 20, 2025
Copy link
Collaborator

@RaymondLuong3 RaymondLuong3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 7 of 7 files at r1, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @pmachapman)


src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor.component.ts line 1420 at r1 (raw file):

          });
        } else {
          this.dialogService.message('editor.cannot_edit_note_paratext');

I'm not sure if it is possible to get into this state of editing a note that's not editable. I suppose the dialog can be opened, and then a sync from a different client marks the current note as not editable. This is probably safe.


src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/note-dialog/note-dialog.component.ts line 362 at r1 (raw file):

    if (this.currentNoteContent.trim().length > 0) {
      content.noteContent = this.currentNoteContent;
      content.noteDataId = this.noteIdBeingEdited;

Nice job fixing this bug. I was able to see duplicate notes if I edited a note and selected the resolve option.

@RaymondLuong3 RaymondLuong3 added ready to test and removed will require testing PR should not be merged until testers confirm testing is complete labels Jan 20, 2025
@Nateowami Nateowami added testing complete Testing of PR is complete and should no longer hold up merging of the PR and removed ready to test labels Jan 23, 2025
@Nateowami Nateowami enabled auto-merge (squash) January 23, 2025 17:34
@Nateowami Nateowami merged commit 333c5d3 into master Jan 23, 2025
14 of 15 checks passed
@Nateowami Nateowami deleted the fix/SF-3083 branch January 23, 2025 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
testing complete Testing of PR is complete and should no longer hold up merging of the PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants