From 37b6a6481113b6a3559ca70bef14d70363fb3c45 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Thu, 2 Feb 2023 10:21:19 +0100
Subject: [PATCH 1/3] feat(chalice): removed series from get-dashboard response

---
 api/chalicelib/core/dashboards.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/chalicelib/core/dashboards.py b/api/chalicelib/core/dashboards.py
index 77ea9c3e5..5cabb8bae 100644
--- a/api/chalicelib/core/dashboards.py
+++ b/api/chalicelib/core/dashboards.py
@@ -50,7 +50,7 @@ def get_dashboard(project_id, user_id, dashboard_id):
         pg_query = """SELECT dashboards.*, all_metric_widgets.widgets AS widgets
                         FROM dashboards
                                  LEFT JOIN LATERAL (SELECT COALESCE(JSONB_AGG(raw_metrics), '[]') AS widgets
-                                                    FROM (SELECT dashboard_widgets.*, metrics.*, metric_series.series
+                                                    FROM (SELECT dashboard_widgets.*, metrics.*
                                                           FROM metrics
                                                                    INNER JOIN dashboard_widgets USING (metric_id)
                                                                    LEFT JOIN LATERAL (SELECT COALESCE(JSONB_AGG(metric_series.* ORDER BY index),'[]') AS series

From a2e0e073611fbbb1326a250d485f52b3c5817064 Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Wed, 1 Feb 2023 11:34:08 +0100
Subject: [PATCH 2/3] 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) {
                 </div>
             </div>
             <div className="p-4 pt-0">
-                <WidgetWrapper widget={metric} isPreview={true} isWidget={false} hideName />
+                <WidgetWrapper widget={metric} isPreview={true} isWidget={!props.isEditing} hideName />
             </div>
         </div>
         { canAddToDashboard && (

From 6076add62bb16e1fcf7597d43caa3d8d36b2ba43 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Wed, 1 Feb 2023 15:50:03 +0100
Subject: [PATCH 3/3] 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) {
                 </div>
             </div>
             <div className="p-4 pt-0">
-                <WidgetWrapper widget={metric} isPreview={true} isWidget={!props.isEditing} hideName />
+                <WidgetWrapper widget={metric} isPreview={true} isWidget={false} hideName />
             </div>
         </div>
         { canAddToDashboard && (