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

Author: KUGDev

src/main/kotlin/eu/ibagroup/formainframe/config/ws/ui/AbstractWsDialog.kt

@@ -14,6 +14,7 @@ import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.ui.CollectionComboBoxModel
 import com.intellij.ui.SimpleListCellRenderer
+import com.intellij.ui.dsl.builder.RowLayout
 import com.intellij.ui.dsl.builder.bindItem
 import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.panel
@@ -96,7 +97,7 @@ abstract class AbstractWsDialog<Connection : ConnectionConfigBase, WSConfig : Wo
   private val panel by lazy {
     panel {
       row {
-        label(wsNameLabel)
+        label("$wsNameLabel: ")
         textField()
           .bindText(state::workingSetName)
           .validationOnApply {
@@ -108,9 +109,9 @@ abstract class AbstractWsDialog<Connection : ConnectionConfigBase, WSConfig : Wo
             )
           }
           .focused()
-      }
+      }.layout(RowLayout.LABEL_ALIGNED)
       row {
-        label("Specify connection")
+        label("z/OSMF Connection: ")
         comboBox(connectionComboBoxModel, SimpleListCellRenderer.create("") { it?.name })
           .bindItem(
             {
@@ -136,7 +137,7 @@ abstract class AbstractWsDialog<Connection : ConnectionConfigBase, WSConfig : Wo
               null
             }
           }
-      }
+      }.layout(RowLayout.LABEL_ALIGNED)
       group(tableTitle, false) {
         row {
           tableWithToolbar(masksTable, addDefaultActions = true) {

src/main/kotlin/eu/ibagroup/formainframe/dataops/operations/mover/UssToUssFileMover.kt

@@ -17,6 +17,8 @@ import eu.ibagroup.formainframe.dataops.DataOpsManager
 import eu.ibagroup.formainframe.dataops.attributes.RemoteUssAttributes
 import eu.ibagroup.formainframe.dataops.attributes.USS_DELIMITER
 import eu.ibagroup.formainframe.dataops.exceptions.CallException
+import eu.ibagroup.formainframe.dataops.operations.DeleteOperation
+import eu.ibagroup.formainframe.dataops.operations.DeleteOperationRunner
 import eu.ibagroup.formainframe.dataops.operations.OperationRunner
 import eu.ibagroup.formainframe.dataops.operations.OperationRunnerFactory
 import eu.ibagroup.formainframe.utils.cancelByIndicator
@@ -25,7 +27,6 @@ import eu.ibagroup.formainframe.utils.log
 import org.zowe.kotlinsdk.CopyDataUSS
 import org.zowe.kotlinsdk.DataAPI
 import org.zowe.kotlinsdk.FilePath
-import org.zowe.kotlinsdk.MoveUssFile
 import retrofit2.Call
 import retrofit2.Response
 
@@ -43,6 +44,7 @@ class UssToUssFileMoverFactory : OperationRunnerFactory {
  * Implements copying of uss file to uss directory inside 1 system
  */
 class UssToUssFileMover(private val dataOpsManager: DataOpsManager) : AbstractFileMover() {
+
   override fun canRun(operation: MoveCopyOperation): Boolean {
     return operation.sourceAttributes is RemoteUssAttributes
             && operation.destinationAttributes is RemoteUssAttributes
@@ -57,30 +59,48 @@ class UssToUssFileMover(private val dataOpsManager: DataOpsManager) : AbstractFi
    * Proceeds move/copy of uss file to uss directory
    * @param connectionConfig connection configuration of system inside which to copy file
    * @param operation requested operation
-   * @param progressIndicator indicator that will show progress of copying/moving in UI
    */
   private fun makeCall(
     connectionConfig: ConnectionConfig,
-    operation: MoveCopyOperation,
-    progressIndicator: ProgressIndicator
-  ): Triple<Call<Void>, String, String> {
+    operation: MoveCopyOperation
+  ): Triple<Pair<Call<Void>, () -> Unit>, String, String> {
     val sourceAttributes = (operation.sourceAttributes as RemoteUssAttributes)
-    val destinationAttributes = (operation.destinationAttributes as RemoteUssAttributes)
     val from = sourceAttributes.path
-    val to = destinationAttributes.path + USS_DELIMITER + (operation.newName ?: sourceAttributes.name)
-    val api = api<DataAPI>(connectionConfig)
-    val call = if (operation.isMove) {
-      api.moveUssFile(
-        authorizationToken = connectionConfig.authToken,
-        body = MoveUssFile(
-          from = from
-        ),
-        filePath = FilePath(
-          path = to
-        )
-      )
-    } else {
-      api.copyUssFile(
+    val to = computeUssDestination(operation)
+    val call = if (operation.isMove)
+      buildMoveCall(connectionConfig, operation, from, to)
+    else
+      buildCopyCall(connectionConfig, operation, from, to)
+    return Triple(call, from, to)
+  }
+
+  /**
+   * Function builds a Move call and Delete source callback after moving is performed
+   * @return Pair of Move call and its delete source file callback
+   */
+  private fun buildMoveCall(
+    connectionConfig: ConnectionConfig,
+    operation: MoveCopyOperation,
+    from: String,
+    to: String)
+  : Pair<Call<Void>, () -> Unit> {
+    val copyCall = buildCopyCall(connectionConfig, operation, from, to).first
+    val deleteSourceCallback = buildDeleteSourceCallback(operation)
+    return Pair(copyCall, deleteSourceCallback)
+  }
+
+  /**
+   * Function builds a Copy call
+   * @return Pair of Copy call and empty callback function to execute after Copy is performed
+   */
+  private fun buildCopyCall(
+    connectionConfig: ConnectionConfig,
+    operation: MoveCopyOperation,
+    from: String,
+    to: String)
+  : Pair<Call<Void>, () -> Unit> {
+    return Pair(
+      api<DataAPI>(connectionConfig).copyUssFile(
         authorizationToken = connectionConfig.authToken,
         body = CopyDataUSS.CopyFromFileOrDir(
           from = from,
@@ -93,8 +113,53 @@ class UssToUssFileMover(private val dataOpsManager: DataOpsManager) : AbstractFi
           path = to
         )
       )
+    ) {}
+  }
+
+  /**
+   * Function builds a Delete callback which will be executed after successful Move is performed
+   * @return delete callback
+   */
+  private fun buildDeleteSourceCallback(operation: MoveCopyOperation): () -> Unit {
+    return {
+      val sourceAttributes = operation.sourceAttributes as RemoteUssAttributes
+      val deleteOperation = DeleteOperation(operation.source, sourceAttributes)
+      DeleteOperationRunner(dataOpsManager).run(deleteOperation)
+    }
+  }
+
+  /**
+   * Function is used to determine the correct USS destination for Move/Copy operation
+   * The possible list of destinations are:
+   *
+   * Copying:
+   * 1. Directory -> Directory without(with) conflict: Destination would be <ROOT_PATH>
+   * 2. Directory -> Directory with conflict, but "Use new name" option was pressed: Destination would be <ROOT_PATH>/<NEW_DIR_NAME>
+   * 3. File -> Directory with conflict: Destination would be <ROOT_PATH>/<FILE_NEW_NAME>
+   * 4. File -> Directory without conflict: Destination would be <ROOT_PATH>/<SOURCE_FILE_NAME>
+   *
+   * Moving:
+   * 1. Directory -> Directory without(with) conflict: Destination would be <ROOT_PATH>
+   * 2. Directory -> Directory with conflict and "Use new name" is pressed: Destination would be <ROOT_PATH>/<NEW_DIR_NAME>
+   * 3. File -> Directory the same behavior as for Copying
+   *
+   *    *   example: mv(cp) -Rf /u/<USER>/test /u/<USER>/destination
+   *    *   (if test is present under destination all files and subdirs from /u/<USER>/test will be copied/moved
+   *    *   and overwritten in /u/<USER>/destination/test, otherwise test would be copied/moved to /u/<USER>/destination/test)
+   *    *   If operation is Move, the source would be deleted afterward
+   *
+   * @return target destination in String format
+   */
+  private fun computeUssDestination(operation: MoveCopyOperation) : String {
+    val destinationRootPath = (operation.destinationAttributes as RemoteUssAttributes).path
+    val destinationNewName = operation.newName
+    val destinationNewNameWithDelimiter = USS_DELIMITER + operation.newName
+    // Copying or Moving USS directory
+    return if (operation.source.isDirectory && operation.destination.isDirectory) {
+        destinationRootPath + if (destinationNewName != null) destinationNewNameWithDelimiter else ""
     }
-    return Triple(call.cancelByIndicator(progressIndicator), from, to)
+    // Copying or Moving USS file
+    else destinationRootPath + USS_DELIMITER + (operation.newName ?: operation.sourceAttributes?.name)
   }
 
   /**
@@ -106,11 +171,14 @@ class UssToUssFileMover(private val dataOpsManager: DataOpsManager) : AbstractFi
     var throwable: Throwable? = null
     for ((requester, _) in operation.commonUrls(dataOpsManager)) {
       try {
-        val (call, from, to) = makeCall(requester.connectionConfig, operation, progressIndicator)
+        val (call, from, to) = makeCall(requester.connectionConfig, operation)
         val operationName = if (operation.isMove) "move" else "copy"
-        val response: Response<Void> = call.execute()
+        val response: Response<Void> = call.first.cancelByIndicator(progressIndicator).execute()
         if (!response.isSuccessful) {
           throwable = CallException(response, "Cannot $operationName $from to $to")
+        } else {
+          // Call the built early callback for source file/dir deletion (always empty callback for Copy)
+          call.second.invoke()
         }
         break
       } catch (t: Throwable) {

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

@@ -54,12 +54,12 @@ class AllocationDialog(project: Project?, config: ConnectionConfig, override var
   private lateinit var advancedParametersField: JTextField
   private lateinit var presetsBox: JComboBox<Presets>
   private val HLQ = getUsername(config)
+  private val nonNegativeIntRange = IntRange(0, Int.MAX_VALUE - 1)
+  private val positiveIntRange = IntRange(1, Int.MAX_VALUE - 1)
 
   private val mainPanel by lazy {
     val sameWidthLabelsGroup = "ALLOCATION_DIALOG_LABELS_WIDTH_GROUP"
     val sameWidthComboBoxGroup = "ALLOCATION_DIALOG_COMBO_BOX_WIDTH_GROUP"
-    val nonNegativeIntRange = IntRange(0, Int.MAX_VALUE - 1)
-    val positiveIntRange = IntRange(1, Int.MAX_VALUE - 1)
 
     panel {
       row {
@@ -199,7 +199,7 @@ class AllocationDialog(project: Project?, config: ConnectionConfig, override var
       row {
         label("Record Length: ")
           .widthGroup(sameWidthLabelsGroup)
-        intTextField(positiveIntRange)
+        intTextField(nonNegativeIntRange)
           .bindText(
             { state.allocationParameters.recordLength?.toString() ?: "0" },
             { state.allocationParameters.recordLength = it.toIntOrNull() }
@@ -334,6 +334,7 @@ class AllocationDialog(project: Project?, config: ConnectionConfig, override var
     return validateDatasetNameOnInput(datasetNameField)
       ?: validateForBlank(memberNameField)
       ?: validateMemberName(memberNameField)
+      ?: validateLrecl(recordFormatBox, recordLengthField)
       ?: defaultValidationInfos.firstOrNull()
       ?: validateVolser(advancedParametersField)
   }
@@ -342,6 +343,26 @@ class AllocationDialog(project: Project?, config: ConnectionConfig, override var
     return mainPanel.preferredFocusedComponent ?: super.getPreferredFocusedComponent()
   }
 
+  /**
+   * Function for validating LRECL value
+   * @param recordFormatBox RecordFormat combo box
+   * @param recordLengthField  record length text field
+   * @return ValidationInfo in case of error or null otherwise
+   */
+  private fun validateLrecl(recordFormatBox: JComboBox<RecordFormat>, recordLengthField: JTextField): ValidationInfo? {
+    val range = if (recordFormatBox.selectedItem == RecordFormat.U)
+      nonNegativeIntRange
+    else
+      positiveIntRange
+    return if (recordLengthField.text.toIntOrNull() !in range)
+      ValidationInfo(
+        "Please enter a number from ${range.first} to ${range.last}",
+        recordLengthField
+      )
+    else
+      null
+  }
+
   init {
     title = "Allocate Dataset"
     init()

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

@@ -33,6 +33,7 @@ import eu.ibagroup.formainframe.dataops.DataOpsManager
 import eu.ibagroup.formainframe.dataops.Query
 import eu.ibagroup.formainframe.dataops.attributes.AttributesService
 import eu.ibagroup.formainframe.dataops.attributes.FileAttributes
+import eu.ibagroup.formainframe.dataops.attributes.RemoteUssAttributes
 import eu.ibagroup.formainframe.dataops.attributes.attributesListener
 import eu.ibagroup.formainframe.dataops.content.synchronizer.DocumentedSyncProvider
 import eu.ibagroup.formainframe.dataops.content.synchronizer.SaveStrategy
@@ -42,6 +43,7 @@ import eu.ibagroup.formainframe.explorer.*
 import eu.ibagroup.formainframe.utils.*
 import eu.ibagroup.formainframe.utils.crudable.EntityWithUuid
 import eu.ibagroup.formainframe.vfs.MFBulkFileListener
+import eu.ibagroup.formainframe.vfs.MFVirtualFile
 import eu.ibagroup.formainframe.vfs.MFVirtualFileSystem
 import org.jetbrains.concurrency.AsyncPromise
 import java.awt.Component
@@ -53,6 +55,8 @@ import javax.swing.tree.TreeSelectionModel
 
 val EXPLORER_VIEW = DataKey.create<ExplorerTreeView<*, *, *>>("explorerView")
 
+private val log = log<ExplorerTreeView<*, *, *>>()
+
 fun <ExplorerView: ExplorerTreeView<*, *, *>> AnActionEvent.getExplorerView(clazz: Class<out ExplorerView>): ExplorerView? {
   return getData(EXPLORER_VIEW).castOrNull(clazz)
 }
@@ -221,6 +225,18 @@ abstract class ExplorerTreeView<Connection: ConnectionConfigBase, U : WorkingSet
               }
             }
           }
+
+          // TODO: rework it so that listener registers once
+          // This listener should only be registered in FileExplorerView
+          if (this@ExplorerTreeView is FileExplorerView) {
+            events.filterIsInstance<VFilePropertyChangeEvent>().filter {
+              it.propertyName == VirtualFile.PROP_NAME && it.file is MFVirtualFile
+            }.forEach {
+              (it.newValue as? String)?.let { newName ->
+                updateAttributesForChildrenInEditor(it.file, newName)
+              }
+            }
+          }
         }
       },
       disposable = this
@@ -406,4 +422,45 @@ abstract class ExplorerTreeView<Connection: ConnectionConfigBase, U : WorkingSet
     }
   }
 
+  /**
+   * Update attributes for files opened in editor if renamed file is an ancestor of these files.
+   * For USS files only
+   */
+  fun updateAttributesForChildrenInEditor(renamedFile: VirtualFile, newName: String) {
+    val dataOpsManager = DataOpsManager.instance
+    val parentAttributes = dataOpsManager.tryToGetAttributes(renamedFile)
+    val fileEditorManager = FileEditorManager.getInstance(project)
+    val openFiles = fileEditorManager.openFiles
+    openFiles.forEach { openFile ->
+      if (VfsUtilCore.isAncestor(renamedFile, openFile, false)) {
+        val oldAttributes = dataOpsManager.tryToGetAttributes(openFile)
+        if (parentAttributes is RemoteUssAttributes && oldAttributes is RemoteUssAttributes) {
+          val relativePathToFile = oldAttributes.path.removePrefix(parentAttributes.path)
+          val newPath = "/${parentAttributes.parentDirPath}/$newName$relativePathToFile"
+          val newAttributes = RemoteUssAttributes(
+            newPath,
+            oldAttributes.isDirectory,
+            oldAttributes.fileMode,
+            oldAttributes.url,
+            oldAttributes.requesters,
+            oldAttributes.length,
+            oldAttributes.uid,
+            oldAttributes.owner,
+            oldAttributes.gid,
+            oldAttributes.groupId,
+            oldAttributes.modificationTime,
+            oldAttributes.symlinkTarget
+          )
+          log.info(
+            "Update attributes for file in editor.\nVirtual file - $openFile.\n" +
+                "Old attributes - $oldAttributes.\nNew attributes - $newAttributes."
+          )
+          val attributesService =
+            dataOpsManager.getAttributesService(oldAttributes::class.java, renamedFile::class.java)
+          attributesService.updateAttributes(oldAttributes, newAttributes)
+        }
+      }
+    }
+  }
+
 }