Merge branch 'private-release/v1.2.5-221' into private-release/v1.2.5-223

Signed-off-by: Uladzislau <leksilonchikk@gmail.com>

Author: KUGDev

.gitignore

@@ -5,6 +5,7 @@
 /ide_for_launch
 /out
 /allure-results
+**/mock_project/*
 
 libs
 verifier-all.jar

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 All notable changes to the For Mainframe Plugin will be documented in this file.
 
-## [1.2.4-223] (2024-11-18)
+## [Unreleased]
+
+## [1.2.4-221] (2024-11-18)
 
 ### Bugfixes
 

gradle.properties

@@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xss1M
 platformVersion = 2022.3
 
 # SemVer format -> https://semver.org
-pluginVersion = 1.2.4-223
+pluginVersion = 1.2.5-223
 pluginGroup = eu.ibagroup
 pluginRepositoryUrl = https://github.com/for-mainframe/For-Mainframe
 

src/main/kotlin/eu/ibagroup/formainframe/analytics/ui/AnalyticsPolicyDialog.kt

@@ -61,6 +61,7 @@ class AnalyticsPolicyDialog(
             lineWrap = true
             wrapStyleWord = true
             caretPosition = 0
+            isEditable = false
           }
         scrollCell(licenseTextArea)
           .horizontalAlign(HorizontalAlign.FILL)

src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerTreeView.kt

@@ -96,6 +96,29 @@ abstract class ExplorerTreeView<Connection: ConnectionConfigBase, U : WorkingSet
 
   private var treeModel: AsyncTreeModel
 
+  /**
+   * Function is called when onFetchCancelled event has been raised.
+   * It searches for nodes by provided @param Query, looks through the tree and collects
+   * TreePath objects on Promise resolution. For every found TreePath collapses this path
+   * @param query - query on which 'fetch cancelled' event has been occurred
+   */
+  private fun collapseNodesByQuery(query: Query<*, *>) {
+    // Collapse only those nodes for which TreePath has been resolved.
+    // If tree path cannot be resolved as the result of Promise resolution,
+    // it means that node does not present in the tree model anymore
+    myFsTreeStructure.findByPredicate { it is FetchNode && it.query == query }
+      .mapNotNull { myStructure.promisePath(it, myTree).get() }
+      .forEach { foundTreePath ->
+        treeModel.onValidThread {
+          myTree.collapsePath(foundTreePath)
+          synchronized(myNodesToInvalidateOnExpand) {
+            val node = foundTreePath.lastPathComponent
+            myNodesToInvalidateOnExpand.add(node)
+          }
+        }
+      }
+  }
+
   /**
    * Get node by provided query and invalidate them. The nodes will be either collapsed or invalidated on this action, basing on the provided parameters
    * @param query the query to search nodes by
@@ -326,7 +349,7 @@ abstract class ExplorerTreeView<Connection: ConnectionConfigBase, U : WorkingSet
         }
 
         override fun <R : Any, Q : Query<R, Unit>> onFetchCancelled(query: Q) {
-          getNodesByQueryAndInvalidate(query, collapse = true, invalidate = false)
+          collapseNodesByQuery(query)
         }
 
         override fun <R : Any, Q : Query<R, Unit>> onFetchFailure(query: Q, throwable: Throwable) {