Continuing to work on the new architecture, NodeSyncService implemented

Signed-off-by: Uladzislau Kalesnikau <[email protected]>

Author: KUGDev

gradle/libs.versions.toml

@@ -10,7 +10,7 @@ mockk = "1.14.0"
 kotest = "5.9.1"
 jgrapht = "1.5.2"
 keytar = "1.0.0"
-zowe-kotlin-sdk = "0.5.2-rc.1"
+zowe-kotlin-sdk = "1.0.0-rc.1"
 ibm-mq-allclient = "9.4.0.0"
 
 # plugins
@@ -29,7 +29,7 @@ retrofit2-converter-scalars = { group = "com.squareup.retrofit2", name = "conver
 okhttp3 = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp3" }
 jgrapht-core = { group = "org.jgrapht", name = "jgrapht-core", version.ref = "jgrapht" }
 java-keytar = { group = "com.starxg", name = "java-keytar", version.ref = "keytar" }
-zowe-kotlin-sdk = { group = "org.zowe.sdk", name = "zowe-kotlin-sdk", version.ref = "zowe-kotlin-sdk" }
+zowe-kotlin-sdk = { group = "org.zowe.sdk", name = "kotlinsdk", version.ref = "zowe-kotlin-sdk" }
 ibm-mq-allclient = { group = "com.ibm.mq", name = "com.ibm.mq.allclient", version.ref = "ibm-mq-allclient" }
 
 # test deps

src/main/kotlin/org/zowe/explorer/v3/ZoweExplorerToolWindowFactory.kt

@@ -19,23 +19,32 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.ui.content.ContentFactory
-import org.zowe.explorer.v3.components.ExplorerTreeComponentService
+import org.zowe.explorer.v3.tree.ExplorerTreeComponentService
 
 // TODO: doc
 class ZoweExplorerToolWindowFactory : ToolWindowFactory, DumbAware {
   override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
     val contentFactory = ContentFactory.getInstance()
+
     val filesExplorerComponent = ExplorerTreeComponentService.getService().getFilesExplorerComponent(project)
     val filesExplorerContent = contentFactory.createContent(
       filesExplorerComponent.initExplorerTreeComponent(),
       filesExplorerComponent.explorerName,
       filesExplorerComponent.isLockable
     )
     toolWindow.contentManager.addContent(filesExplorerContent)
-    // TODO: JES Explorer View
+
+    val jesExplorerComponent = ExplorerTreeComponentService.getService().getJesExplorerComponent(project)
+    val jesExplorerContent = contentFactory.createContent(
+      jesExplorerComponent.initExplorerTreeComponent(),
+      jesExplorerComponent.explorerName,
+      jesExplorerComponent.isLockable
+    )
+    toolWindow.contentManager.addContent(jesExplorerContent)
   }
 
   override fun init(toolWindow: ToolWindow) {
+    // TODO: define what to do with it
 //    subscribe(
 //      project = toolWindow.project,
 //      topic = AutoSyncFileListener.AUTO_SYNC_FILE,

src/main/kotlin/org/zowe/explorer/v3/actions/RefreshNodeAction.kt

@@ -15,8 +15,8 @@
 package org.zowe.explorer.v3.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
-import org.zowe.explorer.v3.components.ExplorerTreeComponentService
-import org.zowe.explorer.v3.tree.nodes.RefreshableNode
+import org.zowe.explorer.v3.tree.ExplorerTreeComponentService
+import org.zowe.explorer.v3.tree.nodes.Refreshable
 
 // TODO: doc
 class RefreshNodeAction : DumbAwareEDTAction() {
@@ -26,8 +26,11 @@ class RefreshNodeAction : DumbAwareEDTAction() {
       .getFilesExplorerComponent(project)
       .selectedNodes
       .forEach {
-        if (it is RefreshableNode) {
-          it.refreshNode()
+        if (
+          it.nodeDescriptor is Refreshable
+          && ((it.nodeDescriptor as? Refreshable)?.isNodeReadyForRefresh(it) ?: false)
+        ) {
+          (it.nodeDescriptor as? Refreshable)?.refreshNode(it)
         }
       }
   }
@@ -41,6 +44,12 @@ class RefreshNodeAction : DumbAwareEDTAction() {
       .getFilesExplorerComponent(project)
     e.presentation.isEnabledAndVisible = explorerComponent
       .selectedNodes
-      .any { it is RefreshableNode }
+      .any { it.nodeDescriptor is Refreshable }
+    e.presentation.isVisible = explorerComponent
+      .selectedNodes
+      .any {
+        it.nodeDescriptor is Refreshable
+          && ((it.nodeDescriptor as? Refreshable)?.isNodeReadyForRefresh(it) ?: false)
+      }
   }
 }

src/main/kotlin/org/zowe/explorer/v3/actions/RenameNodeAction.kt

@@ -15,8 +15,7 @@
 package org.zowe.explorer.v3.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
-import org.zowe.explorer.v3.components.ExplorerTreeComponentService
-import org.zowe.explorer.v3.tree.nodes.RefreshableNode
+import org.zowe.explorer.v3.tree.ExplorerTreeComponentService
 import org.zowe.explorer.v3.tree.nodes.Renameable
 
 // TODO: doc
@@ -27,7 +26,7 @@ class RenameNodeAction : DumbAwareEDTAction() {
       .getFilesExplorerComponent(project)
       .selectedNodes
     if (selectedNodes.size == 1) {
-      (selectedNodes[0] as? Renameable)?.renameNode()
+      (selectedNodes[0].nodeDescriptor as? Renameable)?.renameNode()
     }
     // TODO: process e.dataContext as well???
   }
@@ -41,7 +40,7 @@ class RenameNodeAction : DumbAwareEDTAction() {
       .getFilesExplorerComponent(project)
     val selectedNodes = explorerComponent.selectedNodes
     if (selectedNodes.size == 1) {
-      e.presentation.isEnabledAndVisible = (selectedNodes[0] as? Renameable) != null
+      e.presentation.isEnabledAndVisible = (selectedNodes[0].nodeDescriptor as? Renameable) != null
     }
     // TODO: process e.dataContext as well???
   }

src/main/kotlin/org/zowe/explorer/v3/actions/workingset/CreateFilesWorkingSetAction.kt

@@ -15,30 +15,13 @@
 package org.zowe.explorer.v3.actions.workingset
 
 import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.util.containers.isEmpty
-import org.zowe.explorer.common.message
-import org.zowe.explorer.utils.addTooltip
 import org.zowe.explorer.v3.components.files.FilesExplorerComponent
-import org.zowe.explorer.v3.state.config.ConfigType
-import org.zowe.explorer.v3.state.storage.StableStorage
-import org.zowe.explorer.v3.state.storage.StorageService
 
 // TODO: doc
-class CreateFilesWorkingSetAction : CreateWorkingSetAction() {
-  @OptIn(StableStorage::class)
-  override fun update(e: AnActionEvent) {
-    e.presentation.text = "Files Working Set"
-    e.presentation.isEnabledAndVisible = e.place.contains(FilesExplorerComponent.FILES_EXPLORER_COMPONENT_NAME)
-    val isConnectionConfigCreated = !StorageService.getService()
-      .getConfigsFromStorage(ConfigType.HTTP_CONNECTION_CONFIG_V1)
-      .isEmpty()
-    e.presentation.isEnabled = isConnectionConfigCreated
-    if (!isConnectionConfigCreated) {
-      e.presentation.addTooltip(message("create.connection.tooltip"))
-    }
-  }
-
-  /** Shows add Working Set dialog (for files or for jobs) */
+class CreateFilesWorkingSetAction : CreateWorkingSetAction(
+"Files Working Set",
+  FilesExplorerComponent.FILES_EXPLORER_COMPONENT_NAME
+) {
   override fun actionPerformed(e: AnActionEvent) {
     TODO("Not yet implemented")
     // TODO: CreateFilesWorkingSetDialog

src/main/kotlin/org/zowe/explorer/v3/actions/workingset/CreateJesWorkingSetAction.kt

@@ -0,0 +1,28 @@
+/*
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
+ * Contributors:
+ *   Zowe Community
+ *   Uladzislau Kalesnikau
+ */
+
+package org.zowe.explorer.v3.actions.workingset
+
+import com.intellij.openapi.actionSystem.AnActionEvent
+import org.zowe.explorer.v3.components.jes.JesExplorerComponent
+
+// TODO: doc
+class CreateJesWorkingSetAction : CreateWorkingSetAction(
+"JES Working Set",
+  JesExplorerComponent.JES_EXPLORER_COMPONENT_NAME
+) {
+  override fun actionPerformed(e: AnActionEvent) {
+    TODO("Not yet implemented")
+  }
+}

src/main/kotlin/org/zowe/explorer/v3/actions/workingset/CreateWorkingSetAction.kt

@@ -14,7 +14,28 @@
 
 package org.zowe.explorer.v3.actions.workingset
 
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.util.containers.isEmpty
+import org.zowe.explorer.common.message
+import org.zowe.explorer.utils.addTooltip
 import org.zowe.explorer.v3.actions.DumbAwareEDTAction
+import org.zowe.explorer.v3.state.config.ConfigType
+import org.zowe.explorer.v3.state.config.cache.ConfigCacheService
 
 // TODO: doc
-abstract class CreateWorkingSetAction : DumbAwareEDTAction()
+abstract class CreateWorkingSetAction(
+  private val workingSetType: String,
+  private val targetExplorer: String
+) : DumbAwareEDTAction() {
+  override fun update(e: AnActionEvent) {
+    e.presentation.text = workingSetType
+    e.presentation.isEnabledAndVisible = e.place.contains(targetExplorer)
+    val isConnectionConfigCreated = !ConfigCacheService.getService()
+      .getConfigsFromCache(ConfigType.HTTP_CONNECTION_CONFIG_V1)
+      .isEmpty()
+    e.presentation.isEnabled = isConnectionConfigCreated
+    if (!isConnectionConfigCreated) {
+      e.presentation.addTooltip(message("create.connection.tooltip"))
+    }
+  }
+}

src/main/kotlin/org/zowe/explorer/v3/api/ZosmfApiService.kt

@@ -0,0 +1,60 @@
+/*
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
+ * Contributors:
+ *   Zowe Community
+ *   Uladzislau Kalesnikau
+ */
+
+package org.zowe.explorer.v3.api
+
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.service
+import com.intellij.util.net.ssl.CertificateManager
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.cio.CIO
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.serialization.kotlinx.json.json
+import kotlinx.serialization.json.Json
+import org.zowe.kotlinsdk.core.WrapperType
+import org.zowe.kotlinsdk.core.datasets.api.DatasetsAPI
+import org.zowe.kotlinsdk.core.files.api.FilesAPI
+import org.zowe.kotlinsdk.providers.zowe.HttpRequestRunner
+import org.zowe.kotlinsdk.providers.zowe.ZoweAPIProvider
+
+// TODO: doc
+@Service
+class ZosmfApiService {
+  companion object {
+    fun getService(): ZosmfApiService = service()
+  }
+
+  private val zosmfClient by lazy {
+    HttpClient(CIO) {
+      install(ContentNegotiation.Plugin) {
+        json(
+          Json {
+            ignoreUnknownKeys = true
+            prettyPrint = true
+          }
+        )
+      }
+      engine {
+        https {
+          trustManager = CertificateManager.getInstance().trustManager
+        }
+      }
+    }
+  }
+
+  private val zoweAPIProvider by lazy { ZoweAPIProvider(listOf(HttpRequestRunner(zosmfClient))) }
+
+  val datasets: DatasetsAPI by lazy { zoweAPIProvider.getApi(WrapperType.ZOSMF, DatasetsAPI::class.java) }
+  val files: FilesAPI by lazy { zoweAPIProvider.getApi(WrapperType.ZOSMF, FilesAPI::class.java) }
+}