From ee87e89805106c4fe6422bde167367d191fec22e Mon Sep 17 00:00:00 2001 From: Kraiem Taha Yassine Date: Tue, 12 Mar 2024 16:10:05 +0100 Subject: [PATCH] fix(chalice): fixed cards data merge (#1948) --- api/chalicelib/core/custom_metrics.py | 8 ++++---- ee/api/chalicelib/core/custom_metrics.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/chalicelib/core/custom_metrics.py b/api/chalicelib/core/custom_metrics.py index 2a37a620c..f72c25330 100644 --- a/api/chalicelib/core/custom_metrics.py +++ b/api/chalicelib/core/custom_metrics.py @@ -193,10 +193,10 @@ def __merge_metric_with_data(metric: schemas.CardSchema, if data.series is not None and len(data.series) > 0: metric.series = data.series - if len(data.filters) > 0: - for s in metric.series: - s.filter.filters += data.filters - metric = schemas.CardSchema(**metric.model_dump(by_alias=True)) + # if len(data.filters) > 0: + # for s in metric.series: + # s.filter.filters += data.filters + # metric = schemas.CardSchema(**metric.model_dump(by_alias=True)) return metric diff --git a/ee/api/chalicelib/core/custom_metrics.py b/ee/api/chalicelib/core/custom_metrics.py index 5383d980d..a6d5440d3 100644 --- a/ee/api/chalicelib/core/custom_metrics.py +++ b/ee/api/chalicelib/core/custom_metrics.py @@ -213,10 +213,10 @@ def __merge_metric_with_data(metric: schemas.CardSchema, if data.series is not None and len(data.series) > 0: metric.series = data.series - if len(data.filters) > 0: - for s in metric.series: - s.filter.filters += data.filters - metric = schemas.CardSchema(**metric.model_dump(by_alias=True)) + # if len(data.filters) > 0: + # for s in metric.series: + # s.filter.filters += data.filters + # metric = schemas.CardSchema(**metric.model_dump(by_alias=True)) return metric