Merge branch 'release/v0.7.1' into release/v0.7.2

zowe · Dec 1, 2022 · d35a3e8 · d35a3e8
2 parents 83961d0 + 9aa33c3
commit d35a3e8
Show file tree

Hide file tree

Showing 18 changed files with 527 additions and 356 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,43 +2,82 @@
 
 All notable changes to the Zowe IntelliJ Plugin will be documented in this file.
 
+## `0.7.1 (2022-11-30)`
+
+* Feature: Unit tests for utils module ([16fae1fb](https://github.com/zowe/zowe-explorer-intellij/commit/16fae1fb)) ([683185bb](https://github.com/zowe/zowe-explorer-intellij/commit/683185bb))
+
+
+* Bugfix: DnD does not work properly ([e5dfa3a3](https://github.com/zowe/zowe-explorer-intellij/commit/e5dfa3a3))
+* Bugfix: Copy DS member to USS folder does not work ([1e94ec48](https://github.com/zowe/zowe-explorer-intellij/commit/1e94ec48))
+* Bugfix: Unknown type of file if copy-delete-copy the same PDS member ([21651646](https://github.com/zowe/zowe-explorer-intellij/commit/21651646))
+* Bugfix: Ctrl+C/Ctrl+V does not work if copy file from remote to local ([e5601e7f](https://github.com/zowe/zowe-explorer-intellij/commit/e5601e7f))
+
 ## `0.7.0 (2022-10-31)`
 
 * Breaking: Kotlin DSL v2 usage introduced. Plugin requires to use it with IntelliJ version >= 2022.1
 
 
-* Feature: Configurable batch size to load filter smoothly ([928baba](https://github.com/zowe/zowe-explorer-intellij/commit/928baba))
+* Feature: Configurable batch size to load filter
+  smoothly ([928baba](https://github.com/zowe/zowe-explorer-intellij/commit/928baba))
 * Feature: Job Purge operation ([95bf7eb](https://github.com/zowe/zowe-explorer-intellij/commit/95bf7eb))
 * Feature: Job Edit operation  ([b3962de](https://github.com/zowe/zowe-explorer-intellij/commit/b3962de))
-* Feature: Copy local to remote ([d9dcdd2](https://github.com/zowe/zowe-explorer-intellij/commit/d9dcdd2), [ea92b4b](https://github.com/zowe/zowe-explorer-intellij/commit/ea92b4b))
+* Feature: Copy local to remote ([d9dcdd2](https://github.com/zowe/zowe-explorer-intellij/commit/d9dcdd2)
+  , [ea92b4b](https://github.com/zowe/zowe-explorer-intellij/commit/ea92b4b))
 * Feature: Copy remote to remote ([586a7f2](https://github.com/zowe/zowe-explorer-intellij/commit/586a7f2))
-* Feature: GitHub issue #10: Edit Working sets directly from Tool Window ([63a2e4f](https://github.com/zowe/zowe-explorer-intellij/commit/63a2e4f))
-* Feature: GitHub issue #70: Add date and time to JES Explorer ([eaea2cc](https://github.com/zowe/zowe-explorer-intellij/commit/eaea2cc))
-* Feature: Copy remote to local: clarify warning ([26bbb2c](https://github.com/zowe/zowe-explorer-intellij/commit/26bbb2c))
-* Feature: GitHub issue #67: Allocate like for datasets with BLK will be with warning ([7ae6261](https://github.com/zowe/zowe-explorer-intellij/commit/7ae6261))
-* Feature: Move the file attribute conversion to a separate thread ([975f75d](https://github.com/zowe/zowe-explorer-intellij/commit/975f75d))
-* Feature: Source code documentation added ([636411e](https://github.com/zowe/zowe-explorer-intellij/commit/636411e), [11bb7dd](https://github.com/zowe/zowe-explorer-intellij/commit/11bb7dd))
-
-
-* Bugfix: File cache conflict if open JCL to edit it in JES explorer second time ([b3962de](https://github.com/zowe/zowe-explorer-intellij/commit/b3962de))
-* Bugfix: GitHub issue #86: Incorrect error message if mask length > 44 ([cfb4ab6](https://github.com/zowe/zowe-explorer-intellij/commit/cfb4ab6))
-* Bugfix: GitHub issue #87: Masks type autodetection does not work in Add/Edit Working Set dialogs ([49fc53a](https://github.com/zowe/zowe-explorer-intellij/commit/49fc53a))
-* Bugfix: Problem with automatic refresh after creating new members/deleting members from dataset ([928baba](https://github.com/zowe/zowe-explorer-intellij/commit/928baba))
-* Bugfix: Confusing dialog title 'Rename Directory' when renaming USS mask from context menu ([1e1a147](https://github.com/zowe/zowe-explorer-intellij/commit/1e1a147))
-* Bugfix: GitHub issue #81: There is no difference between upper and lower cases when create USS masks from context menu ([f8ea3e9](https://github.com/zowe/zowe-explorer-intellij/commit/f8ea3e9))
-* Bugfix: GitHub issue #88: Lower case is not changed to upper case during Job Filter creation ([c2f5b01](https://github.com/zowe/zowe-explorer-intellij/commit/c2f5b01))
-* Bugfix: GitHub issue #44: 'Sync data' button does not work properly when multiple changes in USS file ([27f9c6a](https://github.com/zowe/zowe-explorer-intellij/commit/27f9c6a))
-* Bugfix: GitHub issue #30: Create new member in dataset that does not have enough space creates empty member despite of warning ([7a649e6](https://github.com/zowe/zowe-explorer-intellij/commit/7a649e6))
-* Bugfix: GitHub issue #54: Accumulation of errors in WS that breaks WS ([8648da2](https://github.com/zowe/zowe-explorer-intellij/commit/8648da2))
-* Bugfix: USS file cannot be deleted in development branch ([8886770](https://github.com/zowe/zowe-explorer-intellij/commit/8886770))
-* Bugfix: z/OS version specified in connection information doesn't match the z/OS version returned from z/OSMF ([1148e10](https://github.com/zowe/zowe-explorer-intellij/commit/1148e10))
-* Bugfix: IDE error with ReadOnlyModificationException when set 'use binary mode' for read only uss-file ([c2ebf6a](https://github.com/zowe/zowe-explorer-intellij/commit/c2ebf6a))
-* Bugfix: GitHub issue #94: SYSPRINT I looked at first always opens in JES explorer for a job with multiple steps ([301012a](https://github.com/zowe/zowe-explorer-intellij/commit/301012a))
-* Bugfix: IDE error with CallException when try to open uss-file to which you have no access ([78650b9](https://github.com/zowe/zowe-explorer-intellij/commit/78650b9))
-* Bugfix: The content of sequential dataset/member is changed anyway even if you choose do not sync data with mainframe ([559b05e](https://github.com/zowe/zowe-explorer-intellij/commit/559b05e))
-* Bugfix: IDE error while retrieving job list in JES Explorer ([e3dfe93](https://github.com/zowe/zowe-explorer-intellij/commit/e3dfe93))
-* Bugfix: Extra item 'Rename' is active in the context menu if click on 'loading...'/'load more' in file explorer ([78ab43f](https://github.com/zowe/zowe-explorer-intellij/commit/78ab43f)) 
-* Bugfix: Impossible to open any file/dataset second time ([9dc62ef](https://github.com/zowe/zowe-explorer-intellij/commit/9dc62ef))
-* Bugfix: The job is marked with green icon as passed despite it finished with abend ([773a252](https://github.com/zowe/zowe-explorer-intellij/commit/773a252))
+* Feature: GitHub issue #10: Edit Working sets directly from Tool
+  Window ([63a2e4f](https://github.com/zowe/zowe-explorer-intellij/commit/63a2e4f))
+* Feature: GitHub issue #70: Add date and time to JES
+  Explorer ([eaea2cc](https://github.com/zowe/zowe-explorer-intellij/commit/eaea2cc))
+* Feature: Copy remote to local: clarify
+  warning ([26bbb2c](https://github.com/zowe/zowe-explorer-intellij/commit/26bbb2c))
+* Feature: GitHub issue #67: Allocate like for datasets with BLK will be with
+  warning ([7ae6261](https://github.com/zowe/zowe-explorer-intellij/commit/7ae6261))
+* Feature: Move the file attribute conversion to a separate
+  thread ([975f75d](https://github.com/zowe/zowe-explorer-intellij/commit/975f75d))
+* Feature: Source code documentation added ([636411e](https://github.com/zowe/zowe-explorer-intellij/commit/636411e)
+  , [11bb7dd](https://github.com/zowe/zowe-explorer-intellij/commit/11bb7dd))
+
+
+* Bugfix: File cache conflict if open JCL to edit it in JES explorer second
+  time ([b3962de](https://github.com/zowe/zowe-explorer-intellij/commit/b3962de))
+* Bugfix: GitHub issue #86: Incorrect error message if mask length >
+  44 ([cfb4ab6](https://github.com/zowe/zowe-explorer-intellij/commit/cfb4ab6))
+* Bugfix: GitHub issue #87: Masks type autodetection does not work in Add/Edit Working Set
+  dialogs ([49fc53a](https://github.com/zowe/zowe-explorer-intellij/commit/49fc53a))
+* Bugfix: Problem with automatic refresh after creating new members/deleting members from
+  dataset ([928baba](https://github.com/zowe/zowe-explorer-intellij/commit/928baba))
+* Bugfix: Confusing dialog title 'Rename Directory' when renaming USS mask from context
+  menu ([1e1a147](https://github.com/zowe/zowe-explorer-intellij/commit/1e1a147))
+* Bugfix: GitHub issue #81: There is no difference between upper and lower cases when create USS masks from context
+  menu ([f8ea3e9](https://github.com/zowe/zowe-explorer-intellij/commit/f8ea3e9))
+* Bugfix: GitHub issue #88: Lower case is not changed to upper case during Job Filter
+  creation ([c2f5b01](https://github.com/zowe/zowe-explorer-intellij/commit/c2f5b01))
+* Bugfix: GitHub issue #44: 'Sync data' button does not work properly when multiple changes in USS
+  file ([27f9c6a](https://github.com/zowe/zowe-explorer-intellij/commit/27f9c6a))
+* Bugfix: GitHub issue #30: Create new member in dataset that does not have enough space creates empty member despite of
+  warning ([7a649e6](https://github.com/zowe/zowe-explorer-intellij/commit/7a649e6))
+* Bugfix: GitHub issue #54: Accumulation of errors in WS that breaks
+  WS ([8648da2](https://github.com/zowe/zowe-explorer-intellij/commit/8648da2))
+* Bugfix: USS file cannot be deleted in development
+  branch ([8886770](https://github.com/zowe/zowe-explorer-intellij/commit/8886770))
+* Bugfix: z/OS version specified in connection information doesn't match the z/OS version returned from
+  z/OSMF ([1148e10](https://github.com/zowe/zowe-explorer-intellij/commit/1148e10))
+* Bugfix: IDE error with ReadOnlyModificationException when set 'use binary mode' for read only
+  uss-file ([c2ebf6a](https://github.com/zowe/zowe-explorer-intellij/commit/c2ebf6a))
+* Bugfix: GitHub issue #94: SYSPRINT I looked at first always opens in JES explorer for a job with multiple
+  steps ([301012a](https://github.com/zowe/zowe-explorer-intellij/commit/301012a))
+* Bugfix: IDE error with CallException when try to open uss-file to which you have no
+  access ([78650b9](https://github.com/zowe/zowe-explorer-intellij/commit/78650b9))
+* Bugfix: The content of sequential dataset/member is changed anyway even if you choose do not sync data with
+  mainframe ([559b05e](https://github.com/zowe/zowe-explorer-intellij/commit/559b05e))
+* Bugfix: IDE error while retrieving job list in JES
+  Explorer ([e3dfe93](https://github.com/zowe/zowe-explorer-intellij/commit/e3dfe93))
+* Bugfix: Extra item 'Rename' is active in the context menu if click on 'loading...'/'load more' in file
+  explorer ([78ab43f](https://github.com/zowe/zowe-explorer-intellij/commit/78ab43f))
+* Bugfix: Impossible to open any file/dataset second
+  time ([9dc62ef](https://github.com/zowe/zowe-explorer-intellij/commit/9dc62ef))
+* Bugfix: The job is marked with green icon as passed despite it finished with
+  abend ([773a252](https://github.com/zowe/zowe-explorer-intellij/commit/773a252))
 * Bugfix: GitHub issue #16: Error creating zOSMF connection
-* Bugfix: GitHub issue #85: The windows 'Add Working Set'/'Edit Working Set' are automatically resized if z/OSMF connection with very long name is added
+* Bugfix: GitHub issue #85: The windows 'Add Working Set'/'Edit Working Set' are automatically resized if z/OSMF
+  connection with very long name is added
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -58,7 +58,7 @@ dependencies {
   implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.20")
   implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2")
   implementation("org.jgrapht:jgrapht-core:1.5.1")
-  implementation("eu.ibagroup:r2z:1.2.3-rc.1")
+  implementation("eu.ibagroup:r2z:1.2.3")
   implementation("com.segment.analytics.java:analytics:+")
   testImplementation("io.mockk:mockk:1.12.4")
   testImplementation("org.mock-server:mockserver-netty:5.13.2")
@@ -90,50 +90,17 @@ tasks {
       """
       <b>WARNING: </b> version 0.7 introduces breaking change. You won't be able to use the plugin with IntelliJ version < 2022.1
       <br>
-      <b>New features:</b>
-      <ul>
-        <li>Configurable batch size to load filter smoothly</li>
-        <li>Job Purge operation</li>
-        <li>Job Edit operation</li>
-        <li>Copy local to remote</li>
-        <li>Copy remote to remote</li>
-        <li>GitHub issue #10: Edit Working sets directly from Tool Window</li>
-        <li>GitHub issue #70: Add date and time to JES Explorer</li>
-      </ul>
-      <br>
       <b>Minor changes:</b>
       <ul>
-        <li>Copy remote to local: clarify warning</li>
-        <li>GitHub issue #67: Allocate like for datasets with BLK will be with warning</li>
-        <li>Move the file attribute conversion to a separate thread</li>
-        <li>Source code documentation added</li>
+        <li>Added some unit tests for 'utils' module</li>
       </ul>
       <br>
       <b>Fixed bugs:</b>
       <ul>
-        <li>File cache conflict if open JCL to edit it in JES explorer second time</li>
-        <li>GitHub issue #86: Incorrect error message if mask length > 44</li>
-        <li>GitHub issue #87: Masks type autodetection does not work in Add/Edit Working Set dialogs</li>
-        <li>Problem with automatic refresh after creating new members/deleting members from dataset</li>
-        <li>Confusing dialog title 'Rename Directory' when renaming USS mask from context menu</li>
-        <li>GitHub issue #81: There is no difference between upper and lower cases when create USS masks from context menu</li>
-        <li>GitHub issue #88: Lower case is not changed to upper case during Job Filter creation</li>
-        <li>GitHub issue #44: 'Sync data' button does not work properly when multiple changes in USS file</li>
-        <li>GitHub issue #30: Create new member in dataset that does not have enough space creates empty member despite of warning</li>
-        <li>GitHub issue #54: Accumulation of errors in WS that breaks WS</li>
-        <li>USS file cannot be deleted in development branch</li>
-        <li>z/OS version specified in connection information doesn't match the z/OS version returned from z/OSMF</li>
-        <li>Zowe config connection test always failed</li>
-        <li>IDE error with ReadOnlyModificationException when set 'use binary mode' for read only uss-file</li>
-        <li>GitHub issue #94: SYSPRINT I looked at first always opens in JES explorer for a job with multiple steps</li>
-        <li>IDE error with CallException when try to open uss-file to which you have no access</li>
-        <li>The content of sequential dataset/member is changed anyway even if you choose do not sync data with mainframe</li>
-        <li>IDE error while retrieving job list in JES Explorer</li>
-        <li>Extra item 'Rename' is active in the context menu if click on 'loading...'/'load more' in file explorer</li>
-        <li>GitHub issue #16: Error creating zOSMF connection</li>
-        <li>GitHub issue #85: The windows 'Add Working Set'/'Edit Working Set' are automatically resized if z/OSMF connection with very long name is added</li>
-        <li>Impossible to open any file/dataset second time</li>
-        <li>The job is marked with green icon as passed despite it finished with abend</li>
+        <li>DnD does not work properly</li>
+        <li>Copy DS member to USS folder does not work</li>
+        <li>Unknown type of file if copy-delete-copy the same PDS member</li>
+        <li>Ctrl+C/Ctrl+V does not work if copy file from remote to local</li>
       </ul>"""
     )
   }

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/common/ui/treeUtils.kt b/src/main/kotlin/eu/ibagroup/formainframe/common/ui/treeUtils.kt
@@ -69,7 +69,7 @@ fun TreePath.getVirtualFile(): VirtualFile? {
 /**
  * Removes node from "invalidateOnExpand" collection of explorer view.
  * @param node node to remove.
- * @param view explorer view from wich to return node.
+ * @param view explorer view from which to return node.
  */
 fun cleanInvalidateOnExpand(
   node: ExplorerTreeNode<*>,
@@ -83,4 +83,4 @@ fun cleanInvalidateOnExpand(
       }
     }
   }
-}
+}
diff --git a/src/main/kotlin/eu/ibagroup/formainframe/dataops/DataOpsManagerImpl.kt b/src/main/kotlin/eu/ibagroup/formainframe/dataops/DataOpsManagerImpl.kt
@@ -72,7 +72,8 @@ class DataOpsManagerImpl : DataOpsManager {
    * @return attributes of file/folder
    */
   override fun tryToGetAttributes(file: VirtualFile): FileAttributes? {
-    return attributesServices.stream()
+    return attributesServices
+      .stream()
       .filter { it.vFileClass.isAssignableFrom(file::class.java) }
       .map { it.getAttributes(file) }
       .filter { it != null }
@@ -111,11 +112,11 @@ class DataOpsManagerImpl : DataOpsManager {
     @Suppress("UNCHECKED_CAST")
     return fileFetchProviders.find {
       it.requestClass.isAssignableFrom(requestClass)
-              && it.queryClass.isAssignableFrom(queryClass)
-              && it.vFileClass.isAssignableFrom(vFileClass)
+        && it.queryClass.isAssignableFrom(queryClass)
+        && it.vFileClass.isAssignableFrom(vFileClass)
     } as FileFetchProvider<R, Q, File>? ?: throw IllegalArgumentException(
       "Cannot find FileFetchProvider for " +
-              "requestClass=${requestClass.name}; queryClass=${queryClass.name}; vFileClass=${vFileClass.name}"
+        "requestClass=${requestClass.name}; queryClass=${queryClass.name}; vFileClass=${vFileClass.name}"
     )
   }
 

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/dataops/fetch/FileFetchProvider.kt b/src/main/kotlin/eu/ibagroup/formainframe/dataops/fetch/FileFetchProvider.kt
@@ -38,19 +38,22 @@ interface FileFetchProvider<R : Any, Q : Query<R, Unit>, File : VirtualFile> {
 
   fun reload(query: Q, progressIndicator: ProgressIndicator = DumbProgressIndicator.INSTANCE)
 
+  /** Function for "load more" nodes */
+  fun loadMode(query: Q, progressIndicator: ProgressIndicator = DumbProgressIndicator.INSTANCE)
+
   /**
    * File fetch provider contains all list of queries inside.
    * If the query was created with default parameters - it will find query with real parameters.
    * It was made firstly for BatchedRemoteQuery.
    * @param query supposed query.
    * @return real query instance or null if it was not found.
    */
-  fun <Q: Query<R, Unit>> getRealQueryInstance(query: Q?): Q?
+  fun <Q : Query<R, Unit>> getRealQueryInstance(query: Q?): Q?
 
   val requestClass: Class<out R>
 
   val queryClass: Class<out Query<*, *>>
 
   val vFileClass: Class<out File>
 
-}
+}