From 9a49d3d1e41873ac9b86abfb0a9038b548d320b9 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Wed, 1 Feb 2023 20:12:34 +0100 Subject: [PATCH 1/5] feat(chalice): allow card time override in charts --- api/chalicelib/core/custom_metrics.py | 9 ++++----- ee/api/chalicelib/core/custom_metrics.py | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/api/chalicelib/core/custom_metrics.py b/api/chalicelib/core/custom_metrics.py index 5b34cc687..b2d3db361 100644 --- a/api/chalicelib/core/custom_metrics.py +++ b/api/chalicelib/core/custom_metrics.py @@ -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, diff --git a/ee/api/chalicelib/core/custom_metrics.py b/ee/api/chalicelib/core/custom_metrics.py index 46fa491e3..fc7f7cfde 100644 --- a/ee/api/chalicelib/core/custom_metrics.py +++ b/ee/api/chalicelib/core/custom_metrics.py @@ -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, From 8d260f5b633afe20840155107dad71b34f9b335c Mon Sep 17 00:00:00 2001 From: nick-delirium Date: Wed, 1 Feb 2023 11:34:08 +0100 Subject: [PATCH 2/5] fix(ui): dont send try when metric exists and not edited --- .../Dashboard/components/WidgetPreview/WidgetPreview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app/components/Dashboard/components/WidgetPreview/WidgetPreview.tsx b/frontend/app/components/Dashboard/components/WidgetPreview/WidgetPreview.tsx index 7c534a8bb..6fb1042dc 100644 --- a/frontend/app/components/Dashboard/components/WidgetPreview/WidgetPreview.tsx +++ b/frontend/app/components/Dashboard/components/WidgetPreview/WidgetPreview.tsx @@ -95,7 +95,7 @@ function WidgetPreview(props: Props) {
- +
{ canAddToDashboard && ( From aff01103e23e5d9905f1db1ad5ecb8747a31d7f3 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Wed, 1 Feb 2023 15:50:03 +0100 Subject: [PATCH 3/5] fix(ui) - widget preview --- .../Dashboard/components/WidgetPreview/WidgetPreview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app/components/Dashboard/components/WidgetPreview/WidgetPreview.tsx b/frontend/app/components/Dashboard/components/WidgetPreview/WidgetPreview.tsx index 6fb1042dc..7c534a8bb 100644 --- a/frontend/app/components/Dashboard/components/WidgetPreview/WidgetPreview.tsx +++ b/frontend/app/components/Dashboard/components/WidgetPreview/WidgetPreview.tsx @@ -95,7 +95,7 @@ function WidgetPreview(props: Props) {
- +
{ canAddToDashboard && ( From 12bb001d486001581af39fec2a04d0b41dfcc103 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Wed, 1 Feb 2023 17:52:54 +0100 Subject: [PATCH 4/5] fix(ui) - audit trail page title --- frontend/app/components/Client/Audit/AuditView/AuditView.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/app/components/Client/Audit/AuditView/AuditView.tsx b/frontend/app/components/Client/Audit/AuditView/AuditView.tsx index 9b955d5e2..fd30a8e90 100644 --- a/frontend/app/components/Client/Audit/AuditView/AuditView.tsx +++ b/frontend/app/components/Client/Audit/AuditView/AuditView.tsx @@ -7,6 +7,7 @@ import { useObserver } from 'mobx-react-lite'; import Select from 'Shared/Select'; import SelectDateRange from 'Shared/SelectDateRange'; import { numberWithCommas } from 'App/utils'; +import withPageTitle from 'HOCs/withPageTitle'; function AuditView() { const { auditStore } = useStore(); @@ -73,4 +74,4 @@ function AuditView() { )); } -export default AuditView; \ No newline at end of file +export default withPageTitle('Audit Trail - OpenReplay Preferences')(AuditView); \ No newline at end of file From 5c9ed96bb551f86a42409e378023a5a3c4d31ada Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Wed, 1 Feb 2023 18:32:08 +0100 Subject: [PATCH 5/5] fix(ui) - eventsOrderSupport check --- .../app/components/shared/Filters/FilterList/FilterList.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/app/components/shared/Filters/FilterList/FilterList.tsx b/frontend/app/components/shared/Filters/FilterList/FilterList.tsx index 6a115b502..e4b919bd1 100644 --- a/frontend/app/components/shared/Filters/FilterList/FilterList.tsx +++ b/frontend/app/components/shared/Filters/FilterList/FilterList.tsx @@ -56,9 +56,9 @@ function FilterList(props: Props) { onSelect={props.onChangeEventsOrder} value={{ value: filter.eventsOrder }} list={[ - { name: 'THEN', value: 'then', disabled: !eventsOrderSupport.includes('then') }, - { name: 'AND', value: 'and', disabled: !eventsOrderSupport.includes('and')}, - { name: 'OR', value: 'or', disabled: !eventsOrderSupport.includes('or')}, + { name: 'THEN', value: 'then', disabled: eventsOrderSupport && !eventsOrderSupport.includes('then') }, + { name: 'AND', value: 'and', disabled: eventsOrderSupport && !eventsOrderSupport.includes('and')}, + { name: 'OR', value: 'or', disabled: eventsOrderSupport && !eventsOrderSupport.includes('or')}, ]} />