From 15ad4313fce0764705c0dd50717c3e4d8d2dc99a Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Fri, 24 Feb 2023 15:22:18 +0100
Subject: [PATCH 1/3] feat(chalice): changed update dashboard response

---
 api/chalicelib/core/dashboards.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/api/chalicelib/core/dashboards.py b/api/chalicelib/core/dashboards.py
index 93c2b8675..10143a5a4 100644
--- a/api/chalicelib/core/dashboards.py
+++ b/api/chalicelib/core/dashboards.py
@@ -114,17 +114,19 @@ def update_dashboard(project_id, user_id, dashboard_id, data: schemas.EditDashbo
         row = cur.fetchone()
         offset = row["count"]
         pg_query = f"""UPDATE dashboards
-                      SET name = %(name)s,
+                       SET name = %(name)s,
                           description= %(description)s
                             {", is_public = %(is_public)s" if data.is_public is not None else ""}
                             {", is_pinned = %(is_pinned)s" if data.is_pinned is not None else ""}
-                        WHERE dashboards.project_id = %(projectId)s
+                       WHERE dashboards.project_id = %(projectId)s
                           AND dashboard_id = %(dashboard_id)s
-                          AND (dashboards.user_id = %(userId)s OR is_public)"""
+                          AND (dashboards.user_id = %(userId)s OR is_public)
+                       RETURNING dashboard_id,name,description,is_public,createdAt;"""
         if data.metrics is not None and len(data.metrics) > 0:
             pg_query = f"""WITH dash AS ({pg_query})
-                         INSERT INTO dashboard_widgets(dashboard_id, metric_id, user_id, config)
-                         VALUES {",".join([f"(%(dashboard_id)s, %(metric_id_{i})s, %(userId)s, (SELECT default_config FROM metrics WHERE metric_id=%(metric_id_{i})s)||%(config_{i})s)" for i in range(len(data.metrics))])};"""
+                           INSERT INTO dashboard_widgets(dashboard_id, metric_id, user_id, config)
+                           VALUES {",".join([f"(%(dashboard_id)s, %(metric_id_{i})s, %(userId)s, (SELECT default_config FROM metrics WHERE metric_id=%(metric_id_{i})s)||%(config_{i})s)" for i in range(len(data.metrics))])}
+                           RETURNING dash.*;"""
             for i, m in enumerate(data.metrics):
                 params[f"metric_id_{i}"] = m
                 # params[f"config_{i}"] = schemas.AddWidgetToDashboardPayloadSchema.schema() \
@@ -134,8 +136,9 @@ def update_dashboard(project_id, user_id, dashboard_id, data: schemas.EditDashbo
                 params[f"config_{i}"] = json.dumps({"position": i + offset})
 
         cur.execute(cur.mogrify(pg_query, params))
+        row = cur.fetchone()
 
-    return {"success": True}
+    return helper.dict_to_camel_case(row)
 
 
 def get_widget(project_id, user_id, dashboard_id, widget_id):

From 54fa17dc3f2eccba1270b97e4a95a30f8bd0d3e5 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Fri, 24 Feb 2023 15:31:57 +0100
Subject: [PATCH 2/3] feat(chalice): changed update dashboard response

---
 api/chalicelib/core/dashboards.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/chalicelib/core/dashboards.py b/api/chalicelib/core/dashboards.py
index 10143a5a4..89f56176b 100644
--- a/api/chalicelib/core/dashboards.py
+++ b/api/chalicelib/core/dashboards.py
@@ -121,7 +121,7 @@ def update_dashboard(project_id, user_id, dashboard_id, data: schemas.EditDashbo
                        WHERE dashboards.project_id = %(projectId)s
                           AND dashboard_id = %(dashboard_id)s
                           AND (dashboards.user_id = %(userId)s OR is_public)
-                       RETURNING dashboard_id,name,description,is_public,createdAt;"""
+                       RETURNING dashboard_id,name,description,is_public,created_at;"""
         if data.metrics is not None and len(data.metrics) > 0:
             pg_query = f"""WITH dash AS ({pg_query})
                            INSERT INTO dashboard_widgets(dashboard_id, metric_id, user_id, config)
@@ -137,7 +137,8 @@ def update_dashboard(project_id, user_id, dashboard_id, data: schemas.EditDashbo
 
         cur.execute(cur.mogrify(pg_query, params))
         row = cur.fetchone()
-
+        if row:
+            row["created_at"] = TimeUTC.datetime_to_timestamp(row["created_at"])
     return helper.dict_to_camel_case(row)
 
 

From fb5ba3e932750e196152fd9cc89a99b6f425ed1c Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Fri, 24 Feb 2023 17:42:57 +0100
Subject: [PATCH 3/3] feat(assist): changed image

---
 utilities/Dockerfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/utilities/Dockerfile b/utilities/Dockerfile
index 8f4d98549..84b54c906 100644
--- a/utilities/Dockerfile
+++ b/utilities/Dockerfile
@@ -1,14 +1,11 @@
 FROM node:18-alpine
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
-ARG GIT_SHA
-LABEL GIT_SHA=$GIT_SHA
-RUN apk add --no-cache tini git libc6-compat && ln -s /lib/libc.musl-x86_64.so.1 /lib/ld-linux-x86-64.so.2
+RUN apk add --no-cache tini
 
 ARG envarg
 ENV ENTERPRISE_BUILD=${envarg} \
     MAXMINDDB_FILE=/home/openreplay/geoip.mmdb \
     PRIVATE_ENDPOINTS=false \
-    GIT_SHA=$GIT_SHA \
     LISTEN_PORT=9001
 WORKDIR /work
 COPY package.json .