From 8f038ab250ebf3b4897f65bd55305ca0b1f4cab2 Mon Sep 17 00:00:00 2001 From: JasonBellONS <95040942+JasonBellONS@users.noreply.github.com> Date: Tue, 16 Jul 2024 16:20:56 +0100 Subject: [PATCH] CI: Contentful integration email (#342) * Contentful integration complete * CMS python file added * Code refactored * Code updated to display status from user selecting from a list on the CMS * Changed the code to work with the radio button option added on the CMS for the user * Integrated the help centre page with Contentful for categories of items to show. * Methods catalogue page panel deleted * Abort added back * Updated the methods table to remove access * Linting errors corrected * Pipfile lock updated * Merged with main * 1.0.0 Automatically generated by python-semantic-release * 1.0.0 Automatically generated by python-semantic-release * add header attributes * ensure methods are assigned to correct tables * update second table to match * add url link for method summary * add url for ready methods * add conditional clause to future methods table * simplify code * refactoring * debug method summary page * remove redundant term * add release link support * retain consistency with variables * fix bug with detail content link * retain layout consistency with current website * missing end of quote * fix release term issue * formatting * formatting changes * formatting changes * ignore formatting error * get help centre structure from contentful * continue to use contentful structure * add error handling & clean up * partially derive page content from contentful * add error handling for missing sub pages * remove external link page filtering * unused variable * remove content overwriting * ensure methods-request page is also derived from contentful * integrate methods-request into contentful * formatting fixes * CMS Markdown template created * First draft of the CMS markdown document is complete * CMS MD updated * CMS MD moved to root of the repo * correct accessibility statement page title * add accessibility statement page to contentful * remove redundant imports * update tests to reflect title change * resolve issue with methods request page * integrate privacy page into contentful * fix issue with bullet list * update variable names * Code formatted & confluence link removed from CMS.md file * add contentful secrets to concourse * add contentful params to live pipeline * export variables to env * remove tokens from dev pipeline * use temp file to read cms tokens * rename variables for use with poetry * empty commit * empty commit * reformatting * print statements * print testing * rename env variables * fixing syntax * use github secret to check env variables * Merge branch 'main' into contentful-integration Signed-off-by: jasonbellONS # Conflicts: # CMS.md # ci/tasks/build_and_deploy/build_files.sh # poetry.lock # pyproject.toml # sml_builder/__init__.py # sml_builder/cms.py # sml_builder/help_centre.py # sml_builder/method.py # sml_builder/page.py # sml_builder/templates/about.html # sml_builder/templates/accessibility_statement.html # sml_builder/templates/content/privacy.html # sml_builder/templates/help-methods-request.html # sml_builder/templates/help_category.html # sml_builder/templates/index.html # sml_builder/templates/method.html # sml_builder/templates/methods.html * Amending Pipeline Signed-off-by: jasonbellONS * Amending Pipeline Signed-off-by: jasonbellONS * Amending Pipeline Signed-off-by: jasonbellONS * running poetry lock Signed-off-by: jasonbellONS * running poetry lock Signed-off-by: jasonbellONS --------- Signed-off-by: jasonbellONS Co-authored-by: sanjeevz3009 Co-authored-by: semantic-release Co-authored-by: Joseph-Percival-ONS --- ci/live-pipeline.yml | 3 +-- ci/tasks/util/email_metadata.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ci/live-pipeline.yml b/ci/live-pipeline.yml index e42f7938b..b971f136c 100644 --- a/ci/live-pipeline.yml +++ b/ci/live-pipeline.yml @@ -144,6 +144,7 @@ resources: states: ["CLOSED", "MERGED"] resources: + jobs: - name: build_and_deploy_dev_branch plan: @@ -422,7 +423,5 @@ jobs: resource: pr-done params: path: repo - - status: failure context: Deleting Workspace \ No newline at end of file diff --git a/ci/tasks/util/email_metadata.yml b/ci/tasks/util/email_metadata.yml index 03d039081..680920dc1 100644 --- a/ci/tasks/util/email_metadata.yml +++ b/ci/tasks/util/email_metadata.yml @@ -9,8 +9,7 @@ image_resource: inputs: - name: repo -output: - - name: email + run: path: sh dir: repo