Skip to content

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

Open
wants to merge 38 commits into
base: main
Choose a base branch
from

Conversation

zikunz
Copy link

@zikunz zikunz commented Apr 8, 2025

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:
Screen Shot 2025-04-24 at 4 03 14 AM

If the built-in list is disabled, journal names found in the built-in list will not be abbreviated or unabbreviated:
Screen Shot 2025-04-24 at 4 03 55 AM
Screen Shot 2025-04-24 at 4 04 27 AM

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:

  • Temporarily enable/disable specific sources during editing sessions
  • Control which lists are active without removing them

How

The implementation follows JabRef's existing architecture patterns

Key Features

Filtering Logic

  • Only enabled abbreviation sources will apply changes during operations
  • Disabled abbreviation sources have no effect on journal name processing
  • The repository dynamically filters abbreviations based on source enabled state

Persistence

  • Toggle states are stored in preferences only upon clicking "Save"
  • If the user clicks "Cancel" or closes the dialog (X), previous states are restored
  • States persist between application restarts

UI Feedback

  • Visual indicators show enabled/disabled state for each list
  • Toggle button provides easy access to state change
  • Dropdown shows current state with clear visual indicators

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:

  1. Repository loading is very efficient as it only builds active abbreviation sets
  2. Abbreviation operations are typically infrequent user actions
  3. The benefits of having accurate, up-to-date toggle states outweigh the small overhead of reloading

I have also tested with fairly large abbreviation lists and observed no noticeable performance degradation.

Design Alternatives Considered

  1. 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.

  2. 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.

  3. 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)

  1. JournalAbbreviationsTab.java

    • Purpose: User interface tab for managing journal abbreviations
    • Changes:
      • Added toggle button next to journal list dropdown
      • Created custom ListCell displaying checkmarks (✓) or circles (○) to indicate enabled state
      • Implemented real-time UI refresh when toggling lists
    • Why: Provides the visual interface for users to see and change enabled states
  2. AbbreviationsFileViewModel.java

    • Purpose: View model for a single abbreviation file
    • Changes:
      • Added enabledProperty to track and bind state
      • Implemented getter/setter methods for state access
      • Added path handling for consistent preference storage
    • Why: Provides the model binding for UI components to reflect enabled state changes
  3. JournalAbbreviationsTabViewModel.java

    • Purpose: Manages the journal abbreviation tab's business logic
    • Changes:
      • Implemented state tracking with proper model update notification
      • Added event handling for toggle button click
      • Added methods to build file list with correct initial states
      • Connected UI state to persistence layer
    • Why: Connects the UI actions to the model and ensures proper state synchronization
  4. MainMenu.java

    • Purpose: Builds the application's main menu
    • Changes:
      • Updated constructor calls to accommodate new repository loading mechanism
    • Why: Required to accommodate the new repository loading approach in AbbreviateAction

Backend Changes (Logic)

  1. JournalAbbreviationRepository.java

    • Purpose: Central repository that stores and retrieves abbreviations
    • Changes:
      • Added source tracking with sourceToAbbreviations map to associate abbreviations with their sources
      • Added enabledSources map to track enabled/disabled state of each source
      • Modified core lookup methods to filter based on enabled state
      • Implemented proper updating of active abbreviations when toggling
    • Why: This is the core component where abbreviation filtering happens. When a source is disabled, its abbreviations shouldn't be used in operations
  2. JournalAbbreviationLoader.java

    • Purpose: Loads abbreviations from various sources into the repository
    • Changes:
      • Modified to respect enabled states from preferences
      • Implemented consistent key naming for external list identification
      • Added robust error handling for missing files
    • Why: The loader needed to initialize the repository with the correct enabled states and ensure proper source identification
  3. AbbreviateAction.java

    • Purpose: Handles abbreviation/unabbreviation commands from menu
    • Changes:
      • Implemented repository reload before abbreviation operations
      • Ensured operations use the latest toggle states
    • Why: Without reloading the repository, toggle state changes wouldn't affect already-running abbreviation operations
  4. JournalAbbreviationPreferences.java

    • Purpose: Stores user preferences for journal abbreviations
    • Changes:
      • Added enabledExternalLists map to store enabled/disabled states
      • Added methods to check if a specific source has an explicit enabled setting
      • Enhanced preference retrieval with multiple lookup strategies
    • Why: Provides the persistence mechanism for toggle states between application sessions
  5. JabRefCliPreferences.java

    • Purpose: Handles preference loading/saving at application level
    • Changes:
      • Added settings for journal abbreviation toggle states
      • Integrated with the overall preference system
    • Why: Ensures toggle states are properly saved/loaded at application level

Testing Strategy

Test Files and Coverage

  1. JournalAbbreviationRepositoryTest.java

    • Purpose: Tests the core backend functionality for source tracking and toggle behavior
    • Test Cases:
      • multipleSourcesCanBeToggled: Verifies that multiple sources can be independently enabled/disabled
      • disabledSourcesAreFilteredFromLookup: Ensures abbreviations from disabled sources aren't returned in lookups
      • builtInListCanBeToggled: Confirms the built-in list can be toggled like external sources
      • toggleStateAffectsAbbreviationSets: Tests that abbreviation sets are properly filtered by source state
  2. JournalAbbreviationsViewModelTabTest.java

    • Purpose: Tests the UI view model for toggle functionality
    • Test Cases:
      • addBuiltInListInitializesWithCorrectEnabledState: Verifies built-in list loaded with correct enabled state
      • enabledExternalListFiltersAbbreviationsWhenDisabled: Tests that UI reflects filtered abbreviations
      • storeSettingsPersistsEnabledStateToPreferences: Ensures toggle states are saved to preferences

Implementation Additions for Testing

The following methods and properties were added specifically to support testing:

  1. AbbreviationsFileViewModel.java

    • Added refreshAbbreviations() method to simulate UI updates when toggle state changes
    • Added thorough isEnabled(), setEnabled(), and enabledProperty() methods for test validation
  2. JournalAbbreviationsTabViewModel.java

    • Added markAsDirty() method to allow tests to mark files as needing to be saved
    • Enhanced storeSettings() to provide verification points for proper state persistence
  3. JournalAbbreviationRepository.java

    • Implemented addCustomAbbreviation(abbreviation, sourcePath, enabled) with source tracking for test scenarios
    • Added test-friendly mapping between abbreviations and their sources for verification
  4. JournalAbbreviationPreferences.java

    • Added hasExplicitEnabledSetting() method to improve testability of preference storage
    • Implemented clean getters/setters for toggle states to simplify test verification

These additions ensure the toggle functionality can be thoroughly tested while maintaining clean separation between the application code and test code.

Mandatory checks

  • I own the copyright of the code submitted and I license it under the MIT license
  • Change in CHANGELOG.md described in a way that is understandable for the average user (if change is visible to the user)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (if change is visible to the user)
  • 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.

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
@zikunz zikunz force-pushed the feature/journal-abbreviation-toggle branch from dd85326 to 37c8d2c Compare April 8, 2025 15:02
@subhramit subhramit marked this pull request as draft April 8, 2025 15:21
@subhramit
Copy link
Member

Please update your screenshots here as well.

@zikunz
Copy link
Author

zikunz commented Apr 8, 2025

@subhramit Got it, I will make sure all the screenshots will be updated in the PR content above :)

@zikunz
Copy link
Author

zikunz commented Apr 8, 2025

I tried to fix the two screenshots in the PR content, may I ask whether you are able to see them? @subhramit

@subhramit
Copy link
Member

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

@zikunz
Copy link
Author

zikunz commented Apr 8, 2025

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
@zikunz
Copy link
Author

zikunz commented Apr 13, 2025

Update: the bug is now fixed and I proceed to refactor the code now. Afterwards, this PR will be ready for review :)

zikunz added 8 commits April 13, 2025 18:17
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
@jabref-machine
Copy link
Collaborator

Your pull request conflicts with the target branch.

Please merge upstream/main with your code. For a step-by-step guide to resolve merge conflicts, see https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.

@jabref-machine
Copy link
Collaborator

Your pull request conflicts with the target branch.

Please merge upstream/main with your code. For a step-by-step guide to resolve merge conflicts, see https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.

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.
@zikunz
Copy link
Author

zikunz commented Apr 18, 2025

@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 git checkout 1a4e1f38864e9bb1fc336a366ec24c3c0d48a94f in main branch to understand the behavior after merging #12880 to main (without my code changes).

During my local testing of the merged functionality, I observed some behavior that I would like to confirm is working as intended:

  1. When testing with the LTWA abbreviation mode, I noticed that the word "graph" does not get abbreviated to "gr." despite the csv file found in Add support for LTWA #12273 containing the entry -graph-;"-gr.";"eng".
Screen Shot 2025-04-19 at 2 39 11 AM Screen Shot 2025-04-19 at 2 39 21 AM
  1. I can successfully abbreviate "Journal of Polymer Science Part A" to "J. Polym. Sci. A" using LTWA mode (matching a test case in Add support for LTWA #12273), but when I try to unabbreviate it, it does not revert to the original text. In addition, "Journal of Polymer Science Part A" does not seem to be found in the the csv file found in Add support for LTWA #12273.
Screen Shot 2025-04-19 at 2 38 22 AM Screen Shot 2025-04-19 at 2 38 34 AM Screen Shot 2025-04-19 at 2 38 48 AM Screen Shot 2025-04-19 at 2 38 57 AM
  1. When attempting to abbreviate "Dem" (this is achieved by first abbreviating "Demonstration" using the shortest unique mode) using LTWA mode, the result is an empty string.
Screen Shot 2025-04-19 at 2 36 27 AM Screen Shot 2025-04-19 at 2 36 32 AM

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.

@koppor
Copy link
Member

koppor commented Apr 19, 2025

@Yubo-Cao Can you look into #12912 (comment) maybe? I currently don't have the resources to properly answer.

@zikunz
Copy link
Author

zikunz commented Apr 19, 2025

@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");
Copy link

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.

@zikunz zikunz force-pushed the feature/journal-abbreviation-toggle branch from 720209d to 9dafa2a Compare April 23, 2025 19:31
@zikunz
Copy link
Author

zikunz commented Apr 23, 2025

The changes so far are looking good. How much more work do you estimate it'll take to get to a "ready" state?
See if you can get rid of Collectors and Collections wherever possible. I have left some hints in comments below and some miscellaneous code suggestions.

@subhramit Thank you so much for your thorough code review and feedback. I estimate I will need approximately 1 - 2 additional days to bring this PR to a "ready" state. Here is what remains on my task list (please let me know if I still miss any):

  1. Code Refactoring (most significant effort)

    • Address all remaining review comments by trag-bot
    • Implement your suggestions regarding Collectors and Collections alternatives
    • Conduct a final quality review to identify additional improvements
  2. PR Documentation Updates

    • Enhance the description with clear explanations of:

      • Modified files and rationale for changes
      • Implementation approach
      • Key design decisions and alternatives considered
      • ...
  3. Documentation Repo Updates

    • Open a corresponding issue in the documentation repo
    • Submit a PR with necessary documentation changes

I am really thankful for your guidance on reducing dependencies on Collectors and Collections - I will incorporate your suggestions in my upcoming changes. The hints you have provided in the comments are especially helpful.

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.

@zikunz zikunz changed the title [WIP] Add toggle functionality for journal abbreviation lists Add toggle functionality for journal abbreviation lists Apr 23, 2025
@zikunz zikunz marked this pull request as ready for review April 23, 2025 20:43
@zikunz
Copy link
Author

zikunz commented Apr 23, 2025

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.

tsantalis added a commit to tsantalis/RefactoringMiner that referenced this pull request Apr 25, 2025
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
Copy link

trag-bot bot commented Apr 25, 2025

@trag-bot didn't find any issues in the code! ✅✨

@subhramit
Copy link
Member

@zikunz note that not all tragbot comments are relevant.
E.g. if you are dealing with pure bollean functions, assertTrue and assertFalse is alright to use.

@subhramit
Copy link
Member

Could you also answer #12912 (comment)

if (!journalAbbreviationRepository.isAbbreviatedName(text)) {
return false; // Cannot unabbreviate unabbreviated name.
Copy link
Member

Choose a reason for hiding this comment

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

Revert the comment removal

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ability to disable the built-in JabRef journal abbreviation list
5 participants