From 64a6f51f47f558aa9ba371a6d27e4f69fe6fef68 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Tue, 31 Jan 2023 16:18:05 +0100 Subject: [PATCH] feat(chalice): support filter table-card before creating --- api/chalicelib/core/custom_metrics.py | 2 ++ ee/api/chalicelib/core/custom_metrics.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/api/chalicelib/core/custom_metrics.py b/api/chalicelib/core/custom_metrics.py index 944bebc4f..381b86553 100644 --- a/api/chalicelib/core/custom_metrics.py +++ b/api/chalicelib/core/custom_metrics.py @@ -239,6 +239,8 @@ def try_sessions(project_id, user_id, data: schemas.CardSessionsSchema): s.filter.endDate = data.endTimestamp s.filter.limit = data.limit s.filter.page = data.page + if len(data.filters) > 0: + s.filter.filters += data.filters results.append({"seriesId": None, "seriesName": s.name, **sessions.search_sessions(data=s.filter, project_id=project_id, user_id=user_id)}) diff --git a/ee/api/chalicelib/core/custom_metrics.py b/ee/api/chalicelib/core/custom_metrics.py index eb47a767c..2f7c39b99 100644 --- a/ee/api/chalicelib/core/custom_metrics.py +++ b/ee/api/chalicelib/core/custom_metrics.py @@ -268,6 +268,8 @@ def try_sessions(project_id, user_id, data: schemas.CardSessionsSchema): s.filter.endDate = data.endTimestamp s.filter.limit = data.limit s.filter.page = data.page + if len(data.filters) > 0: + s.filter.filters += data.filters results.append({"seriesId": None, "seriesName": s.name, **sessions.search_sessions(data=s.filter, project_id=project_id, user_id=user_id)})