-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Add toggle functionality for journal abbreviation lists #12912
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
base: main
Are you sure you want to change the base?
Conversation
This feature allows users to enable/disable specific journal abbreviation lists, including both the built-in list and external CSV files, without removing them from configuration. - Added toggle controls in UI with visual indicators for enabled/disabled states - Implemented filtering of abbreviations based on source enabled state - Ensured toggle states persist between application sessions - Optimized performance with efficient repository loading - Added comprehensive test coverage for new functionality Closes JabRef#12468
dd85326
to
37c8d2c
Compare
Please update your screenshots here as well. |
@subhramit Got it, I will make sure all the screenshots will be updated in the PR content above :) |
I tried to fix the two screenshots in the PR content, may I ask whether you are able to see them? @subhramit |
yes, they are fine now |
Thank you! @subhramit |
Journal abbreviations coming from sources that the user has disabled should neither be generated nor reversed.\n\nThis patch:\n 1. Makes UndoableUnabbreviator skip entries whose source is disabled\n2. Introduces AbbreviationWithSource to persist source metadata\n3. Filters candidates early in AbbreviateAction\n4. Refreshes repository state when a source is toggled in the UI
Update: the bug is now fixed and I proceed to refactor the code now. Afterwards, this PR will be ready for review :) |
This commit fixes test failures that occurred after implementing the journal abbreviation toggle feature. The changes include: 1. Ensuring the built-in list is always enabled by default in the JournalAbbreviationLoader for backward compatibility 2. Updating journal abbreviation tests to use controlled test data rather than depending on the built-in repository contents 3. Adding a more comprehensive test case for the abbreviation cycle
Your pull request conflicts with the target branch. Please merge |
Your pull request conflicts with the target branch. Please merge |
Integrate journal abbreviation toggle functionality (JabRef#12880) with the LTWA repository support from main branch. Resolve conflicts in JournalAbbreviationRepository, JournalAbbreviationLoader, and MainMenu to ensure both features work correctly together. The combined functionality allows users to enable/disable specific journal abbreviation sources while maintaining LTWA abbreviation support.
@koppor @Siedlerchr @subhramit I have completed resolving the 6 merge conflicts between my PR and PR #12880 (which closed #12273). The resolved changes are reflected in my recent commit with the commit message of "feat: resolve merge conflicts with journal abbreviation toggle feature". To properly test the combined functionality, I first proceeded to During my local testing of the merged functionality, I observed some behavior that I would like to confirm is working as intended:
![]() ![]()
![]() ![]() ![]() ![]()
![]() ![]() I want to ensure that my merge conflict resolution is correct and that I am understanding the expected behavior of the LTWA abbreviation functionality properly. Could you please advise if these observations align with the intended functionality of the LTWA implementation, or if further adjustments are needed? Thank you for your guidance. |
@Yubo-Cao Can you look into #12912 (comment) maybe? I currently don't have the resources to properly answer. |
@koppor Thank you! @Yubo-Cao I look forward to your guidance. Thank you in advance! |
@Test | ||
void checkBasicAbbreviate() { | ||
BibEntry entry = new BibEntry(); | ||
entry.setField(StandardField.JOURNAL, "TJ"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When creating a new BibEntry object, 'withers' should be used instead of 'setField'. This improves code readability and follows modern Java practices.
720209d
to
9dafa2a
Compare
src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
Show resolved
Hide resolved
src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
Show resolved
Hide resolved
b3eb812
to
9dafa2a
Compare
I just updated the PR content and opened an issue in the documentation repo. I addressed all trag-bot comments and now working on resolving all comments from @subhramit's code review. The refactoring might take some time. |
Co-authored-by: Subhramit Basu <[email protected]>
src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
Show resolved
Hide resolved
src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
Show resolved
Hide resolved
src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
Show resolved
Hide resolved
src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
Show resolved
Hide resolved
src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
Show resolved
Hide resolved
src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
Show resolved
Hide resolved
src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
Outdated
Show resolved
Hide resolved
src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
Show resolved
Hide resolved
All checks have passed and no more trag-bot comments for the time being, I will proceed to address the remaining comments @subhramit raised during code review. Please feel free to add more comments for the code changes. |
JabRef/jabref#12912 src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java Extract Variable result : Optional<Abbreviation> in method package abbreviationsWithEscapedAmpersand() : void from class org.jabref.logic.journals.JournalAbbreviationRepositoryTest Extract Attribute private AMERICAN_JOURNAL : Abbreviation in class org.jabref.logic.journals.JournalAbbreviationRepositoryTest
@trag-bot didn't find any issues in the code! ✅✨ |
@zikunz note that not all tragbot comments are relevant. |
Could you also answer #12912 (comment) |
if (!journalAbbreviationRepository.isAbbreviatedName(text)) { | ||
return false; // Cannot unabbreviate unabbreviated name. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Revert the comment removal
Toggle Functionality for Journal Abbreviation Lists
Closes #12468.
Documentation repo's issue is JabRef/user-documentation#560
What
This feature is comprehensive and solves more than what is asked in #12468.
Specifially, this PR adds the ability to enable/disable any journal abbreviation lists in JabRef, including both the built-in list and external CSV files. Users can now toggle all types of journal abbreviation lists on/off to make them enabled/disabled.
We can disable and re-enable the built-in list:

If the built-in list is disabled, journal names found in the built-in list will not be abbreviated or unabbreviated:


In addition, external CSV files can be disabled or enabled. Likewise, if an external CSV file is disabled, journal names found in the external CSV file will not be abbreviated or unabbreviated too.
Why
In the original codebase, all journal abbreviation lists were always active once loaded. Users had no way to temporarily disable specific abbreviation sources without completely removing them. This was particularly problematic with the built-in list, which could not be removed at all. Detailed reasons about why we want to disable built-in list sometimes can be found in #12468.
This feature improves workflow flexibility by allowing users to:
How
The implementation follows JabRef's existing architecture patterns
Key Features
Filtering Logic
Persistence
UI Feedback
Design Considerations
Performance Considerations
The implementation reloads the journal repository before each abbreviation operation to ensure it uses the latest toggle states. This approach has minimal performance impact because:
I have also tested with fairly large abbreviation lists and observed no noticeable performance degradation.
Design Alternatives Considered
Event-based updates: I considered using an event system to update the repository when toggle states change. While potentially more efficient, this approach would be more complex and error-prone, requiring careful synchronization between preference changes and repository state.
Runtime filtering: Another approach was to keep all abbreviations loaded and filter at runtime during abbreviation operations. This would be slightly faster but would require more memory and complicate the core lookup methods.
Separate repositories: I also considered maintaining separate repositories for each source, but this would diverge significantly from JabRef's existing architecture and complicate cross-source operations.
The chosen approach of reloading the repository provides the best balance of reliability, maintainability, and adherence to existing architecture patterns.
Proposed Code Changes
Frontend Changes (GUI)
JournalAbbreviationsTab.java
AbbreviationsFileViewModel.java
JournalAbbreviationsTabViewModel.java
MainMenu.java
Backend Changes (Logic)
JournalAbbreviationRepository.java
sourceToAbbreviations
map to associate abbreviations with their sourcesenabledSources
map to track enabled/disabled state of each sourceJournalAbbreviationLoader.java
AbbreviateAction.java
JournalAbbreviationPreferences.java
enabledExternalLists
map to store enabled/disabled statesJabRefCliPreferences.java
Testing Strategy
Test Files and Coverage
JournalAbbreviationRepositoryTest.java
multipleSourcesCanBeToggled
: Verifies that multiple sources can be independently enabled/disableddisabledSourcesAreFilteredFromLookup
: Ensures abbreviations from disabled sources aren't returned in lookupsbuiltInListCanBeToggled
: Confirms the built-in list can be toggled like external sourcestoggleStateAffectsAbbreviationSets
: Tests that abbreviation sets are properly filtered by source stateJournalAbbreviationsViewModelTabTest.java
addBuiltInListInitializesWithCorrectEnabledState
: Verifies built-in list loaded with correct enabled stateenabledExternalListFiltersAbbreviationsWhenDisabled
: Tests that UI reflects filtered abbreviationsstoreSettingsPersistsEnabledStateToPreferences
: Ensures toggle states are saved to preferencesImplementation Additions for Testing
The following methods and properties were added specifically to support testing:
AbbreviationsFileViewModel.java
refreshAbbreviations()
method to simulate UI updates when toggle state changesisEnabled()
,setEnabled()
, andenabledProperty()
methods for test validationJournalAbbreviationsTabViewModel.java
markAsDirty()
method to allow tests to mark files as needing to be savedstoreSettings()
to provide verification points for proper state persistenceJournalAbbreviationRepository.java
addCustomAbbreviation(abbreviation, sourcePath, enabled)
with source tracking for test scenariosJournalAbbreviationPreferences.java
hasExplicitEnabledSetting()
method to improve testability of preference storageThese additions ensure the toggle functionality can be thoroughly tested while maintaining clean separation between the application code and test code.
Mandatory checks
CHANGELOG.md
described in a way that is understandable for the average user (if change is visible to the user)