From 114bd4080b127d21df9a2fd8922f2b0cb6021bc4 Mon Sep 17 00:00:00 2001
From: Kraiem Taha Yassine <tahayk2@gmail.com>
Date: Tue, 25 Feb 2025 18:22:51 +0100
Subject: [PATCH] fix(chalice): fixed EE autocomplete top values (#3067)

fix(chalice): fixed funnels param
---
 .../modules/significance/significance_ch.py   |  2 +-
 ee/api/.gitignore                             |  2 +-
 .../core/autocomplete/autocomplete_ch.py      | 20 +++++++++----------
 ee/api/clean-dev.sh                           |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/api/chalicelib/core/metrics/modules/significance/significance_ch.py b/api/chalicelib/core/metrics/modules/significance/significance_ch.py
index f309841c0..c547f9a6b 100644
--- a/api/chalicelib/core/metrics/modules/significance/significance_ch.py
+++ b/api/chalicelib/core/metrics/modules/significance/significance_ch.py
@@ -175,7 +175,7 @@ def get_simple_funnel(filter_d: schemas.CardSeriesFilterSchema, project: schemas
                     value_key=e_k
                 ) if not specific_condition else specific_condition)
 
-    full_args = {"eventTypes": tuple(event_types), **full_args, **values}
+    full_args = {"eventTypes": event_types, **full_args, **values}
     n_stages = len(n_stages_query)
     if n_stages == 0:
         return []
diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index ae8b4fca0..1df9cf0e0 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -222,7 +222,7 @@ Pipfile.lock
 /chalicelib/core/sessions/performance_event.py
 /chalicelib/core/sessions/sessions_viewed.py
 /chalicelib/core/sessions/unprocessed_sessions.py
-/chalicelib/core/significance.py
+/chalicelib/core/metrics/modules
 /chalicelib/core/socket_ios.py
 /chalicelib/core/sourcemaps.py
 /chalicelib/core/sourcemaps_parser.py
diff --git a/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py b/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py
index a3ad1d836..a779ec602 100644
--- a/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py
+++ b/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py
@@ -266,16 +266,16 @@ def __search_metadata(project_id, value, key=None, source=None):
 
 
 TYPE_TO_COLUMN = {
-    schemas.EventType.CLICK: "label",
-    schemas.EventType.INPUT: "label",
-    schemas.EventType.LOCATION: "url_path",
-    schemas.EventType.CUSTOM: "name",
-    schemas.FetchFilterType.FETCH_URL: "url_path",
-    schemas.GraphqlFilterType.GRAPHQL_NAME: "name",
-    schemas.EventType.STATE_ACTION: "name",
+    schemas.EventType.CLICK: "`$properties`.label",
+    schemas.EventType.INPUT: "`$properties`.label",
+    schemas.EventType.LOCATION: "`$properties`.url_path",
+    schemas.EventType.CUSTOM: "`$properties`.name",
+    schemas.FetchFilterType.FETCH_URL: "`$properties`.url_path",
+    schemas.GraphqlFilterType.GRAPHQL_NAME: "`$properties`.name",
+    schemas.EventType.STATE_ACTION: "`$properties`.name",
     # For ERROR, sessions search is happening over name OR message,
     # for simplicity top 10 is using name only
-    schemas.EventType.ERROR: "name",
+    schemas.EventType.ERROR: "`$properties`.name",
     schemas.FilterType.USER_COUNTRY: "user_country",
     schemas.FilterType.USER_CITY: "user_city",
     schemas.FilterType.USER_STATE: "user_state",
@@ -325,9 +325,9 @@ def get_top_values(project_id, event_type, event_key=None):
             query = f"""WITH raw AS (SELECT DISTINCT {colname} AS c_value,
                                                      COUNT(1) OVER (PARTITION BY c_value) AS row_count,
                                                      COUNT(1) OVER ()                   AS total_count
-                                     FROM experimental.events
+                                     FROM product_analytics.events
                                      WHERE project_id = %(project_id)s
-                                       AND event_type = '{event_type}'
+                                       AND `$event_name` = '{event_type}'
                                        AND isNotNull(c_value)
                                        AND notEmpty(c_value)
                                      ORDER BY row_count DESC
diff --git a/ee/api/clean-dev.sh b/ee/api/clean-dev.sh
index ba6628328..e1c4b83cc 100755
--- a/ee/api/clean-dev.sh
+++ b/ee/api/clean-dev.sh
@@ -43,7 +43,7 @@ rm -rf ./chalicelib/core/sessions/sessions_search.py
 rm -rf ./chalicelib/core/sessions/performance_event.py
 rm -rf ./chalicelib/core/sessions/sessions_viewed.py
 rm -rf ./chalicelib/core/sessions/unprocessed_sessions.py
-rm -rf ./chalicelib/core/significance.py
+rm -rf ./chalicelib/core/metrics/modules
 rm -rf ./chalicelib/core/socket_ios.py
 rm -rf ./chalicelib/core/sourcemaps.py
 rm -rf ./chalicelib/core/sourcemaps_parser.py