Merge branch 'main' of https://github.com/JabRef/jabref into fix-for-issue-JabRef#12272

Author: oops-shlok

.github/workflows/assign-issue.yml

@@ -34,7 +34,7 @@ jobs:
 
             ⏳ Please note, you will be automatically unassigned if the issue isn't closed within **{{ total_days }} days** (by **{{ unassigned_date }}**). A maintainer can also add the "**{{ pin_label }}**"" label to prevent automatic unassignment.
       - name: Move Issue to "Assigned" Column in "Candidates for University Projects"
-        uses: koppor/github-action-move-issues@work-for-labeled
+        uses: m7kvqbe1/github-action-move-issues@feat/skip-if-not-in-project-flag
         # Action currently works for issues only - pre-condition: https://github.com/takanome-dev/assign-issue-action/issues/269 fixed
         if: github.event_name == 'issue_comment'
         with:
@@ -46,7 +46,7 @@ jobs:
           default-column: "Free to take"
           skip-if-not-in-project: true
       - name: Move Issue to "Assigned" Column in "Good First Issues"
-        uses: koppor/github-action-move-issues@work-for-labeled
+        uses: m7kvqbe1/github-action-move-issues@feat/skip-if-not-in-project-flag
         if: github.event_name == 'issue_comment'
         with:
           github-token: ${{ secrets.GH_TOKEN_ACTION_MOVE_ISSUE }}

.github/workflows/product-map.yml

@@ -0,0 +1,33 @@
+name: Product Map Generation
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  generate-map:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 100
+
+      - name: Get changed Java files
+        id: changed-files
+        run: |
+          FILES=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} -- '*.java' | sed 's|^|\"|' | sed 's|$|\"|' | paste -sd "," -)
+          if [ -z "$FILES" ]; then FILES="\"dummy.java\""; fi
+          echo "expected_files=(${FILES})" >> $GITHUB_ENV
+
+      - name: ProductMap Map Generation
+        uses: product-map/product-map-action@main
+        # disabled because of https://github.com/product-map/product-map-action/issues/7
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          expected_files: ${{ env.expected_files }}
+          user_email: [email protected]

CHANGELOG.md

@@ -19,12 +19,21 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We added a new "Copy citation (text)" button in the context menu of the preview. [#12551](https://github.com/JabRef/jabref/issues/12551)
 - We added a new "Export to clipboard" button in the context menu of the preview. [#12551](https://github.com/JabRef/jabref/issues/12551)
 - We added an integrity check if a URL appears in a title. [#12354](https://github.com/JabRef/jabref/issues/12354)
+- We added a feature for enabling drag-and-drop of files into groups  [#12540](https://github.com/JabRef/jabref/issues/12540)
+- We added support for reordering keywords via drag and drop, automatic alphabetical ordering, and improved pasting and editing functionalities in the keyword editor. [#10984](https://github.com/JabRef/jabref/issues/10984)
 
 ### Changed
 
 - We moved the "Generate a new key for imported entries" option from the "Web search" tab to the "Citation key generator" tab in preferences. [#12436](https://github.com/JabRef/jabref/pull/12436)
 - We improved the offline parsing of BibTeX data from PDF-documents. [#12278](https://github.com/JabRef/jabref/issues/12278)
 - The tab bar is now hidden when only one library is open. [#9971](https://github.com/JabRef/jabref/issues/9971)
+- We renamed "Rename file to a given name" to "Rename files to configured filename format pattern" in the entry editor. [#12587](https://github.com/JabRef/jabref/pull/12587)
+- We renamed "Move DOIs from note and URL field to DOI field and remove http prefix" to "Move DOIs from 'note' field and 'URL' field to 'DOI' field and remove http prefix" in the Cleanup entries. [#12587](https://github.com/JabRef/jabref/pull/12587)
+- We renamed "Move preprint information from 'URL' and 'journal' field to the 'eprint' field" to "Move preprint information from 'URL' field and 'journal' field to the 'eprint' field" in the Cleanup entries. [#12587](https://github.com/JabRef/jabref/pull/12587)
+- We renamed "Move URL in note field to url field" to "Move URL in 'note' field to 'URL' field" in the Cleanup entries. [#12587](https://github.com/JabRef/jabref/pull/12587)
+- We renamed "Rename PDFs to given filename format pattern" to "Rename files to configured filename format pattern" in the Cleanup entries. [#12587](https://github.com/JabRef/jabref/pull/12587)
+- We renamed "Rename only PDFs having a relative path" to "Only rename files that have a relative path" in the Cleanup entries. [#12587](https://github.com/JabRef/jabref/pull/12587)
+- We renamed "Filename format pattern: " to "Filename format pattern (from preferences)" in the Cleanup entries. [#12587](https://github.com/JabRef/jabref/pull/12587)
 - When working with CSL styles in LibreOffice, citing with a new style now updates all other citations in the document to have the currently selected style. [#12472](https://github.com/JabRef/jabref/pull/12472)
 - We improved the user comments field visibility so that it remains displayed if it contains text. Additionally, users can now easily toggle the field on or off via buttons unless disabled in preferences. [#11021](https://github.com/JabRef/jabref/issues/11021)
 - The LibreOffice integration for CSL styles is now more performant. [#12472](https://github.com/JabRef/jabref/pull/12472)

CONTRIBUTING.md

@@ -5,6 +5,9 @@ General overview about contributing for non-programmers is available at <https:/
 We welcome contributions to JabRef and encourage you to follow the GitHub workflow specified below.
 If you are not familiar with this type of workflow, take a look at GitHub's excellent overview on the [GitHub flow](https://docs.github.com/en/get-started/using-github/github-flow) and the explanation of [Feature Branch Workflow](https://atlassian.com/git/tutorials/comparing-workflows#feature-branch-workflow) for the idea behind this kind of development.
 
+**JabRef regards its contributors as [software engineers, not just programmers](https://www.phoenix.edu/blog/programmer-vs-software-engineer-key-differences.html)**.
+As one consequence, for non-basic issues, you will have to work on the requirements side, too.
+
 Before you start, get the JabRef code on your local machine.
 Detailed instructions about this step can be found in our [guidelines for setting up a local workspace](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/).
 
@@ -27,11 +30,27 @@ Some are simpler, while others are more complex. Our primary aim is to guide you
 
 ### I am a student and I want to start with something easy
 
-We collect good issues to start with at our [list of good first issues](https://github.com/orgs/JabRef/projects/5/views/1).
+We collect good issues to start with at our [list of unassigned good first issues](https://github.com/JabRef/jabref/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20label%3A%22good%20first%20issue%22%20no%3Aassignee).
 
 ### I am a student and I want to choose from a curated list of university projects
 
-Take a look at [JabRef's candidates for university projects](https://github.com/orgs/JabRef/projects/3). There, a list of possible projects to work on during a teaching period is offered.
+Apart from "good first issues", we also offer collections of curated issues to work on.
+We categorize them into "small", "medium", and "large".
+All of them are intended to
+a) bring you closer to a larger code base with a dedicated issue and
+b) be clear in their description of work.
+Sometimes, you may need to refine the requirements:
+We see contributors as software engineers and [not just programmers](https://www.phoenix.edu/blog/programmer-vs-software-engineer-key-differences.html).
+Thus, requirement engineering inherently comes up as a part of the process.
+
+Take a look at [JabRef's candidates for university projects](https://github.com/orgs/JabRef/projects/3).
+Here, you will get a table of curated issues.
+The table offers filtering for small, medium, and large projects.
+You can check the main focus (UI, logic, or both), the issue understanding effort, the implementation effort, and testing effort.
+The "issue understanding effort" is an indication of how much time you will need to understand the issue before you can do any coding. It may depend on how easy it is to reproduce the issue, how much background knowledge is needed, etc.
+The "implementation effort" is based on our experience of JabRef development.
+Note that there may be issues with a high effort in understanding, but low implementation effort.
+The challenge of these issues is to understand **where** in the code base something needs to be modified.
 
 ### I am a lecturer
 

src/main/java/org/jabref/gui/actions/StandardActions.java

@@ -157,7 +157,7 @@ public enum StandardActions implements Action {
     DOWNLOAD_FILE(Localization.lang("Download file"), IconTheme.JabRefIcons.DOWNLOAD_FILE),
     REDOWNLOAD_FILE(Localization.lang("Redownload file"), IconTheme.JabRefIcons.DOWNLOAD_FILE),
     RENAME_FILE_TO_PATTERN(Localization.lang("Rename file to defined pattern"), IconTheme.JabRefIcons.AUTO_RENAME),
-    RENAME_FILE_TO_NAME(Localization.lang("Rename file to a given name"), IconTheme.JabRefIcons.RENAME, KeyBinding.REPLACE_STRING),
+    RENAME_FILE_TO_NAME(Localization.lang("Rename files to configured filename format pattern"), IconTheme.JabRefIcons.RENAME, KeyBinding.REPLACE_STRING),
     MOVE_FILE_TO_FOLDER(Localization.lang("Move file to file directory"), IconTheme.JabRefIcons.MOVE_TO_FOLDER),
     MOVE_FILE_TO_FOLDER_AND_RENAME(Localization.lang("Move file to file directory and rename file")),
     COPY_FILE_TO_FOLDER(Localization.lang("Copy linked file to folder..."), IconTheme.JabRefIcons.COPY_TO_FOLDER, KeyBinding.COPY),

src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml

@@ -17,9 +17,9 @@
          <VBox.margin>
             <Insets left="20.0" />
          </VBox.margin>
-         <CheckBox fx:id="cleanUpDOI" text="%Move DOIs from note and URL field to DOI field and remove http prefix" />
-         <CheckBox fx:id="cleanUpEprint" text="%Move preprint information from 'URL' and 'journal' field to the 'eprint' field" />
-         <CheckBox fx:id="cleanUpURL" text="%Move URL in note field to url field" />
+         <CheckBox fx:id="cleanUpDOI" text="%Move DOIs from 'note' field and 'URL' field to 'DOI' field and remove http prefix" />
+         <CheckBox fx:id="cleanUpEprint" text="%Move preprint information from 'URL' field and 'journal' field to the 'eprint' field" />
+         <CheckBox fx:id="cleanUpURL" text="%Move URL in 'note' field to 'URL' field" />
          <CheckBox fx:id="cleanUpISSN" text="%Reformat ISSN" />
          <CheckBox fx:id="cleanUpBiblatex" text="%Convert to biblatex format (e.g., store publication date in date field)" />
          <CheckBox fx:id="cleanUpBibtex" text="%Convert to BibTeX format (e.g., store publication date in year and month fields)" />
@@ -35,10 +35,10 @@
          <CheckBox fx:id="cleanUpUpgradeExternalLinks" />
          <CheckBox fx:id="cleanUpMovePDF" />
          <CheckBox fx:id="cleanUpMakePathsRelative" text="%Make paths of linked files relative (if possible)" />
-         <CheckBox fx:id="cleanUpRenamePDF" text="%Rename PDFs to given filename format pattern" />
+         <CheckBox fx:id="cleanUpRenamePDF" text="%Rename files to configured filename format pattern" />
          <VBox prefHeight="40.0" prefWidth="451.0" spacing="10.0">
             <Label fx:id="cleanupRenamePDFLabel" />
-            <CheckBox fx:id="cleanUpRenamePDFonlyRelativePaths" text="%Rename only PDFs having a relative path" />
+            <CheckBox fx:id="cleanUpRenamePDFonlyRelativePaths" text="%Only rename files that have a relative path" />
          <VBox.margin>
             <Insets left="20.0" />
          </VBox.margin>

src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java

@@ -68,8 +68,7 @@ private void init(CleanupPreferences cleanupPreferences, FilePreferences filePre
 
         cleanUpUpgradeExternalLinks.setText(Localization.lang("Upgrade external PDF/PS links to use the '%0' field.", StandardField.FILE.getDisplayName()));
 
-        String currentPattern = Localization.lang("Filename format pattern")
-                                            .concat(": ")
+        String currentPattern = Localization.lang("Filename format pattern (from preferences)")
                                             .concat(filePreferences.getFileNamePattern());
         cleanupRenamePDFLabel.setText(currentPattern);
 

src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java

@@ -1,6 +1,7 @@
 package org.jabref.gui.fieldeditors;
 
 import java.util.Comparator;
+import java.util.Optional;
 
 import javax.swing.undo.UndoManager;
 
@@ -12,6 +13,10 @@
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
+import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.DragEvent;
+import javafx.scene.input.Dragboard;
+import javafx.scene.input.TransferMode;
 import javafx.scene.layout.HBox;
 
 import org.jabref.gui.ClipBoardManager;
@@ -22,16 +27,21 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.keyboard.KeyBinding;
+import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Keyword;
+import org.jabref.model.entry.KeywordList;
 import org.jabref.model.entry.field.Field;
 
+import com.airhacks.afterburner.injection.Injector;
 import com.airhacks.afterburner.views.ViewLoader;
 import com.dlsc.gemsfx.TagsField;
+import com.google.common.collect.Comparators;
 import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,6 +58,9 @@ public class KeywordsEditor extends HBox implements FieldEditorFX {
     @Inject private UndoManager undoManager;
     @Inject private ClipBoardManager clipBoardManager;
 
+    private boolean isSortedTagsField = false;
+    private Optional<Keyword> draggedKeyword = Optional.empty();
+
     public KeywordsEditor(Field field,
                           SuggestionProvider<?> suggestionProvider,
                           FieldCheckers fieldCheckers) {
@@ -87,6 +100,29 @@ public KeywordsEditor(Field field,
             }
         });
 
+        this.viewModel.keywordListProperty().addListener((observable, oldValue, newValue) -> {
+            if (keywordTagsField.getTags().size() < 2) {
+                isSortedTagsField = false;
+            } else if ((Comparators.isInOrder(keywordTagsField.getTags(), Comparator.comparing(Keyword::get))) || isSortedTagsField) {
+                isSortedTagsField = true;
+                keywordTagsField.getTags().sort(Comparator.comparing(Keyword::get));
+            }
+        });
+
+        keywordTagsField.getEditor().setOnKeyPressed(event -> {
+            KeyBindingRepository keyBindingRepository = Injector.instantiateModelOrService(KeyBindingRepository.class);
+
+            if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.PASTE, event)) {
+                String clipboardText = clipBoardManager.getContents();
+                if (!clipboardText.isEmpty()) {
+                    KeywordList keywordsList = KeywordList.parse(clipboardText, viewModel.getKeywordSeparator());
+                    keywordsList.stream().forEach(keyword -> keywordTagsField.addTags(keyword));
+                    keywordTagsField.getEditor().clear();
+                    event.consume();
+                }
+            }
+        });
+
         Bindings.bindContentBidirectional(keywordTagsField.getTags(), viewModel.keywordListProperty());
     }
 
@@ -104,6 +140,46 @@ private Node createTag(Keyword keyword) {
                 factory.createMenuItem(StandardActions.DELETE, new KeywordsEditor.TagContextAction(StandardActions.DELETE, keyword))
         );
         tagLabel.setContextMenu(contextMenu);
+        tagLabel.setOnMouseClicked(event -> {
+            if (event.getClickCount() == 2) {
+                keywordTagsField.removeTags(keyword);
+                keywordTagsField.getEditor().setText(keyword.get());
+                keywordTagsField.getEditor().positionCaret(keyword.get().length());
+            }
+        });
+        tagLabel.setOnDragOver(event -> {
+            if (event.getGestureSource() != tagLabel && event.getDragboard().hasString()) {
+                event.acceptTransferModes(TransferMode.MOVE);
+            }
+            event.consume();
+        });
+        tagLabel.setOnDragDetected(event -> {
+            Dragboard db = tagLabel.startDragAndDrop(TransferMode.MOVE);
+            ClipboardContent content = new ClipboardContent();
+            content.putString(keyword.get());
+            db.setContent(content);
+            draggedKeyword = Optional.of(keyword);
+            event.consume();
+        });
+        tagLabel.setOnDragEntered(event -> tagLabel.setStyle("-fx-background-color: lightgrey;"));
+        tagLabel.setOnDragExited(event -> tagLabel.setStyle(""));
+        tagLabel.setOnDragDropped(event -> {
+            Dragboard db = event.getDragboard();
+            if (db.hasString() && draggedKeyword.isPresent()) {
+                int oldIndex = keywordTagsField.getTags().indexOf(draggedKeyword.get());
+                int dropIndex = keywordTagsField.getTags().indexOf(keyword);
+                if (oldIndex != dropIndex) {
+                    keywordTagsField.removeTags(draggedKeyword.get());
+                    keywordTagsField.getTags().add(dropIndex, draggedKeyword.get());
+                }
+                event.setDropCompleted(true);
+            } else {
+                event.setDropCompleted(false);
+            }
+            draggedKeyword = Optional.empty();
+            event.consume();
+        });
+        tagLabel.setOnDragDone(DragEvent::consume);
         return tagLabel;
     }
 
@@ -141,18 +217,18 @@ public void execute() {
                 case COPY -> {
                     clipBoardManager.setContent(keyword.get());
                     dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                            JabRefDialogService.shortenDialogMessage(keyword.get())));
+                                                           JabRefDialogService.shortenDialogMessage(keyword.get())));
                 }
                 case CUT -> {
                     clipBoardManager.setContent(keyword.get());
                     dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                            JabRefDialogService.shortenDialogMessage(keyword.get())));
+                                                           JabRefDialogService.shortenDialogMessage(keyword.get())));
                     keywordTagsField.removeTags(keyword);
                 }
                 case DELETE ->
-                        keywordTagsField.removeTags(keyword);
+                    keywordTagsField.removeTags(keyword);
                 default ->
-                        LOGGER.info("Action {} not defined", command.getText());
+                    LOGGER.info("Action {} not defined", command.getText());
             }
         }
     }

src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java

@@ -349,7 +349,8 @@ public boolean acceptableDrop(Dragboard dragboard) {
         // TODO: we should also check isNodeDescendant
         boolean canDropOtherGroup = dragboard.hasContent(DragAndDropDataFormats.GROUP);
         boolean canDropEntries = localDragBoard.hasBibEntries() && (groupNode.getGroup() instanceof GroupEntryChanger);
-        return canDropOtherGroup || canDropEntries;
+        boolean canDropFiles = dragboard.hasFiles();
+        return canDropOtherGroup || canDropEntries || canDropFiles;
     }
 
     public void moveTo(GroupNodeViewModel target) {