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

Author: oops-shlok

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,10 @@
 YOU HAVE TO MODIFY THIS TEXT TO FIT YOUR PR. OTHERWISE, YOUR PR WILL BE CLOSED WITHOUT FURTHER COMMENT.
 Describe the changes you have made here: what, why, ...
-Link the issue that will be closed. Example: "Closes #333".
+Closes #xyz. <!-- number of the issue that will be closed -->
 
 ### Mandatory checks
 
-<!-- 
+<!--
 - Go through the list below. Please don't remove any items.
 - [x] done; [ ] not done / not applicable
 -->

.github/workflows/cleanup-pr.yml

@@ -29,7 +29,7 @@ jobs:
           BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
       - name: Delete folder on builds.jabref.org
         if: steps.checksecrets.outputs.secretspresent == 'YES'
-        uses: appleboy/[email protected].1
+        uses: appleboy/[email protected].2
         with:
           script: rm -rf /var/www/builds.jabref.org/www/pull/${{ github.event.pull_request.number }} || true
           host: build-upload.jabref.org

.github/workflows/product-map.yml

@@ -22,11 +22,10 @@ jobs:
           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
+          echo "Files: ${FILES}"
 
       - 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 }}

CHANGELOG.md

@@ -44,6 +44,8 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We changed the "Copy Preview" button to "Copy citation (html) in the context menu of the preview. [#12551](https://github.com/JabRef/jabref/issues/12551)
 - Pressing Tab in empty text fields of the entry editor now moves the focus to the next field instead of inserting a tab character. [#11938](https://github.com/JabRef/jabref/issues/11938)
 - The embedded PostgresSQL server for the search now supports Linux and macOS ARM based distributions natively [#12607](https://github.com/JabRef/jabref/pull/12607)
+- We disabled the search and group fields in the sidebar when no library is opened. [#12657](https://github.com/JabRef/jabref/issues/12657)
+- We removed the obsolete Twitter link and added Mastodon and LinkedIn links in Help -> JabRef resources. [#12660](https://github.com/JabRef/jabref/issues/12660)
 
 ### Fixed
 

CONTRIBUTING.md

@@ -154,6 +154,7 @@ You can click on failing checks to see more information about why they failed.
 Then, please look into them and handle accordingly.
 
 Afterwards, you will receive comments on your pull request.
+Since JabRef is driven by volunteers in their spare time, reviews may take more time than a project with full time developers.
 The pull request may be approved immediatly, or a reviewer may request changes.
 In that case, please implement the requested changes.
 

build.gradle

@@ -182,7 +182,7 @@ dependencies {
     implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.13.0'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
     implementation group: 'org.apache.commons', name: 'commons-text', version: '1.13.0'
-    implementation 'commons-logging:commons-logging:1.3.4'
+    implementation 'commons-logging:commons-logging:1.3.5'
     implementation 'com.h2database:h2-mvstore:2.3.232'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
@@ -265,7 +265,7 @@ dependencies {
     implementation 'org.controlsfx:controlsfx:11.2.1'
 
     // region HTTP clients
-    implementation 'org.jsoup:jsoup:1.18.3'
+    implementation 'org.jsoup:jsoup:1.19.1'
     implementation 'com.konghq:unirest-java-core:4.4.5'
     implementation 'com.konghq:unirest-modules-gson:4.4.5'
     implementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
@@ -301,7 +301,7 @@ dependencies {
     implementation 'com.vladsch.flexmark:flexmark:0.64.8'
     implementation 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
 
-    implementation group: 'net.harawata', name: 'appdirs', version: '1.3.0'
+    implementation group: 'net.harawata', name: 'appdirs', version: '1.4.0'
 
     implementation group: 'org.jooq', name: 'jool', version: '0.9.15'
     // JAX-RS implemented by Jersey
@@ -382,7 +382,7 @@ dependencies {
     implementation 'io.zonky.test.postgres:embedded-postgres-binaries-linux-arm64v8'
 
     testImplementation 'io.github.classgraph:classgraph:4.8.179'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.12.0'
     testImplementation 'org.junit.platform:junit-platform-launcher:1.11.4'
 
     testImplementation 'org.mockito:mockito-core:5.16.0'
@@ -396,7 +396,7 @@ dependencies {
     testImplementation "com.github.javaparser:javaparser-symbol-solver-core:3.26.3"
 
     // recommended by https://github.com/wiremock/wiremock/issues/2149#issuecomment-1835775954
-    testImplementation 'org.wiremock:wiremock-standalone:3.10.0'
+    testImplementation 'org.wiremock:wiremock-standalone:3.12.1'
 
     checkstyle 'com.puppycrawl.tools:checkstyle:10.21.3'
     // xjc needs the runtime as well for the ant task, otherwise it fails

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

@@ -174,7 +174,8 @@ public enum StandardActions implements Action {
     WEB_MENU(Localization.lang("JabRef resources")),
     OPEN_WEBPAGE(Localization.lang("Website"), Localization.lang("Opens JabRef's website"), IconTheme.JabRefIcons.HOME),
     OPEN_FACEBOOK("Facebook", Localization.lang("Opens JabRef's Facebook page"), IconTheme.JabRefIcons.FACEBOOK),
-    OPEN_TWITTER("Twitter", Localization.lang("Opens JabRef's Twitter page"), IconTheme.JabRefIcons.TWITTER),
+    OPEN_LINKEDIN("LinkedIn", Localization.lang("Opens JabRef's LinkedIn page"), IconTheme.JabRefIcons.LINKEDIN),
+    OPEN_MASTODON("Mastodon", Localization.lang("Opens JabRef's Mastodon page"), IconTheme.JabRefIcons.MASTODON),
     OPEN_BLOG(Localization.lang("Blog"), Localization.lang("Opens JabRef's blog"), IconTheme.JabRefIcons.BLOG),
     OPEN_DEV_VERSION_LINK(Localization.lang("Development version"), Localization.lang("Opens a link where the current development version can be downloaded")),
     OPEN_CHANGELOG(Localization.lang("View change log"), Localization.lang("See what has been changed in the JabRef versions")),

src/main/java/org/jabref/gui/frame/MainMenu.java

@@ -356,8 +356,9 @@ private void createMenu() {
                 factory.createSubMenu(StandardActions.WEB_MENU,
                         factory.createMenuItem(StandardActions.OPEN_WEBPAGE, new OpenBrowserAction("https://jabref.org/", dialogService, preferences.getExternalApplicationsPreferences())),
                         factory.createMenuItem(StandardActions.OPEN_BLOG, new OpenBrowserAction("https://blog.jabref.org/", dialogService, preferences.getExternalApplicationsPreferences())),
+                        factory.createMenuItem(StandardActions.OPEN_LINKEDIN, new OpenBrowserAction("https://linkedin.com/company/jabref/", dialogService, preferences.getExternalApplicationsPreferences())),
                         factory.createMenuItem(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/", dialogService, preferences.getExternalApplicationsPreferences())),
-                        factory.createMenuItem(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org", dialogService, preferences.getExternalApplicationsPreferences())),
+                        factory.createMenuItem(StandardActions.OPEN_MASTODON, new OpenBrowserAction("https://foojay.social/@jabref", dialogService, preferences.getExternalApplicationsPreferences())),
                         factory.createMenuItem(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref", dialogService, preferences.getExternalApplicationsPreferences())),
 
                         new SeparatorMenuItem(),

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

@@ -18,6 +18,7 @@
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.ObservableBooleanValue;
 import javafx.css.PseudoClass;
 import javafx.geometry.Orientation;
 import javafx.scene.Node;
@@ -132,6 +133,7 @@ public GroupTreeView(TaskExecutor taskExecutor,
         this.undoManager = undoManager;
         this.fileUpdateMonitor = fileUpdateMonitor;
         this.keyBindingRepository = preferences.getKeyBindingRepository();
+        this.disableProperty().bind(groupsDisabledProperty());
         createNodes();
         initialize();
     }
@@ -643,6 +645,16 @@ private void setupClearButtonField(CustomTextField customTextField) {
         }
     }
 
+    /**
+     * Creates an observable boolean value that is true if no database is open
+     */
+    private ObservableBooleanValue groupsDisabledProperty() {
+        return Bindings.createBooleanBinding(
+                () -> stateManager.getOpenDatabases().isEmpty(),
+                stateManager.getOpenDatabases()
+        );
+    }
+
     private static class DragExpansionHandler {
         private static final long DRAG_TIME_BEFORE_EXPANDING_MS = 1000;
         private TreeItem<GroupNodeViewModel> draggedItem;

src/main/java/org/jabref/gui/icon/IconTheme.java

@@ -298,6 +298,8 @@ public enum JabRefIcons implements JabRefIcon {
         CONSOLE(MaterialDesignC.CONSOLE),
         FORUM(MaterialDesignF.FORUM),
         FACEBOOK(MaterialDesignF.FACEBOOK),
+        MASTODON(MaterialDesignM.MASTODON),
+        LINKEDIN(MaterialDesignL.LINKEDIN),
         TWITTER(MaterialDesignT.TWITTER),
         BLOG(MaterialDesignR.RSS),
         DATE_PICKER(MaterialDesignC.CALENDAR),

src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java

@@ -1,6 +1,8 @@
 package org.jabref.gui.importer.fetcher;
 
+import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanExpression;
+import javafx.beans.value.ObservableBooleanValue;
 import javafx.css.PseudoClass;
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
@@ -33,36 +35,26 @@ public class WebSearchPaneView extends VBox {
     private final WebSearchPaneViewModel viewModel;
     private final GuiPreferences preferences;
     private final DialogService dialogService;
+    private final StateManager stateManager;
 
     public WebSearchPaneView(GuiPreferences preferences, DialogService dialogService, StateManager stateManager) {
         this.preferences = preferences;
         this.dialogService = dialogService;
+        this.stateManager = stateManager;
         this.viewModel = new WebSearchPaneViewModel(preferences, dialogService, stateManager);
         initialize();
     }
 
     private void initialize() {
-        ComboBox<SearchBasedFetcher> fetchers = new ComboBox<>();
-        new ViewModelListCellFactory<SearchBasedFetcher>()
-                .withText(SearchBasedFetcher::getName)
-                .install(fetchers);
-        fetchers.itemsProperty().bind(viewModel.fetchersProperty());
-        fetchers.valueProperty().bindBidirectional(viewModel.selectedFetcherProperty());
-        fetchers.setMaxWidth(Double.POSITIVE_INFINITY);
-        HBox.setHgrow(fetchers, Priority.ALWAYS);
-
         StackPane helpButtonContainer = createHelpButtonContainer();
-        HBox fetcherContainer = new HBox(fetchers, helpButtonContainer);
-        TextField query = SearchTextField.create(preferences.getKeyBindingRepository());
-        getChildren().addAll(fetcherContainer, query, createSearchButton());
-
-        viewModel.queryProperty().bind(query.textProperty());
-
-        addQueryValidationHints(query);
-
-        enableEnterToTriggerSearch(query);
-
-        ClipBoardManager.addX11Support(query);
+        HBox fetcherContainer = new HBox(createFetcherComboBox(), helpButtonContainer);
+
+        getChildren().addAll(
+                fetcherContainer,
+                createQueryField(),
+                createSearchButton()
+        );
+        this.disableProperty().bind(searchDisabledProperty());
     }
 
     /**
@@ -89,6 +81,33 @@ private void addQueryValidationHints(TextField query) {
                 });
     }
 
+    /**
+     * Create combo box for selecting fetcher
+     */
+    private ComboBox<SearchBasedFetcher> createFetcherComboBox() {
+        ComboBox<SearchBasedFetcher> fetchers = new ComboBox<>();
+        new ViewModelListCellFactory<SearchBasedFetcher>()
+                .withText(SearchBasedFetcher::getName)
+                .install(fetchers);
+        fetchers.itemsProperty().bind(viewModel.fetchersProperty());
+        fetchers.valueProperty().bindBidirectional(viewModel.selectedFetcherProperty());
+        fetchers.setMaxWidth(Double.POSITIVE_INFINITY);
+        HBox.setHgrow(fetchers, Priority.ALWAYS);
+        return fetchers;
+    }
+
+    /**
+     * Create text field for search query
+     */
+    private TextField createQueryField() {
+        TextField query = SearchTextField.create(preferences.getKeyBindingRepository());
+        viewModel.queryProperty().bind(query.textProperty());
+        addQueryValidationHints(query);
+        enableEnterToTriggerSearch(query);
+        ClipBoardManager.addX11Support(query);
+        return query;
+    }
+
     /**
      * Create button that triggers search
      */
@@ -118,4 +137,14 @@ private StackPane createHelpButtonContainer() {
         });
         return helpButtonContainer;
     }
+
+    /**
+     * Creates an observable boolean value that is true if no database is open
+     */
+    private ObservableBooleanValue searchDisabledProperty() {
+        return Bindings.createBooleanBinding(
+                () -> stateManager.getOpenDatabases().isEmpty(),
+                stateManager.getOpenDatabases()
+        );
+    }
 }

src/main/resources/csl-locales

@@ -1344,7 +1344,8 @@ Set\ read\ status\ to\ read=Set read status to read
 Set\ read\ status\ to\ skimmed=Set read status to skimmed
 
 Opens\ JabRef's\ GitHub\ page=Opens JabRef's GitHub page
-Opens\ JabRef's\ Twitter\ page=Opens JabRef's Twitter page
+Opens\ JabRef's\ LinkedIn\ page=Opens JabRef's LinkedIn page
+Opens\ JabRef's\ Mastodon\ page=Opens JabRef's Mastodon page
 Opens\ JabRef's\ Facebook\ page=Opens JabRef's Facebook page
 Opens\ JabRef's\ blog=Opens JabRef's blog
 Opens\ JabRef's\ website=Opens JabRef's website

src/main/resources/csl-styles

@@ -9,11 +9,13 @@
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.SearchBasedFetcher;
+import org.jabref.logic.util.BuildInfo;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
 
+import com.airhacks.afterburner.injection.Injector;
 import kong.unirest.core.json.JSONObject;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -32,8 +34,10 @@ class SpringerFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSear
 
     @BeforeEach
     void setUp() {
-        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        BuildInfo buildInfo = Injector.instantiateModelOrService(BuildInfo.class);
         fetcher = new SpringerFetcher(importerPreferences);
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        when(importerPreferences.getApiKey(fetcher.getName())).thenReturn(Optional.of(buildInfo.springerNatureAPIKey));
     }
 
     @Test