From 4352328a4ff4fe7d55503a1d9b75f368f7509b2f Mon Sep 17 00:00:00 2001 From: Ihor Kriatov Date: Wed, 10 Jan 2024 18:18:26 +0200 Subject: [PATCH 1/6] CI: update workflow to invoke DEV deployment --- .github/workflows/ci.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 79a5c44..385b667 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,13 +3,26 @@ name: Invoker on: pull_request: types: [closed] + push: + branches: + - develop 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' + 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 }} From 6be4f8d42438c7644b3dd4c3c5a05d88bd832d8f Mon Sep 17 00:00:00 2001 From: Ihor Kriatov Date: Wed, 28 Feb 2024 12:18:32 +0100 Subject: [PATCH 2/6] CI: update pipeline to include dispatch event --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 385b667..cf54b6e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,6 +6,7 @@ on: push: branches: - develop + workflow_dispatch: jobs: trigger-workflow: From 7c283ee129fe7aed42406a97e8a1f7152841bde8 Mon Sep 17 00:00:00 2001 From: Ihor Kriatov Date: Wed, 28 Feb 2024 18:02:33 +0100 Subject: [PATCH 3/6] CI: invoke Dev workflow once manually triggered --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cf54b6e..57cc22d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Invoke Dev Workflow - if: github.event_name == 'push' && github.ref == 'refs/heads/develop' + 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 }} From e9eaa13f1eef97abc5a61682d589d268cb359948 Mon Sep 17 00:00:00 2001 From: Cecilia Nistal Date: Thu, 7 Mar 2024 21:46:50 -0300 Subject: [PATCH 4/6] Separate Page and Post Translation Options --- Apps.Wordpress/Actions/PageActions.cs | 12 +++++----- Apps.Wordpress/Actions/PostActions.cs | 12 +++++----- .../Requests/Page/PageTranslationOptions.cs | 22 +++++++++++++++++++ ...onOptions.cs => PostTranslationOptions.cs} | 2 +- 4 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 Apps.Wordpress/Models/Requests/Page/PageTranslationOptions.cs rename Apps.Wordpress/Models/Requests/Post/{TranslationOptions.cs => PostTranslationOptions.cs} (93%) diff --git a/Apps.Wordpress/Actions/PageActions.cs b/Apps.Wordpress/Actions/PageActions.cs index ad7d249..a95bfd0 100644 --- a/Apps.Wordpress/Actions/PageActions.cs +++ b/Apps.Wordpress/Actions/PageActions.cs @@ -126,13 +126,13 @@ public async Task 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 CreatePage([ActionParameter] ModificationRequest input, [ActionParameter] TranslationOptions translationOptions) + public Task 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 CreatePageFromHtml([ActionParameter] FileModificationRequest input, [ActionParameter] TranslationOptions translationOptions) + public Task CreatePageFromHtml([ActionParameter] FileModificationRequest input, [ActionParameter] PageTranslationOptions translationOptions) { return ExecuteModification(input, translationOptions, null); } @@ -141,7 +141,7 @@ public Task CreatePageFromHtml([ActionParameter] FileModification public Task UpdatePage( [ActionParameter] PageRequest page, [ActionParameter] ModificationRequest input, - [ActionParameter] TranslationOptions translationOptions + [ActionParameter] PageTranslationOptions translationOptions ) { return ExecuteModification(input, translationOptions, page.Id); @@ -151,13 +151,13 @@ [ActionParameter] TranslationOptions translationOptions public Task UpdatePageFromHtml( [ActionParameter] PageRequest page, [ActionParameter] FileModificationRequest input, - [ActionParameter] TranslationOptions translationOptions + [ActionParameter] PageTranslationOptions translationOptions ) { return ExecuteModification(input, translationOptions, page.Id); } - private Task ExecuteModification(FileModificationRequest input, TranslationOptions translationOptions, string? id) + private Task ExecuteModification(FileModificationRequest input, PageTranslationOptions translationOptions, string? id) { var html = Encoding.UTF8.GetString(input.File.Bytes); var htmlDocument = html.AsHtmlDocument(); @@ -166,7 +166,7 @@ private Task ExecuteModification(FileModificationRequest input, T return ExecuteModification(new ModificationRequest { Title = title, Content = body }, translationOptions, id); } - private async Task ExecuteModification(ModificationRequest input, TranslationOptions translationOptions, string? id) + private async Task ExecuteModification(ModificationRequest input, PageTranslationOptions translationOptions, string? id) { var client = new WordpressRestClient(Creds); var request = new WordpressRestRequest(Endpoint + (id == null ? "" : $"/{id}"), Method.Post, Creds); diff --git a/Apps.Wordpress/Actions/PostActions.cs b/Apps.Wordpress/Actions/PostActions.cs index 2231ae0..163b7d5 100644 --- a/Apps.Wordpress/Actions/PostActions.cs +++ b/Apps.Wordpress/Actions/PostActions.cs @@ -125,13 +125,13 @@ public async Task 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 CreatePost([ActionParameter] ModificationRequest input, [ActionParameter] TranslationOptions translationOptions) + public Task 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 CreatePostFromHtml([ActionParameter] FileModificationRequest input, [ActionParameter] TranslationOptions translationOptions) + public Task CreatePostFromHtml([ActionParameter] FileModificationRequest input, [ActionParameter] PostTranslationOptions translationOptions) { return ExecuteModification(input, translationOptions, null); } @@ -140,7 +140,7 @@ public Task CreatePostFromHtml([ActionParameter] FileModification public Task UpdatePost( [ActionParameter] PostRequest post, [ActionParameter] ModificationRequest input, - [ActionParameter] TranslationOptions translationOptions + [ActionParameter] PostTranslationOptions translationOptions ) { return ExecuteModification(input, translationOptions, post.Id); @@ -150,13 +150,13 @@ [ActionParameter] TranslationOptions translationOptions public Task UpdatePostFromHtml( [ActionParameter] PostRequest post, [ActionParameter] FileModificationRequest input, - [ActionParameter] TranslationOptions translationOptions + [ActionParameter] PostTranslationOptions translationOptions ) { return ExecuteModification(input, translationOptions, post.Id); } - private Task ExecuteModification(FileModificationRequest input, TranslationOptions translationOptions, string? id) + private Task ExecuteModification(FileModificationRequest input, PostTranslationOptions translationOptions, string? id) { var html = Encoding.UTF8.GetString(input.File.Bytes); var htmlDocument = html.AsHtmlDocument(); @@ -165,7 +165,7 @@ private Task ExecuteModification(FileModificationRequest input, T return ExecuteModification(new ModificationRequest { Title = title, Content = body }, translationOptions, id); } - private async Task ExecuteModification(ModificationRequest input, TranslationOptions translationOptions, string? id) + private async Task ExecuteModification(ModificationRequest input, PostTranslationOptions translationOptions, string? id) { var client = new WordpressRestClient(Creds); var request = new WordpressRestRequest(Endpoint + (id == null ? "" : $"/{id}"), Method.Post, Creds); diff --git a/Apps.Wordpress/Models/Requests/Page/PageTranslationOptions.cs b/Apps.Wordpress/Models/Requests/Page/PageTranslationOptions.cs new file mode 100644 index 0000000..09397a4 --- /dev/null +++ b/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; } + } +} diff --git a/Apps.Wordpress/Models/Requests/Post/TranslationOptions.cs b/Apps.Wordpress/Models/Requests/Post/PostTranslationOptions.cs similarity index 93% rename from Apps.Wordpress/Models/Requests/Post/TranslationOptions.cs rename to Apps.Wordpress/Models/Requests/Post/PostTranslationOptions.cs index 8e5da34..df56c62 100644 --- a/Apps.Wordpress/Models/Requests/Post/TranslationOptions.cs +++ b/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))] From b55698550cac5a650f77191244b63b2b8cd5c3bb Mon Sep 17 00:00:00 2001 From: Cecilia Nistal Date: Fri, 8 Mar 2024 09:15:15 -0300 Subject: [PATCH 5/6] Update version --- Apps.Wordpress/Apps.Wordpress.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apps.Wordpress/Apps.Wordpress.csproj b/Apps.Wordpress/Apps.Wordpress.csproj index 8f4b73d..646f8b2 100644 --- a/Apps.Wordpress/Apps.Wordpress.csproj +++ b/Apps.Wordpress/Apps.Wordpress.csproj @@ -4,7 +4,7 @@ enable enable Wordpress (+ Polylang) - 1.1.0 + 1.1.1 The world’s most popular website builder Apps.Wordpress From 1d5a6d86f8aa23f591410fd8e10cd98dd3446be3 Mon Sep 17 00:00:00 2001 From: Cecilia Nistal Date: Fri, 8 Mar 2024 09:23:41 -0300 Subject: [PATCH 6/6] Fix conflict --- Apps.Wordpress/Actions/PageActions.cs | 2 +- Apps.Wordpress/Actions/PostActions.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Apps.Wordpress/Actions/PageActions.cs b/Apps.Wordpress/Actions/PageActions.cs index 0fd7a6e..e53a028 100644 --- a/Apps.Wordpress/Actions/PageActions.cs +++ b/Apps.Wordpress/Actions/PageActions.cs @@ -161,7 +161,7 @@ [ActionParameter] PageTranslationOptions translationOptions return ExecuteModification(input, translationOptions, page.Id); } - private Task ExecuteModification(FileModificationRequest input, PageTranslationOptions translationOptions, string? id) + private async Task ExecuteModification(FileModificationRequest input, PageTranslationOptions translationOptions, string? id) { var fileStream = await _fileManagementClient.DownloadAsync(input.File); var fileBytes = await fileStream.GetByteData(); diff --git a/Apps.Wordpress/Actions/PostActions.cs b/Apps.Wordpress/Actions/PostActions.cs index efb2a3c..d135eb9 100644 --- a/Apps.Wordpress/Actions/PostActions.cs +++ b/Apps.Wordpress/Actions/PostActions.cs @@ -159,7 +159,7 @@ [ActionParameter] PostTranslationOptions translationOptions return ExecuteModification(input, translationOptions, post.Id); } - private Task ExecuteModification(FileModificationRequest input, PostTranslationOptions translationOptions, string? id) + private async Task ExecuteModification(FileModificationRequest input, PostTranslationOptions translationOptions, string? id) { var fileStream = await _fileManagementClient.DownloadAsync(input.File); var fileBytes = await fileStream.GetByteData();