impl: support for Toolbox 2.6.0.38881 (5)

- fix compiler errors for Coder main page
- associated strings converted to LocalizedString instances
- observable properties are now moved to Kotlin's StateFlow

Author: fioan89

src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt

@@ -307,11 +307,12 @@ class CoderRemoteProvider(
      * Create a connect page that starts polling and resets the UI on success.
      */
     private fun createConnectPage(deploymentURL: URL, token: String?): ConnectPage = ConnectPage(
+        serviceLocator,
         deploymentURL,
         token,
         settings,
         httpClient,
-        coroutineScope,
+        i18n.ptrl("Connecting to Coder"),
         ::goToEnvironmentsPage,
     ) { client, cli ->
         // Store the URL and token for use next time.

src/main/kotlin/com/coder/toolbox/views/ConnectPage.kt

@@ -6,11 +6,16 @@ import com.coder.toolbox.plugin.PluginManager
 import com.coder.toolbox.sdk.CoderRestClient
 import com.coder.toolbox.settings.CoderSettings
 import com.coder.toolbox.util.humanizeConnectionError
+import com.jetbrains.toolbox.api.core.ServiceLocator
+import com.jetbrains.toolbox.api.localization.LocalizableString
+import com.jetbrains.toolbox.api.localization.LocalizableStringFactory
 import com.jetbrains.toolbox.api.ui.actions.RunnableActionDescription
 import com.jetbrains.toolbox.api.ui.components.LabelField
 import com.jetbrains.toolbox.api.ui.components.UiField
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import java.net.URL
@@ -19,22 +24,26 @@ import java.net.URL
  * A page that connects a REST client and cli to Coder.
  */
 class ConnectPage(
+    private val serviceLocator: ServiceLocator,
     private val url: URL,
     private val token: String?,
     private val settings: CoderSettings,
     private val httpClient: OkHttpClient,
-    private val coroutineScope: CoroutineScope,
+    title: LocalizableString,
     private val onCancel: () -> Unit,
     private val onConnect: (
         client: CoderRestClient,
         cli: CoderCLIManager,
     ) -> Unit,
-) : CoderPage("Connecting to Coder") {
+) : CoderPage(serviceLocator, title) {
+    private val coroutineScope = serviceLocator.getService(CoroutineScope::class.java)
+    private val i18n = serviceLocator.getService(LocalizableStringFactory::class.java)
+
     private var signInJob: Job? = null
 
-    private var statusField = LabelField("Connecting to ${url.host}...")
+    private var statusField = LabelField(i18n.pnotr("Connecting to ${url.host}..."))
 
-    override val description: String = "Please wait while we configure Toolbox for ${url.host}."
+    override val description: LocalizableString = i18n.pnotr("Please wait while we configure Toolbox for ${url.host}.")
 
     init {
         connect()
@@ -45,23 +54,26 @@ class ConnectPage(
      *
      * TODO@JB: This looks kinda sparse.  A centered spinner would be welcome.
      */
-    override val fields: MutableList<UiField> = listOfNotNull(
+    override val fields: StateFlow<List<UiField>> = MutableStateFlow(
+        listOfNotNull(
         statusField,
-        errorField,
-    ).toMutableList()
+            errorField
+        )
+    )
 
     /**
      * Show a retry button on error.
      */
-    override val actionButtons: MutableList<RunnableActionDescription> = listOfNotNull(
-        if (errorField != null) Action("Retry", closesPage = false) { retry() } else null,
-        if (errorField != null) Action("Cancel", closesPage = false) { onCancel() } else null,
-    ).toMutableList()
+    override val actionButtons: StateFlow<List<RunnableActionDescription>> = MutableStateFlow(
+        listOfNotNull(
+        if (errorField != null) Action(i18n.ptrl("Retry"), closesPage = false) { retry() } else null,
+        if (errorField != null) Action(i18n.ptrl("Cancel"), closesPage = false) { onCancel() } else null,
+    ))
 
     /**
      * Update the status and error fields then refresh.
      */
-    private fun updateStatus(newStatus: String, error: String?) {
+    private fun updateStatus(newStatus: LocalizableString, error: String?) {
         statusField = LabelField(newStatus)
         updateError(error) // Will refresh.
     }
@@ -70,7 +82,7 @@ class ConnectPage(
      * Try connecting again after an error.
      */
     private fun retry() {
-        updateStatus("Connecting to ${url.host}...", null)
+        updateStatus(i18n.pnotr("Connecting to ${url.host}..."), null)
         connect()
     }
 
@@ -92,21 +104,21 @@ class ConnectPage(
                     httpClient
                 )
                 client.authenticate()
-                updateStatus("Checking Coder binary...", error = null)
+                updateStatus(i18n.ptrl("Checking Coder binary..."), error = null)
                 val cli = ensureCLI(client.url, client.buildVersion, settings) { status ->
-                    updateStatus(status, error = null)
+                    updateStatus(i18n.pnotr(status), error = null)
                 }
                 // We only need to log in if we are using token-based auth.
                 if (client.token != null) {
-                    updateStatus("Configuring CLI...", error = null)
+                    updateStatus(i18n.ptrl("Configuring CLI..."), error = null)
                     cli.login(client.token)
                 }
                 onConnect(client, cli)
 
             } catch (ex: Exception) {
                 val msg = humanizeConnectionError(url, settings.requireTokenAuth, ex)
                 notify("Failed to configure ${url.host}", ex)
-                updateStatus("Failed to configure ${url.host}", msg)
+                updateStatus(i18n.pnotr("Failed to configure ${url.host}"), msg)
             }
         }
     }

src/main/resources/localization/defaultMessages.po

@@ -115,4 +115,14 @@ msgstr ""
 msgid "Disable autostart"
 msgstr ""
 
+msgid "Connecting to Coder"
+msgstr ""
+
+msgid "Checking Coder binary..."
+msgstr ""
 
+msgid "Configuring CLI..."
+msgstr ""
+
+msgid "Retry"
+msgstr ""