From 62ed1b5e80e222ff776a3bc5e27f3a425075d91a Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Mon, 7 Jul 2025 14:33:56 +0930
Subject: [PATCH 01/14] Add Pagination for fetchers

---
 .../gui/importer/ImportEntriesDialog.java     | 36 +++++++++++++
 .../gui/importer/ImportEntriesViewModel.java  | 50 ++++++++++++++++++-
 .../gui/importer/ImportEntriesDialog.fxml     |  4 ++
 .../main/resources/l10n/JabRef_en.properties  |  2 +
 4 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 46298d897a1..69de0afdbb6 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -6,6 +6,7 @@
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
+import javafx.collections.ListChangeListener;
 import javafx.css.PseudoClass;
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
@@ -35,6 +36,7 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.NoSelectionModel;
 import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.DatabaseLocation;
@@ -114,6 +116,20 @@ private void initialize() {
         placeholder.textProperty().bind(viewModel.messageProperty());
         entriesListView.setPlaceholder(placeholder);
         entriesListView.setItems(viewModel.getEntries());
+        entriesListView.getCheckModel().getCheckedItems().addListener((ListChangeListener<BibEntry>) change -> {
+            while (change.next()) {
+                if (change.wasAdded()) {
+                    for (BibEntry entry : change.getAddedSubList()) {
+                        viewModel.getCheckedEntries().add(entry);
+                    }
+                }
+                if (change.wasRemoved()) {
+                    for (BibEntry entry : change.getRemoved()) {
+                        viewModel.getCheckedEntries().remove(entry);
+                    }
+                }
+            }
+        });
 
         libraryListView.setEditable(false);
         libraryListView.getItems().addAll(stateManager.getOpenDatabases());
@@ -225,4 +241,24 @@ public void selectAllEntries() {
         unselectAll();
         entriesListView.getCheckModel().checkAll();
     }
+
+    @FXML
+    private void onPrevPage() {
+        viewModel.prevPage();
+        restoreCheckedEntries();
+    }
+
+    @FXML
+    private void onNextPage() {
+        viewModel.nextPage();
+        restoreCheckedEntries();
+    }
+
+    private void restoreCheckedEntries() {
+        for (BibEntry entry : viewModel.getEntries()) {
+            if (viewModel.getCheckedEntries().contains(entry)) {
+                entriesListView.getCheckModel().check(entry);
+            }
+        }
+    }
 }
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index 8dc031f249a..b329ee3ece0 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -2,8 +2,10 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import javax.swing.undo.UndoManager;
 
@@ -13,6 +15,7 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
@@ -40,6 +43,7 @@
 public class ImportEntriesViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImportEntriesViewModel.class);
+    private static final int PAGE_SIZE = 20;
 
     private final StringProperty message;
     private final TaskExecutor taskExecutor;
@@ -53,6 +57,11 @@ public class ImportEntriesViewModel extends AbstractViewModel {
     private final GuiPreferences preferences;
     private final BibEntryTypesManager entryTypesManager;
     private final ObjectProperty<BibDatabaseContext> selectedDb;
+    private final ObservableList<BibEntry> pagedEntries = FXCollections.observableArrayList();
+    private final ObservableSet<BibEntry> checkedEntries = FXCollections.observableSet();
+    private List<BibEntry> allEntries = new ArrayList<>();
+
+    private int currentPage = 0;
 
     /**
      * @param databaseContext the database to import into
@@ -85,6 +94,7 @@ public ImportEntriesViewModel(BackgroundTask<ParserResult> task,
             this.parserResult = parserResult;
             // fill in the list for the user, where one can select the entries to import
             entries.addAll(parserResult.getDatabase().getEntries());
+            loadAllEntries(entries);
             if (entries.isEmpty()) {
                 task.updateMessage(Localization.lang("No entries corresponding to given query"));
             }
@@ -111,7 +121,7 @@ public BibDatabaseContext getSelectedDb() {
     }
 
     public ObservableList<BibEntry> getEntries() {
-        return entries;
+        return pagedEntries;
     }
 
     public boolean hasDuplicate(BibEntry entry) {
@@ -177,4 +187,42 @@ private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
         }
         return Optional.empty();
     }
+
+    public Set<BibEntry> getCheckedEntries() {
+        return checkedEntries;
+    }
+
+    public void loadAllEntries(List<BibEntry> entries) {
+        this.allEntries = new ArrayList<>(entries);
+        this.currentPage = 0;
+        updatePagedEntries();
+    }
+
+    public void nextPage() {
+        if (hasNextPage()) {
+            currentPage++;
+            updatePagedEntries();
+        }
+    }
+
+    public void prevPage() {
+        if (hasPrevPage()) {
+            currentPage--;
+            updatePagedEntries();
+        }
+    }
+
+    public boolean hasNextPage() {
+        return (currentPage + 1) * PAGE_SIZE < allEntries.size();
+    }
+
+    public boolean hasPrevPage() {
+        return currentPage > 0;
+    }
+
+    private void updatePagedEntries() {
+        int fromIdx = currentPage * PAGE_SIZE;
+        int toIdx = Math.min(fromIdx + PAGE_SIZE, allEntries.size());
+        pagedEntries.setAll(allEntries.subList(fromIdx, toIdx));
+    }
 }
diff --git a/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml b/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
index a7061744df7..d747c905e4a 100644
--- a/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
@@ -20,6 +20,10 @@
         <VBox spacing="10.0">
             <Label text="%Select the entries to be imported:"/>
             <CheckListView fx:id="entriesListView" VBox.vgrow="ALWAYS"/>
+            <HBox spacing="10" alignment="CENTER">
+                <Button onAction="#onPrevPage" text="%Previous"/>
+                <Button onAction="#onNextPage" text="%Next"/>
+            </HBox>
             <HBox spacing="4">
                 <VBox spacing="10">
                     <HBox spacing="4">
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index 131266ce455..fa2b985c802 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -2040,6 +2040,8 @@ Total\ items\ found\:=Total items found:
 Selected\ items\:=Selected items:
 Download\ referenced\ files\ (PDFs,\ ...)=Download referenced files (PDFs, ...)
 Select\ the\ entries\ to\ be\ imported\:=Select the entries to be imported\:
+Previous=Previous
+Next=Next
 Open\ Help\ page=Open Help page
 Add\ new\ keyword=Add new keyword
 Keyword\:=Keyword:

From cfb484824353dc4a1d5ae931b8b907b254a67ad4 Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Fri, 18 Jul 2025 14:59:35 +0930
Subject: [PATCH 02/14] An Attempt to define pagination for arXiv - Clone and
 create web* (WebImportEntriesDialog and WebImportEntriesDialogViewModel for
 web implementation) - Cache prev pages in case of page based fetcher

---
 .../gui/importer/ImportEntriesDialog.java     |  36 ---
 .../gui/importer/ImportEntriesViewModel.java  |  50 +--
 .../gui/importer/WebImportEntriesDialog.java  | 278 +++++++++++++++++
 .../importer/WebImportEntriesViewModel.java   | 285 ++++++++++++++++++
 .../fetcher/WebSearchPaneViewModel.java       |   4 +-
 .../gui/importer/ImportEntriesDialog.fxml     |   4 -
 .../gui/importer/WebImportEntriesDialog.fxml  |  69 +++++
 jablib/src/main/java/module-info.java         |   1 +
 8 files changed, 636 insertions(+), 91 deletions(-)
 create mode 100644 jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
 create mode 100644 jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
 create mode 100644 jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml

diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 69de0afdbb6..46298d897a1 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -6,7 +6,6 @@
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
-import javafx.collections.ListChangeListener;
 import javafx.css.PseudoClass;
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
@@ -36,7 +35,6 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.NoSelectionModel;
 import org.jabref.gui.util.ViewModelListCellFactory;
-import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.DatabaseLocation;
@@ -116,20 +114,6 @@ private void initialize() {
         placeholder.textProperty().bind(viewModel.messageProperty());
         entriesListView.setPlaceholder(placeholder);
         entriesListView.setItems(viewModel.getEntries());
-        entriesListView.getCheckModel().getCheckedItems().addListener((ListChangeListener<BibEntry>) change -> {
-            while (change.next()) {
-                if (change.wasAdded()) {
-                    for (BibEntry entry : change.getAddedSubList()) {
-                        viewModel.getCheckedEntries().add(entry);
-                    }
-                }
-                if (change.wasRemoved()) {
-                    for (BibEntry entry : change.getRemoved()) {
-                        viewModel.getCheckedEntries().remove(entry);
-                    }
-                }
-            }
-        });
 
         libraryListView.setEditable(false);
         libraryListView.getItems().addAll(stateManager.getOpenDatabases());
@@ -241,24 +225,4 @@ public void selectAllEntries() {
         unselectAll();
         entriesListView.getCheckModel().checkAll();
     }
-
-    @FXML
-    private void onPrevPage() {
-        viewModel.prevPage();
-        restoreCheckedEntries();
-    }
-
-    @FXML
-    private void onNextPage() {
-        viewModel.nextPage();
-        restoreCheckedEntries();
-    }
-
-    private void restoreCheckedEntries() {
-        for (BibEntry entry : viewModel.getEntries()) {
-            if (viewModel.getCheckedEntries().contains(entry)) {
-                entriesListView.getCheckModel().check(entry);
-            }
-        }
-    }
 }
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index b329ee3ece0..8dc031f249a 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -2,10 +2,8 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 
 import javax.swing.undo.UndoManager;
 
@@ -15,7 +13,6 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.collections.ObservableSet;
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
@@ -43,7 +40,6 @@
 public class ImportEntriesViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImportEntriesViewModel.class);
-    private static final int PAGE_SIZE = 20;
 
     private final StringProperty message;
     private final TaskExecutor taskExecutor;
@@ -57,11 +53,6 @@ public class ImportEntriesViewModel extends AbstractViewModel {
     private final GuiPreferences preferences;
     private final BibEntryTypesManager entryTypesManager;
     private final ObjectProperty<BibDatabaseContext> selectedDb;
-    private final ObservableList<BibEntry> pagedEntries = FXCollections.observableArrayList();
-    private final ObservableSet<BibEntry> checkedEntries = FXCollections.observableSet();
-    private List<BibEntry> allEntries = new ArrayList<>();
-
-    private int currentPage = 0;
 
     /**
      * @param databaseContext the database to import into
@@ -94,7 +85,6 @@ public ImportEntriesViewModel(BackgroundTask<ParserResult> task,
             this.parserResult = parserResult;
             // fill in the list for the user, where one can select the entries to import
             entries.addAll(parserResult.getDatabase().getEntries());
-            loadAllEntries(entries);
             if (entries.isEmpty()) {
                 task.updateMessage(Localization.lang("No entries corresponding to given query"));
             }
@@ -121,7 +111,7 @@ public BibDatabaseContext getSelectedDb() {
     }
 
     public ObservableList<BibEntry> getEntries() {
-        return pagedEntries;
+        return entries;
     }
 
     public boolean hasDuplicate(BibEntry entry) {
@@ -187,42 +177,4 @@ private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
         }
         return Optional.empty();
     }
-
-    public Set<BibEntry> getCheckedEntries() {
-        return checkedEntries;
-    }
-
-    public void loadAllEntries(List<BibEntry> entries) {
-        this.allEntries = new ArrayList<>(entries);
-        this.currentPage = 0;
-        updatePagedEntries();
-    }
-
-    public void nextPage() {
-        if (hasNextPage()) {
-            currentPage++;
-            updatePagedEntries();
-        }
-    }
-
-    public void prevPage() {
-        if (hasPrevPage()) {
-            currentPage--;
-            updatePagedEntries();
-        }
-    }
-
-    public boolean hasNextPage() {
-        return (currentPage + 1) * PAGE_SIZE < allEntries.size();
-    }
-
-    public boolean hasPrevPage() {
-        return currentPage > 0;
-    }
-
-    private void updatePagedEntries() {
-        int fromIdx = currentPage * PAGE_SIZE;
-        int toIdx = Math.min(fromIdx + PAGE_SIZE, allEntries.size());
-        pagedEntries.setAll(allEntries.subList(fromIdx, toIdx));
-    }
 }
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
new file mode 100644
index 00000000000..91e4b6be297
--- /dev/null
+++ b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
@@ -0,0 +1,278 @@
+package org.jabref.gui.importer;
+
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.collections.ListChangeListener;
+import javafx.css.PseudoClass;
+import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.Border;
+import javafx.scene.layout.BorderStroke;
+import javafx.scene.layout.BorderStrokeStyle;
+import javafx.scene.layout.BorderWidths;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.entryeditor.citationrelationtab.BibEntryView;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.preferences.GuiPreferences;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.NoSelectionModel;
+import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.SearchBasedFetcher;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.shared.DatabaseLocation;
+import org.jabref.logic.util.BackgroundTask;
+import org.jabref.logic.util.TaskExecutor;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.util.FileUpdateMonitor;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
+import org.controlsfx.control.CheckListView;
+import org.fxmisc.richtext.CodeArea;
+
+public class WebImportEntriesDialog extends BaseDialog<Boolean> {
+
+    @FXML private Label pageNumberLabel;
+    @FXML private CheckListView<BibEntry> entriesListView;
+    @FXML private ComboBox<BibDatabaseContext> libraryListView;
+    @FXML private ButtonType importButton;
+    @FXML private Label totalItems;
+    @FXML private Label selectedItems;
+    @FXML private Label bibTeXDataLabel;
+    @FXML private CheckBox downloadLinkedOnlineFiles;
+    @FXML private CheckBox showEntryInformation;
+    @FXML private CodeArea bibTeXData;
+    @FXML private VBox bibTeXDataBox;
+
+    private final BackgroundTask<ParserResult> task;
+    private final BibDatabaseContext database;
+    private WebImportEntriesViewModel viewModel;
+    private final SearchBasedFetcher searchBasedFetcher;
+    private final String query;
+
+    @Inject private TaskExecutor taskExecutor;
+    @Inject private DialogService dialogService;
+    @Inject private UndoManager undoManager;
+    @Inject private GuiPreferences preferences;
+    @Inject private StateManager stateManager;
+    @Inject private BibEntryTypesManager entryTypesManager;
+    @Inject private FileUpdateMonitor fileUpdateMonitor;
+
+    /**
+     * Imports the given entries into the given database. The entries are provided using the BackgroundTask
+     *
+     * @param database the database to import into
+     * @param task     the task executed for parsing the selected files(s).
+     */
+    public WebImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task, SearchBasedFetcher fetcher, String query) {
+        this.database = database;
+        this.task = task;
+        this.searchBasedFetcher = fetcher;
+        this.query = query;
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        BooleanBinding booleanBind = Bindings.isEmpty(entriesListView.getCheckModel().getCheckedItems());
+        Button btn = (Button) this.getDialogPane().lookupButton(importButton);
+        btn.disableProperty().bind(booleanBind);
+
+        downloadLinkedOnlineFiles.setSelected(preferences.getFilePreferences().shouldDownloadLinkedFiles());
+
+        setResultConverter(button -> {
+            if (button == importButton) {
+                viewModel.importEntries(entriesListView.getCheckModel().getCheckedItems(), downloadLinkedOnlineFiles.isSelected());
+            } else {
+                dialogService.notify(Localization.lang("Import canceled"));
+            }
+
+            return false;
+        });
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new WebImportEntriesViewModel(task, taskExecutor, database, dialogService, undoManager, preferences, stateManager, entryTypesManager, fileUpdateMonitor, searchBasedFetcher, query);
+        Label placeholder = new Label();
+        placeholder.textProperty().bind(viewModel.messageProperty());
+        entriesListView.setPlaceholder(placeholder);
+        entriesListView.setItems(viewModel.getEntries());
+        entriesListView.getCheckModel().getCheckedItems().addListener((ListChangeListener<BibEntry>) change -> {
+            while (change.next()) {
+                if (change.wasAdded()) {
+                    for (BibEntry entry : change.getAddedSubList()) {
+                        viewModel.getCheckedEntries().add(entry);
+                    }
+                }
+                if (change.wasRemoved()) {
+                    for (BibEntry entry : change.getRemoved()) {
+                        viewModel.getCheckedEntries().remove(entry);
+                    }
+                }
+            }
+        });
+
+        libraryListView.setEditable(false);
+        libraryListView.getItems().addAll(stateManager.getOpenDatabases());
+        new ViewModelListCellFactory<BibDatabaseContext>()
+                .withText(database -> {
+                    Optional<String> dbOpt = Optional.empty();
+                    if (database.getDatabasePath().isPresent()) {
+                        dbOpt = FileUtil.getUniquePathFragment(stateManager.collectAllDatabasePaths(), database.getDatabasePath().get());
+                    }
+                    if (database.getLocation() == DatabaseLocation.SHARED) {
+                        return database.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared") + "]";
+                    }
+
+                    return dbOpt.orElseGet(() -> Localization.lang("untitled"));
+                })
+                .install(libraryListView);
+        viewModel.selectedDbProperty().bind(libraryListView.getSelectionModel().selectedItemProperty());
+        stateManager.getActiveDatabase().ifPresent(database1 -> libraryListView.getSelectionModel().select(database1));
+
+        PseudoClass entrySelected = PseudoClass.getPseudoClass("selected");
+        new ViewModelListCellFactory<BibEntry>()
+                .withGraphic(entry -> {
+                    ToggleButton addToggle = IconTheme.JabRefIcons.ADD.asToggleButton();
+                    EasyBind.subscribe(addToggle.selectedProperty(), selected -> {
+                        if (selected) {
+                            addToggle.setGraphic(IconTheme.JabRefIcons.ADD_FILLED.withColor(IconTheme.SELECTED_COLOR).getGraphicNode());
+                        } else {
+                            addToggle.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
+                        }
+                    });
+                    addToggle.getStyleClass().add("addEntryButton");
+                    addToggle.selectedProperty().bindBidirectional(entriesListView.getItemBooleanProperty(entry));
+                    HBox separator = new HBox();
+                    HBox.setHgrow(separator, Priority.SOMETIMES);
+                    Node entryNode = BibEntryView.getEntryNode(entry);
+                    HBox.setHgrow(entryNode, Priority.ALWAYS);
+                    HBox container = new HBox(entryNode, separator, addToggle);
+                    container.getStyleClass().add("entry-container");
+                    container.prefWidthProperty().bind(entriesListView.widthProperty().subtract(25));
+
+                    BackgroundTask.wrap(() -> viewModel.hasDuplicate(entry)).onSuccess(duplicateFound -> {
+                        if (duplicateFound) {
+                            Node icon = IconTheme.JabRefIcons.ERROR.getGraphicNode();
+                            Tooltip tooltip = new Tooltip(Localization.lang("Possible duplicate of existing entry. Will be resolved on import."));
+                            Tooltip.install(icon, tooltip);
+                            container.getChildren().add(icon);
+                        }
+                    }).executeWith(taskExecutor);
+
+                    /*
+                    inserted the if-statement here, since a Platform.runLater() call did not work.
+                    also tried to move it to the end of the initialize method, but it did not select the entry.
+                    */
+                    if (entriesListView.getItems().size() == 1) {
+                        selectAllNewEntries();
+                    }
+
+                    return container;
+                })
+                .withOnMouseClickedEvent((entry, event) -> {
+                    entriesListView.getCheckModel().toggleCheckState(entry);
+                    displayBibTeX(entry, viewModel.getSourceString(entry));
+                })
+                .withPseudoClass(entrySelected, entriesListView::getItemBooleanProperty)
+                .install(entriesListView);
+
+        selectedItems.textProperty().bind(Bindings.size(entriesListView.getCheckModel().getCheckedItems()).asString());
+        totalItems.textProperty().bind(Bindings.size(entriesListView.getItems()).asString());
+        entriesListView.setSelectionModel(new NoSelectionModel<>());
+        initBibTeX();
+        pageNumberLabel.setText("Loading...");
+    }
+
+    private void displayBibTeX(BibEntry entry, String bibTeX) {
+        if (entriesListView.getCheckModel().isChecked(entry)) {
+            bibTeXData.clear();
+            bibTeXData.appendText(bibTeX);
+            bibTeXData.moveTo(0);
+            bibTeXData.requestFollowCaret();
+        } else {
+            bibTeXData.clear();
+        }
+    }
+
+    private void initBibTeX() {
+        bibTeXDataLabel.setText(Localization.lang("%0 source", "BibTeX"));
+        bibTeXData.setBorder(new Border(new BorderStroke(Color.GREY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
+        bibTeXData.setPadding(new Insets(5.0));
+        showEntryInformation.selectedProperty().addListener((observableValue, old_val, new_val) -> {
+            bibTeXDataBox.setVisible(new_val);
+            bibTeXDataBox.setManaged(new_val);
+        });
+    }
+
+    public void unselectAll() {
+        entriesListView.getCheckModel().clearChecks();
+    }
+
+    public void selectAllNewEntries() {
+        unselectAll();
+        for (BibEntry entry : entriesListView.getItems()) {
+            if (!viewModel.hasDuplicate(entry)) {
+                entriesListView.getCheckModel().check(entry);
+                displayBibTeX(entry, viewModel.getSourceString(entry));
+            }
+        }
+    }
+
+    public void selectAllEntries() {
+        unselectAll();
+        entriesListView.getCheckModel().checkAll();
+    }
+
+    @FXML
+    private void onPrevPage() {
+        viewModel.prevPage();
+        updatePageNumberLabel();
+        restoreCheckedEntries();
+    }
+
+    @FXML
+    private void onNextPage() {
+        viewModel.nextPage();
+        updatePageNumberLabel();
+        restoreCheckedEntries();
+    }
+
+    private void restoreCheckedEntries() {
+        for (BibEntry entry : viewModel.getEntries()) {
+            if (viewModel.getCheckedEntries().contains(entry)) {
+                entriesListView.getCheckModel().check(entry);
+            }
+        }
+    }
+
+    private void updatePageNumberLabel() {
+        int total = (int) Math.ceil((double) viewModel.allEntries.size() / 20);
+        pageNumberLabel.setText("Page " + (viewModel.currentPage + 1) + " of " + total);
+    }
+}
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
new file mode 100644
index 00000000000..fe87efef610
--- /dev/null
+++ b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
@@ -0,0 +1,285 @@
+package org.jabref.gui.importer;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+
+import javax.swing.undo.UndoManager;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
+import javafx.concurrent.Task;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.externalfiles.ImportHandler;
+import org.jabref.gui.preferences.GuiPreferences;
+import org.jabref.logic.bibtex.BibEntryWriter;
+import org.jabref.logic.bibtex.FieldWriter;
+import org.jabref.logic.database.DatabaseMerger;
+import org.jabref.logic.database.DuplicateCheck;
+import org.jabref.logic.exporter.BibWriter;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.SearchBasedFetcher;
+import org.jabref.logic.importer.fetcher.ArXivFetcher;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.os.OS;
+import org.jabref.logic.util.BackgroundTask;
+import org.jabref.logic.util.TaskExecutor;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.util.FileUpdateMonitor;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class WebImportEntriesViewModel extends AbstractViewModel {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ImportEntriesViewModel.class);
+    private static final int PAGE_SIZE = 20;
+
+    public int currentPage = 0;
+    public List<BibEntry> allEntries = new ArrayList<>();
+
+    private final StringProperty message;
+    private final TaskExecutor taskExecutor;
+    private final BibDatabaseContext databaseContext;
+    private final DialogService dialogService;
+    private final UndoManager undoManager;
+    private final StateManager stateManager;
+    private final FileUpdateMonitor fileUpdateMonitor;
+    private ParserResult parserResult = null;
+    private final ObservableList<BibEntry> entries;
+    private final GuiPreferences preferences;
+    private final BibEntryTypesManager entryTypesManager;
+    private final ObjectProperty<BibDatabaseContext> selectedDb;
+    private final ObservableList<BibEntry> pagedEntries = FXCollections.observableArrayList();
+    private final ObservableSet<BibEntry> checkedEntries = FXCollections.observableSet();
+    private final SearchBasedFetcher fetcher;
+    private final String query;
+
+    /**
+     * @param databaseContext the database to import into
+     * @param task            the task executed for parsing the selected files(s).
+     */
+    public WebImportEntriesViewModel(BackgroundTask<ParserResult> task,
+                                  TaskExecutor taskExecutor,
+                                  BibDatabaseContext databaseContext,
+                                  DialogService dialogService,
+                                  UndoManager undoManager,
+                                  GuiPreferences preferences,
+                                  StateManager stateManager,
+                                  BibEntryTypesManager entryTypesManager,
+                                  FileUpdateMonitor fileUpdateMonitor,
+                                  SearchBasedFetcher fetcher,
+                                  String query) {
+        this.taskExecutor = taskExecutor;
+        this.databaseContext = databaseContext;
+        this.dialogService = dialogService;
+        this.undoManager = undoManager;
+        this.preferences = preferences;
+        this.stateManager = stateManager;
+        this.entryTypesManager = entryTypesManager;
+        this.fileUpdateMonitor = fileUpdateMonitor;
+        this.entries = FXCollections.observableArrayList();
+        this.message = new SimpleStringProperty();
+        this.message.bind(task.messageProperty());
+        this.selectedDb = new SimpleObjectProperty<>();
+        this.fetcher = fetcher;
+        this.query = query;
+
+        task.onSuccess(parserResult -> {
+            // store the complete parser result (to import groups, ... later on)
+            this.parserResult = parserResult;
+            // fill in the list for the user, where one can select the entries to import
+            entries.addAll(parserResult.getDatabase().getEntries());
+            try {
+                loadAllEntries(entries);
+                updatePagedEntries();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            if (entries.isEmpty()) {
+                task.updateMessage(Localization.lang("No entries corresponding to given query"));
+            }
+        }).onFailure(ex -> {
+            LOGGER.error("Error importing", ex);
+            dialogService.showErrorDialogAndWait(ex);
+        }).executeWith(taskExecutor);
+    }
+
+    public String getMessage() {
+        return message.get();
+    }
+
+    public StringProperty messageProperty() {
+        return message;
+    }
+
+    public ObjectProperty<BibDatabaseContext> selectedDbProperty() {
+        return selectedDb;
+    }
+
+    public BibDatabaseContext getSelectedDb() {
+        return selectedDb.get();
+    }
+
+    public ObservableList<BibEntry> getEntries() {
+        return pagedEntries;
+    }
+
+    public boolean hasDuplicate(BibEntry entry) {
+        return findInternalDuplicate(entry).isPresent() ||
+                new DuplicateCheck(entryTypesManager)
+                        .containsDuplicate(selectedDb.getValue().getDatabase(), entry, selectedDb.getValue().getMode()).isPresent();
+    }
+
+    public String getSourceString(BibEntry entry) {
+        StringWriter writer = new StringWriter();
+        BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
+        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(preferences.getFieldPreferences());
+        try {
+            new BibEntryWriter(fieldWriter, entryTypesManager).write(entry, bibWriter, selectedDb.getValue().getMode());
+        } catch (IOException ioException) {
+            return "";
+        }
+        return writer.toString();
+    }
+
+    /**
+     * Called after the user selected the entries to import. Does the real import stuff.
+     *
+     * @param entriesToImport subset of the entries contained in parserResult
+     */
+    public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownloadFiles) {
+        // Remember the selection in the dialog
+        preferences.getFilePreferences().setDownloadLinkedFiles(shouldDownloadFiles);
+
+        new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator()).mergeStrings(
+                databaseContext.getDatabase(),
+                parserResult.getDatabase());
+        new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator()).mergeMetaData(
+                databaseContext.getMetaData(),
+                parserResult.getMetaData(),
+                parserResult.getPath().map(path -> path.getFileName().toString()).orElse("unknown"),
+                parserResult.getDatabase().getEntries());
+        ImportHandler importHandler = new ImportHandler(
+                selectedDb.getValue(),
+                preferences,
+                fileUpdateMonitor,
+                undoManager,
+                stateManager,
+                dialogService,
+                taskExecutor);
+        importHandler.importEntriesWithDuplicateCheck(selectedDb.getValue(), entriesToImport);
+    }
+
+    /**
+     * Checks if there are duplicates to the given entry in the list of entries to be imported.
+     *
+     * @param entry The entry to search for duplicates of.
+     * @return A possible duplicate, if any, or null if none were found.
+     */
+    private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
+        for (BibEntry othEntry : entries) {
+            if (othEntry.equals(entry)) {
+                continue; // Don't compare the entry to itself
+            }
+            if (new DuplicateCheck(entryTypesManager).isDuplicate(entry, othEntry, databaseContext.getMode())) {
+                return Optional.of(othEntry);
+            }
+        }
+        return Optional.empty();
+    }
+
+    public Set<BibEntry> getCheckedEntries() {
+        return checkedEntries;
+    }
+
+    public void loadAllEntries(List<BibEntry> entries) {
+        this.allEntries = new ArrayList<>(entries);
+        this.currentPage = 0;
+    }
+
+    public void nextPage() {
+        if (hasNextPage()) {
+            currentPage++;
+            updatePagedEntries();
+        }
+    }
+
+    public void prevPage() {
+        if (hasPrevPage()) {
+            currentPage--;
+            updatePagedEntries();
+        }
+    }
+
+    public boolean hasNextPage() {
+        return (currentPage + 1) * PAGE_SIZE < allEntries.size();
+    }
+
+    public boolean hasPrevPage() {
+        return currentPage > 0;
+    }
+
+    private void updatePagedEntries() {
+        if (fetcher.getName().equals("ArXiv") && (currentPage + 1) * PAGE_SIZE >= allEntries.size()) {
+            fetchMoreEntries();
+        }
+
+        int fromIdx = currentPage * PAGE_SIZE;
+        int toIdx = Math.min(fromIdx + PAGE_SIZE, allEntries.size());
+        pagedEntries.setAll(allEntries.subList(fromIdx, toIdx));
+    }
+
+    private void fetchMoreEntries() {
+        Task<List<BibEntry>> fetchTask = new Task<List<BibEntry>>() {
+            @Override
+            protected List<BibEntry> call() throws Exception {
+                ArXivFetcher arXivFetcher = new ArXivFetcher(preferences.getImportFormatPreferences());
+                LOGGER.info("Fetching ArXiv entries for page {}", currentPage + 2);
+                return new ArrayList<>(arXivFetcher.performSearchPaged(query, currentPage + 1).getContent());
+            }
+
+            @Override
+            protected void succeeded() {
+                try {
+                    List<BibEntry> newEntries = get();
+                    if (newEntries != null && !newEntries.isEmpty()) {
+                        allEntries.addAll(newEntries);
+                    } else {
+                        LOGGER.warn("No new entries fetched for page {}", currentPage + 1);
+                    }
+                } catch (InterruptedException | ExecutionException ex) {
+                    showErrorDialog(ex);
+                }
+            }
+
+            @Override
+            protected void failed() {
+                showErrorDialog(getException());
+            }
+        };
+
+        new Thread(fetchTask).start();
+    }
+
+    private void showErrorDialog(Throwable e) {
+        dialogService.showErrorDialogAndWait(
+                Localization.lang("Error fetching entries"),
+                Localization.lang("An error occurred while fetching entries from ArXiv: ") + e.getMessage()
+        );
+    }
+}
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
index 9057d8078b8..0191b6d7f35 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -14,7 +14,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.frame.SidePanePreferences;
-import org.jabref.gui.importer.ImportEntriesDialog;
+import org.jabref.gui.importer.WebImportEntriesDialog;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.importer.CompositeIdFetcher;
 import org.jabref.logic.importer.ParserResult;
@@ -162,7 +162,7 @@ public void search() {
                                                           .withInitialMessage(Localization.lang("Processing \"%0\"...", query));
         task.onFailure(dialogService::showErrorDialogAndWait);
 
-        ImportEntriesDialog dialog = new ImportEntriesDialog(stateManager.getActiveDatabase().get(), task);
+        WebImportEntriesDialog dialog = new WebImportEntriesDialog(stateManager.getActiveDatabase().get(), task, activeFetcher, query);
         dialog.setTitle(fetcherName);
         dialogService.showCustomDialogAndWait(dialog);
     }
diff --git a/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml b/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
index d747c905e4a..a7061744df7 100644
--- a/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
@@ -20,10 +20,6 @@
         <VBox spacing="10.0">
             <Label text="%Select the entries to be imported:"/>
             <CheckListView fx:id="entriesListView" VBox.vgrow="ALWAYS"/>
-            <HBox spacing="10" alignment="CENTER">
-                <Button onAction="#onPrevPage" text="%Previous"/>
-                <Button onAction="#onNextPage" text="%Next"/>
-            </HBox>
             <HBox spacing="4">
                 <VBox spacing="10">
                     <HBox spacing="4">
diff --git a/jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml b/jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml
new file mode 100644
index 00000000000..7719f9be603
--- /dev/null
+++ b/jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import org.controlsfx.control.CheckListView?>
+<?import org.fxmisc.richtext.CodeArea?>
+<DialogPane prefHeight="700.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/10.0.2-internal"
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.importer.WebImportEntriesDialog"
+            id="importEntriesDialog">
+    <content>
+        <VBox spacing="10.0">
+            <Label text="%Select the entries to be imported:"/>
+            <CheckListView fx:id="entriesListView" VBox.vgrow="ALWAYS"/>
+            <HBox spacing="10" alignment="CENTER">
+                <Button onAction="#onPrevPage" text="%Previous"/>
+                <Label fx:id="pageNumberLabel" text=" " />
+                <Button onAction="#onNextPage" text="%Next"/>
+            </HBox>
+            <HBox spacing="4">
+                <VBox spacing="10">
+                    <HBox spacing="4">
+                        <Button onAction="#selectAllNewEntries"  text="%Select all new entries"/>
+                        <Button onAction="#selectAllEntries"  text="%Select all entries"/>
+                        <Button onAction="#unselectAll"  text="%Unselect all"/>
+                    </HBox>
+                    <VBox fx:id="bibTeXDataBox" visible="false" managed="false">
+                        <Label fx:id="bibTeXDataLabel"/>
+                        <CodeArea fx:id="bibTeXData" editable="false" minHeight="30.0" prefHeight="200.0" prefWidth="700.0" wrapText="true"/>
+                    </VBox>
+                    <HBox spacing="4" alignment="CENTER_LEFT">
+                        <Label text="%Library to import into"/>
+                        <ComboBox fx:id="libraryListView" layoutX="16.0" layoutY="52.0"/>
+                    </HBox>
+                </VBox>
+                <HBox HBox.hgrow="ALWAYS"/>
+                <GridPane hgap="4.0" vgap="4.0">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="30" halignment="RIGHT"/>
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0"/>
+                        <RowConstraints minHeight="10.0"/>
+                        <RowConstraints minHeight="10.0"/>
+                    </rowConstraints>
+                    <Label styleClass="info-section" text="%Total items found:"/>
+                    <Label fx:id="totalItems" GridPane.columnIndex="1"/>
+                    <Label styleClass="info-section" text="%Selected items:" GridPane.rowIndex="1"/>
+                    <Label fx:id="selectedItems" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
+                </GridPane>
+            </HBox>
+            <HBox spacing="4">
+                <CheckBox fx:id="downloadLinkedOnlineFiles" text="%Download referenced files (PDFs, ...)"/>
+                <CheckBox fx:id="showEntryInformation" text="%Show BibTeX source"/>
+            </HBox>
+        </VBox>
+    </content>
+    <ButtonType fx:id="importButton" buttonData="OK_DONE" text="%Import entries"/>
+    <ButtonType fx:constant="CANCEL"/>
+</DialogPane>
diff --git a/jablib/src/main/java/module-info.java b/jablib/src/main/java/module-info.java
index 069a32f3e9e..3a2e438ac62 100644
--- a/jablib/src/main/java/module-info.java
+++ b/jablib/src/main/java/module-info.java
@@ -106,6 +106,7 @@
     exports org.jabref.logic.git;
     exports org.jabref.logic.pseudonymization;
     exports org.jabref.logic.citation.repository;
+    exports org.jabref.model.paging;
 
     requires java.base;
 

From a10adf49cb5de8d4554deee868af09567cddc93e Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Sat, 19 Jul 2025 02:11:47 +0930
Subject: [PATCH 03/14] Fix page number display state for pagination

---
 .../gui/importer/WebImportEntriesDialog.java  | 27 ++++++++----
 .../importer/WebImportEntriesViewModel.java   | 41 ++++++++++++++++---
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
index 91e4b6be297..a8325d479d8 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
@@ -206,7 +206,25 @@ private void initialize() {
         totalItems.textProperty().bind(Bindings.size(entriesListView.getItems()).asString());
         entriesListView.setSelectionModel(new NoSelectionModel<>());
         initBibTeX();
-        pageNumberLabel.setText("Loading...");
+        updatePageUI();
+    }
+
+    private void updatePageUI() {
+        pageNumberLabel.textProperty().bind(Bindings.createStringBinding(() -> {
+            int totalPages = viewModel.totalPagesProperty().get();
+            int currentPage = viewModel.currentPageProperty().get() + 1;
+            if (totalPages != 0) {
+                return "Page " + currentPage + " of " + totalPages;
+            }
+            return "";
+        }, viewModel.currentPageProperty(), viewModel.totalPagesProperty()));
+        viewModel.getAllEntries().addListener((ListChangeListener<BibEntry>) change -> {
+            while (change.next()) {
+                if (change.wasAdded() || change.wasRemoved()) {
+                    viewModel.updateTotalPages();
+                }
+            }
+        });
     }
 
     private void displayBibTeX(BibEntry entry, String bibTeX) {
@@ -252,14 +270,12 @@ public void selectAllEntries() {
     @FXML
     private void onPrevPage() {
         viewModel.prevPage();
-        updatePageNumberLabel();
         restoreCheckedEntries();
     }
 
     @FXML
     private void onNextPage() {
         viewModel.nextPage();
-        updatePageNumberLabel();
         restoreCheckedEntries();
     }
 
@@ -270,9 +286,4 @@ private void restoreCheckedEntries() {
             }
         }
     }
-
-    private void updatePageNumberLabel() {
-        int total = (int) Math.ceil((double) viewModel.allEntries.size() / 20);
-        pageNumberLabel.setText("Page " + (viewModel.currentPage + 1) + " of " + total);
-    }
 }
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
index fe87efef610..e589f950c83 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
@@ -10,7 +10,9 @@
 
 import javax.swing.undo.UndoManager;
 
+import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
@@ -46,11 +48,11 @@
 
 public class WebImportEntriesViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ImportEntriesViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(WebImportEntriesViewModel.class);
     private static final int PAGE_SIZE = 20;
 
     public int currentPage = 0;
-    public List<BibEntry> allEntries = new ArrayList<>();
+    public ObservableList<BibEntry> allEntries = FXCollections.observableArrayList();
 
     private final StringProperty message;
     private final TaskExecutor taskExecutor;
@@ -64,10 +66,13 @@ public class WebImportEntriesViewModel extends AbstractViewModel {
     private final GuiPreferences preferences;
     private final BibEntryTypesManager entryTypesManager;
     private final ObjectProperty<BibDatabaseContext> selectedDb;
+    private final IntegerProperty currentPageProperty = new SimpleIntegerProperty(0);
+    private final IntegerProperty totalPagesProperty = new SimpleIntegerProperty(0);
     private final ObservableList<BibEntry> pagedEntries = FXCollections.observableArrayList();
     private final ObservableSet<BibEntry> checkedEntries = FXCollections.observableSet();
     private final SearchBasedFetcher fetcher;
     private final String query;
+    private boolean fetchingInProcess;
 
     /**
      * @param databaseContext the database to import into
@@ -98,6 +103,7 @@ public WebImportEntriesViewModel(BackgroundTask<ParserResult> task,
         this.selectedDb = new SimpleObjectProperty<>();
         this.fetcher = fetcher;
         this.query = query;
+        fetchingInProcess = false;
 
         task.onSuccess(parserResult -> {
             // store the complete parser result (to import groups, ... later on)
@@ -107,6 +113,7 @@ public WebImportEntriesViewModel(BackgroundTask<ParserResult> task,
             try {
                 loadAllEntries(entries);
                 updatePagedEntries();
+                updateTotalPages();
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -207,25 +214,46 @@ public Set<BibEntry> getCheckedEntries() {
         return checkedEntries;
     }
 
+    public ObservableList<BibEntry> getAllEntries() {
+        return allEntries;
+    }
+
     public void loadAllEntries(List<BibEntry> entries) {
-        this.allEntries = new ArrayList<>(entries);
+        this.allEntries = FXCollections.observableArrayList(entries);
         this.currentPage = 0;
     }
 
     public void nextPage() {
         if (hasNextPage()) {
+            currentPageProperty.set(currentPageProperty.get() + 1);
             currentPage++;
             updatePagedEntries();
+            updateTotalPages();
         }
     }
 
     public void prevPage() {
         if (hasPrevPage()) {
+            currentPageProperty.set(currentPageProperty.get() - 1);
             currentPage--;
             updatePagedEntries();
+            updateTotalPages();
         }
     }
 
+    public void updateTotalPages() {
+        int total = (int) Math.ceil((double) allEntries.size() / PAGE_SIZE);
+        totalPagesProperty.set(total);
+    }
+
+    public IntegerProperty currentPageProperty() {
+        return currentPageProperty;
+    }
+
+    public IntegerProperty totalPagesProperty() {
+        return totalPagesProperty;
+    }
+
     public boolean hasNextPage() {
         return (currentPage + 1) * PAGE_SIZE < allEntries.size();
     }
@@ -235,7 +263,8 @@ public boolean hasPrevPage() {
     }
 
     private void updatePagedEntries() {
-        if (fetcher.getName().equals("ArXiv") && (currentPage + 1) * PAGE_SIZE >= allEntries.size()) {
+        if (!fetchingInProcess && fetcher.getName().equals("ArXiv") && (currentPage + 1) * PAGE_SIZE >= allEntries.size()) {
+            fetchingInProcess = true;
             fetchMoreEntries();
         }
 
@@ -259,8 +288,10 @@ protected void succeeded() {
                     List<BibEntry> newEntries = get();
                     if (newEntries != null && !newEntries.isEmpty()) {
                         allEntries.addAll(newEntries);
+                        updateTotalPages();
+                        fetchingInProcess = false;
                     } else {
-                        LOGGER.warn("No new entries fetched for page {}", currentPage + 1);
+                        LOGGER.warn("No new entries fetched for page {}", currentPage + 2);
                     }
                 } catch (InterruptedException | ExecutionException ex) {
                     showErrorDialog(ex);

From ee4cabbcdede0a781ba9185cd7be5e89bdf3d0ed Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Sun, 20 Jul 2025 02:35:55 +0930
Subject: [PATCH 04/14] Minor fixes

- Enhance the background fetching mechanism for page-based search entries
- Fix 'Import Entries' button functionality
- Fix display of total and selected items counters
- Fix selection buttons behavior (unselectAll, selectAllNewEntries, selectAllEntries)
---
 .../gui/importer/WebImportEntriesDialog.java  | 17 ++++--
 .../importer/WebImportEntriesViewModel.java   | 57 ++++++-------------
 2 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
index a8325d479d8..f4d7ac2d05b 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
@@ -106,7 +106,7 @@ public WebImportEntriesDialog(BibDatabaseContext database, BackgroundTask<Parser
 
         setResultConverter(button -> {
             if (button == importButton) {
-                viewModel.importEntries(entriesListView.getCheckModel().getCheckedItems(), downloadLinkedOnlineFiles.isSelected());
+                viewModel.importEntries(viewModel.getCheckedEntries().stream().toList(), downloadLinkedOnlineFiles.isSelected());
             } else {
                 dialogService.notify(Localization.lang("Import canceled"));
             }
@@ -202,8 +202,8 @@ private void initialize() {
                 .withPseudoClass(entrySelected, entriesListView::getItemBooleanProperty)
                 .install(entriesListView);
 
-        selectedItems.textProperty().bind(Bindings.size(entriesListView.getCheckModel().getCheckedItems()).asString());
-        totalItems.textProperty().bind(Bindings.size(entriesListView.getItems()).asString());
+        selectedItems.textProperty().bind(Bindings.size(viewModel.getCheckedEntries()).asString());
+        totalItems.textProperty().bind(Bindings.size(viewModel.getAllEntries()).asString());
         entriesListView.setSelectionModel(new NoSelectionModel<>());
         initBibTeX();
         updatePageUI();
@@ -228,7 +228,7 @@ private void updatePageUI() {
     }
 
     private void displayBibTeX(BibEntry entry, String bibTeX) {
-        if (entriesListView.getCheckModel().isChecked(entry)) {
+        if (viewModel.getCheckedEntries().contains(entry)) {
             bibTeXData.clear();
             bibTeXData.appendText(bibTeX);
             bibTeXData.moveTo(0);
@@ -249,14 +249,18 @@ private void initBibTeX() {
     }
 
     public void unselectAll() {
-        entriesListView.getCheckModel().clearChecks();
+        viewModel.getCheckedEntries().clear();
+        for (int i = 0; i < entriesListView.getItems().size(); i++) {
+            entriesListView.getCheckModel().clearCheck(i);
+        }
     }
 
     public void selectAllNewEntries() {
         unselectAll();
-        for (BibEntry entry : entriesListView.getItems()) {
+        for (BibEntry entry : viewModel.getAllEntries()) {
             if (!viewModel.hasDuplicate(entry)) {
                 entriesListView.getCheckModel().check(entry);
+                viewModel.getCheckedEntries().add(entry);
                 displayBibTeX(entry, viewModel.getSourceString(entry));
             }
         }
@@ -265,6 +269,7 @@ public void selectAllNewEntries() {
     public void selectAllEntries() {
         unselectAll();
         entriesListView.getCheckModel().checkAll();
+        viewModel.getCheckedEntries().addAll(viewModel.getAllEntries());
     }
 
     @FXML
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
index e589f950c83..6f97bcd7fd3 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
@@ -5,8 +5,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
 
 import javax.swing.undo.UndoManager;
 
@@ -19,7 +17,6 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableSet;
-import javafx.concurrent.Task;
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
@@ -103,7 +100,7 @@ public WebImportEntriesViewModel(BackgroundTask<ParserResult> task,
         this.selectedDb = new SimpleObjectProperty<>();
         this.fetcher = fetcher;
         this.query = query;
-        fetchingInProcess = false;
+        this.fetchingInProcess = false;
 
         task.onSuccess(parserResult -> {
             // store the complete parser result (to import groups, ... later on)
@@ -210,7 +207,7 @@ private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
         return Optional.empty();
     }
 
-    public Set<BibEntry> getCheckedEntries() {
+    public ObservableSet<BibEntry> getCheckedEntries() {
         return checkedEntries;
     }
 
@@ -219,7 +216,7 @@ public ObservableList<BibEntry> getAllEntries() {
     }
 
     public void loadAllEntries(List<BibEntry> entries) {
-        this.allEntries = FXCollections.observableArrayList(entries);
+        allEntries.addAll(entries);
         this.currentPage = 0;
     }
 
@@ -274,43 +271,25 @@ private void updatePagedEntries() {
     }
 
     private void fetchMoreEntries() {
-        Task<List<BibEntry>> fetchTask = new Task<List<BibEntry>>() {
-            @Override
-            protected List<BibEntry> call() throws Exception {
+        BackgroundTask<ArrayList<BibEntry>> fetchTask = BackgroundTask
+            .wrap(() -> {
                 ArXivFetcher arXivFetcher = new ArXivFetcher(preferences.getImportFormatPreferences());
                 LOGGER.info("Fetching ArXiv entries for page {}", currentPage + 2);
                 return new ArrayList<>(arXivFetcher.performSearchPaged(query, currentPage + 1).getContent());
-            }
-
-            @Override
-            protected void succeeded() {
-                try {
-                    List<BibEntry> newEntries = get();
-                    if (newEntries != null && !newEntries.isEmpty()) {
-                        allEntries.addAll(newEntries);
-                        updateTotalPages();
-                        fetchingInProcess = false;
-                    } else {
-                        LOGGER.warn("No new entries fetched for page {}", currentPage + 2);
-                    }
-                } catch (InterruptedException | ExecutionException ex) {
-                    showErrorDialog(ex);
+            })
+            .onSuccess(newEntries -> {
+                if (newEntries != null && !newEntries.isEmpty()) {
+                    allEntries.addAll(newEntries);
+                    updateTotalPages();
+                    fetchingInProcess = false;
+                } else {
+                    LOGGER.warn("No new entries fetched for page {}", currentPage + 2);
                 }
-            }
-
-            @Override
-            protected void failed() {
-                showErrorDialog(getException());
-            }
-        };
-
-        new Thread(fetchTask).start();
-    }
+            }).onFailure(exception -> dialogService.showErrorDialogAndWait(
+                    Localization.lang("Error fetching entries"),
+                    Localization.lang("An error occurred while fetching entries from ArXiv: ") + exception.getMessage()
+            ));
 
-    private void showErrorDialog(Throwable e) {
-        dialogService.showErrorDialogAndWait(
-                Localization.lang("Error fetching entries"),
-                Localization.lang("An error occurred while fetching entries from ArXiv: ") + e.getMessage()
-        );
+        fetchTask.executeWith(taskExecutor);
     }
 }

From 7511a6c85c54498c2e79b2938113de6400be3909 Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Mon, 21 Jul 2025 01:11:10 +0930
Subject: [PATCH 05/14] Refactor fetchMoreEntries method

- generalized fetching of entries for all page-search-based fetcher
- improved pageNumberLabel UI
- update JabRef_en.properties
---
 .../gui/importer/WebImportEntriesDialog.java  |   6 +-
 .../importer/WebImportEntriesViewModel.java   | 165 +++++++++---------
 .../gui/importer/WebImportEntriesDialog.fxml  |   8 +-
 .../main/resources/l10n/JabRef_en.properties  |   5 +-
 4 files changed, 100 insertions(+), 84 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
index f4d7ac2d05b..d67ea0f8973 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
@@ -36,6 +36,7 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.NoSelectionModel;
 import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.l10n.Localization;
@@ -213,8 +214,11 @@ private void updatePageUI() {
         pageNumberLabel.textProperty().bind(Bindings.createStringBinding(() -> {
             int totalPages = viewModel.totalPagesProperty().get();
             int currentPage = viewModel.currentPageProperty().get() + 1;
+            if (searchBasedFetcher instanceof PagedSearchBasedFetcher && currentPage == totalPages) {
+                return Localization.lang("Fetching...");
+            }
             if (totalPages != 0) {
-                return "Page " + currentPage + " of " + totalPages;
+                return currentPage + " " + Localization.lang("of") + " " + totalPages;
             }
             return "";
         }, viewModel.currentPageProperty(), viewModel.totalPagesProperty()));
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
index 6f97bcd7fd3..280c69fb41e 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
@@ -8,8 +8,10 @@
 
 import javax.swing.undo.UndoManager;
 
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -28,9 +30,9 @@
 import org.jabref.logic.database.DatabaseMerger;
 import org.jabref.logic.database.DuplicateCheck;
 import org.jabref.logic.exporter.BibWriter;
+import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.SearchBasedFetcher;
-import org.jabref.logic.importer.fetcher.ArXivFetcher;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.os.OS;
 import org.jabref.logic.util.BackgroundTask;
@@ -47,9 +49,7 @@ public class WebImportEntriesViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(WebImportEntriesViewModel.class);
     private static final int PAGE_SIZE = 20;
-
-    public int currentPage = 0;
-    public ObservableList<BibEntry> allEntries = FXCollections.observableArrayList();
+    private int CURRENT_PAGE = 0;
 
     private final StringProperty message;
     private final TaskExecutor taskExecutor;
@@ -63,13 +63,15 @@ public class WebImportEntriesViewModel extends AbstractViewModel {
     private final GuiPreferences preferences;
     private final BibEntryTypesManager entryTypesManager;
     private final ObjectProperty<BibDatabaseContext> selectedDb;
+
     private final IntegerProperty currentPageProperty = new SimpleIntegerProperty(0);
     private final IntegerProperty totalPagesProperty = new SimpleIntegerProperty(0);
+    private final BooleanProperty loading = new SimpleBooleanProperty(false);
     private final ObservableList<BibEntry> pagedEntries = FXCollections.observableArrayList();
     private final ObservableSet<BibEntry> checkedEntries = FXCollections.observableSet();
+    private final ObservableList<BibEntry> allEntries = FXCollections.observableArrayList();
     private final SearchBasedFetcher fetcher;
     private final String query;
-    private boolean fetchingInProcess;
 
     /**
      * @param databaseContext the database to import into
@@ -100,20 +102,15 @@ public WebImportEntriesViewModel(BackgroundTask<ParserResult> task,
         this.selectedDb = new SimpleObjectProperty<>();
         this.fetcher = fetcher;
         this.query = query;
-        this.fetchingInProcess = false;
 
         task.onSuccess(parserResult -> {
             // store the complete parser result (to import groups, ... later on)
             this.parserResult = parserResult;
             // fill in the list for the user, where one can select the entries to import
             entries.addAll(parserResult.getDatabase().getEntries());
-            try {
-                loadAllEntries(entries);
-                updatePagedEntries();
-                updateTotalPages();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
+            loadAllEntries(entries);
+            updatePagedEntries();
+            updateTotalPages();
             if (entries.isEmpty()) {
                 task.updateMessage(Localization.lang("No entries corresponding to given query"));
             }
@@ -139,16 +136,51 @@ public BibDatabaseContext getSelectedDb() {
         return selectedDb.get();
     }
 
+    public BooleanProperty loadingProperty() {
+        return loading;
+    }
+
     public ObservableList<BibEntry> getEntries() {
         return pagedEntries;
     }
 
+    public ObservableSet<BibEntry> getCheckedEntries() {
+        return checkedEntries;
+    }
+
+    public ObservableList<BibEntry> getAllEntries() {
+        return allEntries;
+    }
+
+    public void loadAllEntries(List<BibEntry> entries) {
+        allEntries.addAll(entries);
+        this.CURRENT_PAGE = 0;
+    }
+
     public boolean hasDuplicate(BibEntry entry) {
         return findInternalDuplicate(entry).isPresent() ||
                 new DuplicateCheck(entryTypesManager)
                         .containsDuplicate(selectedDb.getValue().getDatabase(), entry, selectedDb.getValue().getMode()).isPresent();
     }
 
+    /**
+     * Checks if there are duplicates to the given entry in the list of entries to be imported.
+     *
+     * @param entry The entry to search for duplicates of.
+     * @return A possible duplicate, if any, or null if none were found.
+     */
+    private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
+        for (BibEntry othEntry : entries) {
+            if (othEntry.equals(entry)) {
+                continue; // Don't compare the entry to itself
+            }
+            if (new DuplicateCheck(entryTypesManager).isDuplicate(entry, othEntry, databaseContext.getMode())) {
+                return Optional.of(othEntry);
+            }
+        }
+        return Optional.empty();
+    }
+
     public String getSourceString(BibEntry entry) {
         StringWriter writer = new StringWriter();
         BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
@@ -189,58 +221,30 @@ public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownload
         importHandler.importEntriesWithDuplicateCheck(selectedDb.getValue(), entriesToImport);
     }
 
-    /**
-     * Checks if there are duplicates to the given entry in the list of entries to be imported.
-     *
-     * @param entry The entry to search for duplicates of.
-     * @return A possible duplicate, if any, or null if none were found.
-     */
-    private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
-        for (BibEntry othEntry : entries) {
-            if (othEntry.equals(entry)) {
-                continue; // Don't compare the entry to itself
-            }
-            if (new DuplicateCheck(entryTypesManager).isDuplicate(entry, othEntry, databaseContext.getMode())) {
-                return Optional.of(othEntry);
-            }
+    public void prevPage() {
+        if (hasPrevPage()) {
+            currentPageProperty.set(currentPageProperty.get() - 1);
+            CURRENT_PAGE--;
+            updatePagedEntries();
+            updateTotalPages();
         }
-        return Optional.empty();
-    }
-
-    public ObservableSet<BibEntry> getCheckedEntries() {
-        return checkedEntries;
-    }
-
-    public ObservableList<BibEntry> getAllEntries() {
-        return allEntries;
-    }
-
-    public void loadAllEntries(List<BibEntry> entries) {
-        allEntries.addAll(entries);
-        this.currentPage = 0;
     }
 
     public void nextPage() {
         if (hasNextPage()) {
             currentPageProperty.set(currentPageProperty.get() + 1);
-            currentPage++;
+            CURRENT_PAGE++;
             updatePagedEntries();
             updateTotalPages();
         }
     }
 
-    public void prevPage() {
-        if (hasPrevPage()) {
-            currentPageProperty.set(currentPageProperty.get() - 1);
-            currentPage--;
-            updatePagedEntries();
-            updateTotalPages();
-        }
+    public boolean hasNextPage() {
+        return (CURRENT_PAGE + 1) * PAGE_SIZE < allEntries.size();
     }
 
-    public void updateTotalPages() {
-        int total = (int) Math.ceil((double) allEntries.size() / PAGE_SIZE);
-        totalPagesProperty.set(total);
+    public boolean hasPrevPage() {
+        return CURRENT_PAGE > 0;
     }
 
     public IntegerProperty currentPageProperty() {
@@ -251,44 +255,45 @@ public IntegerProperty totalPagesProperty() {
         return totalPagesProperty;
     }
 
-    public boolean hasNextPage() {
-        return (currentPage + 1) * PAGE_SIZE < allEntries.size();
-    }
-
-    public boolean hasPrevPage() {
-        return currentPage > 0;
+    public void updateTotalPages() {
+        int total = (int) Math.ceil((double) allEntries.size() / PAGE_SIZE);
+        totalPagesProperty.set(total);
     }
 
     private void updatePagedEntries() {
-        if (!fetchingInProcess && fetcher.getName().equals("ArXiv") && (currentPage + 1) * PAGE_SIZE >= allEntries.size()) {
-            fetchingInProcess = true;
-            fetchMoreEntries();
+        if (!loadingProperty().get() && fetcher instanceof PagedSearchBasedFetcher pagedFetcher && (CURRENT_PAGE + 1) * PAGE_SIZE >= allEntries.size()) {
+            loading.set(true);
+            fetchMoreEntries(pagedFetcher);
         }
 
-        int fromIdx = currentPage * PAGE_SIZE;
+        int fromIdx = CURRENT_PAGE * PAGE_SIZE;
         int toIdx = Math.min(fromIdx + PAGE_SIZE, allEntries.size());
         pagedEntries.setAll(allEntries.subList(fromIdx, toIdx));
     }
 
-    private void fetchMoreEntries() {
+    private void fetchMoreEntries(PagedSearchBasedFetcher pagedFetcher) {
         BackgroundTask<ArrayList<BibEntry>> fetchTask = BackgroundTask
-            .wrap(() -> {
-                ArXivFetcher arXivFetcher = new ArXivFetcher(preferences.getImportFormatPreferences());
-                LOGGER.info("Fetching ArXiv entries for page {}", currentPage + 2);
-                return new ArrayList<>(arXivFetcher.performSearchPaged(query, currentPage + 1).getContent());
-            })
-            .onSuccess(newEntries -> {
-                if (newEntries != null && !newEntries.isEmpty()) {
-                    allEntries.addAll(newEntries);
-                    updateTotalPages();
-                    fetchingInProcess = false;
-                } else {
-                    LOGGER.warn("No new entries fetched for page {}", currentPage + 2);
-                }
-            }).onFailure(exception -> dialogService.showErrorDialogAndWait(
-                    Localization.lang("Error fetching entries"),
-                    Localization.lang("An error occurred while fetching entries from ArXiv: ") + exception.getMessage()
-            ));
+                .wrap(() -> {
+                    LOGGER.info("Fetching entries from {} for page {}", fetcher.getName(), CURRENT_PAGE + 2);
+                    return new ArrayList<>(pagedFetcher.performSearchPaged(query, CURRENT_PAGE + 1).getContent());
+                })
+                .onSuccess(newEntries -> {
+                    if (newEntries != null && !newEntries.isEmpty()) {
+                        allEntries.addAll(newEntries);
+                        updateTotalPages();
+                    } else {
+                        LOGGER.warn("No new entries fetched from {} for page {}", fetcher.getName(), CURRENT_PAGE + 2);
+                    }
+                    loading.set(false);
+                })
+                .onFailure(exception -> {
+                    loading.set(false);
+                    dialogService.showErrorDialogAndWait(
+                            Localization.lang("Error fetching entries"),
+                            Localization.lang("An error occurred while fetching entries from {0}: {1}",
+                                    fetcher.getName(), exception.getMessage())
+                    );
+                });
 
         fetchTask.executeWith(taskExecutor);
     }
diff --git a/jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml b/jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml
index 7719f9be603..d07e20f8e31 100644
--- a/jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml
@@ -20,10 +20,14 @@
         <VBox spacing="10.0">
             <Label text="%Select the entries to be imported:"/>
             <CheckListView fx:id="entriesListView" VBox.vgrow="ALWAYS"/>
-            <HBox spacing="10" alignment="CENTER">
+            <HBox spacing="10">
+                <HBox HBox.hgrow="ALWAYS"/>
                 <Button onAction="#onPrevPage" text="%Previous"/>
-                <Label fx:id="pageNumberLabel" text=" " />
                 <Button onAction="#onNextPage" text="%Next"/>
+                <HBox HBox.hgrow="ALWAYS"/>
+                <HBox spacing="4">
+                    <Label fx:id="pageNumberLabel" text=" " />
+                </HBox>
             </HBox>
             <HBox spacing="4">
                 <VBox spacing="10">
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index c67591ca8cb..5da024dad3a 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -679,7 +679,10 @@ Possible\ duplicate\ entries=Possible duplicate entries
 Possible\ duplicate\ of\ existing\ entry.\ Will\ be\ resolved\ on\ import.=Possible duplicate of existing entry. Will be resolved on import.
 
 Import\ canceled=Import canceled
-
+An\ error\ occurred\ while\ fetching\ entries\ from\ {0}\:\ {1}=An error occurred while fetching entries from {0}: {1}
+Error\ fetching\ entries=Error fetching entries
+Fetching...=Fetching...
+of=of
 
 Preferences=Preferences
 

From 2030c8d442c59d79c5826706aa6bb283b770b0b4 Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Fri, 25 Jul 2025 00:24:40 +0930
Subject: [PATCH 06/14] Add CHANGELOG.md entry

---
 CHANGELOG.md                                                    | 1 +
 .../java/org/jabref/gui/importer/WebImportEntriesDialog.java    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 143535288ea..6e3eabcff1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We added the field `monthfiled` to the default list of fields to resolve BibTeX-Strings for [#13375](https://github.com/JabRef/jabref/issues/13375)
 - We added a new ID based fetcher for [EuropePMC](https://europepmc.org/). [#13389](https://github.com/JabRef/jabref/pull/13389)
 - We added an initial [cite as you write](https://retorque.re/zotero-better-bibtex/citing/cayw/) endpoint. [#13187](https://github.com/JabRef/jabref/issues/13187)
+- We added pagination support for the web search entries dialog, improving navigation for large search results. [#5507](https://github.com/JabRef/jabref/issues/5507)
 
 ### Changed
 
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
index d67ea0f8973..6cad0f096ae 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
@@ -144,7 +144,7 @@ private void initialize() {
                 .withText(database -> {
                     Optional<String> dbOpt = Optional.empty();
                     if (database.getDatabasePath().isPresent()) {
-                        dbOpt = FileUtil.getUniquePathFragment(stateManager.collectAllDatabasePaths(), database.getDatabasePath().get());
+                        dbOpt = FileUtil.getUniquePathFragment(stateManager.getAllDatabasePaths(), database.getDatabasePath().get());
                     }
                     if (database.getLocation() == DatabaseLocation.SHARED) {
                         return database.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared") + "]";

From 3e8f567b7a652ac2628f93b71855b3e3dbc52b57 Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Sun, 3 Aug 2025 01:30:50 +0930
Subject: [PATCH 07/14] Remove WebImportEntriesDialog, its ViewModel, and
 associated FXML in favor of integrating pagination into ImportEntriesDialog.

---
 .../gui/frame/JabRefFrameViewModel.java       |   2 +-
 .../jabref/gui/importer/ImportCommand.java    |   2 +-
 .../gui/importer/ImportEntriesDialog.java     |  95 +++++-
 .../gui/importer/ImportEntriesViewModel.java  | 129 +++++++-
 .../gui/importer/WebImportEntriesDialog.java  | 298 -----------------
 .../importer/WebImportEntriesViewModel.java   | 300 ------------------
 .../fetcher/WebSearchPaneViewModel.java       |   4 +-
 .../maintable/ExtractReferencesAction.java    |   2 +-
 .../texparser/ParseLatexResultViewModel.java  |   2 +-
 .../gui/importer/ImportEntriesDialog.fxml     |   9 +
 .../gui/importer/WebImportEntriesDialog.fxml  |  73 -----
 .../main/resources/l10n/JabRef_en.properties  |   2 +-
 12 files changed, 229 insertions(+), 689 deletions(-)
 delete mode 100644 jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
 delete mode 100644 jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
 delete mode 100644 jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml

diff --git a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java
index c16ad7ff8ca..394e9f33b3b 100644
--- a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java
@@ -324,7 +324,7 @@ private void addParserResult(ParserResult parserResult) {
         BackgroundTask<ParserResult> task = BackgroundTask.wrap(() -> parserResult);
         ImportCleanup cleanup = ImportCleanup.targeting(libraryTab.getBibDatabaseContext().getMode(), preferences.getFieldPreferences());
         cleanup.doPostCleanup(parserResult.getDatabase().getEntries());
-        ImportEntriesDialog dialog = new ImportEntriesDialog(libraryTab.getBibDatabaseContext(), task);
+        ImportEntriesDialog dialog = new ImportEntriesDialog(libraryTab.getBibDatabaseContext(), task, null, null);
 
         dialog.setTitle(Localization.lang("Import"));
         dialogService.showCustomDialogAndWait(dialog);
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportCommand.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportCommand.java
index 5a9f78e4d48..61dfb448e30 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportCommand.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportCommand.java
@@ -144,7 +144,7 @@ private void importMultipleFiles(List<Path> files, SortedSet<Importer> importers
                 })
                 .executeWith(taskExecutor);
         } else {
-            ImportEntriesDialog dialog = new ImportEntriesDialog(tab.getBibDatabaseContext(), task);
+            ImportEntriesDialog dialog = new ImportEntriesDialog(tab.getBibDatabaseContext(), task, null, null);
             dialog.setTitle(Localization.lang("Import"));
             dialogService.showCustomDialogAndWait(dialog);
         }
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 4fc5a89000e..d2bdac48e19 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -6,6 +6,7 @@
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
+import javafx.collections.ListChangeListener;
 import javafx.css.PseudoClass;
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
@@ -35,7 +36,9 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.NoSelectionModel;
 import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.DatabaseLocation;
 import org.jabref.logic.util.BackgroundTask;
@@ -53,7 +56,8 @@
 import org.fxmisc.richtext.CodeArea;
 
 public class ImportEntriesDialog extends BaseDialog<Boolean> {
-
+    @FXML private HBox paginationBox;
+    @FXML private Label pageNumberLabel;
     @FXML private CheckListView<BibEntry> entriesListView;
     @FXML private ComboBox<BibDatabaseContext> libraryListView;
     @FXML private ButtonType importButton;
@@ -68,6 +72,8 @@ public class ImportEntriesDialog extends BaseDialog<Boolean> {
     private final BackgroundTask<ParserResult> task;
     private final BibDatabaseContext database;
     private ImportEntriesViewModel viewModel;
+    private final SearchBasedFetcher searchBasedFetcher;
+    private final String query;
 
     @Inject private TaskExecutor taskExecutor;
     @Inject private DialogService dialogService;
@@ -83,13 +89,20 @@ public class ImportEntriesDialog extends BaseDialog<Boolean> {
      * @param database the database to import into
      * @param task     the task executed for parsing the selected files(s).
      */
-    public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task) {
+    public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task, SearchBasedFetcher fetcher, String query) {
         this.database = database;
         this.task = task;
+        this.searchBasedFetcher = fetcher;
+        this.query = query;
+
         ViewLoader.view(this)
                   .load()
                   .setAsDialogPane(this);
 
+        boolean showPagination = (searchBasedFetcher != null) && (query != null);
+        paginationBox.setVisible(showPagination);
+        paginationBox.setManaged(showPagination);
+
         BooleanBinding booleanBind = Bindings.isEmpty(entriesListView.getCheckModel().getCheckedItems());
         Button btn = (Button) this.getDialogPane().lookupButton(importButton);
         btn.disableProperty().bind(booleanBind);
@@ -98,7 +111,7 @@ public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserRes
 
         setResultConverter(button -> {
             if (button == importButton) {
-                viewModel.importEntries(entriesListView.getCheckModel().getCheckedItems(), downloadLinkedOnlineFiles.isSelected());
+                viewModel.importEntries(viewModel.getCheckedEntries().stream().toList(), downloadLinkedOnlineFiles.isSelected());
             } else {
                 dialogService.notify(Localization.lang("Import canceled"));
             }
@@ -109,11 +122,25 @@ public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserRes
 
     @FXML
     private void initialize() {
-        viewModel = new ImportEntriesViewModel(task, taskExecutor, database, dialogService, undoManager, preferences, stateManager, entryTypesManager, fileUpdateMonitor);
+        viewModel = new ImportEntriesViewModel(task, taskExecutor, database, dialogService, undoManager, preferences, stateManager, entryTypesManager, fileUpdateMonitor, searchBasedFetcher, query);
         Label placeholder = new Label();
         placeholder.textProperty().bind(viewModel.messageProperty());
         entriesListView.setPlaceholder(placeholder);
         entriesListView.setItems(viewModel.getEntries());
+        entriesListView.getCheckModel().getCheckedItems().addListener((ListChangeListener<BibEntry>) change -> {
+            while (change.next()) {
+                if (change.wasAdded()) {
+                    for (BibEntry entry : change.getAddedSubList()) {
+                        viewModel.getCheckedEntries().add(entry);
+                    }
+                }
+                if (change.wasRemoved()) {
+                    for (BibEntry entry : change.getRemoved()) {
+                        viewModel.getCheckedEntries().remove(entry);
+                    }
+                }
+            }
+        });
 
         libraryListView.setEditable(false);
         libraryListView.getItems().addAll(stateManager.getOpenDatabases());
@@ -180,14 +207,39 @@ private void initialize() {
                 .withPseudoClass(entrySelected, entriesListView::getItemBooleanProperty)
                 .install(entriesListView);
 
-        selectedItems.textProperty().bind(Bindings.size(entriesListView.getCheckModel().getCheckedItems()).asString());
-        totalItems.textProperty().bind(Bindings.size(entriesListView.getItems()).asString());
+        selectedItems.textProperty().bind(Bindings.size(viewModel.getCheckedEntries()).asString());
+        totalItems.textProperty().bind(Bindings.size(viewModel.getAllEntries()).asString());
         entriesListView.setSelectionModel(new NoSelectionModel<>());
         initBibTeX();
+        if (searchBasedFetcher != null) {
+            updatePageUI();
+        }
+    }
+
+    private void updatePageUI() {
+        pageNumberLabel.textProperty().bind(Bindings.createStringBinding(() -> {
+            int totalPages = viewModel.totalPagesProperty().get();
+            int currentPage = viewModel.currentPageProperty().get() + 1;
+            if (searchBasedFetcher instanceof PagedSearchBasedFetcher && currentPage == totalPages) {
+                return Localization.lang("Fetching...");
+            }
+            if (totalPages != 0) {
+                return currentPage + " " + Localization.lang("of") + " " + totalPages;
+            }
+            return "";
+        }, viewModel.currentPageProperty(), viewModel.totalPagesProperty()));
+
+        viewModel.getAllEntries().addListener((ListChangeListener<BibEntry>) change -> {
+            while (change.next()) {
+                if (change.wasAdded() || change.wasRemoved()) {
+                    viewModel.updateTotalPages();
+                }
+            }
+        });
     }
 
     private void displayBibTeX(BibEntry entry, String bibTeX) {
-        if (entriesListView.getCheckModel().isChecked(entry)) {
+        if (viewModel.getCheckedEntries().contains(entry)) {
             bibTeXData.clear();
             bibTeXData.appendText(bibTeX);
             bibTeXData.moveTo(0);
@@ -208,14 +260,18 @@ private void initBibTeX() {
     }
 
     public void unselectAll() {
-        entriesListView.getCheckModel().clearChecks();
+        viewModel.getCheckedEntries().clear();
+        for (int i = 0; i < entriesListView.getItems().size(); i++) {
+            entriesListView.getCheckModel().clearCheck(i);
+        }
     }
 
     public void selectAllNewEntries() {
         unselectAll();
-        for (BibEntry entry : entriesListView.getItems()) {
+        for (BibEntry entry : viewModel.getAllEntries()) {
             if (!viewModel.hasDuplicate(entry)) {
                 entriesListView.getCheckModel().check(entry);
+                viewModel.getCheckedEntries().add(entry);
                 displayBibTeX(entry, viewModel.getSourceString(entry));
             }
         }
@@ -224,5 +280,26 @@ public void selectAllNewEntries() {
     public void selectAllEntries() {
         unselectAll();
         entriesListView.getCheckModel().checkAll();
+        viewModel.getCheckedEntries().addAll(viewModel.getAllEntries());
+    }
+
+    @FXML
+    private void onPrevPage() {
+        viewModel.prevPage();
+        restoreCheckedEntries();
+    }
+
+    @FXML
+    private void onNextPage() {
+        viewModel.nextPage();
+        restoreCheckedEntries();
+    }
+
+    private void restoreCheckedEntries() {
+        for (BibEntry entry : viewModel.getEntries()) {
+            if (viewModel.getCheckedEntries().contains(entry)) {
+                entriesListView.getCheckModel().check(entry);
+            }
+        }
     }
 }
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index 8dc031f249a..61974fb4fdc 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -2,17 +2,23 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 import javax.swing.undo.UndoManager;
 
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
@@ -24,7 +30,9 @@
 import org.jabref.logic.database.DatabaseMerger;
 import org.jabref.logic.database.DuplicateCheck;
 import org.jabref.logic.exporter.BibWriter;
+import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.os.OS;
 import org.jabref.logic.util.BackgroundTask;
@@ -40,6 +48,8 @@
 public class ImportEntriesViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImportEntriesViewModel.class);
+    private static final int PAGE_SIZE = 20;
+    private int CURRENT_PAGE = 0;
 
     private final StringProperty message;
     private final TaskExecutor taskExecutor;
@@ -54,6 +64,15 @@ public class ImportEntriesViewModel extends AbstractViewModel {
     private final BibEntryTypesManager entryTypesManager;
     private final ObjectProperty<BibDatabaseContext> selectedDb;
 
+    private final IntegerProperty currentPageProperty = new SimpleIntegerProperty(0);
+    private final IntegerProperty totalPagesProperty = new SimpleIntegerProperty(0);
+    private final BooleanProperty loading = new SimpleBooleanProperty(false);
+    private final ObservableList<BibEntry> pagedEntries = FXCollections.observableArrayList();
+    private final ObservableSet<BibEntry> checkedEntries = FXCollections.observableSet();
+    private final ObservableList<BibEntry> allEntries = FXCollections.observableArrayList();
+    private final SearchBasedFetcher fetcher;
+    private final String query;
+
     /**
      * @param databaseContext the database to import into
      * @param task            the task executed for parsing the selected files(s).
@@ -66,7 +85,9 @@ public ImportEntriesViewModel(BackgroundTask<ParserResult> task,
                                   GuiPreferences preferences,
                                   StateManager stateManager,
                                   BibEntryTypesManager entryTypesManager,
-                                  FileUpdateMonitor fileUpdateMonitor) {
+                                  FileUpdateMonitor fileUpdateMonitor,
+                                  SearchBasedFetcher fetcher,
+                                  String query) {
         this.taskExecutor = taskExecutor;
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
@@ -79,12 +100,17 @@ public ImportEntriesViewModel(BackgroundTask<ParserResult> task,
         this.message = new SimpleStringProperty();
         this.message.bind(task.messageProperty());
         this.selectedDb = new SimpleObjectProperty<>();
+        this.fetcher = fetcher;
+        this.query = query;
 
         task.onSuccess(parserResult -> {
             // store the complete parser result (to import groups, ... later on)
             this.parserResult = parserResult;
             // fill in the list for the user, where one can select the entries to import
             entries.addAll(parserResult.getDatabase().getEntries());
+            loadAllEntries(entries);
+            updatePagedEntries();
+            updateTotalPages();
             if (entries.isEmpty()) {
                 task.updateMessage(Localization.lang("No entries corresponding to given query"));
             }
@@ -110,8 +136,25 @@ public BibDatabaseContext getSelectedDb() {
         return selectedDb.get();
     }
 
+    public BooleanProperty loadingProperty() {
+        return loading;
+    }
+
     public ObservableList<BibEntry> getEntries() {
-        return entries;
+        return pagedEntries;
+    }
+
+    public ObservableSet<BibEntry> getCheckedEntries() {
+        return checkedEntries;
+    }
+
+    public ObservableList<BibEntry> getAllEntries() {
+        return allEntries;
+    }
+
+    public void loadAllEntries(List<BibEntry> entries) {
+        allEntries.addAll(entries);
+        this.CURRENT_PAGE = 0;
     }
 
     public boolean hasDuplicate(BibEntry entry) {
@@ -177,4 +220,86 @@ private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
         }
         return Optional.empty();
     }
+
+    public void prevPage() {
+        if (hasPrevPage()) {
+            currentPageProperty.set(currentPageProperty.get() - 1);
+            CURRENT_PAGE--;
+            updatePagedEntries();
+            updateTotalPages();
+        }
+    }
+
+    public void nextPage() {
+        if (hasNextPage()) {
+            currentPageProperty.set(currentPageProperty.get() + 1);
+            CURRENT_PAGE++;
+            updatePagedEntries();
+            updateTotalPages();
+        }
+    }
+
+    public boolean hasNextPage() {
+        return (CURRENT_PAGE + 1) * PAGE_SIZE < allEntries.size();
+    }
+
+    public boolean hasPrevPage() {
+        return CURRENT_PAGE > 0;
+    }
+
+    public IntegerProperty currentPageProperty() {
+        return currentPageProperty;
+    }
+
+    public IntegerProperty totalPagesProperty() {
+        return totalPagesProperty;
+    }
+
+    public void updateTotalPages() {
+        int total = (int) Math.ceil((double) allEntries.size() / PAGE_SIZE);
+        totalPagesProperty.set(total);
+    }
+
+    private void updatePagedEntries() {
+        if (fetcher == null && query == null) {
+            // For entries other than web search, show all entries at once
+            pagedEntries.setAll(allEntries);
+            return;
+        }
+        if (!loadingProperty().get() && fetcher instanceof PagedSearchBasedFetcher pagedFetcher && (CURRENT_PAGE + 1) * PAGE_SIZE >= allEntries.size()) {
+            loading.set(true);
+            fetchMoreEntries(pagedFetcher);
+        }
+
+        int fromIdx = CURRENT_PAGE * PAGE_SIZE;
+        int toIdx = Math.min(fromIdx + PAGE_SIZE, allEntries.size());
+        pagedEntries.setAll(allEntries.subList(fromIdx, toIdx));
+    }
+
+    private void fetchMoreEntries(PagedSearchBasedFetcher pagedFetcher) {
+        BackgroundTask<ArrayList<BibEntry>> fetchTask = BackgroundTask
+                .wrap(() -> {
+                    LOGGER.info("Fetching entries from {} for page {}", fetcher.getName(), CURRENT_PAGE + 2);
+                    return new ArrayList<>(pagedFetcher.performSearchPaged(query, CURRENT_PAGE + 1).getContent());
+                })
+                .onSuccess(newEntries -> {
+                    if (newEntries != null && !newEntries.isEmpty()) {
+                        allEntries.addAll(newEntries);
+                        updateTotalPages();
+                    } else {
+                        LOGGER.warn("No new entries fetched from {} for page {}", fetcher.getName(), CURRENT_PAGE + 2);
+                    }
+                    loading.set(false);
+                })
+                .onFailure(exception -> {
+                    loading.set(false);
+                    dialogService.showErrorDialogAndWait(
+                            Localization.lang("Error fetching entries"),
+                            Localization.lang("An error occurred while fetching entries from %0: %1",
+                                    fetcher.getName(), exception.getMessage())
+                    );
+                });
+
+        fetchTask.executeWith(taskExecutor);
+    }
 }
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
deleted file mode 100644
index 6cad0f096ae..00000000000
--- a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesDialog.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package org.jabref.gui.importer;
-
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.collections.ListChangeListener;
-import javafx.css.PseudoClass;
-import javafx.fxml.FXML;
-import javafx.geometry.Insets;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.ToggleButton;
-import javafx.scene.control.Tooltip;
-import javafx.scene.layout.Border;
-import javafx.scene.layout.BorderStroke;
-import javafx.scene.layout.BorderStrokeStyle;
-import javafx.scene.layout.BorderWidths;
-import javafx.scene.layout.CornerRadii;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
-import org.jabref.gui.entryeditor.citationrelationtab.BibEntryView;
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.preferences.GuiPreferences;
-import org.jabref.gui.util.BaseDialog;
-import org.jabref.gui.util.NoSelectionModel;
-import org.jabref.gui.util.ViewModelListCellFactory;
-import org.jabref.logic.importer.PagedSearchBasedFetcher;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.SearchBasedFetcher;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.shared.DatabaseLocation;
-import org.jabref.logic.util.BackgroundTask;
-import org.jabref.logic.util.TaskExecutor;
-import org.jabref.logic.util.io.FileUtil;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.model.util.FileUpdateMonitor;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-import org.controlsfx.control.CheckListView;
-import org.fxmisc.richtext.CodeArea;
-
-public class WebImportEntriesDialog extends BaseDialog<Boolean> {
-
-    @FXML private Label pageNumberLabel;
-    @FXML private CheckListView<BibEntry> entriesListView;
-    @FXML private ComboBox<BibDatabaseContext> libraryListView;
-    @FXML private ButtonType importButton;
-    @FXML private Label totalItems;
-    @FXML private Label selectedItems;
-    @FXML private Label bibTeXDataLabel;
-    @FXML private CheckBox downloadLinkedOnlineFiles;
-    @FXML private CheckBox showEntryInformation;
-    @FXML private CodeArea bibTeXData;
-    @FXML private VBox bibTeXDataBox;
-
-    private final BackgroundTask<ParserResult> task;
-    private final BibDatabaseContext database;
-    private WebImportEntriesViewModel viewModel;
-    private final SearchBasedFetcher searchBasedFetcher;
-    private final String query;
-
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private DialogService dialogService;
-    @Inject private UndoManager undoManager;
-    @Inject private GuiPreferences preferences;
-    @Inject private StateManager stateManager;
-    @Inject private BibEntryTypesManager entryTypesManager;
-    @Inject private FileUpdateMonitor fileUpdateMonitor;
-
-    /**
-     * Imports the given entries into the given database. The entries are provided using the BackgroundTask
-     *
-     * @param database the database to import into
-     * @param task     the task executed for parsing the selected files(s).
-     */
-    public WebImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task, SearchBasedFetcher fetcher, String query) {
-        this.database = database;
-        this.task = task;
-        this.searchBasedFetcher = fetcher;
-        this.query = query;
-
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
-
-        BooleanBinding booleanBind = Bindings.isEmpty(entriesListView.getCheckModel().getCheckedItems());
-        Button btn = (Button) this.getDialogPane().lookupButton(importButton);
-        btn.disableProperty().bind(booleanBind);
-
-        downloadLinkedOnlineFiles.setSelected(preferences.getFilePreferences().shouldDownloadLinkedFiles());
-
-        setResultConverter(button -> {
-            if (button == importButton) {
-                viewModel.importEntries(viewModel.getCheckedEntries().stream().toList(), downloadLinkedOnlineFiles.isSelected());
-            } else {
-                dialogService.notify(Localization.lang("Import canceled"));
-            }
-
-            return false;
-        });
-    }
-
-    @FXML
-    private void initialize() {
-        viewModel = new WebImportEntriesViewModel(task, taskExecutor, database, dialogService, undoManager, preferences, stateManager, entryTypesManager, fileUpdateMonitor, searchBasedFetcher, query);
-        Label placeholder = new Label();
-        placeholder.textProperty().bind(viewModel.messageProperty());
-        entriesListView.setPlaceholder(placeholder);
-        entriesListView.setItems(viewModel.getEntries());
-        entriesListView.getCheckModel().getCheckedItems().addListener((ListChangeListener<BibEntry>) change -> {
-            while (change.next()) {
-                if (change.wasAdded()) {
-                    for (BibEntry entry : change.getAddedSubList()) {
-                        viewModel.getCheckedEntries().add(entry);
-                    }
-                }
-                if (change.wasRemoved()) {
-                    for (BibEntry entry : change.getRemoved()) {
-                        viewModel.getCheckedEntries().remove(entry);
-                    }
-                }
-            }
-        });
-
-        libraryListView.setEditable(false);
-        libraryListView.getItems().addAll(stateManager.getOpenDatabases());
-        new ViewModelListCellFactory<BibDatabaseContext>()
-                .withText(database -> {
-                    Optional<String> dbOpt = Optional.empty();
-                    if (database.getDatabasePath().isPresent()) {
-                        dbOpt = FileUtil.getUniquePathFragment(stateManager.getAllDatabasePaths(), database.getDatabasePath().get());
-                    }
-                    if (database.getLocation() == DatabaseLocation.SHARED) {
-                        return database.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared") + "]";
-                    }
-
-                    return dbOpt.orElseGet(() -> Localization.lang("untitled"));
-                })
-                .install(libraryListView);
-        viewModel.selectedDbProperty().bind(libraryListView.getSelectionModel().selectedItemProperty());
-        stateManager.getActiveDatabase().ifPresent(database1 -> libraryListView.getSelectionModel().select(database1));
-
-        PseudoClass entrySelected = PseudoClass.getPseudoClass("selected");
-        new ViewModelListCellFactory<BibEntry>()
-                .withGraphic(entry -> {
-                    ToggleButton addToggle = IconTheme.JabRefIcons.ADD.asToggleButton();
-                    EasyBind.subscribe(addToggle.selectedProperty(), selected -> {
-                        if (selected) {
-                            addToggle.setGraphic(IconTheme.JabRefIcons.ADD_FILLED.withColor(IconTheme.SELECTED_COLOR).getGraphicNode());
-                        } else {
-                            addToggle.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
-                        }
-                    });
-                    addToggle.getStyleClass().add("addEntryButton");
-                    addToggle.selectedProperty().bindBidirectional(entriesListView.getItemBooleanProperty(entry));
-                    HBox separator = new HBox();
-                    HBox.setHgrow(separator, Priority.SOMETIMES);
-                    Node entryNode = BibEntryView.getEntryNode(entry);
-                    HBox.setHgrow(entryNode, Priority.ALWAYS);
-                    HBox container = new HBox(entryNode, separator, addToggle);
-                    container.getStyleClass().add("entry-container");
-                    container.prefWidthProperty().bind(entriesListView.widthProperty().subtract(25));
-
-                    BackgroundTask.wrap(() -> viewModel.hasDuplicate(entry)).onSuccess(duplicateFound -> {
-                        if (duplicateFound) {
-                            Node icon = IconTheme.JabRefIcons.ERROR.getGraphicNode();
-                            Tooltip tooltip = new Tooltip(Localization.lang("Possible duplicate of existing entry. Will be resolved on import."));
-                            Tooltip.install(icon, tooltip);
-                            container.getChildren().add(icon);
-                        }
-                    }).executeWith(taskExecutor);
-
-                    /*
-                    inserted the if-statement here, since a Platform.runLater() call did not work.
-                    also tried to move it to the end of the initialize method, but it did not select the entry.
-                    */
-                    if (entriesListView.getItems().size() == 1) {
-                        selectAllNewEntries();
-                    }
-
-                    return container;
-                })
-                .withOnMouseClickedEvent((entry, event) -> {
-                    entriesListView.getCheckModel().toggleCheckState(entry);
-                    displayBibTeX(entry, viewModel.getSourceString(entry));
-                })
-                .withPseudoClass(entrySelected, entriesListView::getItemBooleanProperty)
-                .install(entriesListView);
-
-        selectedItems.textProperty().bind(Bindings.size(viewModel.getCheckedEntries()).asString());
-        totalItems.textProperty().bind(Bindings.size(viewModel.getAllEntries()).asString());
-        entriesListView.setSelectionModel(new NoSelectionModel<>());
-        initBibTeX();
-        updatePageUI();
-    }
-
-    private void updatePageUI() {
-        pageNumberLabel.textProperty().bind(Bindings.createStringBinding(() -> {
-            int totalPages = viewModel.totalPagesProperty().get();
-            int currentPage = viewModel.currentPageProperty().get() + 1;
-            if (searchBasedFetcher instanceof PagedSearchBasedFetcher && currentPage == totalPages) {
-                return Localization.lang("Fetching...");
-            }
-            if (totalPages != 0) {
-                return currentPage + " " + Localization.lang("of") + " " + totalPages;
-            }
-            return "";
-        }, viewModel.currentPageProperty(), viewModel.totalPagesProperty()));
-        viewModel.getAllEntries().addListener((ListChangeListener<BibEntry>) change -> {
-            while (change.next()) {
-                if (change.wasAdded() || change.wasRemoved()) {
-                    viewModel.updateTotalPages();
-                }
-            }
-        });
-    }
-
-    private void displayBibTeX(BibEntry entry, String bibTeX) {
-        if (viewModel.getCheckedEntries().contains(entry)) {
-            bibTeXData.clear();
-            bibTeXData.appendText(bibTeX);
-            bibTeXData.moveTo(0);
-            bibTeXData.requestFollowCaret();
-        } else {
-            bibTeXData.clear();
-        }
-    }
-
-    private void initBibTeX() {
-        bibTeXDataLabel.setText(Localization.lang("%0 source", "BibTeX"));
-        bibTeXData.setBorder(new Border(new BorderStroke(Color.GREY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
-        bibTeXData.setPadding(new Insets(5.0));
-        showEntryInformation.selectedProperty().addListener((observableValue, old_val, new_val) -> {
-            bibTeXDataBox.setVisible(new_val);
-            bibTeXDataBox.setManaged(new_val);
-        });
-    }
-
-    public void unselectAll() {
-        viewModel.getCheckedEntries().clear();
-        for (int i = 0; i < entriesListView.getItems().size(); i++) {
-            entriesListView.getCheckModel().clearCheck(i);
-        }
-    }
-
-    public void selectAllNewEntries() {
-        unselectAll();
-        for (BibEntry entry : viewModel.getAllEntries()) {
-            if (!viewModel.hasDuplicate(entry)) {
-                entriesListView.getCheckModel().check(entry);
-                viewModel.getCheckedEntries().add(entry);
-                displayBibTeX(entry, viewModel.getSourceString(entry));
-            }
-        }
-    }
-
-    public void selectAllEntries() {
-        unselectAll();
-        entriesListView.getCheckModel().checkAll();
-        viewModel.getCheckedEntries().addAll(viewModel.getAllEntries());
-    }
-
-    @FXML
-    private void onPrevPage() {
-        viewModel.prevPage();
-        restoreCheckedEntries();
-    }
-
-    @FXML
-    private void onNextPage() {
-        viewModel.nextPage();
-        restoreCheckedEntries();
-    }
-
-    private void restoreCheckedEntries() {
-        for (BibEntry entry : viewModel.getEntries()) {
-            if (viewModel.getCheckedEntries().contains(entry)) {
-                entriesListView.getCheckModel().check(entry);
-            }
-        }
-    }
-}
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
deleted file mode 100644
index 280c69fb41e..00000000000
--- a/jabgui/src/main/java/org/jabref/gui/importer/WebImportEntriesViewModel.java
+++ /dev/null
@@ -1,300 +0,0 @@
-package org.jabref.gui.importer;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.collections.ObservableSet;
-
-import org.jabref.gui.AbstractViewModel;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
-import org.jabref.gui.externalfiles.ImportHandler;
-import org.jabref.gui.preferences.GuiPreferences;
-import org.jabref.logic.bibtex.BibEntryWriter;
-import org.jabref.logic.bibtex.FieldWriter;
-import org.jabref.logic.database.DatabaseMerger;
-import org.jabref.logic.database.DuplicateCheck;
-import org.jabref.logic.exporter.BibWriter;
-import org.jabref.logic.importer.PagedSearchBasedFetcher;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.SearchBasedFetcher;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.os.OS;
-import org.jabref.logic.util.BackgroundTask;
-import org.jabref.logic.util.TaskExecutor;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.model.util.FileUpdateMonitor;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class WebImportEntriesViewModel extends AbstractViewModel {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(WebImportEntriesViewModel.class);
-    private static final int PAGE_SIZE = 20;
-    private int CURRENT_PAGE = 0;
-
-    private final StringProperty message;
-    private final TaskExecutor taskExecutor;
-    private final BibDatabaseContext databaseContext;
-    private final DialogService dialogService;
-    private final UndoManager undoManager;
-    private final StateManager stateManager;
-    private final FileUpdateMonitor fileUpdateMonitor;
-    private ParserResult parserResult = null;
-    private final ObservableList<BibEntry> entries;
-    private final GuiPreferences preferences;
-    private final BibEntryTypesManager entryTypesManager;
-    private final ObjectProperty<BibDatabaseContext> selectedDb;
-
-    private final IntegerProperty currentPageProperty = new SimpleIntegerProperty(0);
-    private final IntegerProperty totalPagesProperty = new SimpleIntegerProperty(0);
-    private final BooleanProperty loading = new SimpleBooleanProperty(false);
-    private final ObservableList<BibEntry> pagedEntries = FXCollections.observableArrayList();
-    private final ObservableSet<BibEntry> checkedEntries = FXCollections.observableSet();
-    private final ObservableList<BibEntry> allEntries = FXCollections.observableArrayList();
-    private final SearchBasedFetcher fetcher;
-    private final String query;
-
-    /**
-     * @param databaseContext the database to import into
-     * @param task            the task executed for parsing the selected files(s).
-     */
-    public WebImportEntriesViewModel(BackgroundTask<ParserResult> task,
-                                  TaskExecutor taskExecutor,
-                                  BibDatabaseContext databaseContext,
-                                  DialogService dialogService,
-                                  UndoManager undoManager,
-                                  GuiPreferences preferences,
-                                  StateManager stateManager,
-                                  BibEntryTypesManager entryTypesManager,
-                                  FileUpdateMonitor fileUpdateMonitor,
-                                  SearchBasedFetcher fetcher,
-                                  String query) {
-        this.taskExecutor = taskExecutor;
-        this.databaseContext = databaseContext;
-        this.dialogService = dialogService;
-        this.undoManager = undoManager;
-        this.preferences = preferences;
-        this.stateManager = stateManager;
-        this.entryTypesManager = entryTypesManager;
-        this.fileUpdateMonitor = fileUpdateMonitor;
-        this.entries = FXCollections.observableArrayList();
-        this.message = new SimpleStringProperty();
-        this.message.bind(task.messageProperty());
-        this.selectedDb = new SimpleObjectProperty<>();
-        this.fetcher = fetcher;
-        this.query = query;
-
-        task.onSuccess(parserResult -> {
-            // store the complete parser result (to import groups, ... later on)
-            this.parserResult = parserResult;
-            // fill in the list for the user, where one can select the entries to import
-            entries.addAll(parserResult.getDatabase().getEntries());
-            loadAllEntries(entries);
-            updatePagedEntries();
-            updateTotalPages();
-            if (entries.isEmpty()) {
-                task.updateMessage(Localization.lang("No entries corresponding to given query"));
-            }
-        }).onFailure(ex -> {
-            LOGGER.error("Error importing", ex);
-            dialogService.showErrorDialogAndWait(ex);
-        }).executeWith(taskExecutor);
-    }
-
-    public String getMessage() {
-        return message.get();
-    }
-
-    public StringProperty messageProperty() {
-        return message;
-    }
-
-    public ObjectProperty<BibDatabaseContext> selectedDbProperty() {
-        return selectedDb;
-    }
-
-    public BibDatabaseContext getSelectedDb() {
-        return selectedDb.get();
-    }
-
-    public BooleanProperty loadingProperty() {
-        return loading;
-    }
-
-    public ObservableList<BibEntry> getEntries() {
-        return pagedEntries;
-    }
-
-    public ObservableSet<BibEntry> getCheckedEntries() {
-        return checkedEntries;
-    }
-
-    public ObservableList<BibEntry> getAllEntries() {
-        return allEntries;
-    }
-
-    public void loadAllEntries(List<BibEntry> entries) {
-        allEntries.addAll(entries);
-        this.CURRENT_PAGE = 0;
-    }
-
-    public boolean hasDuplicate(BibEntry entry) {
-        return findInternalDuplicate(entry).isPresent() ||
-                new DuplicateCheck(entryTypesManager)
-                        .containsDuplicate(selectedDb.getValue().getDatabase(), entry, selectedDb.getValue().getMode()).isPresent();
-    }
-
-    /**
-     * Checks if there are duplicates to the given entry in the list of entries to be imported.
-     *
-     * @param entry The entry to search for duplicates of.
-     * @return A possible duplicate, if any, or null if none were found.
-     */
-    private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
-        for (BibEntry othEntry : entries) {
-            if (othEntry.equals(entry)) {
-                continue; // Don't compare the entry to itself
-            }
-            if (new DuplicateCheck(entryTypesManager).isDuplicate(entry, othEntry, databaseContext.getMode())) {
-                return Optional.of(othEntry);
-            }
-        }
-        return Optional.empty();
-    }
-
-    public String getSourceString(BibEntry entry) {
-        StringWriter writer = new StringWriter();
-        BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
-        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(preferences.getFieldPreferences());
-        try {
-            new BibEntryWriter(fieldWriter, entryTypesManager).write(entry, bibWriter, selectedDb.getValue().getMode());
-        } catch (IOException ioException) {
-            return "";
-        }
-        return writer.toString();
-    }
-
-    /**
-     * Called after the user selected the entries to import. Does the real import stuff.
-     *
-     * @param entriesToImport subset of the entries contained in parserResult
-     */
-    public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownloadFiles) {
-        // Remember the selection in the dialog
-        preferences.getFilePreferences().setDownloadLinkedFiles(shouldDownloadFiles);
-
-        new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator()).mergeStrings(
-                databaseContext.getDatabase(),
-                parserResult.getDatabase());
-        new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator()).mergeMetaData(
-                databaseContext.getMetaData(),
-                parserResult.getMetaData(),
-                parserResult.getPath().map(path -> path.getFileName().toString()).orElse("unknown"),
-                parserResult.getDatabase().getEntries());
-        ImportHandler importHandler = new ImportHandler(
-                selectedDb.getValue(),
-                preferences,
-                fileUpdateMonitor,
-                undoManager,
-                stateManager,
-                dialogService,
-                taskExecutor);
-        importHandler.importEntriesWithDuplicateCheck(selectedDb.getValue(), entriesToImport);
-    }
-
-    public void prevPage() {
-        if (hasPrevPage()) {
-            currentPageProperty.set(currentPageProperty.get() - 1);
-            CURRENT_PAGE--;
-            updatePagedEntries();
-            updateTotalPages();
-        }
-    }
-
-    public void nextPage() {
-        if (hasNextPage()) {
-            currentPageProperty.set(currentPageProperty.get() + 1);
-            CURRENT_PAGE++;
-            updatePagedEntries();
-            updateTotalPages();
-        }
-    }
-
-    public boolean hasNextPage() {
-        return (CURRENT_PAGE + 1) * PAGE_SIZE < allEntries.size();
-    }
-
-    public boolean hasPrevPage() {
-        return CURRENT_PAGE > 0;
-    }
-
-    public IntegerProperty currentPageProperty() {
-        return currentPageProperty;
-    }
-
-    public IntegerProperty totalPagesProperty() {
-        return totalPagesProperty;
-    }
-
-    public void updateTotalPages() {
-        int total = (int) Math.ceil((double) allEntries.size() / PAGE_SIZE);
-        totalPagesProperty.set(total);
-    }
-
-    private void updatePagedEntries() {
-        if (!loadingProperty().get() && fetcher instanceof PagedSearchBasedFetcher pagedFetcher && (CURRENT_PAGE + 1) * PAGE_SIZE >= allEntries.size()) {
-            loading.set(true);
-            fetchMoreEntries(pagedFetcher);
-        }
-
-        int fromIdx = CURRENT_PAGE * PAGE_SIZE;
-        int toIdx = Math.min(fromIdx + PAGE_SIZE, allEntries.size());
-        pagedEntries.setAll(allEntries.subList(fromIdx, toIdx));
-    }
-
-    private void fetchMoreEntries(PagedSearchBasedFetcher pagedFetcher) {
-        BackgroundTask<ArrayList<BibEntry>> fetchTask = BackgroundTask
-                .wrap(() -> {
-                    LOGGER.info("Fetching entries from {} for page {}", fetcher.getName(), CURRENT_PAGE + 2);
-                    return new ArrayList<>(pagedFetcher.performSearchPaged(query, CURRENT_PAGE + 1).getContent());
-                })
-                .onSuccess(newEntries -> {
-                    if (newEntries != null && !newEntries.isEmpty()) {
-                        allEntries.addAll(newEntries);
-                        updateTotalPages();
-                    } else {
-                        LOGGER.warn("No new entries fetched from {} for page {}", fetcher.getName(), CURRENT_PAGE + 2);
-                    }
-                    loading.set(false);
-                })
-                .onFailure(exception -> {
-                    loading.set(false);
-                    dialogService.showErrorDialogAndWait(
-                            Localization.lang("Error fetching entries"),
-                            Localization.lang("An error occurred while fetching entries from {0}: {1}",
-                                    fetcher.getName(), exception.getMessage())
-                    );
-                });
-
-        fetchTask.executeWith(taskExecutor);
-    }
-}
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
index 0191b6d7f35..e0406752482 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -14,7 +14,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.frame.SidePanePreferences;
-import org.jabref.gui.importer.WebImportEntriesDialog;
+import org.jabref.gui.importer.ImportEntriesDialog;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.importer.CompositeIdFetcher;
 import org.jabref.logic.importer.ParserResult;
@@ -162,7 +162,7 @@ public void search() {
                                                           .withInitialMessage(Localization.lang("Processing \"%0\"...", query));
         task.onFailure(dialogService::showErrorDialogAndWait);
 
-        WebImportEntriesDialog dialog = new WebImportEntriesDialog(stateManager.getActiveDatabase().get(), task, activeFetcher, query);
+        ImportEntriesDialog dialog = new ImportEntriesDialog(stateManager.getActiveDatabase().get(), task, activeFetcher, query);
         dialog.setTitle(fetcherName);
         dialogService.showCustomDialogAndWait(dialog);
     }
diff --git a/jabgui/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java b/jabgui/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java
index b4aa68fd321..761e9164a00 100644
--- a/jabgui/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java
+++ b/jabgui/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java
@@ -114,7 +114,7 @@ private void extractReferences() {
 
             task.onFailure(dialogService::showErrorDialogAndWait);
 
-            ImportEntriesDialog dialog = new ImportEntriesDialog(stateManager.getActiveDatabase().get(), task);
+            ImportEntriesDialog dialog = new ImportEntriesDialog(stateManager.getActiveDatabase().get(), task, null, null);
             String title;
             if (online) {
                 title = Localization.lang("Extract References (online)");
diff --git a/jabgui/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java b/jabgui/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
index ba72bc933b3..eb8e34ccf7a 100644
--- a/jabgui/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
@@ -74,7 +74,7 @@ public void activeReferenceChanged(ReferenceViewModel reference) {
      */
     public void importButtonClicked() {
         DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        ImportEntriesDialog dialog = new ImportEntriesDialog(databaseContext, BackgroundTask.wrap(() -> new ParserResult(resolverResult.getNewEntries())));
+        ImportEntriesDialog dialog = new ImportEntriesDialog(databaseContext, BackgroundTask.wrap(() -> new ParserResult(resolverResult.getNewEntries())), null, null);
         dialog.setTitle(Localization.lang("Import entries from LaTeX files"));
         dialogService.showCustomDialogAndWait(dialog);
     }
diff --git a/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml b/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
index a7061744df7..522c2e94c0d 100644
--- a/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
@@ -20,6 +20,15 @@
         <VBox spacing="10.0">
             <Label text="%Select the entries to be imported:"/>
             <CheckListView fx:id="entriesListView" VBox.vgrow="ALWAYS"/>
+            <HBox fx:id="paginationBox" spacing="10">
+                <HBox HBox.hgrow="ALWAYS"/>
+                <Button onAction="#onPrevPage" text="%Previous"/>
+                <Button onAction="#onNextPage" text="%Next"/>
+                <HBox HBox.hgrow="ALWAYS"/>
+                <HBox spacing="4">
+                    <Label fx:id="pageNumberLabel" text=" " />
+                </HBox>
+            </HBox>
             <HBox spacing="4">
                 <VBox spacing="10">
                     <HBox spacing="4">
diff --git a/jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml b/jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml
deleted file mode 100644
index d07e20f8e31..00000000000
--- a/jabgui/src/main/resources/org/jabref/gui/importer/WebImportEntriesDialog.fxml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import org.controlsfx.control.CheckListView?>
-<?import org.fxmisc.richtext.CodeArea?>
-<DialogPane prefHeight="700.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/10.0.2-internal"
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.importer.WebImportEntriesDialog"
-            id="importEntriesDialog">
-    <content>
-        <VBox spacing="10.0">
-            <Label text="%Select the entries to be imported:"/>
-            <CheckListView fx:id="entriesListView" VBox.vgrow="ALWAYS"/>
-            <HBox spacing="10">
-                <HBox HBox.hgrow="ALWAYS"/>
-                <Button onAction="#onPrevPage" text="%Previous"/>
-                <Button onAction="#onNextPage" text="%Next"/>
-                <HBox HBox.hgrow="ALWAYS"/>
-                <HBox spacing="4">
-                    <Label fx:id="pageNumberLabel" text=" " />
-                </HBox>
-            </HBox>
-            <HBox spacing="4">
-                <VBox spacing="10">
-                    <HBox spacing="4">
-                        <Button onAction="#selectAllNewEntries"  text="%Select all new entries"/>
-                        <Button onAction="#selectAllEntries"  text="%Select all entries"/>
-                        <Button onAction="#unselectAll"  text="%Unselect all"/>
-                    </HBox>
-                    <VBox fx:id="bibTeXDataBox" visible="false" managed="false">
-                        <Label fx:id="bibTeXDataLabel"/>
-                        <CodeArea fx:id="bibTeXData" editable="false" minHeight="30.0" prefHeight="200.0" prefWidth="700.0" wrapText="true"/>
-                    </VBox>
-                    <HBox spacing="4" alignment="CENTER_LEFT">
-                        <Label text="%Library to import into"/>
-                        <ComboBox fx:id="libraryListView" layoutX="16.0" layoutY="52.0"/>
-                    </HBox>
-                </VBox>
-                <HBox HBox.hgrow="ALWAYS"/>
-                <GridPane hgap="4.0" vgap="4.0">
-                    <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES"/>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="30" halignment="RIGHT"/>
-                    </columnConstraints>
-                    <rowConstraints>
-                        <RowConstraints minHeight="10.0"/>
-                        <RowConstraints minHeight="10.0"/>
-                        <RowConstraints minHeight="10.0"/>
-                    </rowConstraints>
-                    <Label styleClass="info-section" text="%Total items found:"/>
-                    <Label fx:id="totalItems" GridPane.columnIndex="1"/>
-                    <Label styleClass="info-section" text="%Selected items:" GridPane.rowIndex="1"/>
-                    <Label fx:id="selectedItems" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
-                </GridPane>
-            </HBox>
-            <HBox spacing="4">
-                <CheckBox fx:id="downloadLinkedOnlineFiles" text="%Download referenced files (PDFs, ...)"/>
-                <CheckBox fx:id="showEntryInformation" text="%Show BibTeX source"/>
-            </HBox>
-        </VBox>
-    </content>
-    <ButtonType fx:id="importButton" buttonData="OK_DONE" text="%Import entries"/>
-    <ButtonType fx:constant="CANCEL"/>
-</DialogPane>
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index 8ade5fcd5aa..f2ff0e86759 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -680,7 +680,7 @@ Possible\ duplicate\ entries=Possible duplicate entries
 Possible\ duplicate\ of\ existing\ entry.\ Will\ be\ resolved\ on\ import.=Possible duplicate of existing entry. Will be resolved on import.
 
 Import\ canceled=Import canceled
-An\ error\ occurred\ while\ fetching\ entries\ from\ {0}\:\ {1}=An error occurred while fetching entries from {0}: {1}
+An\ error\ occurred\ while\ fetching\ entries\ from\ %0\:\ %1=An error occurred while fetching entries from %0: %1
 Error\ fetching\ entries=Error fetching entries
 Fetching...=Fetching...
 of=of

From 539d54de6b8de28b530e3207b9e1fb2e6cf1a479 Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Sun, 3 Aug 2025 10:48:29 +0930
Subject: [PATCH 08/14] Refactor ImportEntriesDialog instantiation to remove
 unnecessary parameters

---
 .../main/java/org/jabref/gui/frame/JabRefFrameViewModel.java  | 2 +-
 .../src/main/java/org/jabref/gui/importer/ImportCommand.java  | 2 +-
 .../java/org/jabref/gui/importer/ImportEntriesDialog.java     | 4 ++++
 .../org/jabref/gui/maintable/ExtractReferencesAction.java     | 2 +-
 .../org/jabref/gui/texparser/ParseLatexResultViewModel.java   | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java
index 394e9f33b3b..c16ad7ff8ca 100644
--- a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java
@@ -324,7 +324,7 @@ private void addParserResult(ParserResult parserResult) {
         BackgroundTask<ParserResult> task = BackgroundTask.wrap(() -> parserResult);
         ImportCleanup cleanup = ImportCleanup.targeting(libraryTab.getBibDatabaseContext().getMode(), preferences.getFieldPreferences());
         cleanup.doPostCleanup(parserResult.getDatabase().getEntries());
-        ImportEntriesDialog dialog = new ImportEntriesDialog(libraryTab.getBibDatabaseContext(), task, null, null);
+        ImportEntriesDialog dialog = new ImportEntriesDialog(libraryTab.getBibDatabaseContext(), task);
 
         dialog.setTitle(Localization.lang("Import"));
         dialogService.showCustomDialogAndWait(dialog);
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportCommand.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportCommand.java
index 61dfb448e30..5a9f78e4d48 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportCommand.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportCommand.java
@@ -144,7 +144,7 @@ private void importMultipleFiles(List<Path> files, SortedSet<Importer> importers
                 })
                 .executeWith(taskExecutor);
         } else {
-            ImportEntriesDialog dialog = new ImportEntriesDialog(tab.getBibDatabaseContext(), task, null, null);
+            ImportEntriesDialog dialog = new ImportEntriesDialog(tab.getBibDatabaseContext(), task);
             dialog.setTitle(Localization.lang("Import"));
             dialogService.showCustomDialogAndWait(dialog);
         }
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index d2bdac48e19..8f75ef0a1f7 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -89,6 +89,10 @@ public class ImportEntriesDialog extends BaseDialog<Boolean> {
      * @param database the database to import into
      * @param task     the task executed for parsing the selected files(s).
      */
+    public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task) {
+        this(database, task, null, null);
+    }
+
     public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task, SearchBasedFetcher fetcher, String query) {
         this.database = database;
         this.task = task;
diff --git a/jabgui/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java b/jabgui/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java
index 761e9164a00..b4aa68fd321 100644
--- a/jabgui/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java
+++ b/jabgui/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java
@@ -114,7 +114,7 @@ private void extractReferences() {
 
             task.onFailure(dialogService::showErrorDialogAndWait);
 
-            ImportEntriesDialog dialog = new ImportEntriesDialog(stateManager.getActiveDatabase().get(), task, null, null);
+            ImportEntriesDialog dialog = new ImportEntriesDialog(stateManager.getActiveDatabase().get(), task);
             String title;
             if (online) {
                 title = Localization.lang("Extract References (online)");
diff --git a/jabgui/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java b/jabgui/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
index eb8e34ccf7a..ba72bc933b3 100644
--- a/jabgui/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
@@ -74,7 +74,7 @@ public void activeReferenceChanged(ReferenceViewModel reference) {
      */
     public void importButtonClicked() {
         DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        ImportEntriesDialog dialog = new ImportEntriesDialog(databaseContext, BackgroundTask.wrap(() -> new ParserResult(resolverResult.getNewEntries())), null, null);
+        ImportEntriesDialog dialog = new ImportEntriesDialog(databaseContext, BackgroundTask.wrap(() -> new ParserResult(resolverResult.getNewEntries())));
         dialog.setTitle(Localization.lang("Import entries from LaTeX files"));
         dialogService.showCustomDialogAndWait(dialog);
     }

From f41f640a155752d8b6a49ec7a4fa0601d53b1b8b Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Sat, 16 Aug 2025 13:59:08 +0930
Subject: [PATCH 09/14] Minor fixes

---
 .../gui/importer/ImportEntriesDialog.java     |  2 +-
 .../gui/importer/ImportEntriesViewModel.java  | 30 ++++++++++---------
 .../main/resources/l10n/JabRef_en.properties  |  3 +-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 8f75ef0a1f7..6e596cbff0f 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -228,7 +228,7 @@ private void updatePageUI() {
                 return Localization.lang("Fetching...");
             }
             if (totalPages != 0) {
-                return currentPage + " " + Localization.lang("of") + " " + totalPages;
+                return Localization.lang("%0 of %1", currentPage, totalPages);
             }
             return "";
         }, viewModel.currentPageProperty(), viewModel.totalPagesProperty()));
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index 61974fb4fdc..13e81dcee56 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -49,7 +49,6 @@ public class ImportEntriesViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImportEntriesViewModel.class);
     private static final int PAGE_SIZE = 20;
-    private int CURRENT_PAGE = 0;
 
     private final StringProperty message;
     private final TaskExecutor taskExecutor;
@@ -108,7 +107,7 @@ public ImportEntriesViewModel(BackgroundTask<ParserResult> task,
             this.parserResult = parserResult;
             // fill in the list for the user, where one can select the entries to import
             entries.addAll(parserResult.getDatabase().getEntries());
-            loadAllEntries(entries);
+            loadEntries(entries);
             updatePagedEntries();
             updateTotalPages();
             if (entries.isEmpty()) {
@@ -152,9 +151,8 @@ public ObservableList<BibEntry> getAllEntries() {
         return allEntries;
     }
 
-    public void loadAllEntries(List<BibEntry> entries) {
+    public void loadEntries(List<BibEntry> entries) {
         allEntries.addAll(entries);
-        this.CURRENT_PAGE = 0;
     }
 
     public boolean hasDuplicate(BibEntry entry) {
@@ -224,7 +222,6 @@ private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
     public void prevPage() {
         if (hasPrevPage()) {
             currentPageProperty.set(currentPageProperty.get() - 1);
-            CURRENT_PAGE--;
             updatePagedEntries();
             updateTotalPages();
         }
@@ -233,18 +230,17 @@ public void prevPage() {
     public void nextPage() {
         if (hasNextPage()) {
             currentPageProperty.set(currentPageProperty.get() + 1);
-            CURRENT_PAGE++;
             updatePagedEntries();
             updateTotalPages();
         }
     }
 
     public boolean hasNextPage() {
-        return (CURRENT_PAGE + 1) * PAGE_SIZE < allEntries.size();
+        return (currentPageProperty.get() + 1) * PAGE_SIZE < allEntries.size();
     }
 
     public boolean hasPrevPage() {
-        return CURRENT_PAGE > 0;
+        return currentPageProperty.get() > 0;
     }
 
     public IntegerProperty currentPageProperty() {
@@ -260,18 +256,24 @@ public void updateTotalPages() {
         totalPagesProperty.set(total);
     }
 
+    private boolean isFromWebSearch() {
+        return fetcher != null && query != null;
+    }
+
     private void updatePagedEntries() {
-        if (fetcher == null && query == null) {
+        if (!isFromWebSearch()) {
             // For entries other than web search, show all entries at once
             pagedEntries.setAll(allEntries);
             return;
         }
-        if (!loadingProperty().get() && fetcher instanceof PagedSearchBasedFetcher pagedFetcher && (CURRENT_PAGE + 1) * PAGE_SIZE >= allEntries.size()) {
+        if (!loadingProperty().get()
+                && fetcher instanceof PagedSearchBasedFetcher pagedFetcher
+                && (currentPageProperty.get() + 1) * PAGE_SIZE >= allEntries.size()) {
             loading.set(true);
             fetchMoreEntries(pagedFetcher);
         }
 
-        int fromIdx = CURRENT_PAGE * PAGE_SIZE;
+        int fromIdx = currentPageProperty.get() * PAGE_SIZE;
         int toIdx = Math.min(fromIdx + PAGE_SIZE, allEntries.size());
         pagedEntries.setAll(allEntries.subList(fromIdx, toIdx));
     }
@@ -279,15 +281,15 @@ private void updatePagedEntries() {
     private void fetchMoreEntries(PagedSearchBasedFetcher pagedFetcher) {
         BackgroundTask<ArrayList<BibEntry>> fetchTask = BackgroundTask
                 .wrap(() -> {
-                    LOGGER.info("Fetching entries from {} for page {}", fetcher.getName(), CURRENT_PAGE + 2);
-                    return new ArrayList<>(pagedFetcher.performSearchPaged(query, CURRENT_PAGE + 1).getContent());
+                    LOGGER.info("Fetching entries from {} for page {}", fetcher.getName(), currentPageProperty.get() + 2);
+                    return new ArrayList<>(pagedFetcher.performSearchPaged(query, currentPageProperty.get() + 1).getContent());
                 })
                 .onSuccess(newEntries -> {
                     if (newEntries != null && !newEntries.isEmpty()) {
                         allEntries.addAll(newEntries);
                         updateTotalPages();
                     } else {
-                        LOGGER.warn("No new entries fetched from {} for page {}", fetcher.getName(), CURRENT_PAGE + 2);
+                        LOGGER.warn("No new entries fetched from {} for page {}", fetcher.getName(), currentPageProperty.get() + 2);
                     }
                     loading.set(false);
                 })
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index b829dfdc70b..7ec0f9892d0 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -685,7 +685,7 @@ Import\ canceled=Import canceled
 An\ error\ occurred\ while\ fetching\ entries\ from\ %0\:\ %1=An error occurred while fetching entries from %0: %1
 Error\ fetching\ entries=Error fetching entries
 Fetching...=Fetching...
-of=of
+%0\ of\ %1=%0 of %1
 
 Preferences=Preferences
 
@@ -2078,7 +2078,6 @@ Selected\ items\:=Selected items:
 Download\ referenced\ files\ (PDFs,\ ...)=Download referenced files (PDFs, ...)
 Select\ the\ entries\ to\ be\ imported\:=Select the entries to be imported\:
 Previous=Previous
-Next=Next
 Open\ Help\ page=Open Help page
 Add\ new\ keyword=Add new keyword
 Keyword\:=Keyword:

From 2506c6e2141af1e1a7c33e6fe434646466f0d90f Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Sat, 16 Aug 2025 14:13:24 +0930
Subject: [PATCH 10/14] Minor fix

---
 .../java/org/jabref/gui/importer/ImportEntriesDialog.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 6e596cbff0f..123ffb61767 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -265,9 +265,7 @@ private void initBibTeX() {
 
     public void unselectAll() {
         viewModel.getCheckedEntries().clear();
-        for (int i = 0; i < entriesListView.getItems().size(); i++) {
-            entriesListView.getCheckModel().clearCheck(i);
-        }
+        entriesListView.getItems().forEach(entry -> entriesListView.getCheckModel().clearCheck(entry));
     }
 
     public void selectAllNewEntries() {

From 5c2506c733de8fa2d0ec5950eec9a6c6b45d7326 Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Mon, 25 Aug 2025 01:39:14 +0930
Subject: [PATCH 11/14] Minor fix

---
 .../gui/importer/ImportEntriesDialog.java       | 17 ++++++++++++++---
 .../gui/importer/ImportEntriesViewModel.java    |  6 ++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 123ffb61767..716dd6d9a76 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -84,7 +84,9 @@ public class ImportEntriesDialog extends BaseDialog<Boolean> {
     @Inject private FileUpdateMonitor fileUpdateMonitor;
 
     /**
-     * Imports the given entries into the given database. The entries are provided using the BackgroundTask
+     * Creates an import dialog for entries from file sources.
+     * This constructor is used for importing entries from local files, BibTeX files,
+     * or other file-based sources that don't require pagination or search functionality.
      *
      * @param database the database to import into
      * @param task     the task executed for parsing the selected files(s).
@@ -93,6 +95,15 @@ public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserRes
         this(database, task, null, null);
     }
 
+    /**
+     * Creates an import dialog for entries from web-based search sources.
+     * This constructor is used for importing entries that support pagination and require search queries.
+     *
+     * @param database database where the imported entries will be added
+     * @param task task that handles parsing and loading entries from the search results
+     * @param fetcher the search-based fetcher implementation used to retrieve entries from the web source
+     * @param query the search string used to find relevant entries
+     */
     public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task, SearchBasedFetcher fetcher, String query) {
         this.database = database;
         this.task = task;
@@ -287,13 +298,13 @@ public void selectAllEntries() {
 
     @FXML
     private void onPrevPage() {
-        viewModel.prevPage();
+        viewModel.goToPrevPage();
         restoreCheckedEntries();
     }
 
     @FXML
     private void onNextPage() {
-        viewModel.nextPage();
+        viewModel.goToNextPage();
         restoreCheckedEntries();
     }
 
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index 13e81dcee56..58faebbc508 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -219,19 +219,17 @@ private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
         return Optional.empty();
     }
 
-    public void prevPage() {
+    public void goToPrevPage() {
         if (hasPrevPage()) {
             currentPageProperty.set(currentPageProperty.get() - 1);
             updatePagedEntries();
-            updateTotalPages();
         }
     }
 
-    public void nextPage() {
+    public void goToNextPage() {
         if (hasNextPage()) {
             currentPageProperty.set(currentPageProperty.get() + 1);
             updatePagedEntries();
-            updateTotalPages();
         }
     }
 

From b23328f675e8666718266e99d474e7a0beec0bc9 Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Mon, 25 Aug 2025 15:02:07 +0930
Subject: [PATCH 12/14] Enhance UI

- Added status label to display loading messages and entry status.
- Implemented bindings to enable/disable pagination buttons based on loading state and current page.
- Updated next/previous page button actions to handle fetching more entries when on the last page.
- Introduced initialLoadComplete property to manage the loading state more effectively.
---
 .../gui/importer/ImportEntriesDialog.java     | 107 +++++++++++++++++-
 .../gui/importer/ImportEntriesViewModel.java  |  21 +++-
 .../gui/importer/ImportEntriesDialog.fxml     |   5 +-
 3 files changed, 121 insertions(+), 12 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 716dd6d9a76..232500de552 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -6,10 +6,12 @@
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.BooleanProperty;
 import javafx.collections.ListChangeListener;
 import javafx.css.PseudoClass;
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
+import javafx.scene.Cursor;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -68,6 +70,9 @@ public class ImportEntriesDialog extends BaseDialog<Boolean> {
     @FXML private CheckBox showEntryInformation;
     @FXML private CodeArea bibTeXData;
     @FXML private VBox bibTeXDataBox;
+    @FXML private Button nextPageButton;
+    @FXML private Button prevPageButton;
+    @FXML private Label statusLabel;
 
     private final BackgroundTask<ParserResult> task;
     private final BibDatabaseContext database;
@@ -228,16 +233,96 @@ private void initialize() {
         initBibTeX();
         if (searchBasedFetcher != null) {
             updatePageUI();
+            setupPaginationBindings();
         }
     }
 
+    private void setupPaginationBindings() {
+        BooleanProperty loading = viewModel.loadingProperty();
+        BooleanProperty initialLoadComplete = viewModel.initialLoadCompleteProperty();
+
+        BooleanBinding isOnLastPage = Bindings.createBooleanBinding(() -> {
+            int currentPage = viewModel.currentPageProperty().get();
+            int totalPages = viewModel.totalPagesProperty().get();
+            return currentPage >= totalPages - 1;
+        }, viewModel.currentPageProperty(), viewModel.totalPagesProperty());
+
+        BooleanBinding isPagedFetcher = Bindings.createBooleanBinding(() ->
+            searchBasedFetcher instanceof PagedSearchBasedFetcher
+        );
+
+        // Disable: during loading OR when on the last page for non-paged fetchers
+        // OR when the initial load is not complete for paged fetchers
+        nextPageButton.disableProperty().bind(
+            loading.or(isOnLastPage.and(isPagedFetcher.not()))
+               .or(isPagedFetcher.and(initialLoadComplete.not()))
+        );
+        prevPageButton.disableProperty().bind(loading.or(viewModel.currentPageProperty().isEqualTo(0)));
+
+        prevPageButton.textProperty().bind(
+            Bindings.when(loading)
+                .then("< " + Localization.lang("Loading..."))
+                .otherwise("< " + Localization.lang("Previous"))
+        );
+
+        nextPageButton.textProperty().bind(
+            Bindings.when(loading)
+                .then(Localization.lang("Loading...") + " >")
+                .otherwise(
+                    Bindings.when(initialLoadComplete.not().and(isPagedFetcher))
+                        .then(Localization.lang("Loading initial entries..."))
+                        .otherwise(
+                            Bindings.when(isOnLastPage)
+                                .then(
+                                    Bindings.when(isPagedFetcher)
+                                        .then(Localization.lang("Load More") + " >>")
+                                        .otherwise(Localization.lang("No more entries"))
+                                )
+                                .otherwise(Localization.lang("Next") + " >")
+                        )
+            )
+        );
+
+        statusLabel.textProperty().bind(
+            Bindings.when(loading)
+                .then(Localization.lang("Fetching more entries..."))
+                .otherwise(
+                    Bindings.when(initialLoadComplete.not().and(isPagedFetcher))
+                        .then(Localization.lang("Loading initial results..."))
+                        .otherwise(
+                            Bindings.when(isOnLastPage)
+                                .then(
+                                    Bindings.when(isPagedFetcher)
+                                        .then(Localization.lang("Click 'Load More' to fetch additional entries"))
+                                        .otherwise(Bindings.createStringBinding(() -> {
+                                            int totalEntries = viewModel.getAllEntries().size();
+                                            return totalEntries > 0 ?
+                                                Localization.lang("All %0 entries loaded", String.valueOf(totalEntries)) :
+                                                Localization.lang("No entries available");
+                                        }, viewModel.getAllEntries()))
+                                )
+                                .otherwise("")
+                        )
+                )
+        );
+
+        loading.addListener((obs, oldVal, newVal) -> {
+            getDialogPane().getScene().setCursor(newVal ? Cursor.WAIT : Cursor.DEFAULT);
+        });
+
+        isOnLastPage.addListener((_, oldVal, newVal) -> {
+            if (newVal && !oldVal) {
+                statusLabel.getStyleClass().add("info-message");
+            } else if (!newVal && oldVal) {
+                statusLabel.getStyleClass().remove("info-message");
+            }
+        });
+}
+
     private void updatePageUI() {
         pageNumberLabel.textProperty().bind(Bindings.createStringBinding(() -> {
             int totalPages = viewModel.totalPagesProperty().get();
             int currentPage = viewModel.currentPageProperty().get() + 1;
-            if (searchBasedFetcher instanceof PagedSearchBasedFetcher && currentPage == totalPages) {
-                return Localization.lang("Fetching...");
-            }
             if (totalPages != 0) {
                 return Localization.lang("%0 of %1", currentPage, totalPages);
             }
@@ -296,6 +381,16 @@ public void selectAllEntries() {
         viewModel.getCheckedEntries().addAll(viewModel.getAllEntries());
     }
 
+    private boolean isOnLastPageAndPagedFetcher() {
+        if (!(searchBasedFetcher instanceof PagedSearchBasedFetcher)) {
+            return false;
+        }
+
+        int currentPage = viewModel.currentPageProperty().get();
+        int totalPages = viewModel.totalPagesProperty().get();
+        return currentPage >= totalPages - 1;
+    }
+
     @FXML
     private void onPrevPage() {
         viewModel.goToPrevPage();
@@ -304,7 +399,11 @@ private void onPrevPage() {
 
     @FXML
     private void onNextPage() {
-        viewModel.goToNextPage();
+        if (isOnLastPageAndPagedFetcher()) {
+            viewModel.fetchMoreEntriesFromLastPage();
+        } else {
+            viewModel.goToNextPage();
+        }
         restoreCheckedEntries();
     }
 
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index 58faebbc508..41cfd690d46 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -66,6 +66,7 @@ public class ImportEntriesViewModel extends AbstractViewModel {
     private final IntegerProperty currentPageProperty = new SimpleIntegerProperty(0);
     private final IntegerProperty totalPagesProperty = new SimpleIntegerProperty(0);
     private final BooleanProperty loading = new SimpleBooleanProperty(false);
+    private final BooleanProperty initialLoadComplete = new SimpleBooleanProperty(false);
     private final ObservableList<BibEntry> pagedEntries = FXCollections.observableArrayList();
     private final ObservableSet<BibEntry> checkedEntries = FXCollections.observableSet();
     private final ObservableList<BibEntry> allEntries = FXCollections.observableArrayList();
@@ -110,15 +111,21 @@ public ImportEntriesViewModel(BackgroundTask<ParserResult> task,
             loadEntries(entries);
             updatePagedEntries();
             updateTotalPages();
+            initialLoadComplete.set(true);
             if (entries.isEmpty()) {
                 task.updateMessage(Localization.lang("No entries corresponding to given query"));
             }
         }).onFailure(ex -> {
             LOGGER.error("Error importing", ex);
+            initialLoadComplete.set(true);
             dialogService.showErrorDialogAndWait(ex);
         }).executeWith(taskExecutor);
     }
 
+    public BooleanProperty initialLoadCompleteProperty() {
+        return initialLoadComplete;
+    }
+
     public String getMessage() {
         return message.get();
     }
@@ -219,6 +226,13 @@ private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
         return Optional.empty();
     }
 
+    public void fetchMoreEntriesFromLastPage() {
+        if (fetcher instanceof PagedSearchBasedFetcher pagedFetcher && !loading.get()) {
+            loading.set(true);
+            fetchMoreEntries(pagedFetcher);
+        }
+    }
+
     public void goToPrevPage() {
         if (hasPrevPage()) {
             currentPageProperty.set(currentPageProperty.get() - 1);
@@ -264,12 +278,6 @@ private void updatePagedEntries() {
             pagedEntries.setAll(allEntries);
             return;
         }
-        if (!loadingProperty().get()
-                && fetcher instanceof PagedSearchBasedFetcher pagedFetcher
-                && (currentPageProperty.get() + 1) * PAGE_SIZE >= allEntries.size()) {
-            loading.set(true);
-            fetchMoreEntries(pagedFetcher);
-        }
 
         int fromIdx = currentPageProperty.get() * PAGE_SIZE;
         int toIdx = Math.min(fromIdx + PAGE_SIZE, allEntries.size());
@@ -288,6 +296,7 @@ private void fetchMoreEntries(PagedSearchBasedFetcher pagedFetcher) {
                         updateTotalPages();
                     } else {
                         LOGGER.warn("No new entries fetched from {} for page {}", fetcher.getName(), currentPageProperty.get() + 2);
+                        dialogService.notify(Localization.lang("No new entries found from %0", fetcher.getName()));
                     }
                     loading.set(false);
                 })
diff --git a/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml b/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
index 522c2e94c0d..8f79d64fecd 100644
--- a/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/importer/ImportEntriesDialog.fxml
@@ -22,13 +22,14 @@
             <CheckListView fx:id="entriesListView" VBox.vgrow="ALWAYS"/>
             <HBox fx:id="paginationBox" spacing="10">
                 <HBox HBox.hgrow="ALWAYS"/>
-                <Button onAction="#onPrevPage" text="%Previous"/>
-                <Button onAction="#onNextPage" text="%Next"/>
+                <Button fx:id="prevPageButton" onAction="#onPrevPage" text="%Previous"/>
+                <Button fx:id="nextPageButton" onAction="#onNextPage" text="%Next"/>
                 <HBox HBox.hgrow="ALWAYS"/>
                 <HBox spacing="4">
                     <Label fx:id="pageNumberLabel" text=" " />
                 </HBox>
             </HBox>
+            <Label fx:id="statusLabel" styleClass="status-message" text=""/>
             <HBox spacing="4">
                 <VBox spacing="10">
                     <HBox spacing="4">

From 51b5f6da7f99719564c54dd59295820d61b7b5c4 Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Mon, 25 Aug 2025 15:18:45 +0930
Subject: [PATCH 13/14] Update JabRef_en.properties

---
 jablib/src/main/resources/l10n/JabRef_en.properties | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index 392cb500423..914314eb401 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -684,8 +684,17 @@ Possible\ duplicate\ of\ existing\ entry.\ Will\ be\ resolved\ on\ import.=Possi
 Import\ canceled=Import canceled
 An\ error\ occurred\ while\ fetching\ entries\ from\ %0\:\ %1=An error occurred while fetching entries from %0: %1
 Error\ fetching\ entries=Error fetching entries
-Fetching...=Fetching...
 %0\ of\ %1=%0 of %1
+All\ %0\ entries\ loaded=All %0 entries loaded
+Click\ 'Load\ More'\ to\ fetch\ additional\ entries=Click 'Load More' to fetch additional entries
+Fetching\ more\ entries...=Fetching more entries...
+Load\ More=Load More
+Loading\ initial\ entries...=Loading initial entries...
+Loading\ initial\ results...=Loading initial results...
+Loading...=Loading...
+No\ entries\ available=No entries available
+No\ more\ entries=No more entries
+No\ new\ entries\ found\ from\ %0=No new entries found from %0
 
 Preferences=Preferences
 

From d7fe212c364ba4860e875d1ecfc6ec384bd21896 Mon Sep 17 00:00:00 2001
From: Ritij Paudel <43158841+paudelritij@users.noreply.github.com>
Date: Sun, 31 Aug 2025 02:23:26 +0930
Subject: [PATCH 14/14] Apply boy scout principle

- Refactor ImportEntriesViewModel and ImportEntriesDialog to use Optional for fetcher and query.
---
 .../gui/importer/ImportEntriesDialog.java     | 74 ++++++++++---------
 .../gui/importer/ImportEntriesViewModel.java  | 74 +++++++++----------
 2 files changed, 77 insertions(+), 71 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 232500de552..03492d4cece 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -77,8 +77,8 @@ public class ImportEntriesDialog extends BaseDialog<Boolean> {
     private final BackgroundTask<ParserResult> task;
     private final BibDatabaseContext database;
     private ImportEntriesViewModel viewModel;
-    private final SearchBasedFetcher searchBasedFetcher;
-    private final String query;
+    private final Optional<SearchBasedFetcher> searchBasedFetcher;
+    private final Optional<String> query;
 
     @Inject private TaskExecutor taskExecutor;
     @Inject private DialogService dialogService;
@@ -97,7 +97,12 @@ public class ImportEntriesDialog extends BaseDialog<Boolean> {
      * @param task     the task executed for parsing the selected files(s).
      */
     public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task) {
-        this(database, task, null, null);
+        this.database = database;
+        this.task = task;
+        this.searchBasedFetcher = Optional.empty();
+        this.query = Optional.empty();
+
+        initializeDialog();
     }
 
     /**
@@ -112,32 +117,10 @@ public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserRes
     public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task, SearchBasedFetcher fetcher, String query) {
         this.database = database;
         this.task = task;
-        this.searchBasedFetcher = fetcher;
-        this.query = query;
-
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
-
-        boolean showPagination = (searchBasedFetcher != null) && (query != null);
-        paginationBox.setVisible(showPagination);
-        paginationBox.setManaged(showPagination);
-
-        BooleanBinding booleanBind = Bindings.isEmpty(entriesListView.getCheckModel().getCheckedItems());
-        Button btn = (Button) this.getDialogPane().lookupButton(importButton);
-        btn.disableProperty().bind(booleanBind);
+        this.searchBasedFetcher = Optional.of(fetcher);
+        this.query = Optional.of(query);
 
-        downloadLinkedOnlineFiles.setSelected(preferences.getFilePreferences().shouldDownloadLinkedFiles());
-
-        setResultConverter(button -> {
-            if (button == importButton) {
-                viewModel.importEntries(viewModel.getCheckedEntries().stream().toList(), downloadLinkedOnlineFiles.isSelected());
-            } else {
-                dialogService.notify(Localization.lang("Import canceled"));
-            }
-
-            return false;
-        });
+        initializeDialog();
     }
 
     @FXML
@@ -231,12 +214,37 @@ private void initialize() {
         totalItems.textProperty().bind(Bindings.size(viewModel.getAllEntries()).asString());
         entriesListView.setSelectionModel(new NoSelectionModel<>());
         initBibTeX();
-        if (searchBasedFetcher != null) {
+        if (searchBasedFetcher.isPresent()) {
             updatePageUI();
             setupPaginationBindings();
         }
     }
 
+    private void initializeDialog() {
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        paginationBox.setVisible(searchBasedFetcher.isPresent());
+        paginationBox.setManaged(searchBasedFetcher.isPresent());
+
+        BooleanBinding booleanBind = Bindings.isEmpty(entriesListView.getCheckModel().getCheckedItems());
+        Button btn = (Button) this.getDialogPane().lookupButton(importButton);
+        btn.disableProperty().bind(booleanBind);
+
+        downloadLinkedOnlineFiles.setSelected(preferences.getFilePreferences().shouldDownloadLinkedFiles());
+
+        setResultConverter(button -> {
+            if (button == importButton) {
+                viewModel.importEntries(viewModel.getCheckedEntries().stream().toList(), downloadLinkedOnlineFiles.isSelected());
+            } else {
+                dialogService.notify(Localization.lang("Import canceled"));
+            }
+
+            return false;
+        });
+    }
+
     private void setupPaginationBindings() {
         BooleanProperty loading = viewModel.loadingProperty();
         BooleanProperty initialLoadComplete = viewModel.initialLoadCompleteProperty();
@@ -248,7 +256,7 @@ private void setupPaginationBindings() {
         }, viewModel.currentPageProperty(), viewModel.totalPagesProperty());
 
         BooleanBinding isPagedFetcher = Bindings.createBooleanBinding(() ->
-            searchBasedFetcher instanceof PagedSearchBasedFetcher
+            searchBasedFetcher.isPresent() && searchBasedFetcher.get() instanceof PagedSearchBasedFetcher
         );
 
         // Disable: during loading OR when on the last page for non-paged fetchers
@@ -306,7 +314,7 @@ private void setupPaginationBindings() {
                 )
         );
 
-        loading.addListener((obs, oldVal, newVal) -> {
+        loading.addListener((_, _, newVal) -> {
             getDialogPane().getScene().setCursor(newVal ? Cursor.WAIT : Cursor.DEFAULT);
         });
 
@@ -382,7 +390,7 @@ public void selectAllEntries() {
     }
 
     private boolean isOnLastPageAndPagedFetcher() {
-        if (!(searchBasedFetcher instanceof PagedSearchBasedFetcher)) {
+        if (searchBasedFetcher.isEmpty() || !(searchBasedFetcher.get() instanceof PagedSearchBasedFetcher)) {
             return false;
         }
 
@@ -400,7 +408,7 @@ private void onPrevPage() {
     @FXML
     private void onNextPage() {
         if (isOnLastPageAndPagedFetcher()) {
-            viewModel.fetchMoreEntriesFromLastPage();
+            viewModel.fetchMoreEntries();
         } else {
             viewModel.goToNextPage();
         }
diff --git a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index 41cfd690d46..53c98f0de50 100644
--- a/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -70,8 +70,8 @@ public class ImportEntriesViewModel extends AbstractViewModel {
     private final ObservableList<BibEntry> pagedEntries = FXCollections.observableArrayList();
     private final ObservableSet<BibEntry> checkedEntries = FXCollections.observableSet();
     private final ObservableList<BibEntry> allEntries = FXCollections.observableArrayList();
-    private final SearchBasedFetcher fetcher;
-    private final String query;
+    private final Optional<SearchBasedFetcher> fetcher;
+    private final Optional<String> query;
 
     /**
      * @param databaseContext the database to import into
@@ -86,8 +86,8 @@ public ImportEntriesViewModel(BackgroundTask<ParserResult> task,
                                   StateManager stateManager,
                                   BibEntryTypesManager entryTypesManager,
                                   FileUpdateMonitor fileUpdateMonitor,
-                                  SearchBasedFetcher fetcher,
-                                  String query) {
+                                  Optional<SearchBasedFetcher> fetcher,
+                                  Optional<String> query) {
         this.taskExecutor = taskExecutor;
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
@@ -226,13 +226,6 @@ private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
         return Optional.empty();
     }
 
-    public void fetchMoreEntriesFromLastPage() {
-        if (fetcher instanceof PagedSearchBasedFetcher pagedFetcher && !loading.get()) {
-            loading.set(true);
-            fetchMoreEntries(pagedFetcher);
-        }
-    }
-
     public void goToPrevPage() {
         if (hasPrevPage()) {
             currentPageProperty.set(currentPageProperty.get() - 1);
@@ -269,7 +262,7 @@ public void updateTotalPages() {
     }
 
     private boolean isFromWebSearch() {
-        return fetcher != null && query != null;
+        return fetcher.isPresent() && query.isPresent();
     }
 
     private void updatePagedEntries() {
@@ -284,31 +277,36 @@ private void updatePagedEntries() {
         pagedEntries.setAll(allEntries.subList(fromIdx, toIdx));
     }
 
-    private void fetchMoreEntries(PagedSearchBasedFetcher pagedFetcher) {
-        BackgroundTask<ArrayList<BibEntry>> fetchTask = BackgroundTask
-                .wrap(() -> {
-                    LOGGER.info("Fetching entries from {} for page {}", fetcher.getName(), currentPageProperty.get() + 2);
-                    return new ArrayList<>(pagedFetcher.performSearchPaged(query, currentPageProperty.get() + 1).getContent());
-                })
-                .onSuccess(newEntries -> {
-                    if (newEntries != null && !newEntries.isEmpty()) {
-                        allEntries.addAll(newEntries);
-                        updateTotalPages();
-                    } else {
-                        LOGGER.warn("No new entries fetched from {} for page {}", fetcher.getName(), currentPageProperty.get() + 2);
-                        dialogService.notify(Localization.lang("No new entries found from %0", fetcher.getName()));
-                    }
-                    loading.set(false);
-                })
-                .onFailure(exception -> {
-                    loading.set(false);
-                    dialogService.showErrorDialogAndWait(
-                            Localization.lang("Error fetching entries"),
-                            Localization.lang("An error occurred while fetching entries from %0: %1",
-                                    fetcher.getName(), exception.getMessage())
-                    );
-                });
-
-        fetchTask.executeWith(taskExecutor);
+    public void fetchMoreEntries() {
+        if (fetcher.isPresent() &&
+            fetcher.get() instanceof PagedSearchBasedFetcher pagedFetcher &&
+            query.isPresent() && !loading.get()) {
+            loading.set(true);
+            BackgroundTask<ArrayList<BibEntry>> fetchTask = BackgroundTask
+                    .wrap(() -> {
+                        LOGGER.info("Fetching entries from {} for page {}", fetcher.get().getName(), currentPageProperty.get() + 2);
+                        return new ArrayList<>(pagedFetcher.performSearchPaged(query.get(), currentPageProperty.get() + 1).getContent());
+                    })
+                    .onSuccess(newEntries -> {
+                        if (newEntries != null && !newEntries.isEmpty()) {
+                            allEntries.addAll(newEntries);
+                            updateTotalPages();
+                        } else {
+                            LOGGER.warn("No new entries fetched from {} for page {}", fetcher.get().getName(), currentPageProperty.get() + 2);
+                            dialogService.notify(Localization.lang("No new entries found from %0", fetcher.get().getName()));
+                        }
+                        loading.set(false);
+                    })
+                    .onFailure(exception -> {
+                        loading.set(false);
+                        dialogService.showErrorDialogAndWait(
+                                Localization.lang("Error fetching entries"),
+                                Localization.lang("An error occurred while fetching entries from %0: %1",
+                                        fetcher.get().getName(), exception.getMessage())
+                        );
+                    });
+
+            fetchTask.executeWith(taskExecutor);
+        }
     }
 }