Update

nkdAgility · Jun 30, 2024 · 26fbfe3 · 26fbfe3
1 parent bbc70ab
commit 26fbfe3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/AzureDevOps.WorkItemClone.ConsoleUI/Commands/WorkItemCloneCommand.cs b/AzureDevOps.WorkItemClone.ConsoleUI/Commands/WorkItemCloneCommand.cs
@@ -22,21 +22,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, WorkItemClo
             var parentId = EnsureParentIdAskIfMissing(settings.targetParentId);
 
             // --------------------------------------------------------------
-            AnsiConsole.Write(
-            new Table()
-                .AddColumn(new TableColumn("Setting").Alignment(Justify.Right))
-                .AddColumn(new TableColumn("Value"))
-                .AddRow("configFile", configFile)
-                .AddRow("outputPath", outputPath)
-                .AddRow("templateAccessToken", "***************")
-                .AddRow("templateOrganization", configSettings.template.Organization)
-                .AddRow("templateProject", configSettings.template.Project)
-                .AddRow("targetAccessToken", "***************")
-                .AddRow("targetOrganization", configSettings.target.Organization)
-                .AddRow("targetProject", configSettings.target.Project)
-                .AddRow("parentId", parentId.ToString())
-                .AddRow("JsonFile", JsonFile)
-                 );
+            WriteOutSettings(settings);
             if (!settings.NonInteractive)
             {
 

diff --git a/AzureDevOps.WorkItemClone.ConsoleUI/Commands/WorkItemCommandBase.cs b/AzureDevOps.WorkItemClone.ConsoleUI/Commands/WorkItemCommandBase.cs
@@ -1,6 +1,7 @@
 using ABB.WorkItemClone.AzureDevOps;
 using ABB.WorkItemClone.AzureDevOps.DataContracts;
 using ABB.WorkItemClone.ConsoleUI.DataContracts;
+using Microsoft.VisualStudio.Services.Identity;
 using Newtonsoft.Json;
 using Spectre.Console;
 using Spectre.Console.Cli;
@@ -179,5 +180,24 @@ internal string EnsureConfigFileAskIfMissing(string? configFile)
             return configFile;
         }
 
+        internal void WriteOutSettings(WorkItemCloneCommandSettings config)
+        {
+            AnsiConsole.Write(
+           new Table()
+               .AddColumn(new TableColumn("Setting").Alignment(Justify.Right))
+               .AddColumn(new TableColumn("Value"))
+               .AddRow("configFile", config.configFile != null ? config.configFile : "NOT SET")
+               .AddRow("CachePath",  config.CachePath != null ? config.CachePath : "NOT SET")
+               .AddRow("templateAccessToken", "***************")
+               .AddRow("templateOrganization", config.templateOrganization != null ? config.templateOrganization : "NOT SET")
+               .AddRow("templateProject", config.templateProject != null ? config.templateProject : "NOT SET")
+               .AddRow("targetAccessToken", "***************")
+               .AddRow("targetOrganization", config.targetOrganization != null ? config.targetOrganization : "NOT SET")
+               .AddRow("targetProject", config.targetProject != null ? config.targetProject : "NOT SET")
+               .AddRow("targetParentId", config.targetParentId != null ? config.targetParentId.ToString() : "NOT SET")
+               .AddRow("inputJsonFile", config.inputJsonFile != null ? config.inputJsonFile : "NOT SET")
+                );
+        }
+
     }
 }
diff --git a/AzureDevOps.WorkItemClone.ConsoleUI/Commands/WorkItemInitCommand.cs b/AzureDevOps.WorkItemClone.ConsoleUI/Commands/WorkItemInitCommand.cs
@@ -30,6 +30,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, WorkItemClo
             {
                 config = new WorkItemCloneCommandSettings();
             }
+            config.configFile = EnsureConfigFileAskIfMissing(config.configFile = settings.configFile != null ? settings.configFile : config.configFile);
             config.inputJsonFile = EnsureJsonFileAskIfMissing(config.inputJsonFile = settings.inputJsonFile != null ? settings.inputJsonFile : config.inputJsonFile);
             config.CachePath = EnsureCachePathAskIfMissing(config.CachePath = settings.CachePath != null ? settings.CachePath : config.CachePath);
 
@@ -40,6 +41,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, WorkItemClo
             config.targetProject = EnsureProjectAskIfMissing(config.targetProject = settings.targetProject != null ? settings.targetProject : config.targetProject);
             config.targetParentId = EnsureParentIdAskIfMissing(config.targetParentId = settings.targetParentId != null ? settings.targetParentId : config.targetParentId);
 
+            WriteOutSettings(config);
 
             System.IO.File.WriteAllText(configFile, JsonConvert.SerializeObject(config, Formatting.Indented));
 

diff --git a/AzureDevOps.WorkItemClone.ConsoleUI/configuration.json b/AzureDevOps.WorkItemClone.ConsoleUI/configuration.json
@@ -1,10 +1,10 @@
 {
   "CachePath": "./cache",
-  "inputJsonFile": null,
+  "inputJsonFile": "ADO_TESTProjPipline_V03.json",
   "targetAccessToken": null,
   "targetOrganization": "nkdagility-preview",
   "targetProject": "ABB-Demo",
-  "parentId": null,
+  "targetParentId": 540,
   "templateAccessToken": null,
   "templateOrganization": "ABB-MO-ATE",
   "templateProject": "ABB Traction Template"