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.

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

Jump to bottom

Implement merging groups in the three way merge UI #8960

Closed
wants to merge 134 commits into from
Closed

Implement merging groups in the three way merge UI #8960

wants to merge 134 commits into from

Conversation

HoussemNasri
Copy link
Member

@HoussemNasri HoussemNasri commented Jul 9, 2022 •
edited
Loading

bandicam.2022-07-09.04-40-39-815.mp4
  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

@HoussemNasri
Update README.md
376760c
@HoussemNasri
Merge branch 'JabRef:main' into main
d898da1
@HoussemNasri
Merge branch 'JabRef:main' into main
752954b
@HoussemNasri
Merge branch 'JabRef:main' into main
41b499f
@HoussemNasri
Merge branch 'JabRef:main' into main
a63045f
@HoussemNasri
Merge branch 'JabRef:main' into main
0901768
@HoussemNasri
Merge remote-tracking branch 'origin/main' into main
5874b4e
@HoussemNasri
Fix Readme
3c3fb02
@HoussemNasri
Merge branch 'JabRef:main' into main
81815fa
@HoussemNasri
Merge branch 'JabRef:main' into main
18d95c2
@HoussemNasri
Merge branch 'JabRef:main' into main
0e08af3
@HoussemNasri
Merge branch 'JabRef:main' into main
2bb0b6c
@HoussemNasri
Create grid cells for rendering field name and field value
1b12b75
@HoussemNasri
Implement FieldNameCell and define style class
4c073d3
@HoussemNasri
Make FieldValueCell selectable
6359058 
- Defined style class
- Defined pseudo class for the selected state
- Created the selection box UI
@HoussemNasri
Implement MergedFieldCell for rendering editable merged field value
d45f4a1
@HoussemNasri
Change MergedFieldCell text based on the selected FieldValueCell
7e226e2
@HoussemNasri
Style MergedFieldCell
fb137cb
@HoussemNasri
Rename ThreeWayMerge css stylesheet
8d76e40
@HoussemNasri
Create HeadView for rendering left, right and merged entry headers
98eea59
@HoussemNasri
Fix typo
3187365
@HoussemNasri
Fix a bug that causes the selection of both left and right field cell…
d00bab3 
…s simultaneously.

- Added a style class for field value cell
@HoussemNasri
Prevent the selection of FieldValueCell when it's disabled
02c0404 
- A cell is disabled when it's either empty or not visible e.g. when the left cell spans 2 columns, right cell is disabled because it's not visible
- Added comments
@HoussemNasri
Display a copy icon inside FieldValueCell
05527c6
@HoussemNasri
Disable left or right FieldValueCell when it's empty
b6db346 
- Added getters for row cells
@HoussemNasri
Update Base CSS style
fa97b59
@HoussemNasri
Design and implement the merge toolbox
52b5604 
- It will be added to the top of the merge dialog
@HoussemNasri
Implement the initial prototype of the new merge UI
b2e5d38 
- Renamed ThreeWayMerge.java to ThreeWayMergeView
@HoussemNasri
Use ThreeWayMergeView in MergeEntriesDialog
51c6195 
- At this stage headers aren't updated and merged bib entry is not created
@HoussemNasri
Fix ThreeWayMergeView.css stylesheet not being imported
e66ae3d
HoussemNasri added 29 commits July 6, 2022 02:12
@HoussemNasri
Fix typo
fffc5d1
@HoussemNasri
Create GroupsFieldNameCell
b4827ec
@HoussemNasri
Create MergedGroups to record the state of the groups before and afte…
a94acd4 
…r the merge
@HoussemNasri
Create a factory class for creating field name cells
484a368
@HoussemNasri
Perform experiments for implementing groups merging
dc02f37
@HoussemNasri
Delegate field name cells creation to ThreeWayMergeView
6aac5fd 
- Seperated field values and field name cells because now it's easier to update field values cells without touching the field name cell
@HoussemNasri
Improve groups merging function
ce9735d
@HoussemNasri
Implement updateFieldValues to redraw the field row when left or righ…
6e8e08f 
…t entry changes
@HoussemNasri
Write a draft version of the logic to merge groups
d3aacae
@HoussemNasri
Refactoring
194be4d
@HoussemNasri
More Refactoring
031e6f0
@HoussemNasri
Merge groups only when left and right entries have different groups
54f2ab3
@HoussemNasri
Add row constraints to fix UI lagging when updating field values
d1a3ed9
@HoussemNasri
Minor refactoring
c217cf8
@HoussemNasri
Don't merge common groups between left and right entries
0ea0da1
@HoussemNasri
Refactor GroupsFieldNameCell constructor
675669f
@HoussemNasri
Allow groups field row to grow in height
e9ab51d
@HoussemNasri
Fix select all left/right not working properly
d166273
@HoussemNasri
Update diff when a field value changes
2f4d6d3
@HoussemNasri
Add the merge icon and style css
9463db7
@HoussemNasri
Extract merge and unmerge commands into their own classes
0992b22
@HoussemNasri
Refactoring
05518ea
@HoussemNasri
Record groups merging operation using CompoundEdit
b38eeec 
- Exposed a public API to be able to cancel groups merge
@HoussemNasri
Cancel groups merge when user choose 'Cancel' in the merge entries di…
0d4a8c2 
…alog
@HoussemNasri
Make FieldNameCell take only one action
3469ffc
@HoussemNasri
Set groups merge action to MERGE by default
22eea64
@HoussemNasri
Fix Unmerge button always disabled
8809bea
@HoussemNasri
Cleanup
30b90bd
@HoussemNasri
Almost f**** everything up. I deleted GroupsFieldNameCell content by …
4217057 
…mistake, it's all ok now

- I did a rebase and then when resolving conflicts, I chose "Accept Theirs" all the way but that didn't go well, now I have no history of GroupsFieldNameCell
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@HoussemNasri