feat(settings): connect validators and binders for LLMClientPanels

Author: Blarc

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/AppSettingsConfigurable.kt

@@ -40,7 +40,15 @@ class AppSettingsConfigurable : BoundConfigurable(message("settings.general.grou
                     llmClientTable.addLlmClient()
                 }
                 .setEditAction {
-                    llmClientTable.editLlmClient()
+                    llmClientTable.editLlmClient()?.let {
+                        val editingActive = llmClientComboBox.selectedItem == it.first
+                        llmClientComboBox.removeItem(it.first)
+                        llmClientComboBox.addItem(it.second)
+
+                        if (editingActive) {
+                            llmClientComboBox.selectedItem = it.second
+                        }
+                    }
                 }
                 .setRemoveAction {
                     llmClientTable.removeLlmClient()?.let {

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClient.kt

@@ -15,8 +15,7 @@ abstract class LLMClient(
     @Attribute var timeout: Int,
     @Attribute var modelId: String,
     @Attribute var temperature: String
-) {
-
+) : Cloneable {
     @get:Transient
     var token: String
         get() = retrieveToken(displayName) ?: ""
@@ -30,6 +29,8 @@ abstract class LLMClient(
 
     abstract suspend fun refreshModels()
 
+    public abstract override fun clone(): LLMClient
+
     @Throws(Exception::class)
     abstract suspend fun verifyConfiguration(
         newHost: String,

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientPanel.kt

@@ -1,9 +1,9 @@
 package com.github.blarc.ai.commits.intellij.plugin.settings.clients
 
-import javax.swing.JComponent
+import com.intellij.openapi.ui.DialogPanel
 
 interface LLMClientPanel {
 
-    fun create(): JComponent
+    fun create(): DialogPanel
 
 }

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientTable.kt

@@ -4,14 +4,17 @@ import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
 import com.github.blarc.ai.commits.intellij.plugin.createColumn
 import com.github.blarc.ai.commits.intellij.plugin.settings.AICommitsListCellRenderer
 import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings2
+import com.intellij.openapi.ui.DialogPanel
 import com.intellij.openapi.ui.DialogWrapper
+import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.ui.JBCardLayout
 import com.intellij.ui.components.Panel
 import com.intellij.ui.dsl.builder.Align
 import com.intellij.ui.dsl.builder.bindItem
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.builder.toNullableProperty
 import com.intellij.ui.table.TableView
+import com.intellij.util.containers.ContainerUtil
 import com.intellij.util.ui.ListTableModel
 import java.awt.event.MouseAdapter
 import java.awt.event.MouseEvent
@@ -65,13 +68,15 @@ class LLMClientTable {
 
     }
 
-    fun editLlmClient(): LLMClient? {
+    fun editLlmClient(): Pair<LLMClient, LLMClient>? {
         val selectedLlmClient = table.selectedObject ?: return null
-        val dialog = LLMClientDialog(selectedLlmClient)
+        val dialog = LLMClientDialog(selectedLlmClient.clone())
 
         if (dialog.showAndGet()) {
+            llmClients = llmClients.minus(selectedLlmClient)
+            llmClients = llmClients.plus(dialog.llmClient)
             refreshTableModel()
-            return selectedLlmClient
+            return selectedLlmClient to dialog.llmClient
         }
         return null
     }
@@ -95,6 +100,7 @@ class LLMClientTable {
         private val cardLayout = JBCardLayout()
         private val cardPanel = Panel(null, cardLayout)
         private val llmClients: List<LLMClient> = getLlmClients(newLlmClient)
+        private var currentLlmClientDisplayName: String = llmClients[0].displayName
         var llmClient = newLlmClient ?: llmClients[0]
 
         init {
@@ -104,16 +110,28 @@ class LLMClientTable {
             llmClients.forEach {
                 cardPanel.add(it.displayName, it.panel().create())
             }
-            cardLayout.show(cardPanel, llmClients[0].displayName)
+            cardLayout.show(cardPanel, currentLlmClientDisplayName)
+            (cardLayout.findComponentById(currentLlmClientDisplayName) as DialogPanel).registerValidators(myDisposable) {
+                isOKActionEnabled = ContainerUtil.and(it.values) { info: ValidationInfo -> info.okEnabled }
+            }
+
             init()
         }
 
+        override fun doOKAction() {
+            (cardLayout.findComponentById(currentLlmClientDisplayName) as DialogPanel).apply()
+            super.doOKAction()
+        }
+
         override fun createCenterPanel() = panel {
             row("Client") {
                 comboBox(llmClients, AICommitsListCellRenderer())
                     .align(Align.FILL)
                     .applyToComponent {
-                        addItemListener { cardLayout.show(cardPanel, (it.item as LLMClient).displayName) }
+                        addItemListener {
+                            currentLlmClientDisplayName = (it.item as LLMClient).displayName
+                            cardLayout.show(cardPanel, currentLlmClientDisplayName)
+                        }
                     }
                     .applyToComponent {
                         isEnabled = newLlmClient == null

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/OpenAIClient.kt

@@ -70,6 +70,16 @@ class OpenAIClient(displayName: String = "OpenAI") : LLMClient(
             .forEach { modelIds.add(it) }
     }
 
+    override fun clone(): LLMClient {
+        val copy = OpenAIClient(displayName)
+        copy.host = host
+        copy.proxyUrl = proxyUrl
+        copy.timeout = timeout
+        copy.modelId = modelId
+        copy.temperature = temperature
+        return copy
+    }
+
     @Throws(Exception::class)
     override suspend fun verifyConfiguration(
         newHost: String,

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/TestAIClient.kt

@@ -1,7 +1,7 @@
 package com.github.blarc.ai.commits.intellij.plugin.settings.clients
 
-class TestAIClient(displayName: String = "TestAI") : LLMClient(
-    displayName,
+data class TestAIClient(var name: String = "TestAI") : LLMClient(
+    name,
     "testAiBaseUrl",
     null,
     30,
@@ -23,6 +23,10 @@ class TestAIClient(displayName: String = "TestAI") : LLMClient(
     override suspend fun refreshModels() {
     }
 
+    override fun clone(): TestAIClient {
+        return copy()
+    }
+
     override suspend fun verifyConfiguration(newHost: String, newProxy: String?, newTimeout: String, newToken: String) {
     }