Merge pull request #566 from hknokh/master

feat: Different target dirs for each ObjectSet

Author: hknokh

messages/resources.json

@@ -120,7 +120,7 @@
     "csvFilesWereUpdated": "Amount of updated source CSV files: %s.",
     "validationCsvFileCompleted": "Processing the source CSV files has been completed.",
     "unableToDeleteTargetDirectory" : "Unable to clean-up the target directory: '%s'. It's probably locked by another application.",
-    "unableToDeleteSourceDirectory": "Unable to clean-up the souce directory: '%s'. It's probably locked by another application.",
+    "unableToDeleteSourceDirectory": "Unable to clean-up the source directory: '%s'. It's probably locked by another application.",
     "unableToDeleteCacheDirectory": "Unable to clean-up the cache directory: '%s'. It's probably locked by another application.",
     "canModifyPrompt": "NOTE! The Plugin has detected that you are about to modify the Production org.\nTo confirm that you really want to modify this org, please type: ",
 

src/modules/commands_processors/runCommand.ts

@@ -118,16 +118,21 @@ export class RunCommand {
     }
 
     try {
+      
       let jsonObject = JSON.parse(json);
+      
       jsonObject.objects = jsonObject.objects || [];
       jsonObject.objectSets = jsonObject.objectSets || [];
+      
       if (jsonObject.objects.length) {
         jsonObject.objectSets.unshift(new ScriptObjectSet(jsonObject.objects));
       }
+
       this.workingJson = JSON.stringify(jsonObject);
       jsonObject.objects = [];
       this.script = plainToClass(models.Script, jsonObject);
-      this.setupGlobalParameters();
+
+      this._setupGlobalScriptParameters();
 
     } catch (ex: any) {
       throw new CommandInitializationError(this.logger.getResourceString(RESOURCES.incorrectExportJsonFormat, ex.message));
@@ -137,12 +142,6 @@ export class RunCommand {
 
   }
 
-  
-  setupGlobalParameters() {
-    Common.csvReadFileDelimiter = this.script.csvReadFileDelimiter;
-    Common.csvWriteFileDelimiter = this.script.csvWriteFileDelimiter;
-  }
-
 
   /**
    * Setup the Command
@@ -269,6 +268,13 @@ export class RunCommand {
     this.script = plainToClass(models.Script, JSON.parse(this.workingJson));
     this.job = undefined;
     this.script.objects = this.script.objectSets[objectSetIndex].objects || this.script.objects;
+    this.script.objectSetIndex = objectSetIndex;
+  }
+
+  
+  private _setupGlobalScriptParameters() {
+    Common.csvReadFileDelimiter = this.script.csvReadFileDelimiter;
+    Common.csvWriteFileDelimiter = this.script.csvWriteFileDelimiter;
   }
 
 }

src/modules/components/common_components/common.ts

@@ -1269,13 +1269,13 @@ export class Common {
    * Remove folder with all files
    *
    * @static
-   * @param {string} path Path to the folder to remove
+   * @param {string} pth Path to the folder to remove
    * @memberof Common
    */
-  public static deleteFolderRecursive(path: string, throwIOErrors?: boolean, removeSelfDirectory: boolean = true) {
-    if (fs.existsSync(path)) {
-      fs.readdirSync(path).forEach(file => {
-        var curPath = path + "/" + file;
+  public static deleteFolderRecursive(pth: string, throwIOErrors?: boolean, removeSelfDirectory: boolean = true) {
+    if (fs.existsSync(pth)) {
+      fs.readdirSync(pth).forEach(file => {
+        var curPath = path.join(pth, file);
         if (fs.lstatSync(curPath).isDirectory()) {
           // Recursive call
           this.deleteFolderRecursive(curPath, throwIOErrors);
@@ -1292,7 +1292,7 @@ export class Common {
       });
       try {
         if (removeSelfDirectory) {
-          fs.rmdirSync(path);
+          fs.rmdirSync(pth);
         }
       } catch (ex) {
         if (throwIOErrors) {

src/modules/components/common_components/statics.ts

@@ -52,6 +52,7 @@ export const CONSTANTS = {
 
   CSV_SOURCE_SUB_DIRECTORY: "source",
   CSV_TARGET_SUB_DIRECTORY: "target",
+  OBJECT_SET_SUBDIRECTORY_PREFIX : '/object-set-',
   BINARY_CACHE_SUB_DIRECTORY: "binary_cache",
   SOURCE_RECORDS_CACHE_SUB_DIRECTORY: "source_records_cache",
   CSV_SOURCE_FILE_SUFFIX: "_source",

src/modules/models/script_models/script.ts

@@ -132,6 +132,7 @@ export default class Script implements IAppScript, ISfdmuRunScript {
   addonManager: SfdmuRunAddonManager;
   runInfo: ICommandRunInfo;
   canModify: string;
+  objectSetIndex: number;
 
 
   // Additional sobject descriptions for sobject which were nbot included into the export.json
@@ -156,7 +157,11 @@ export default class Script implements IAppScript, ISfdmuRunScript {
   }
 
   get targetDirectoryPath(): string {
-    return path.join(this.basePath, CONSTANTS.CSV_TARGET_SUB_DIRECTORY);
+    return path.join(
+      this.basePath,
+      CONSTANTS.CSV_TARGET_SUB_DIRECTORY +
+      (!this.objectSetIndex ? '' : `${CONSTANTS.OBJECT_SET_SUBDIRECTORY_PREFIX}${this.objectSetIndex}`)
+    );
   }
 
   get targetDirectory(): string {
@@ -167,7 +172,11 @@ export default class Script implements IAppScript, ISfdmuRunScript {
   }
 
   get sourceDirectoryPath(): string {
-    return path.join(this.basePath, CONSTANTS.CSV_SOURCE_SUB_DIRECTORY);
+    return path.join(
+      this.basePath,
+      CONSTANTS.CSV_SOURCE_SUB_DIRECTORY +
+      (!this.objectSetIndex ? '' : `${CONSTANTS.OBJECT_SET_SUBDIRECTORY_PREFIX}${this.objectSetIndex}`)
+    );
   }
 
   get sourceDirectory(): string {