From e4dd5067841435f436d3cacdd2c167d63e8217de Mon Sep 17 00:00:00 2001 From: Laurent LAPORTE Date: Thu, 11 Apr 2024 16:30:34 +0200 Subject: [PATCH] fix(configuration): version availability for "STS Cashflow By Cluster" variable is v8.8 --- antarest/study/business/thematic_trimming_field_infos.py | 2 +- docs/CHANGELOG.md | 1 + tests/integration/test_integration.py | 2 -- .../General/dialogs/ThematicTrimmingDialog/utils.ts | 6 ++++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/antarest/study/business/thematic_trimming_field_infos.py b/antarest/study/business/thematic_trimming_field_infos.py index 30d95a9393..764c2c9590 100644 --- a/antarest/study/business/thematic_trimming_field_infos.py +++ b/antarest/study/business/thematic_trimming_field_infos.py @@ -191,7 +191,7 @@ class ThematicTrimmingFormFields(FormFieldsBaseModel, metaclass=AllOptionalMetac "sts_inj_by_plant": {"topic": _SHORT_TERM_STORAGES, "path": "STS inj by plant", "default_value": True, "start_version": 860}, "sts_withdrawal_by_plant": {"topic": _SHORT_TERM_STORAGES, "path": "STS withdrawal by plant", "default_value": True, "start_version": 860}, "sts_lvl_by_plant": {"topic": _SHORT_TERM_STORAGES, "path": "STS lvl by plant", "default_value": True, "start_version": 860}, - "sts_cashflow_by_cluster": {"topic": _SHORT_TERM_STORAGES, "path": "STS Cashflow By Cluster", "default_value": True, "start_version": 860}, + "sts_cashflow_by_cluster": {"topic": _SHORT_TERM_STORAGES, "path": "STS Cashflow By Cluster", "default_value": True, "start_version": 880}, # topic: "Short-Term Storages - Group" "psp_open_injection": {"topic": _SHORT_TERM_STORAGES_GROUP, "path": "PSP_open_injection", "default_value": True, "start_version": 860}, "psp_open_withdrawal": {"topic": _SHORT_TERM_STORAGES_GROUP, "path": "PSP_open_withdrawal", "default_value": True, "start_version": 860}, diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 85a0288a58..6fe7b8494d 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -19,6 +19,7 @@ v2.16.8 (unreleased) * **comments:** use a command to update comments on a variant [`#1959`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/1959) * **outputs (ui):** correct weekly data formatting to support 53-week years [`#1975`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/1975) * **configuration:** add missing variables in Thematic Trimming for studies in version v8.6 or above [`#1992`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/1992) +* **configuration:** version availability for "STS Cashflow By Cluster" variable is v8.8 v2.16.7 (2024-03-05) diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py index d9a03481ae..c07f13c59c 100644 --- a/tests/integration/test_integration.py +++ b/tests/integration/test_integration.py @@ -967,7 +967,6 @@ def test_area_management(client: TestClient, admin_access_token: str, study_id: "solarPv": True, "solarRooft": True, "spilEnrg": True, - "stsCashflowByCluster": True, "stsInjByPlant": True, "stsLvlByPlant": True, "stsWithdrawalByPlant": True, @@ -1135,7 +1134,6 @@ def test_area_management(client: TestClient, admin_access_token: str, study_id: "solarPv": True, "solarRooft": True, "spilEnrg": True, - "stsCashflowByCluster": True, "stsInjByPlant": True, "stsLvlByPlant": True, "stsWithdrawalByPlant": True, diff --git a/webapp/src/components/App/Singlestudy/explore/Configuration/General/dialogs/ThematicTrimmingDialog/utils.ts b/webapp/src/components/App/Singlestudy/explore/Configuration/General/dialogs/ThematicTrimmingDialog/utils.ts index c75d2b1b88..d05f76f289 100644 --- a/webapp/src/components/App/Singlestudy/explore/Configuration/General/dialogs/ThematicTrimmingDialog/utils.ts +++ b/webapp/src/components/App/Singlestudy/explore/Configuration/General/dialogs/ThematicTrimmingDialog/utils.ts @@ -72,7 +72,6 @@ export interface ThematicTrimmingFormFields { stsInjByPlant?: boolean; stsWithdrawalByPlant?: boolean; stsLvlByPlant?: boolean; - stsCashflowByCluster?: boolean; pspOpenInjection?: boolean; pspOpenWithdrawal?: boolean; pspOpenLevel?: boolean; @@ -100,6 +99,8 @@ export interface ThematicTrimmingFormFields { other5Injection?: boolean; other5Withdrawal?: boolean; other5Level?: boolean; + // Study version >= 880 + stsCashflowByCluster?: boolean; } const keysMap: Record = { @@ -172,7 +173,6 @@ const keysMap: Record = { stsInjByPlant: "STS INJ BY PLANT", stsWithdrawalByPlant: "STS WITHDRAWAL BY PLANT", stsLvlByPlant: "STS LVL BY PLANT", - stsCashflowByCluster: "STS CASHFLOW BY CLUSTER", pspOpenInjection: "PSP_OPEN_INJECTION", pspOpenWithdrawal: "PSP_OPEN_WITHDRAWAL", pspOpenLevel: "PSP_OPEN_LEVEL", @@ -200,6 +200,8 @@ const keysMap: Record = { other5Injection: "OTHER5_INJECTION", other5Withdrawal: "OTHER5_WITHDRAWAL", other5Level: "OTHER5_LEVEL", + // Study version >= 880 + stsCashflowByCluster: "STS CASHFLOW BY CLUSTER", }; // Allow to support all study versions by using directly the server config