impl: direct access to observable properties

fioan89 · fioan89 · commit 0d396f1f6652 · 2025-02-18T00:24:57.000+02:00
- without the need to go through a "field accessor"
- fixes some NPE when reading the url
diff --git a/src/main/kotlin/com/coder/gateway/views/CoderPage.kt b/src/main/kotlin/com/coder/gateway/views/CoderPage.kt
@@ -61,18 +61,6 @@ abstract class CoderPage(
         notifier?.accept(ex) ?: errorBuffer.add(ex)
     }
 
-    /**
-     * Get the value for a field.
-     *
-     * TODO@JB: Is this really meant to be used with casting?  I kind of expected
-     *          to be able to do `myField.value`.
-     */
-    fun get(field: UiField): Any? {
-        //return stateAccessor?.get(field)
-        // TODO - check this later
-        return null
-    }
-
     /**
      * Immediately notify any pending errors and store for later errors.
      */
diff --git a/src/main/kotlin/com/coder/gateway/views/CoderSettingsPage.kt b/src/main/kotlin/com/coder/gateway/views/CoderSettingsPage.kt
@@ -48,17 +48,17 @@ class CoderSettingsPage(private val settings: CoderSettingsService) : CoderPage(
 
     override fun getActionButtons(): MutableList<RunnableActionDescription> = mutableListOf(
         Action("Save", closesPage = true) {
-            settings.binarySource = get(binarySourceField) as String
-            settings.binaryDirectory = get(binaryDirectoryField) as String
-            settings.dataDirectory = get(dataDirectoryField) as String
-            settings.enableDownloads = get(enableDownloadsField) as Boolean
-            settings.enableBinaryDirectoryFallback = get(enableBinaryDirectoryFallbackField) as Boolean
-            settings.headerCommand = get(headerCommandField) as String
-            settings.tlsCertPath = get(tlsCertPathField) as String
-            settings.tlsKeyPath = get(tlsKeyPathField) as String
-            settings.tlsCAPath = get(tlsCAPathField) as String
-            settings.tlsAlternateHostname = get(tlsAlternateHostnameField) as String
-            settings.disableAutostart = get(disableAutostartField) as Boolean
+            settings.binarySource = binarySourceField.text.value
+            settings.binaryDirectory = binaryDirectoryField.text.value
+            settings.dataDirectory = dataDirectoryField.text.value
+            settings.enableDownloads = enableDownloadsField.checked.value
+            settings.enableBinaryDirectoryFallback = enableBinaryDirectoryFallbackField.checked.value
+            settings.headerCommand = headerCommandField.text.value
+            settings.tlsCertPath = tlsCertPathField.text.value
+            settings.tlsKeyPath = tlsKeyPathField.text.value
+            settings.tlsCAPath = tlsCAPathField.text.value
+            settings.tlsAlternateHostname = tlsAlternateHostnameField.text.value
+            settings.disableAutostart = disableAutostartField.checked.value
         },
     )
 }
diff --git a/src/main/kotlin/com/coder/gateway/views/SignInPage.kt b/src/main/kotlin/com/coder/gateway/views/SignInPage.kt
@@ -45,7 +45,7 @@ class SignInPage(
      * Call onSignIn with the URL, or error if blank.
      */
     private fun submit() {
-        val urlRaw = get(urlField) as String
+        val urlRaw = urlField.text.value
         // Ensure the URL can be parsed.
         try {
             if (urlRaw.isBlank()) {
diff --git a/src/main/kotlin/com/coder/gateway/views/TokenPage.kt b/src/main/kotlin/com/coder/gateway/views/TokenPage.kt
@@ -3,7 +3,11 @@ package com.coder.gateway.views
 import com.coder.gateway.settings.Source
 import com.coder.gateway.util.withPath
 import com.jetbrains.toolbox.api.ui.actions.RunnableActionDescription
-import com.jetbrains.toolbox.api.ui.components.*
+import com.jetbrains.toolbox.api.ui.components.LabelField
+import com.jetbrains.toolbox.api.ui.components.LinkField
+import com.jetbrains.toolbox.api.ui.components.TextField
+import com.jetbrains.toolbox.api.ui.components.TextType
+import com.jetbrains.toolbox.api.ui.components.UiField
 import java.net.URL
 
 /**
@@ -42,7 +46,7 @@ class TokenPage(
      * Buttons displayed at the bottom of the page.
      */
     override fun getActionButtons(): MutableList<RunnableActionDescription> = mutableListOf(
-        Action("Connect", closesPage = false) { submit(get(tokenField) as String) },
+        Action("Connect", closesPage = false) { submit(tokenField.text.value) },
     )
 
     /**
