From 0587ddf6d097a776544010018d94745a6343cad6 Mon Sep 17 00:00:00 2001 From: mathijs-bb Date: Wed, 14 Aug 2024 18:13:25 +0200 Subject: [PATCH] Fixed issue in generate files --- Apps.XTM/Actions/FileActions.cs | 12 ++++++++++-- Apps.XTM/Apps.XTM.csproj | 2 +- .../Models/Response/Files/GeneratedFileResponse.cs | 6 ++++++ .../Response/Projects/ProjectCompletionResponse.cs | 8 +++++++- Apps.XTM/RestUtilities/XTMClient.cs | 4 ++-- XTM.sln | 6 ++++++ 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/Apps.XTM/Actions/FileActions.cs b/Apps.XTM/Actions/FileActions.cs index 36c9fd5..f4a5cd3 100644 --- a/Apps.XTM/Actions/FileActions.cs +++ b/Apps.XTM/Actions/FileActions.cs @@ -32,13 +32,21 @@ public FileActions(InvocationContext invocationContext, IFileManagementClient fi [Action("Generate files", Description = "Generate project files")] public async Task GenerateFiles( [ActionParameter] ProjectRequest project, - [ActionParameter] GenerateFileRequest query) + [ActionParameter] GenerateFileRequest query, + [ActionParameter] [Display("Job IDs")] IEnumerable? jobIds) { var endpoint = $"{ApiEndpoints.Projects}/{project.ProjectId}/files/generate"; + if (jobIds == null) + { + var projectActions = new ProjectActions(InvocationContext, _fileManagementClient); + var projectCompletion = await projectActions.GetProjectCompletion(project); + jobIds = projectCompletion.JobIds; + } + var request = new XTMRequest(new() { - Url = Creds.Get(CredsNames.Url) + endpoint.WithQuery(query), + Url = Creds.Get(CredsNames.Url) + endpoint.WithQuery(query).SetQueryParameter("jobIds", string.Join(',', jobIds)), Method = Method.Post }, await Client.GetToken(Creds)); diff --git a/Apps.XTM/Apps.XTM.csproj b/Apps.XTM/Apps.XTM.csproj index 3c8900c..4c3046b 100644 --- a/Apps.XTM/Apps.XTM.csproj +++ b/Apps.XTM/Apps.XTM.csproj @@ -4,7 +4,7 @@ enable enable XTM - 3.2.1 + 3.2.2 Translation management system that centralizes localization assets and enables fast, accurate translation and deployment of content tailored to any audience in any territory Apps.XTM 12 diff --git a/Apps.XTM/Models/Response/Files/GeneratedFileResponse.cs b/Apps.XTM/Models/Response/Files/GeneratedFileResponse.cs index 629c448..8ee2161 100644 --- a/Apps.XTM/Models/Response/Files/GeneratedFileResponse.cs +++ b/Apps.XTM/Models/Response/Files/GeneratedFileResponse.cs @@ -6,4 +6,10 @@ public class GeneratedFileResponse { [Display("File ID")] public string FileId { get; set; } + + [Display("Job ID")] + public string JobId { get; set; } + + [Display("File type")] + public string FileType { get; set; } } \ No newline at end of file diff --git a/Apps.XTM/Models/Response/Projects/ProjectCompletionResponse.cs b/Apps.XTM/Models/Response/Projects/ProjectCompletionResponse.cs index a6c1e78..fc48a85 100644 --- a/Apps.XTM/Models/Response/Projects/ProjectCompletionResponse.cs +++ b/Apps.XTM/Models/Response/Projects/ProjectCompletionResponse.cs @@ -1,10 +1,15 @@ -namespace Apps.XTM.Models.Response.Projects; +using Blackbird.Applications.Sdk.Common; + +namespace Apps.XTM.Models.Response.Projects; public class ProjectCompletionResponse { public string Activity { get; set; } public List Jobs { get; set; } + [Display("Job IDs")] + public IEnumerable JobIds { get; set; } + public ProjectCompletionResponse() { Activity = string.Empty; @@ -15,6 +20,7 @@ public ProjectCompletionResponse(checkProjectCompletionResponse response) { Activity = response.@return.project.activity.ToString(); Jobs = new(); + JobIds = response.@return.project.jobs.Select(x => x.jobDescriptor.id.ToString()).ToList(); foreach (var job in response.@return.project.jobs) { diff --git a/Apps.XTM/RestUtilities/XTMClient.cs b/Apps.XTM/RestUtilities/XTMClient.cs index 0b6399b..fc5e9b0 100644 --- a/Apps.XTM/RestUtilities/XTMClient.cs +++ b/Apps.XTM/RestUtilities/XTMClient.cs @@ -21,7 +21,7 @@ public async Task ExecuteXtmWithJson(string endpoint, Method metho var request = new XTMRequest(new() { - Url = creds.GetUrl() + endpoint, + Url = creds.Get(CredsNames.Url) + endpoint, Method = method }, token); @@ -88,7 +88,7 @@ public async Task ExecuteXtm(XTMRequest request) public async Task GetToken(AuthenticationCredentialsProvider[] creds) { - var url = creds.GetUrl(); + var url = creds.Get(CredsNames.Url); var client = creds.Get(CredsNames.Client); var userId = creds.Get(CredsNames.UserId); diff --git a/XTM.sln b/XTM.sln index ff8c34f..8f46885 100644 --- a/XTM.sln +++ b/XTM.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 17.5.33424.131 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apps.XTM", "Apps.XTM\Apps.XTM.csproj", "{6486035A-C63F-4071-A691-873C085B50AD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "ConsoleApp1\ConsoleApp1.csproj", "{396BDD9B-347B-470B-BFFE-180D4942D111}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {6486035A-C63F-4071-A691-873C085B50AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {6486035A-C63F-4071-A691-873C085B50AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {6486035A-C63F-4071-A691-873C085B50AD}.Release|Any CPU.Build.0 = Release|Any CPU + {396BDD9B-347B-470B-BFFE-180D4942D111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {396BDD9B-347B-470B-BFFE-180D4942D111}.Debug|Any CPU.Build.0 = Debug|Any CPU + {396BDD9B-347B-470B-BFFE-180D4942D111}.Release|Any CPU.ActiveCfg = Release|Any CPU + {396BDD9B-347B-470B-BFFE-180D4942D111}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE