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

Merge remote-tracking branch 'origin/api-v1.9.5' into dev

Browse source
This commit is contained in:
Taha Yassine Kraiem 2023-02-01 20:13:07 +01:00
commit 3da0fdf444
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -154,13 +154,12 @@ def __merge_metric_with_data(metric: schemas.CreateCardSchema,
s.filter.events += data.events
metric.limit = data.limit
metric.page = data.page
metric.startTimestamp = data.startTimestamp
metric.endTimestamp = data.endTimestamp
return metric
def make_chart(project_id, user_id, metric_id, data: schemas.CardChartSchema,
metric: schemas.CreateCardSchema = None):
if metric is None:
metric: dict = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False)
def make_chart(project_id, user_id, data: schemas.CardChartSchema, metric: schemas.CreateCardSchema):
if metric is None:
return None
metric: schemas.CreateCardSchema = __merge_metric_with_data(metric=metric, data=data)
@ -595,7 +594,7 @@ def make_chart_from_card(project_id, user_id, metric_id, data: schemas.CardChart
session_id=raw_metric["data"]["sessionId"])
return raw_metric["data"]
return make_chart(project_id=project_id, user_id=user_id, metric_id=metric_id, data=data, metric=metric)
return make_chart(project_id=project_id, user_id=user_id, data=data, metric=metric)
PREDEFINED = {schemas.MetricOfWebVitals.count_sessions: metrics.get_processed_sessions,

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

@ -183,13 +183,12 @@ def __merge_metric_with_data(metric: schemas_ee.CreateCardSchema,
s.filter.events += data.events
metric.limit = data.limit
metric.page = data.page
metric.startTimestamp = data.startTimestamp
metric.endTimestamp = data.endTimestamp
return metric
def make_chart(project_id, user_id, metric_id, data: schemas.CardChartSchema,
metric: schemas_ee.CreateCardSchema = None):
if metric is None:
metric: dict = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False)
def make_chart(project_id, user_id, data: schemas.CardChartSchema, metric: schemas_ee.CreateCardSchema):
if metric is None:
return None
metric: schemas_ee.CreateCardSchema = __merge_metric_with_data(metric=metric, data=data)
@ -651,7 +650,7 @@ def make_chart_from_card(project_id, user_id, metric_id, data: schemas.CardChart
session_id=raw_metric["data"]["sessionId"])
return raw_metric["data"]
return make_chart(project_id=project_id, user_id=user_id, metric_id=metric_id, data=data, metric=metric)
return make_chart(project_id=project_id, user_id=user_id, data=data, metric=metric)
PREDEFINED = {schemas.MetricOfWebVitals.count_sessions: metrics.get_processed_sessions,