Fixed syncing mechanism for USS part, continuing to work on the new presentation rework

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

Author: KUGDev

src/main/kotlin/org/zowe/explorer/v3/components/files/DatasetMaskNodeDescriptor.kt

@@ -6,25 +6,27 @@
  * SPDX-License-Identifier: EPL-2.0
  *
  * Copyright Contributors to the Zowe Project.
- *
- * Contributors:
- *   Zowe Community
- *   Uladzislau Kalesnikau
  */
 
 package org.zowe.explorer.v3.components.files
 
 import org.zowe.explorer.v3.icons.ZoweExplorerIcons
 import org.zowe.explorer.v3.tree.nodes.Renameable
 import org.zowe.explorer.v3.tree.nodes.ExplorerTreeNode
-import org.zowe.explorer.v3.tree.nodes.FileFetcherNodeDescriptor
+import org.zowe.explorer.v3.tree.nodes.FetcherNodeDescriptor
 
 // TODO: doc
 class DatasetMaskNodeDescriptor(
   displayName: String,
-  connectionConfigUuid: String
-) : FileFetcherNodeDescriptor(
+  connectionConfigUuid: String,
+  override val fetchFilter: String,
+  override val invalidationElem: String,
+  override val invalidationPath: List<String>,
+  override var wasExpanded: Boolean
+) : FetcherNodeDescriptor(
   displayName,
+  listOf(),
+  listOf(),
   "Data set mask",
   ZoweExplorerIcons.datasetMask,
   connectionConfigUuid=connectionConfigUuid
@@ -52,4 +54,8 @@ class DatasetMaskNodeDescriptor(
   override fun renameNode() {
     TODO("Not yet implemented")
   }
+
+  override fun expandNode(node: ExplorerTreeNode) {
+    TODO("Not yet implemented")
+  }
 }

src/main/kotlin/org/zowe/explorer/v3/components/files/FilesExplorerTreeView.kt

@@ -6,10 +6,6 @@
  * SPDX-License-Identifier: EPL-2.0
  *
  * Copyright Contributors to the Zowe Project.
- *
- * Contributors:
- *   Zowe Community
- *   Uladzislau Kalesnikau
  */
 
 package org.zowe.explorer.v3.components.files

src/main/kotlin/org/zowe/explorer/v3/components/files/FilesWorkingSetNodeDescriptor.kt

@@ -70,7 +70,7 @@ class FilesWorkingSetNodeDescriptor(
         // TODO: sync filter nodes info with real nodes info if the path is similar (e.g. filter /u/ULADZ and a folder ULADZ)
         val ussFilterNodeDescriptor = NodeSyncService.getService()
           .getOrCreateFilterNodeDescriptor(
-            UssFilterNodeDescriptor.formUssBasePath(host),
+            UssFilterNodeDescriptor.formUssBasePathFromHost(host),
             ussPath.path
           ) {
             UssFilterNodeDescriptor(

src/main/kotlin/org/zowe/explorer/v3/components/files/UssFileNodeDescriptor.kt

@@ -6,10 +6,6 @@
  * SPDX-License-Identifier: EPL-2.0
  *
  * Copyright Contributors to the Zowe Project.
- *
- * Contributors:
- *   Zowe Community
- *   Uladzislau Kalesnikau
  */
 
 package org.zowe.explorer.v3.components.files
@@ -21,8 +17,13 @@ import org.zowe.explorer.v3.tree.nodes.Traversable
 
 // TODO: doc
 class UssFileNodeDescriptor(
-  displayName: String,
-  override val path: List<String>,
+  override val elemName: String,
+  override val placingPath: List<String>,
   override var connectionConfigUuid: String
-) : ExplorerTreeNodeDescriptor(displayName, "USS file", AllIcons.FileTypes.Text),
+) : ExplorerTreeNodeDescriptor(elemName, "USS file", AllIcons.FileTypes.Text),
   ConnectionConfigRelated, Traversable
+{
+  override fun getExactPath(): List<String> {
+    return placingPath + elemName
+  }
+}

src/main/kotlin/org/zowe/explorer/v3/components/files/UssFilterNodeDescriptor.kt

@@ -11,70 +11,58 @@
 package org.zowe.explorer.v3.components.files
 
 import com.intellij.icons.AllIcons
-import com.intellij.ide.util.treeView.PresentableNodeDescriptor
-import com.intellij.ui.SimpleTextAttributes
 import org.zowe.explorer.v3.components.files.operations.LoadUssNodesOperation
 import org.zowe.explorer.v3.components.files.operations.LoadUssNodesOperationData
 import org.zowe.explorer.v3.components.files.operations.RefreshUssNodesOperation
 import org.zowe.explorer.v3.components.files.operations.RefreshUssNodesOperationData
 import org.zowe.explorer.v3.state.config.ConfigType
 import org.zowe.explorer.v3.state.config.cache.ConfigCacheService
 import org.zowe.explorer.v3.state.config.connection.HttpConnectionConfig
+import org.zowe.explorer.v3.tree.ExplorerTreeComponentService
 import org.zowe.explorer.v3.tree.nodes.Renameable
 import org.zowe.explorer.v3.tree.nodes.ExplorerTreeNode
-import org.zowe.explorer.v3.tree.nodes.FileFetcherNodeDescriptor
-import org.zowe.explorer.v3.tree.nodes.LazyExpandable
+import org.zowe.explorer.v3.tree.nodes.FetcherNodeDescriptor
 import org.zowe.explorer.v3.tree.nodes.NoItemsFoundNodeDescriptor
-import org.zowe.explorer.v3.tree.nodes.UpdateInfoHolder
 import org.zowe.explorer.v3.tree.nodes.Refreshable
-import org.zowe.explorer.v3.tree.nodes.getCurrentRefreshDateTime
 
 // TODO: doc
 class UssFilterNodeDescriptor(
   displayName: String,
   override var connectionConfigUuid: String,
-) : FileFetcherNodeDescriptor(
+) : FetcherNodeDescriptor(
   displayName,
+  basePath = formUssBasePathFromConnectionConfig(connectionConfigUuid),
+  filterPath = formUssFilterPath(displayName),
   "USS filter",
   AllIcons.Nodes.Module,
   connectionConfigUuid=connectionConfigUuid
-), Renameable, LazyExpandable, Refreshable, UpdateInfoHolder {
+), Renameable, Refreshable {
   companion object {
-    fun formUssBasePath(host: String): List<String> {
+    fun formUssBasePathFromHost(host: String): List<String> {
       return listOf(host, "files", "uss")
     }
 
+    fun formUssBasePathFromConnectionConfig(connectionConfigUuid: String): List<String> {
+      val connectionConfig = ConfigCacheService.getService()
+        .getConfigFromCache(ConfigType.HTTP_CONNECTION_CONFIG_V1, connectionConfigUuid)
+        ?: throw Exception("Connection config is not found for node $this")
+      val host = (connectionConfig as HttpConnectionConfig).host
+      return formUssBasePathFromHost(host)
+    }
+
     fun formUssFilterPath(displayName: String): List<String> {
       return if (displayName == "/") listOf(displayName)
         else displayName.split("/").map { "$it/"}
     }
   }
 
-  override val path: List<String>
-    get() {
-      val connectionConfig = ConfigCacheService.getService()
-        .getConfigFromCache(ConfigType.HTTP_CONNECTION_CONFIG_V1, connectionConfigUuid)
-        ?: throw Exception("Connection config is not found for node $this")
-      val host = (connectionConfig as HttpConnectionConfig).host
-      return formUssBasePath(host) + formUssFilterPath(displayName)
-    }
+  private val fetchPath = basePath + filterPath
 
-  override var wasExpanded = false
+  override val fetchFilter = if (filterPath.size > 1) filterPath.joinToString("").dropLast(1) else filterPath[0]
 
-  override val textToPreserve = listOf(
-    PresentableNodeDescriptor.ColoredFragment(
-      displayName,
-      SimpleTextAttributes.REGULAR_ATTRIBUTES
-    )
-  )
+  override val invalidationElem = if (filterPath.size > 1) filterPath.last().dropLast(1) else ""
 
-  override fun expandNode(node: ExplorerTreeNode) {
-    if (!wasExpanded) {
-      setUpdateInfo(genuinePresentationData)
-      wasExpanded = true
-      invalidateAssociatedNodes()
-    }
-  }
+  override val invalidationPath = basePath + if (filterPath.size > 1) filterPath.dropLast(1) else filterPath
 
   override fun getNodeChildren(node: ExplorerTreeNode): List<ExplorerTreeNode> {
     return if (connectionConfigUuid.isEmpty()) {
@@ -88,7 +76,7 @@ class UssFilterNodeDescriptor(
     } else {
       if (wasExpanded) {
         val operation = LoadUssNodesOperation(
-          LoadUssNodesOperationData(node, path, displayName)
+          LoadUssNodesOperationData(node, fetchPath, fetchFilter)
         )
         operation.run().loadedNodes
       } else {
@@ -102,12 +90,10 @@ class UssFilterNodeDescriptor(
   }
 
   override fun refreshNode(node: ExplorerTreeNode) {
-    setUpdateInfo(genuinePresentationData)
     val operation = RefreshUssNodesOperation(
-      RefreshUssNodesOperationData(node, path, displayName)
+      RefreshUssNodesOperationData(node, fetchPath, fetchFilter)
     )
     operation.run()
-    invalidateAssociatedNodes()
   }
 
   override fun renameNode() {

src/main/kotlin/org/zowe/explorer/v3/components/files/UssFolderNodeDescriptor.kt

@@ -11,48 +11,45 @@
 package org.zowe.explorer.v3.components.files
 
 import com.intellij.icons.AllIcons
-import com.intellij.ide.util.treeView.PresentableNodeDescriptor
-import com.intellij.ui.SimpleTextAttributes
 import org.zowe.explorer.v3.components.files.operations.LoadUssNodesOperation
 import org.zowe.explorer.v3.components.files.operations.LoadUssNodesOperationData
 import org.zowe.explorer.v3.components.files.operations.RefreshUssNodesOperation
 import org.zowe.explorer.v3.components.files.operations.RefreshUssNodesOperationData
+import org.zowe.explorer.v3.tree.ExplorerTreeComponentService
 import org.zowe.explorer.v3.tree.nodes.Renameable
 import org.zowe.explorer.v3.tree.nodes.ExplorerTreeNode
-import org.zowe.explorer.v3.tree.nodes.FileFetcherNodeDescriptor
-import org.zowe.explorer.v3.tree.nodes.LazyExpandable
+import org.zowe.explorer.v3.tree.nodes.FetcherNodeDescriptor
 import org.zowe.explorer.v3.tree.nodes.NoItemsFoundNodeDescriptor
 import org.zowe.explorer.v3.tree.nodes.Refreshable
-import org.zowe.explorer.v3.tree.nodes.UpdateInfoHolder
+import org.zowe.explorer.v3.tree.nodes.Traversable
 
 // TODO: doc
 class UssFolderNodeDescriptor(
   displayName: String,
-  var pathFilter: String,
-  override var path: List<String>,
+  parentFetchFilter: String,
   override var connectionConfigUuid: String,
-) : FileFetcherNodeDescriptor(
+) : FetcherNodeDescriptor(
   displayName,
+  basePath = UssFilterNodeDescriptor.formUssBasePathFromConnectionConfig(connectionConfigUuid),
+  filterPath = UssFilterNodeDescriptor.formUssFilterPath(parentFetchFilter) + "$displayName/",
   "USS folder",
   AllIcons.Nodes.Folder,
   connectionConfigUuid=connectionConfigUuid
-), Renameable, LazyExpandable, Refreshable, UpdateInfoHolder {
-  override var wasExpanded = false
-  override val textToPreserve = listOf(
-    PresentableNodeDescriptor.ColoredFragment(
-      displayName,
-      SimpleTextAttributes.REGULAR_ATTRIBUTES
-    )
-  )
+), Renameable, Refreshable, Traversable
+{
+  private val fetchPath = basePath + filterPath
 
-  override fun expandNode(node: ExplorerTreeNode) {
-    if (!wasExpanded) {
-      setUpdateInfo(genuinePresentationData)
-    }
-    wasExpanded = true
-    getNodeChildren(node)
-    invalidateAssociatedNodes()
-  }
+  override val fetchFilter = filterPath.joinToString("").dropLast(1)
+
+  override val placingPath = basePath + filterPath.dropLast(1)
+
+  override val elemName = displayName
+
+  override val invalidationPath = placingPath
+
+  override val invalidationElem = displayName
+
+  override fun getExactPath() = placingPath + elemName
 
   override fun getNodeChildren(node: ExplorerTreeNode): List<ExplorerTreeNode> {
     return if (connectionConfigUuid.isEmpty()) {
@@ -66,7 +63,7 @@ class UssFolderNodeDescriptor(
     } else {
       if (wasExpanded) {
         val operation = LoadUssNodesOperation(
-          LoadUssNodesOperationData(node, path, pathFilter)
+          LoadUssNodesOperationData(node, fetchPath, fetchFilter)
         )
         operation.run().loadedNodes
       } else {
@@ -80,12 +77,10 @@ class UssFolderNodeDescriptor(
   }
 
   override fun refreshNode(node: ExplorerTreeNode) {
-    setUpdateInfo(genuinePresentationData)
     val operation = RefreshUssNodesOperation(
-      RefreshUssNodesOperationData(node, path, pathFilter)
+      RefreshUssNodesOperationData(node, fetchPath, fetchFilter)
     )
     operation.run()
-    invalidateAssociatedNodes()
   }
 
   override fun renameNode() {

src/main/kotlin/org/zowe/explorer/v3/components/files/operations/LoadUssNodesOperation.kt

@@ -21,6 +21,7 @@ import org.zowe.explorer.v3.state.config.cache.ConfigCacheService
 import org.zowe.explorer.v3.state.config.connection.HttpConnectionConfig
 import org.zowe.explorer.v3.tree.nodes.ErrorNodeDescriptor
 import org.zowe.explorer.v3.tree.nodes.ExplorerTreeNode
+import org.zowe.explorer.v3.tree.nodes.FetcherNodeDescriptor
 import org.zowe.explorer.v3.tree.nodes.NoItemsFoundNodeDescriptor
 import org.zowe.explorer.v3.tree.nodes.NodeSyncService
 import org.zowe.kotlinsdk.core.ZoweProfileManager
@@ -69,28 +70,36 @@ class LoadUssNodesOperation(
       listFilesResponse
         .items
         .filter { it.name != "." && it.name != ".." }
-        .map {
-          if (it.fileType == FileItem.FileType.DIRECTORY) {
-            val ussPath = operationData.path + "${it.name}/"
-            val ussFolderNodeDescriptor = UssFolderNodeDescriptor(
-              it.name,
-              "${operationData.filter}/${it.name}",
-              ussPath,
-              connectionConfigUuid = parentNodeData.connectionConfigUuid
-            )
-            val ussFolderNode = ExplorerTreeNode(ussFolderNodeDescriptor, parentNode.project, parentNode)
-            ussFolderNode
+        .map { ussEntity ->
+          val ussNodeDescriptor = if (ussEntity.fileType == FileItem.FileType.DIRECTORY) {
+            NodeSyncService.getService()
+              .getOrCreateRealNodeDescriptor(operationData.path, ussEntity.name) {
+                UssFolderNodeDescriptor(
+                  ussEntity.name,
+                  operationData.filter,
+                  connectionConfigUuid = parentNodeData.connectionConfigUuid
+                )
+              }
           } else {
-            val ussPath = operationData.path + it.name
-            val ussFileNodeDescriptor = UssFileNodeDescriptor(it.name, ussPath, connectionConfigUuid = parentNodeData.connectionConfigUuid)
-            val ussFileNode = ExplorerTreeNode(ussFileNodeDescriptor, parentNode.project, parentNode)
-            ussFileNode
+            NodeSyncService.getService()
+              .getOrCreateRealNodeDescriptor(operationData.path, ussEntity.name) {
+                UssFileNodeDescriptor(
+                  ussEntity.name,
+                  operationData.path,
+                  connectionConfigUuid = parentNodeData.connectionConfigUuid
+                )
+              }
           }
+          ExplorerTreeNode(ussNodeDescriptor, parentNode.project, parentNode)
         }
         .ifEmpty { listOf(ExplorerTreeNode(NoItemsFoundNodeDescriptor(), parentNode.project, parentNode)) }
     }
   }
 
+  override fun setNodesRefreshInfo(fetcherNodeDescriptor: FetcherNodeDescriptor) {
+    fetcherNodeDescriptor.setUpdateInfo()
+  }
+
   override fun run(): LoadUssNodesOperationResult {
     val loadedNodes = NodeSyncService.getService().loadNodes(this)
     return LoadUssNodesOperationResult(loadedNodes)

src/main/kotlin/org/zowe/explorer/v3/components/files/operations/LoadUssNodesOperationData.kt

@@ -6,10 +6,6 @@
  * SPDX-License-Identifier: EPL-2.0
  *
  * Copyright Contributors to the Zowe Project.
- *
- * Contributors:
- *   Zowe Community
- *   Uladzislau Kalesnikau
  */
 
 package org.zowe.explorer.v3.components.files.operations

src/main/kotlin/org/zowe/explorer/v3/components/files/operations/RefreshUssNodesOperationData.kt

@@ -6,10 +6,6 @@
  * SPDX-License-Identifier: EPL-2.0
  *
  * Copyright Contributors to the Zowe Project.
- *
- * Contributors:
- *   Zowe Community
- *   Uladzislau Kalesnikau
  */
 
 package org.zowe.explorer.v3.components.files.operations