impl: bump plugin API version to o.6

Author: fioan89

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-toolbox-plugin-api = "0.2"
+toolbox-plugin-api = "0.6.2.6.0.37447"
 kotlin = "2.0.10"
 coroutines = "1.7.3"
 serialization = "1.5.0"

src/main/kotlin/com/coder/gateway/CoderGatewayExtension.kt

@@ -7,7 +7,6 @@ import com.jetbrains.toolbox.api.remoteDev.RemoteDevExtension
 import com.jetbrains.toolbox.api.remoteDev.RemoteEnvironmentConsumer
 import com.jetbrains.toolbox.api.remoteDev.RemoteProvider
 import com.jetbrains.toolbox.api.ui.ToolboxUi
-import com.jetbrains.toolbox.api.ui.observables.ObservablePropertiesFactory
 import kotlinx.coroutines.CoroutineScope
 import okhttp3.OkHttpClient
 
@@ -16,13 +15,14 @@ import okhttp3.OkHttpClient
  */
 class CoderGatewayExtension : RemoteDevExtension {
     // All services must be passed in here and threaded as necessary.
-    override fun createRemoteProviderPluginInstance(serviceLocator: ServiceLocator): RemoteProvider = CoderRemoteProvider(
-        serviceLocator.getService(OkHttpClient::class.java),
-        serviceLocator.getService(RemoteEnvironmentConsumer::class.java),
-        serviceLocator.getService(CoroutineScope::class.java),
-        serviceLocator.getService(ToolboxUi::class.java),
-        serviceLocator.getService(PluginSettingsStore::class.java),
-        serviceLocator.getService(PluginSecretStore::class.java),
-        serviceLocator.getService(ObservablePropertiesFactory::class.java),
-    )
+    override fun createRemoteProviderPluginInstance(serviceLocator: ServiceLocator): RemoteProvider {
+        return CoderRemoteProvider(
+            serviceLocator.getService(OkHttpClient::class.java),
+            serviceLocator.getService(RemoteEnvironmentConsumer::class.java),
+            serviceLocator.getService(CoroutineScope::class.java),
+            serviceLocator.getService(ToolboxUi::class.java),
+            serviceLocator.getService(PluginSettingsStore::class.java),
+            serviceLocator.getService(PluginSecretStore::class.java),
+        )
+    }
 }

src/main/kotlin/com/coder/gateway/CoderRemoteEnvironment.kt

@@ -11,7 +11,6 @@ import com.jetbrains.toolbox.api.remoteDev.EnvironmentVisibilityState
 import com.jetbrains.toolbox.api.remoteDev.environments.EnvironmentContentsView
 import com.jetbrains.toolbox.api.remoteDev.states.EnvironmentStateConsumer
 import com.jetbrains.toolbox.api.ui.ToolboxUi
-import com.jetbrains.toolbox.api.ui.observables.ObservablePropertiesFactory
 import java.util.concurrent.CompletableFuture
 
 /**
@@ -24,8 +23,7 @@ class CoderRemoteEnvironment(
     private var workspace: Workspace,
     private var agent: WorkspaceAgent,
     private val ui: ToolboxUi,
-    observablePropertiesFactory: ObservablePropertiesFactory,
-) : AbstractRemoteProviderEnvironment(observablePropertiesFactory) {
+) : AbstractRemoteProviderEnvironment() {
     override fun getId(): String = "${workspace.name}.${agent.name}"
     override fun getName(): String = "${workspace.name}.${agent.name}"
     private var status = WorkspaceAndAgentStatus.from(workspace, agent)

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

@@ -26,7 +26,6 @@ import com.jetbrains.toolbox.api.ui.ToolboxUi
 import com.jetbrains.toolbox.api.ui.actions.RunnableActionDescription
 import com.jetbrains.toolbox.api.ui.components.AccountDropdownField
 import com.jetbrains.toolbox.api.ui.components.UiPage
-import com.jetbrains.toolbox.api.ui.observables.ObservablePropertiesFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -46,7 +45,6 @@ class CoderRemoteProvider(
     private val ui: ToolboxUi,
     settingsStore: PluginSettingsStore,
     secretsStore: PluginSecretStore,
-    private val observablePropertiesFactory: ObservablePropertiesFactory,
 ) : RemoteProvider {
     private val logger = LoggerFactory.getLogger(javaClass)
 
@@ -98,7 +96,7 @@ class CoderRemoteProvider(
                             it.name
                         }?.map { agent ->
                             // If we have an environment already, update that.
-                            val env = CoderRemoteEnvironment(client, ws, agent, ui, observablePropertiesFactory)
+                            val env = CoderRemoteEnvironment(client, ws, agent, ui)
                             lastEnvironments?.firstOrNull { it == env }?.let {
                                 it.update(ws, agent)
                                 it
@@ -122,7 +120,7 @@ class CoderRemoteProvider(
                     cli.configSsh(newEnvironments.map { it.name }.toSet())
                 }
 
-                consumer.consumeEnvironments(environments)
+                consumer.consumeEnvironments(environments, true)
 
                 lastEnvironments = environments
             } catch (_: CancellationException) {
@@ -157,9 +155,7 @@ class CoderRemoteProvider(
     override fun getAccountDropDown(): AccountDropdownField? {
         val username = client?.me?.username
         if (username != null) {
-            return AccountDropdownField(username) {
-                logout()
-            }
+            return AccountDropdownField(username, Runnable { logout() })
         }
         return null
     }
@@ -183,7 +179,7 @@ class CoderRemoteProvider(
         pollJob?.cancel()
         client = null
         lastEnvironments = null
-        consumer.consumeEnvironments(emptyList())
+        consumer.consumeEnvironments(emptyList(), true)
     }
 
     override fun getName(): String = "Coder Gateway"

src/main/kotlin/com/coder/gateway/views/CoderPage.kt

@@ -33,9 +33,6 @@ abstract class CoderPage(
     /** Toolbox uses this to show notifications on the page. */
     private var notifier: Consumer<Throwable>? = null
 
-    /** Used to get field values. */
-    private var stateAccessor: UiPage.UiFieldStateAccessor? = null
-
     /** Let Toolbox know the fields should be updated. */
     protected var listener: Consumer<UiField?>? = null
 
@@ -71,19 +68,9 @@ abstract class CoderPage(
      *          to be able to do `myField.value`.
      */
     fun get(field: UiField): Any? {
-        return stateAccessor?.get(field)
-    }
-
-    /**
-     * Used to update fields when they change (like validation fields).
-     */
-    override fun setPageChangedListener(listener: Consumer<UiField?>) {
-        this.listener = listener
-    }
-
-
-    override fun setStateAccessor(stateAccessor: UiPage.UiFieldStateAccessor?) {
-        this.stateAccessor = stateAccessor
+        //return stateAccessor?.get(field)
+        // TODO - check this later
+        return null
     }
 
     /**

src/main/resources/dependencies.json

@@ -1,7 +1,7 @@
 [
   {
-    "name": "com.jetbrains.toolbox.gateway:gateway-api",
-    "version": "2.5.0.32871",
+    "name": "Toolbox App plugin API",
+    "version": "2.1.0.16946",
     "url": "https://jetbrains.com/toolbox-app/",
     "license": "The Apache Software License, Version 2.0",
     "licenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -27,13 +27,6 @@
     "license": "The Apache Software License, Version 2.0",
     "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
   },
-  {
-    "name": "org.jetbrains.kotlin:kotlin-stdlib-jdk8",
-    "version": "1.9.10",
-    "url": "https://kotlinlang.org/",
-    "license": "The Apache License, Version 2.0",
-    "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
-  },
   {
     "name": "org.jetbrains.kotlinx:kotlinx-coroutines-core",
     "version": "1.7.3",

src/main/resources/extension.json

@@ -7,7 +7,7 @@
     "vendor": "Coder",
     "url": "https://github.com/coder/jetbrains-coder"
   },
-  "apiVersion": "0.1.0",
+  "apiVersion": "0.3.0",
   "compatibleVersionRange": {
     "from": "2.6.0.0",
     "to": "2.6.0.99999"