Skip to content

[MergeDups] Allow actions from sidebar of protected sense#3561

Merged
imnasnainaec merged 1 commit intomasterfrom
merge-sidebar-drag
Jan 31, 2025
Merged

[MergeDups] Allow actions from sidebar of protected sense#3561
imnasnainaec merged 1 commit intomasterfrom
merge-sidebar-drag

Conversation

@imnasnainaec
Copy link
Collaborator

@imnasnainaec imnasnainaec commented Jan 31, 2025

Fixes #3521

To test:

  • import/open a project with protected senses (e.g. Natqgu.zip)
  • go to Merge Duplicates
  • find a set with at least one protected and one non-protected sense
  • drag'n'drop a non-protected sense into a protected sense
  • when the sidebar pops open, drag the secondary sense out of the sidebar and into any word
  • drag'n'drop the non-protected sense back into a protected senses
  • when the sidebar opens, drag the secondary sense into the trash and confirm deletion

This change is Reviewable

@imnasnainaec imnasnainaec added bug Something isn't working frontend goal: MergeDup labels Jan 31, 2025
@imnasnainaec imnasnainaec self-assigned this Jan 31, 2025
@imnasnainaec imnasnainaec requested a review from andracc January 31, 2025 14:33
@codecov
Copy link

codecov bot commented Jan 31, 2025

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Project coverage is 74.50%. Comparing base (d121eb5) to head (9aee4d6).
Report is 31 commits behind head on master.

Files with missing lines Patch % Lines
...geDuplicates/MergeDupsStep/MergeDragDrop/index.tsx 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3561      +/-   ##
==========================================
- Coverage   74.54%   74.50%   -0.05%     
==========================================
  Files         285      285              
  Lines       11005    11005              
  Branches     1332     1332              
==========================================
- Hits         8204     8199       -5     
- Misses       2419     2423       +4     
- Partials      382      383       +1     
Flag Coverage Δ
backend 83.77% <ø> (-0.10%) ⬇️
frontend 66.32% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@imnasnainaec imnasnainaec changed the title Allow actions on secondary senses from sidebar of protected sense [MergeDups] Allow actions from sidebar of protected sense Jan 31, 2025
Copy link
Collaborator

@andracc andracc left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @imnasnainaec)

@imnasnainaec imnasnainaec merged commit 90c4e80 into master Jan 31, 2025
18 checks passed
@imnasnainaec imnasnainaec deleted the merge-sidebar-drag branch January 31, 2025 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working frontend goal: MergeDup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[MergeDups] In sidebar, if the top sense protected, other senses can't be removed

2 participants