Add source to changes dialog #9533

Siedlerchr · 2023-01-05T16:53:00Z

Fixes #9509 and make Olly happy :)
Does not yet fix issue #9534

I added source tabs for deleted and added.
Remove for entry change.
For entry change I thought about showing the diff in the preview or the source. No idea how this would work. On the other hand the current status with the Preview was confusing because it was not clear which entry shows

Deleted:

Added

Changed:

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.

calixtus · 2023-01-05T17:52:21Z

src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java

-        setBottomAnchor(previewViewer, 8d);
-
-        getChildren().setAll(previewViewer);
+        // TOOD: Show maybe diff of preview and source?


Why is the Preview removed in the change details view? Looks like a regression to me

For entry change I thought about showing the diff in the preview or the source. No idea how this would work.

On the other hand the current status with the Preview was confusing because it was not clear to the user which entry is shown in the preview

And for entry change, the merge dialog is basically showing all relevant info

calixtus · 2023-01-05T17:53:41Z

Also missing indentation

Siedlerchr · 2023-01-05T18:11:50Z

The entry editor bibtex code area has some padding, guess this needs to be added here as well

koppor · 2023-01-05T18:16:37Z

I have an "empty" preview?

Siedlerchr · 2023-01-05T18:23:22Z

@koppor READ THE TEXT: FOR ADDED AND DELETED!

Siedlerchr · 2023-01-05T18:52:35Z

After thinking about this I also added the view for entry change, but this will only show the new entry

src/main/java/org/jabref/gui/Base.css

HoussemNasri · 2023-01-05T19:54:11Z

@Siedlerchr It would be more useful to show both, the Disk and JabRef versions. I was thinking of a nested tabpane inside the source and preview tabs that shows the two versions. Me and ThilotE had a discussion about this.

src/main/java/org/jabref/gui/collab/entrychange/EntryWithPreviewAndSourceDetailsView.java

HoussemNasri · 2023-01-05T20:35:44Z

src/main/java/org/jabref/gui/collab/entryadd/EntryAddDetailsView.java

-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.preferences.PreferencesService;
-
-public final class EntryAddDetailsView extends DatabaseChangeDetailsView {


You can still reuse the details layout for EntryDelete and EntryAdd changes without deleting this. I believe it is better to have a consistent structure and maintain a separate class for each change's details layout.

koppor · 2023-01-05T23:34:17Z

@koppor READ THE TEXT: FOR ADDED AND DELETED!

Ah, sorry, I thought, this PR fixed #9534.

add to string methods simplify enum parsing

src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java

src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java

src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java

…ialog * upstream/main: Bump xmlunit-core from 2.9.0 to 2.9.1 Bump mockito-core from 4.11.0 to 5.0.0 Bump xmlunit-matchers from 2.9.0 to 2.9.1 Bump junit-platform-launcher from 1.9.1 to 1.9.2 Squashed 'buildres/csl/csl-styles/' changes from 43566f2..50eea55b2c New translations JabRef_en.properties (Portuguese, Brazilian) (#9559) Changed the color of light-color-text and highlighted text in … (#9546) New translations JabRef_en.properties (Portuguese, Brazilian) (#9557) chore: improve debug output in powershell starter script (#9550) Show development information (#9555) Observable Preferences T (NameDisplayPreferences, MainTablePreferences, ColumnPreferences) (#9535)

Siedlerchr · 2023-01-16T20:28:51Z

Clarification: Split pane to show both tabs at the same time:
old bibtex + old preview | new bibtex + new preview
sync tab view

Refactor to be able to use inject

…ialog * upstream/main: (22 commits) Avoid using Globals.entryTypeManager try with liberica jdk test with unsigned image adjust dmg scpt and add mac sign id don't use keychain profile use older one return true in case security keychain not existing readd old codesiginng steps codesign image with timestamp read app image fuu yaml again try contains try to add braces fix error in yaml test new codesigning Test entries equality based on their citation key Fix failing tests Detect more cases when an entry is modified Refactor ...

HoussemNasri

Very cool feature!

I only have a question about why BibTeX is editable, otherwise, we can merge

src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java

HoussemNasri · 2023-01-21T23:43:20Z

src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java

+    private void showOrHideEqualFields() {
+        for (FieldRowView row : fieldRows) {
+            if (toolbar.shouldHideEqualFields()) {
+                if (row.hasEqualLeftAndRightValues()) {
+                    row.hide();
+                }
+            } else {
+                row.show();
+            }
+        }


I found it a bit hard to locate the code that shows or hides equal fields, so I moved it into its own method. It is a little slower than the old code, but since the number of fields per entry is small, it shouldn't make any difference.

calixtus · 2023-01-22T08:41:14Z

About the UI: there should be some indication which entry is the modified an the unmodified / old and new entry in the splitpane

…ialog * upstream/main: Fixed ADS tests Bump junit-jupiter from 5.9.1 to 5.9.2 (#9579) Bump actions/configure-pages from 2 to 3 open office csv format correction for abstract column (#9570) Update CHANGELOG.md add change log entry for the given change typo removed (#9577) remove filter that consumes mouse rightclick

Add in JabRef/On Disk as title

Siedlerchr · 2023-01-28T19:23:19Z

I'm just unsure if this is the right order if "old entry" really means in JabRef or the file on disk...

src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java

HoussemNasri · 2023-01-28T20:02:22Z

@Siedlerchr Yeah, that's correct; the old entry is the entry on JabRef.

calixtus · 2023-01-28T23:22:18Z

Maybe sthg like "in jabref" and "imported"? Since an SSD is no "disc"...

ThiloteE · 2023-01-30T20:36:27Z

Devcall decision:

in JabRef
on Disc
imported
(or however we wanna call it)

should - if possible - be put into a row above it's current position. It should be something like a "headline" to the two tabs below.

…ialog * upstream/main: Remove overquoting in jabrefHost on Linux (#9590) Squashed 'buildres/csl/csl-locales/' changes from 3961332022..9b9366b71b Squashed 'buildres/csl/csl-styles/' changes from 50eea55b2c..b111f31efe Checkstyle correction checkstyle issue removal removed unwanted resources related to BibTeXml Bump tinylog-impl from 2.5.0 to 2.6.0 Bump slf4j-tinylog from 2.5.0 to 2.6.0 Exporter Bibtex Xml removed Importer Format changes

todo needs styling rename hide equal fields to -> Only show changed fields

Siedlerchr · 2023-02-03T21:23:29Z

Now added some padding as well:

src/main/java/org/jabref/gui/Base.css

src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java

koppor

In general: works. One small strange thing.

src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java

src/main/java/org/jabref/gui/Base.css

src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java

…rceTab.java Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>

… addSourceToChangesDialog * upstream/addSourceToChangesDialog: Update src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java

Siedlerchr added 3 commits January 5, 2023 17:40

Show source and preview for entry changes/deleted/added

633ac6e

remove preview from EntryChanged, better to use the diff dialog

8b3d26d

add changelog entry and make readonly

f00bbe1

Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jan 5, 2023

Siedlerchr requested a review from HoussemNasri January 5, 2023 17:01

calixtus reviewed Jan 5, 2023

View reviewed changes

add padding, show previe and source also for entry change

6d04e51

github-actions bot reviewed Jan 5, 2023

View reviewed changes

src/main/java/org/jabref/gui/Base.css Outdated Show resolved Hide resolved

Siedlerchr added 2 commits January 5, 2023 20:07

spaces...

a194e2b

remove from permit

a4abb6d

HoussemNasri requested changes Jan 5, 2023

View reviewed changes

Hide and show rows

3168b78

add to string methods simplify enum parsing

github-actions bot reviewed Jan 6, 2023

View reviewed changes

Siedlerchr and others added 3 commits January 6, 2023 21:20

fix checkstlye

3511420

Show/hide indifferent field rows

a2649c8

Merge branch 'main' into addSourceToChangesDialog

15b1eff

calixtus reviewed Jan 15, 2023

View reviewed changes

src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java Outdated Show resolved Hide resolved

HoussemNasri and others added 3 commits January 16, 2023 11:48

Update FieldRowView.java

c4de530

checkstyle

fe2385e

Siedlerchr added 2 commits January 17, 2023 23:45

Add SplitPane to show both entries with preview together

d2b1f63

Refactor to be able to use inject

Refactor code

4dd0b0b

HoussemNasri previously approved these changes Jan 21, 2023

View reviewed changes

Siedlerchr added 2 commits January 28, 2023 19:36

Create PreviewView in advance at least for added and removed

e970e88

Add in JabRef/On Disk as title

Siedlerchr dismissed HoussemNasri’s stale review via e970e88 January 28, 2023 19:22

github-actions bot reviewed Jan 28, 2023

View reviewed changes

src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java Show resolved Hide resolved

checkstyle

cc418bf

HoussemNasri mentioned this pull request Feb 3, 2023

Synchronize scrollbars in the change resolver dialog #9576

Closed

Add label header for tab pane

4e2336a

todo needs styling rename hide equal fields to -> Only show changed fields

add css class

2efa489

github-actions bot reviewed Feb 4, 2023

View reviewed changes

src/main/java/org/jabref/gui/Base.css Outdated Show resolved Hide resolved

Siedlerchr added 2 commits February 4, 2023 15:17

Store value of chekcbox in prefs

2a3a341

remove tab chars

22899e7

github-actions bot reviewed Feb 4, 2023

View reviewed changes

src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java Outdated Show resolved Hide resolved

make prefs inject private

ef6cfc3

koppor requested changes Feb 5, 2023

View reviewed changes

src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java Outdated Show resolved Hide resolved

src/main/java/org/jabref/gui/Base.css Outdated Show resolved Hide resolved

src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java Outdated Show resolved Hide resolved

Siedlerchr and others added 4 commits February 5, 2023 22:49

Update src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSou…

74a653c

…rceTab.java Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>

remove empty line

771b032

Merge remote-tracking branch 'upstream/addSourceToChangesDialog' into…

0291ed3

… addSourceToChangesDialog * upstream/addSourceToChangesDialog: Update src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java

empty line

93dd7cf

Siedlerchr merged commit ae84b22 into main Feb 7, 2023

Siedlerchr deleted the addSourceToChangesDialog branch February 7, 2023 20:00

ThiloteE mentioned this pull request Feb 13, 2023

Update info about backup manager and .sav and .bak files in docs JabRef/user-documentation#414

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add source to changes dialog #9533

Add source to changes dialog #9533

Siedlerchr commented Jan 5, 2023 •

edited by ThiloteE

Loading

calixtus Jan 5, 2023

Siedlerchr Jan 5, 2023

Siedlerchr Jan 5, 2023

calixtus commented Jan 5, 2023

Siedlerchr commented Jan 5, 2023

koppor commented Jan 5, 2023

Siedlerchr commented Jan 5, 2023

Siedlerchr commented Jan 5, 2023

HoussemNasri commented Jan 5, 2023 •

edited

Loading

HoussemNasri Jan 5, 2023

koppor commented Jan 5, 2023

Siedlerchr commented Jan 16, 2023 •

edited

Loading

HoussemNasri left a comment •

edited

Loading

HoussemNasri Jan 21, 2023

calixtus commented Jan 22, 2023

Siedlerchr commented Jan 28, 2023

HoussemNasri commented Jan 28, 2023

calixtus commented Jan 28, 2023

ThiloteE commented Jan 30, 2023

Siedlerchr commented Feb 3, 2023 •

edited

Loading

koppor left a comment

Add source to changes dialog #9533

Add source to changes dialog #9533

Conversation

Siedlerchr commented Jan 5, 2023 • edited by ThiloteE Loading

calixtus Jan 5, 2023

Choose a reason for hiding this comment

Siedlerchr Jan 5, 2023

Choose a reason for hiding this comment

Siedlerchr Jan 5, 2023

Choose a reason for hiding this comment

calixtus commented Jan 5, 2023

Siedlerchr commented Jan 5, 2023

koppor commented Jan 5, 2023

Siedlerchr commented Jan 5, 2023

Siedlerchr commented Jan 5, 2023

HoussemNasri commented Jan 5, 2023 • edited Loading

HoussemNasri Jan 5, 2023

Choose a reason for hiding this comment

koppor commented Jan 5, 2023

Siedlerchr commented Jan 16, 2023 • edited Loading

HoussemNasri left a comment • edited Loading

Choose a reason for hiding this comment

HoussemNasri Jan 21, 2023

Choose a reason for hiding this comment

calixtus commented Jan 22, 2023

Siedlerchr commented Jan 28, 2023

HoussemNasri commented Jan 28, 2023

calixtus commented Jan 28, 2023

ThiloteE commented Jan 30, 2023

Siedlerchr commented Feb 3, 2023 • edited Loading

koppor left a comment

Choose a reason for hiding this comment

Siedlerchr commented Jan 5, 2023 •

edited by ThiloteE

Loading

HoussemNasri commented Jan 5, 2023 •

edited

Loading

Siedlerchr commented Jan 16, 2023 •

edited

Loading

HoussemNasri left a comment •

edited

Loading

Siedlerchr commented Feb 3, 2023 •

edited

Loading