Merge branch 'bugfix/IJMP-2041-perform-refresh-concurrently-on-inters…

…ecting-nodes' into 'release/v2.1.0' IJMP-2041-perform-refresh-concurrently-on-intersecting-nodes See merge request ijmp/for-mainframe!641
zowe · Jan 28, 2025 · 6a7a2eb · 6a7a2eb
2 parents d70c400 + 726fbd0
commit 6a7a2eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/CreateUssEntityAction.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/CreateUssEntityAction.kt
@@ -27,10 +27,8 @@ import eu.ibagroup.formainframe.common.ui.showUntilDone
 import eu.ibagroup.formainframe.config.connect.ConnectionConfig
 import eu.ibagroup.formainframe.config.connect.CredentialService
 import eu.ibagroup.formainframe.dataops.DataOpsManager
-import eu.ibagroup.formainframe.dataops.RemoteQuery
 import eu.ibagroup.formainframe.dataops.attributes.RemoteUssAttributes
 import eu.ibagroup.formainframe.dataops.exceptions.CredentialsNotFoundForConnectionException
-import eu.ibagroup.formainframe.dataops.fetch.UssQuery
 import eu.ibagroup.formainframe.dataops.getAttributesService
 import eu.ibagroup.formainframe.dataops.operations.UssAllocationOperation
 import eu.ibagroup.formainframe.dataops.operations.UssAllocationParams
@@ -125,12 +123,6 @@ abstract class CreateUssEntityAction : AnAction() {
               progressIndicator = indicator
             )
 
-            val fileFetchProvider = dataOpsManager
-              .getFileFetchProvider<UssQuery, RemoteQuery<ConnectionConfig, UssQuery, Unit>, MFVirtualFile>(
-                UssQuery::class.java, RemoteQuery::class.java, MFVirtualFile::class.java
-              )
-            ussDirNode?.query?.let { query -> fileFetchProvider.reload(query) }
-
             changeFileModeIfNeeded(file, allocationParams, connectionConfig, indicator)
 
             AnalyticsService.getService().trackAnalyticsEvent(
@@ -140,7 +132,10 @@ abstract class CreateUssEntityAction : AnAction() {
               )
             )
           }.onSuccess {
-            ussDirNode?.cleanCache(false)
+            ussDirNode?.let {
+              view.myFsTreeStructure.findByPredicate { node -> node is FetchNode && node.query == it.query }
+                .forEach { node -> node.cleanCacheIfPossible(false) }
+            }
             res = true
           }.onFailure { t ->
             NotificationsService.errorNotification(t, project)

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerTreeView.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerTreeView.kt
@@ -287,7 +287,8 @@ abstract class ExplorerTreeView<Connection : ConnectionConfigBase, U : WorkingSe
         override fun after(events: List<VFileEvent>) {
           events
             .mapNotNull {
-              val nodes = myFsTreeStructure.findByVirtualFile(it.file ?: return@mapNotNull null)
+              val eventFile = it.file ?: return@mapNotNull null
+              val nodes = myFsTreeStructure.findByVirtualFile(eventFile)
               when {
                 this@ExplorerTreeView
                   .ignoreVFSChangeEvents