Merge pull request #7 from bb-io/develop

Develop

.github/workflows/ci.yaml

@@ -3,13 +3,27 @@ name: Invoker
 on:
   pull_request:
     types: [closed]
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
 
 jobs:
   trigger-workflow:
     runs-on: ubuntu-latest
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
     steps:
-      - name: Invoke workflow
+      - name: Invoke Dev Workflow
+        if: github.event_name == 'push' && (github.ref == 'refs/heads/develop' || github.event.inputs.manual_trigger == 'true')
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: ${{ vars.GH_BUILD_WORKFLOW }}
+          repo: ${{ vars.GH_BUILD_REPOSITORY }}
+          token: ${{ secrets.GH_PAT_TOKEN }}
+          ref: develop
+          inputs: '{"repository_url": "${{ github.repository }}","ref":"${{ github.ref }}", "sha":"${{ github.sha }}", "commit_url" : "${{ github.event.head_commit.url }}", "commit_message" : "${{ github.event.head_commit.message }}"}'
+
+      - name: Invoke Prod Workflow
+        if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
         uses: benc-uk/workflow-dispatch@v1
         with:
           workflow: ${{ vars.GH_BUILD_WORKFLOW }}

Apps.Wordpress/Actions/PageActions.cs

@@ -130,13 +130,13 @@ public async Task<FileResponse> GetPageByIdAsHtml([ActionParameter] PageRequest
     #region Post & Update
 
     [Action("Create page", Description = "Create a new page. With Polylang enabled it can also be used to create translations of other pages.")]
-    public Task<WordPressItem> CreatePage([ActionParameter] ModificationRequest input, [ActionParameter] TranslationOptions translationOptions)
+    public Task<WordPressItem> CreatePage([ActionParameter] ModificationRequest input, [ActionParameter] PageTranslationOptions translationOptions)
     {
         return ExecuteModification(input, translationOptions, null);
     }
 
     [Action("Create page from HTML", Description = "Create a new page from an HTML file. With Polylang enabled it can also be used to create translations of other pages.")]
-    public Task<WordPressItem> CreatePageFromHtml([ActionParameter] FileModificationRequest input, [ActionParameter] TranslationOptions translationOptions)
+    public Task<WordPressItem> CreatePageFromHtml([ActionParameter] FileModificationRequest input, [ActionParameter] PageTranslationOptions translationOptions)
     {
         return ExecuteModification(input, translationOptions, null);
     }
@@ -145,7 +145,7 @@ public Task<WordPressItem> CreatePageFromHtml([ActionParameter] FileModification
     public Task<WordPressItem> UpdatePage(
         [ActionParameter] PageRequest page,
         [ActionParameter] ModificationRequest input,
-        [ActionParameter] TranslationOptions translationOptions
+        [ActionParameter] PageTranslationOptions translationOptions
         )
     {
         return ExecuteModification(input, translationOptions, page.Id);
@@ -155,13 +155,13 @@ [ActionParameter] TranslationOptions translationOptions
     public Task<WordPressItem> UpdatePageFromHtml(
         [ActionParameter] PageRequest page,
         [ActionParameter] FileModificationRequest input,
-        [ActionParameter] TranslationOptions translationOptions
+        [ActionParameter] PageTranslationOptions translationOptions
         )
     {
         return ExecuteModification(input, translationOptions, page.Id);
     }
 
-    private async Task<WordPressItem> ExecuteModification(FileModificationRequest input, TranslationOptions translationOptions, string? id)
+    private async Task<WordPressItem> ExecuteModification(FileModificationRequest input, PageTranslationOptions translationOptions, string? id)
     {
         var fileStream = await _fileManagementClient.DownloadAsync(input.File);
         var fileBytes = await fileStream.GetByteData();
@@ -172,7 +172,7 @@ private async Task<WordPressItem> ExecuteModification(FileModificationRequest in
         return await ExecuteModification(new ModificationRequest { Title = title, Content = body }, translationOptions, id);
     }
 
-    private async Task<WordPressItem> ExecuteModification(ModificationRequest input, TranslationOptions translationOptions, string? id)
+    private async Task<WordPressItem> ExecuteModification(ModificationRequest input, PageTranslationOptions translationOptions, string? id)
     {
         var client = new WordpressRestClient(Creds);
         var request = new WordpressRestRequest(Endpoint + (id == null ? "" : $"/{id}"), Method.Post, Creds);

Apps.Wordpress/Actions/PostActions.cs

@@ -128,13 +128,13 @@ public async Task<FileResponse> GetPostByIdAsHtml([ActionParameter] PostRequest
     #region Post & Update
 
     [Action("Create post", Description = "Create a new post. With Polylang enabled it can also be used to create translations of other posts.")]
-    public Task<WordPressItem> CreatePost([ActionParameter] ModificationRequest input, [ActionParameter] TranslationOptions translationOptions)
+    public Task<WordPressItem> CreatePost([ActionParameter] ModificationRequest input, [ActionParameter] PostTranslationOptions translationOptions)
     {
         return ExecuteModification(input, translationOptions, null);       
     }
 
     [Action("Create post from HTML", Description = "Create a new post from an HTML file. With Polylang enabled it can also be used to create translations of other posts.")]
-    public Task<WordPressItem> CreatePostFromHtml([ActionParameter] FileModificationRequest input, [ActionParameter] TranslationOptions translationOptions)
+    public Task<WordPressItem> CreatePostFromHtml([ActionParameter] FileModificationRequest input, [ActionParameter] PostTranslationOptions translationOptions)
     {
         return ExecuteModification(input, translationOptions, null);
     }
@@ -143,7 +143,7 @@ public Task<WordPressItem> CreatePostFromHtml([ActionParameter] FileModification
     public Task<WordPressItem> UpdatePost(
         [ActionParameter] PostRequest post, 
         [ActionParameter] ModificationRequest input, 
-        [ActionParameter] TranslationOptions translationOptions
+        [ActionParameter] PostTranslationOptions translationOptions
         )
     {
         return ExecuteModification(input, translationOptions, post.Id);
@@ -153,13 +153,13 @@ [ActionParameter] TranslationOptions translationOptions
     public Task<WordPressItem> UpdatePostFromHtml(
         [ActionParameter] PostRequest post,
         [ActionParameter] FileModificationRequest input,
-        [ActionParameter] TranslationOptions translationOptions
+        [ActionParameter] PostTranslationOptions translationOptions
         )
     {
         return ExecuteModification(input, translationOptions, post.Id);
     }    
 
-    private async Task<WordPressItem> ExecuteModification(FileModificationRequest input, TranslationOptions translationOptions, string? id)
+    private async Task<WordPressItem> ExecuteModification(FileModificationRequest input, PostTranslationOptions translationOptions, string? id)
     {
         var fileStream = await _fileManagementClient.DownloadAsync(input.File);
         var fileBytes = await fileStream.GetByteData();
@@ -170,7 +170,7 @@ private async Task<WordPressItem> ExecuteModification(FileModificationRequest in
         return await ExecuteModification(new ModificationRequest { Title = title, Content = body }, translationOptions, id);
     }
 
-    private async Task<WordPressItem> ExecuteModification(ModificationRequest input, TranslationOptions translationOptions, string? id)
+    private async Task<WordPressItem> ExecuteModification(ModificationRequest input, PostTranslationOptions translationOptions, string? id)
     {
         var client = new WordpressRestClient(Creds);
         var request = new WordpressRestRequest(Endpoint + (id == null ? "" : $"/{id}"), Method.Post, Creds);

Apps.Wordpress/Models/Requests/Page/PageTranslationOptions.cs

@@ -0,0 +1,22 @@
+using Apps.Wordpress.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common;
+using Blackbird.Applications.Sdk.Common.Dynamic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Apps.Wordpress.Models.Requests.Page
+{
+    public class PageTranslationOptions
+    {
+        [Display("Language (P)")]
+        [DataSource(typeof(LanguageDataHandler))]
+        public string? Language { get; set; }
+
+        [Display("As translation of (P)")]
+        [DataSource(typeof(PageDataHandler))]
+        public string? ParentId { get; set; }
+    }
+}

Apps.Wordpress/Models/Requests/Post/TranslationOptions.cs → Apps.Wordpress/Models/Requests/Post/PostTranslationOptions.cs

@@ -9,7 +9,7 @@
 
 namespace Apps.Wordpress.Models.Requests.Post
 {
-    public class TranslationOptions
+    public class PostTranslationOptions
     {
         [Display("Language (P)")]
         [DataSource(typeof(LanguageDataHandler))]