From e55f8d41d9c6175d2be50cb5a3e8af24d55ca0c4 Mon Sep 17 00:00:00 2001
From: InAnYan <ruslanpopov1512@gmail.com>
Date: Sun, 6 Oct 2024 14:04:50 +0300
Subject: [PATCH] Fix from code review

---
 .../PlainCitationParserDialog.fxml            |  2 +-
 .../PlainCitationParserDialog.java            |  2 +-
 .../PlainCitationParserViewModel.java         | 14 ++--
 .../PreferencesDialogViewModel.java           |  7 +-
 .../org/jabref/gui/preferences/ai/AiTab.java  |  5 ++
 .../preferences/websearch/WebSearchTab.fxml   |  4 +-
 .../preferences/websearch/WebSearchTab.java   | 17 +++--
 .../websearch/WebSearchTabViewModel.java      | 64 ++++++++++++++++---
 .../PlainCitationParserChoice.java            |  2 +-
 .../preferences/JabRefCliPreferences.java     |  4 +-
 src/main/resources/l10n/JabRef_en.properties  | 25 ++++----
 11 files changed, 102 insertions(+), 44 deletions(-)

diff --git a/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserDialog.fxml b/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserDialog.fxml
index 3576f665e5a..46265fba049 100644
--- a/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserDialog.fxml
+++ b/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserDialog.fxml
@@ -31,7 +31,7 @@
                 <HBox alignment="BASELINE_LEFT"
                       spacing="10">
                     <children>
-                        <Label text="%Parser choice:"/>
+                        <Label text="%Parser choice"/>
                         <ComboBox
                                 fx:id="parserChoice"
                                 HBox.hgrow="ALWAYS"/>
diff --git a/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserDialog.java b/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserDialog.java
index ea6bcb5c519..a72b8c66d3a 100644
--- a/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserDialog.java
+++ b/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserDialog.java
@@ -72,7 +72,7 @@ private void initialize() {
         new ViewModelListCellFactory<PlainCitationParserChoice>()
                 .withText(PlainCitationParserChoice::getLocalizedName)
                 .install(parserChoice);
-        parserChoice.getItems().setAll(viewModel.onlinePlainCitationParsers());
+        parserChoice.getItems().setAll(viewModel.plainCitationParsers());
         parserChoice.valueProperty().bindBidirectional(viewModel.parserChoice());
 
         input.textProperty().bindBidirectional(viewModel.inputTextProperty());
diff --git a/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserViewModel.java b/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserViewModel.java
index 0ad66bf3bb2..e4037dd1416 100644
--- a/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserViewModel.java
+++ b/src/main/java/org/jabref/gui/plaincitationparser/PlainCitationParserViewModel.java
@@ -43,7 +43,7 @@ public class PlainCitationParserViewModel {
     private final ImportHandler importHandler;
 
     private final StringProperty inputTextProperty = new SimpleStringProperty("");
-    private final ListProperty<PlainCitationParserChoice> onlinePlainCitationParsers
+    private final ListProperty<PlainCitationParserChoice> plainCitationParsers
             = new SimpleListProperty<>(FXCollections.observableArrayList(List.of(PlainCitationParserChoice.RULE_BASED)));
     private final ObjectProperty<PlainCitationParserChoice> parserChoice;
 
@@ -69,15 +69,15 @@ public PlainCitationParserViewModel(BibDatabaseContext bibdatabaseContext,
                 dialogService,
                 taskExecutor);
 
-        this.parserChoice = new SimpleObjectProperty<>(preferences.getImporterPreferences().defaultPlainCitationParserProperty().get());
-
         if (preferences.getGrobidPreferences().isGrobidEnabled()) {
-            onlinePlainCitationParsers.add(PlainCitationParserChoice.GROBID);
+            plainCitationParsers.add(PlainCitationParserChoice.GROBID);
         }
 
         if (preferences.getAiPreferences().getEnableAi()) {
-            onlinePlainCitationParsers.add(PlainCitationParserChoice.LLM);
+            plainCitationParsers.add(PlainCitationParserChoice.LLM);
         }
+
+        this.parserChoice = new SimpleObjectProperty<>(preferences.getImporterPreferences().defaultPlainCitationParserProperty().get());
     }
 
     public void startParsing() {
@@ -112,8 +112,8 @@ public StringProperty inputTextProperty() {
         return this.inputTextProperty;
     }
 
-    public ListProperty<PlainCitationParserChoice> onlinePlainCitationParsers() {
-        return this.onlinePlainCitationParsers;
+    public ListProperty<PlainCitationParserChoice> plainCitationParsers() {
+        return this.plainCitationParsers;
     }
 
     public ObjectProperty<PlainCitationParserChoice> parserChoice() {
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index d99eeb7fd34..5767090d226 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -59,12 +59,15 @@ public PreferencesDialogViewModel(DialogService dialogService, GuiPreferences pr
         this.dialogService = dialogService;
         this.preferences = preferences;
 
+        // TODO: This is a dirty hack of passing "currently-not-set" preferences values from different preferences tabs.
+        AiTab aiTab = new AiTab();
+
         preferenceTabs = FXCollections.observableArrayList(
                 new GeneralTab(),
                 new KeyBindingsTab(),
                 new GroupsTab(),
-                new WebSearchTab(),
-                new AiTab(),
+                new WebSearchTab(aiTab.aiEnabledProperty()),
+                aiTab,
                 new EntryTab(),
                 new TableTab(),
                 new PreviewTab(),
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
index 4cb67256603..ebffe78ad96 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.preferences.ai;
 
 import javafx.application.Platform;
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
@@ -187,4 +188,8 @@ public String getTabName() {
     private void onResetExpertSettingsButtonClick() {
         viewModel.resetExpertSettings();
     }
+
+    public ReadOnlyBooleanProperty aiEnabledProperty() {
+        return enableAi.selectedProperty();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
index a57b62dd9f7..870b9633ac5 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
@@ -23,8 +23,8 @@
     <CheckBox fx:id="downloadLinkedOnlineFiles" text="%Download linked online files"/>
     <CheckBox fx:id="keepDownloadUrl" text="%Store url for downloaded file" />
     <HBox alignment="BASELINE_LEFT" spacing="10">
-        <Label text="%Default online plain citation parser"/>
-        <ComboBox fx:id="defaultOnlinePlainCitationParser" HBox.hgrow="ALWAYS"/>
+        <Label text="%Default plain citation parser"/>
+        <ComboBox fx:id="defaultPlainCitationParser" HBox.hgrow="ALWAYS"/>
     </HBox>
 
     <Label styleClass="sectionHeader" text="%Custom DOI URI"/>
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
index 59b30824814..b981b4148d1 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.preferences.websearch;
 
 import javafx.beans.InvalidationListener;
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
@@ -33,7 +34,7 @@ public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewMode
     @FXML private CheckBox warnAboutDuplicatesOnImport;
     @FXML private CheckBox downloadLinkedOnlineFiles;
     @FXML private CheckBox keepDownloadUrl;
-    @FXML private ComboBox<PlainCitationParserChoice> defaultOnlinePlainCitationParser;
+    @FXML private ComboBox<PlainCitationParserChoice> defaultPlainCitationParser;
 
     @FXML private CheckBox useCustomDOI;
     @FXML private TextField useCustomDOIName;
@@ -53,7 +54,11 @@ public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewMode
     @FXML private TableColumn<StudyCatalogItem, Boolean> catalogEnabledColumn;
     @FXML private TableColumn<StudyCatalogItem, String> catalogColumn;
 
-    public WebSearchTab() {
+    private final ReadOnlyBooleanProperty refAiEnabled;
+
+    public WebSearchTab(ReadOnlyBooleanProperty refAiEnabled) {
+        this.refAiEnabled = refAiEnabled;
+
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -65,7 +70,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new WebSearchTabViewModel(preferences, dialogService);
+        this.viewModel = new WebSearchTabViewModel(preferences, dialogService, refAiEnabled);
 
         enableWebSearch.selectedProperty().bindBidirectional(viewModel.enableWebSearchProperty());
         generateNewKeyOnImport.selectedProperty().bindBidirectional(viewModel.generateKeyOnImportProperty());
@@ -75,9 +80,9 @@ public void initialize() {
 
         new ViewModelListCellFactory<PlainCitationParserChoice>()
                 .withText(PlainCitationParserChoice::getLocalizedName)
-                .install(defaultOnlinePlainCitationParser);
-        defaultOnlinePlainCitationParser.itemsProperty().bind(viewModel.onlinePlainCitationParsers());
-        defaultOnlinePlainCitationParser.valueProperty().bindBidirectional(viewModel.defaultOnlinePlainCitationParserProperty());
+                .install(defaultPlainCitationParser);
+        defaultPlainCitationParser.itemsProperty().bind(viewModel.plainCitationParsers());
+        defaultPlainCitationParser.valueProperty().bindBidirectional(viewModel.defaultPlainCitationParserProperty());
 
         grobidEnabled.selectedProperty().bindBidirectional(viewModel.grobidEnabledProperty());
         grobidURL.textProperty().bindBidirectional(viewModel.grobidURLProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
index 0e572bc5546..37f33badb6a 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -44,8 +44,10 @@ public class WebSearchTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
     private final BooleanProperty shouldDownloadLinkedOnlineFiles = new SimpleBooleanProperty();
     private final BooleanProperty shouldkeepDownloadUrl = new SimpleBooleanProperty();
-    private final ListProperty<PlainCitationParserChoice> onlinePlainCitationParsers = new SimpleListProperty<>(FXCollections.observableArrayList(PlainCitationParserChoice.values()));
-    private final ObjectProperty<PlainCitationParserChoice> defaultOnlinePlainCitationParser = new SimpleObjectProperty<>();
+
+    private final ListProperty<PlainCitationParserChoice> plainCitationParsers =
+            new SimpleListProperty<>(FXCollections.observableArrayList(PlainCitationParserChoice.values()));
+    private final ObjectProperty<PlainCitationParserChoice> defaultPlainCitationParser = new SimpleObjectProperty<>();
 
     private final BooleanProperty useCustomDOIProperty = new SimpleBooleanProperty();
     private final StringProperty useCustomDOINameProperty = new SimpleStringProperty("");
@@ -67,7 +69,9 @@ public class WebSearchTabViewModel implements PreferenceTabViewModel {
     private final FilePreferences filePreferences;
     private final ImportFormatPreferences importFormatPreferences;
 
-    public WebSearchTabViewModel(CliPreferences preferences, DialogService dialogService) {
+    private final ReadOnlyBooleanProperty refAiEnabled;
+
+    public WebSearchTabViewModel(CliPreferences preferences, DialogService dialogService, ReadOnlyBooleanProperty refAiEnabled) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.importerPreferences = preferences.getImporterPreferences();
@@ -75,6 +79,48 @@ public WebSearchTabViewModel(CliPreferences preferences, DialogService dialogSer
         this.doiPreferences = preferences.getDOIPreferences();
         this.filePreferences = preferences.getFilePreferences();
         this.importFormatPreferences = preferences.getImportFormatPreferences();
+
+        this.refAiEnabled = refAiEnabled;
+
+        setupPlainCitationParsers(preferences);
+    }
+
+    private void setupPlainCitationParsers(CliPreferences preferences) {
+        if (!refAiEnabled.get()) {
+            plainCitationParsers.remove(PlainCitationParserChoice.LLM);
+        }
+
+        refAiEnabled.addListener((observable, oldValue, newValue) -> {
+            if (newValue) {
+                plainCitationParsers.add(PlainCitationParserChoice.LLM);
+            } else {
+                PlainCitationParserChoice oldChoice = defaultPlainCitationParser.get();
+
+                plainCitationParsers.remove(PlainCitationParserChoice.LLM);
+
+                if (oldChoice == PlainCitationParserChoice.LLM) {
+                    defaultPlainCitationParser.set(plainCitationParsers.getFirst());
+                }
+            }
+        });
+
+        if (!grobidEnabledProperty().get()) {
+            plainCitationParsers.remove(PlainCitationParserChoice.GROBID);
+        }
+
+        grobidEnabledProperty.addListener((observable, oldValue, newValue) -> {
+            if (newValue) {
+                plainCitationParsers.add(PlainCitationParserChoice.GROBID);
+            } else {
+                PlainCitationParserChoice oldChoice = defaultPlainCitationParser.get();
+
+                plainCitationParsers.remove(PlainCitationParserChoice.GROBID);
+
+                if (oldChoice == PlainCitationParserChoice.GROBID) {
+                    defaultPlainCitationParser.set(plainCitationParsers.getFirst());
+                }
+            }
+        });
     }
 
     @Override
@@ -84,7 +130,7 @@ public void setValues() {
         warnAboutDuplicatesOnImportProperty.setValue(importerPreferences.shouldWarnAboutDuplicatesOnImport());
         shouldDownloadLinkedOnlineFiles.setValue(filePreferences.shouldDownloadLinkedFiles());
         shouldkeepDownloadUrl.setValue(filePreferences.shouldKeepDownloadUrl());
-        defaultOnlinePlainCitationParser.setValue(importerPreferences.getDefaultPlainCitationParser());
+        defaultPlainCitationParser.setValue(importerPreferences.getDefaultPlainCitationParser());
 
         useCustomDOIProperty.setValue(doiPreferences.isUseCustom());
         useCustomDOINameProperty.setValue(doiPreferences.getDefaultBaseURI());
@@ -113,7 +159,7 @@ public void storeSettings() {
         importerPreferences.setWarnAboutDuplicatesOnImport(warnAboutDuplicatesOnImportProperty.getValue());
         filePreferences.setDownloadLinkedFiles(shouldDownloadLinkedOnlineFiles.getValue());
         filePreferences.setKeepDownloadUrl(shouldkeepDownloadUrl.getValue());
-        importerPreferences.setDefaultPlainCitationParser(defaultOnlinePlainCitationParser.getValue());
+        importerPreferences.setDefaultPlainCitationParser(defaultPlainCitationParser.getValue());
         grobidPreferences.setGrobidEnabled(grobidEnabledProperty.getValue());
         grobidPreferences.setGrobidOptOut(grobidPreferences.isGrobidOptOut());
         grobidPreferences.setGrobidURL(grobidURLProperty.getValue());
@@ -139,12 +185,12 @@ public BooleanProperty generateKeyOnImportProperty() {
         return generateKeyOnImportProperty;
     }
 
-    public ListProperty<PlainCitationParserChoice> onlinePlainCitationParsers() {
-        return onlinePlainCitationParsers;
+    public ListProperty<PlainCitationParserChoice> plainCitationParsers() {
+        return plainCitationParsers;
     }
 
-    public ObjectProperty<PlainCitationParserChoice> defaultOnlinePlainCitationParserProperty() {
-        return defaultOnlinePlainCitationParser;
+    public ObjectProperty<PlainCitationParserChoice> defaultPlainCitationParserProperty() {
+        return defaultPlainCitationParser;
     }
 
     public BooleanProperty useCustomDOIProperty() {
diff --git a/src/main/java/org/jabref/logic/importer/plaincitation/PlainCitationParserChoice.java b/src/main/java/org/jabref/logic/importer/plaincitation/PlainCitationParserChoice.java
index 28e32e35bb0..8d9040fd63f 100644
--- a/src/main/java/org/jabref/logic/importer/plaincitation/PlainCitationParserChoice.java
+++ b/src/main/java/org/jabref/logic/importer/plaincitation/PlainCitationParserChoice.java
@@ -12,7 +12,7 @@ public String getLocalizedName() {
             case RULE_BASED ->
                     Localization.lang("Rule-based");
             case GROBID ->
-                    Localization.lang("GROBID");
+                    Localization.lang("Grobid");
             case LLM ->
                     Localization.lang("LLM");
         };
diff --git a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
index ced6c42f556..465c8f7b182 100644
--- a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -211,7 +211,7 @@ public class JabRefCliPreferences implements CliPreferences {
     public static final String SEARCH_WINDOW_WIDTH = "searchWindowWidth";
     public static final String SEARCH_WINDOW_DIVIDER_POS = "searchWindowDividerPos";
     public static final String SEARCH_CATALOGS = "searchCatalogs";
-    public static final String DEFAULT_PLAIN_CITATION_PARSER = "defaultOnlinePlainCitationParser";
+    public static final String DEFAULT_PLAIN_CITATION_PARSER = "defaultPlainCitationParser";
     public static final String IMPORTERS_ENABLED = "importersEnabled";
     public static final String GENERATE_KEY_ON_IMPORT = "generateKeyOnImport";
     public static final String GROBID_ENABLED = "grobidEnabled";
@@ -438,7 +438,7 @@ protected JabRefCliPreferences() {
                 SpringerFetcher.FETCHER_NAME,
                 DBLPFetcher.FETCHER_NAME,
                 IEEE.FETCHER_NAME)));
-        defaults.put(DEFAULT_PLAIN_CITATION_PARSER, PlainCitationParserChoice.GROBID.name());
+        defaults.put(DEFAULT_PLAIN_CITATION_PARSER, PlainCitationParserChoice.RULE_BASED.name());
         defaults.put(IMPORTERS_ENABLED, Boolean.TRUE);
         defaults.put(GENERATE_KEY_ON_IMPORT, Boolean.TRUE);
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index f65c6840097..d48b40ebed6 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2133,6 +2133,18 @@ This\ operation\ requires\ an\ open\ library.=This operation requires an open li
 Add\ to\ current\ library=Add to current library
 %0\ entries\ were\ parsed\ from\ your\ query.=%0 entries were parsed from your query.
 Your\ text\ is\ being\ parsed...=Your text is being parsed...
+LLM=LLM
+Please\ verify\ any\ information\ provided.=Please verify any information provided.
+Warning\:\ plain\ citation\ parsing\ may\ generate\ inaccurate\ or\ inappropriate\ responses.=Warning: plain citation parsing may generate inaccurate or inappropriate responses.
+New\ entry\ from\ plain\ text\ (online)=New entry from plain text (online)
+Parser\ choice=Parser choice
+Plain\ Citations\ Parser=Plain Citations Parser
+Please\ enter\ the\ plain\ citations\ to\ parse\ from\ separated\ by\ double\ empty\ lines.=Please enter the plain citations to parse from separated by double empty lines.
+Rule-based=Rule-based
+Starts\ the\ parsing\ and\ adds\ the\ resulting\ entries\ to\ the\ currently\ opened\ database=Starts the parsing and adds the resulting entries to the currently opened database
+Unable\ to\ parse\ plain\ citations.\ Detailed\ information\:\ %0=Unable to parse plain citations. Detailed information: %0
+Default\ plain\ citation\ parser=Default plain citation parser
+Grobid=Grobid
 
 Citation\ key\ filters=Citation key filters
 Field\ filters=Field filters
@@ -2631,19 +2643,6 @@ RAG\ minimum\ score\ must\ be\ greater\ than\ 0\ and\ less\ than\ 1=RAG minimum
 Temperature\ must\ be\ a\ number=Temperature must be a number
 If\ you\ have\ chosen\ %0\ as\ an\ AI\ provider,\ the\ privacy\ policy\ of\ %0\ applies.\ You\ find\ it\ at\ %1.=If you have chosen %0 as an AI provider, the privacy policy of %0 applies. You find it at %1.
 
-Default\ online\ plain\ citation\ parser=Default online plain citation parser
-GROBID=GROBID
-LLM=LLM
-Please\ verify\ any\ information\ provided.=Please verify any information provided.
-Warning\:\ plain\ citation\ parsing\ may\ generate\ inaccurate\ or\ inappropriate\ responses.=Warning: plain citation parsing may generate inaccurate or inappropriate responses.
-New\ entry\ from\ plain\ text\ (online)=New entry from plain text (online)
-Parser\ choice\:=Parser choice:
-Plain\ Citations\ Parser=Plain Citations Parser
-Please\ enter\ the\ plain\ citations\ to\ parse\ from\ separated\ by\ double\ empty\ lines.=Please enter the plain citations to parse from separated by double empty lines.
-Rule-based=Rule-based
-Starts\ the\ parsing\ and\ adds\ the\ resulting\ entries\ to\ the\ currently\ opened\ database=Starts the parsing and adds the resulting entries to the currently opened database
-Unable\ to\ parse\ plain\ citations.\ Detailed\ information\:\ %0=Unable to parse plain citations. Detailed information: %0
-
 Link=Link
 Source\ URL=Source URL
 Edit\ file\ link=Edit file link