diff --git a/api/chalicelib/core/custom_metrics.py b/api/chalicelib/core/custom_metrics.py index e986c08e7..f0ce45ff3 100644 --- a/api/chalicelib/core/custom_metrics.py +++ b/api/chalicelib/core/custom_metrics.py @@ -191,12 +191,13 @@ def __merge_metric_with_data(metric: schemas.CardSchema, # TODO: try to refactor this metric: schemas.CardSchema = schemas.CardSchema(**{**data.model_dump(by_alias=True), **metric.model_dump(by_alias=True)}) - if len(data.filters) > 0 or len(data.events) > 0: + # if len(data.filters) > 0 or len(data.events) > 0: + if len(data.filters) > 0: for s in metric.series: - if len(data.filters) > 0: - s.filter.filters += data.filters - if len(data.events) > 0: - s.filter.events += data.events + # if len(data.filters) > 0: + s.filter.filters += data.filters + # if len(data.events) > 0: + # s.filter.events += data.events # metric.limit = data.limit # metric.page = data.page # metric.startTimestamp = data.startTimestamp diff --git a/ee/api/chalicelib/core/custom_metrics.py b/ee/api/chalicelib/core/custom_metrics.py index 6f5431cbb..b58c1e84d 100644 --- a/ee/api/chalicelib/core/custom_metrics.py +++ b/ee/api/chalicelib/core/custom_metrics.py @@ -210,12 +210,13 @@ def __merge_metric_with_data(metric: schemas.CardSchema, # TODO: try to refactor this metric: schemas.CardSchema = schemas.CardSchema(**{**data.model_dump(by_alias=True), **metric.model_dump(by_alias=True)}) - if len(data.filters) > 0 or len(data.events) > 0: + # if len(data.filters) > 0 or len(data.events) > 0: + if len(data.filters) > 0: for s in metric.series: - if len(data.filters) > 0: - s.filter.filters += data.filters - if len(data.events) > 0: - s.filter.events += data.events + # if len(data.filters) > 0: + s.filter.filters += data.filters + # if len(data.events) > 0: + # s.filter.events += data.events # metric.limit = data.limit # metric.page = data.page # metric.startTimestamp = data.startTimestamp