jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(chalice): fixed cards data merge (#1948)

Browse source 
(cherry picked from commit ee87e89805)
This commit is contained in:
Kraiem Taha Yassine 2024-03-12 16:10:05 +01:00 • committed by Taha Yassine Kraiem
parent 538af09cc8
commit 89d501edb5
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api/chalicelib/core/custom_metrics.py
View file

@ -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

8
ee/api/chalicelib/core/custom_metrics.py
View file

@ -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