From 817b2dffb7a9dbebd3c72bd8a45f6f65e08d8b33 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Tue, 15 Mar 2022 12:36:02 +0100
Subject: [PATCH 1/2] chore(helm): nginx service dedicated name block

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 .../openreplay/charts/nginx-ingress/templates/service.yaml      | 2 +-
 scripts/helmcharts/openreplay/charts/nginx-ingress/values.yaml  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/service.yaml b/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/service.yaml
index 6c978f7f6..f20d4fc38 100644
--- a/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/service.yaml
@@ -19,7 +19,7 @@ spec:
     - port: {{ .port }}
       targetPort: {{ .targetPort }}
       protocol: TCP
-      name: {{ .targetPort }}
+      name: {{ .name }}
     {{- end }}
   selector:
     {{- include "nginx-ingress.selectorLabels" . | nindent 4 }}
diff --git a/scripts/helmcharts/openreplay/charts/nginx-ingress/values.yaml b/scripts/helmcharts/openreplay/charts/nginx-ingress/values.yaml
index 6984c1938..1f7169c0d 100644
--- a/scripts/helmcharts/openreplay/charts/nginx-ingress/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/nginx-ingress/values.yaml
@@ -42,8 +42,10 @@ service:
   ports:
     - port: 80
       targetPort: http
+      name: http
     - port: 443
       targetPort: https
+      name: https
 
 ingress:
   enabled: false

From d05b4e5b121b3fa6f836ba8b232847d07953c201 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Tue, 15 Mar 2022 13:14:28 +0100
Subject: [PATCH 2/2] feat(api): transform update funnel response

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

diff --git a/api/chalicelib/core/funnels.py b/api/chalicelib/core/funnels.py
index adcb1167e..e63ea6efc 100644
--- a/api/chalicelib/core/funnels.py
+++ b/api/chalicelib/core/funnels.py
@@ -108,6 +108,7 @@ def update(funnel_id, user_id, project_id, name=None, filter=None, is_public=Non
         r["created_at"] = TimeUTC.datetime_to_timestamp(r["created_at"])
         r = helper.dict_to_camel_case(r)
         r["filter"]["startDate"], r["filter"]["endDate"] = TimeUTC.get_start_end_from_range(r["filter"]["rangeValue"])
+        r["filter"] = helper.old_search_payload_to_flat(r["filter"])
         return {"data": r}