From 710fb3ccc472a4c1e7ef3f2ed2ec540c3a591a7d Mon Sep 17 00:00:00 2001 From: James Chapman <196318169+JC-wk@users.noreply.github.com> Date: Tue, 20 Jan 2026 12:26:33 +0000 Subject: [PATCH 1/4] Add ESLint config file paths for validation --- .github/workflows/build_validation_develop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_validation_develop.yml b/.github/workflows/build_validation_develop.yml index 21276a47d..03f63760b 100644 --- a/.github/workflows/build_validation_develop.yml +++ b/.github/workflows/build_validation_develop.yml @@ -102,6 +102,8 @@ jobs: VALIDATE_DOCKERFILE_HADOLINT: true VALIDATE_TSX: true VALIDATE_TYPESCRIPT_ES: true + TYPESCRIPT_ES_CONFIG_FILE: ui/app/eslint.config.js + TSX_CONFIG_FILE: ui/app/eslint.config.js - name: Docs validation if: ${{ steps.filter.outputs.docs == 'true' }} From d44bfe81a7449ef8cb8a0ff6a8357538e96a339c Mon Sep 17 00:00:00 2001 From: James Chapman Date: Tue, 27 Jan 2026 17:09:29 +0000 Subject: [PATCH 2/4] Fix property substitution not occuring where there only a main step in the pipeline ([#4824](https://github.com/microsoft/AzureTRE/issues/4824)) --- CHANGELOG.md | 1 + api_app/_version.py | 2 +- api_app/service_bus/helpers.py | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2b4b6f13..6c6b1d231 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ BUG FIXES: * Fix missing metastoreDomains for Databricks, which caused metastore outages for some domains ([#4779](https://github.com/microsoft/AzureTRE/issues/4779)) * Fix cost display duplication when user resource is deleted - UI incorrectly reused cost data for remaining resources ([#4783](https://github.com/microsoft/AzureTRE/issues/4783)) * Delete npm package lock file ([#4810](https://github.com/microsoft/AzureTRE/issues/4810)) +* Fix property substitution not occuring where there only a main step in the pipeline ([#4824](https://github.com/microsoft/AzureTRE/issues/4824)) COMPONENTS: diff --git a/api_app/_version.py b/api_app/_version.py index 545cb3374..e6e3369ba 100644 --- a/api_app/_version.py +++ b/api_app/_version.py @@ -1 +1 @@ -__version__ = "0.25.12" +__version__ = "0.25.13" diff --git a/api_app/service_bus/helpers.py b/api_app/service_bus/helpers.py index 65acff1e4..56ff47a72 100644 --- a/api_app/service_bus/helpers.py +++ b/api_app/service_bus/helpers.py @@ -76,9 +76,15 @@ async def update_resource_for_step(operation_step: OperationStep, resource_repo: pipeline_primary_action = parent_template_pipeline_dict[primary_action] is_first_main_step = pipeline_primary_action and len(pipeline_primary_action) == 1 and pipeline_primary_action[0]['stepId'] == 'main' - if not pipeline_primary_action or is_first_main_step: + + if not pipeline_primary_action: return step_resource + if is_first_main_step: + single_step = pipeline_primary_action[0] + if not single_step.get('properties'): + return step_resource + # get the template step template_step = None for step in parent_template_pipeline_dict[primary_action]: From 2285cec956f3f620f7bcbe3a75c8ad6fc44f7099 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Tue, 27 Jan 2026 17:18:14 +0000 Subject: [PATCH 3/4] revert file --- .github/workflows/build_validation_develop.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build_validation_develop.yml b/.github/workflows/build_validation_develop.yml index 03f63760b..21276a47d 100644 --- a/.github/workflows/build_validation_develop.yml +++ b/.github/workflows/build_validation_develop.yml @@ -102,8 +102,6 @@ jobs: VALIDATE_DOCKERFILE_HADOLINT: true VALIDATE_TSX: true VALIDATE_TYPESCRIPT_ES: true - TYPESCRIPT_ES_CONFIG_FILE: ui/app/eslint.config.js - TSX_CONFIG_FILE: ui/app/eslint.config.js - name: Docs validation if: ${{ steps.filter.outputs.docs == 'true' }} From bc64b0a45b1936ba66d5553924bb433841c72d24 Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Mon, 2 Feb 2026 22:16:08 +0000 Subject: [PATCH 4/4] version --- api_app/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api_app/_version.py b/api_app/_version.py index e6e3369ba..6623c5202 100644 --- a/api_app/_version.py +++ b/api_app/_version.py @@ -1 +1 @@ -__version__ = "0.25.13" +__version__ = "0.25.14"