Merge branch 'master' into tests

server/config/feature_flag_configs/custom.json

@@ -0,0 +1,24 @@
+[{
+    "name": "autocomplete",
+    "enabled": false,
+    "owner": "gmechali",
+    "description": "Feature flag to enable place autocomplete."
+},
+{
+    "name": "dev_place_experiment",
+    "enabled": false,
+    "owner": "gmechali",
+    "description": "Feature flag to enable the V2 place page only for the experiment places."
+},
+{
+    "name": "dev_place_ga",
+    "enabled": false,
+    "owner": "dwnoble",
+    "description": "Feature flag to enable the V2 Place page to GA."
+},
+{
+    "name": "scroll_to_top_button",
+    "enabled": true,
+    "owner": "gmechali",
+    "description": "Feature flag to enable the scroll to top button on the explore and place pages."
+}]

server/lib/util.py

@@ -431,7 +431,7 @@ def load_feature_flags_from_gcs(environment: str):
 def load_fallback_feature_flags(environment: str):
   """Loads the fallback feature flags into the app config. We fallback to checked in flag configs per environment."""
   environments_with_local_files = set(
-      ['local', 'autopush', 'dev', 'staging', 'production'])
+      ['local', 'autopush', 'dev', 'staging', 'production', 'custom'])
   testing_environments = set(['integration_test', 'test', 'webdriver'])
 
   if environment in testing_environments:

server/templates/custom_dc/custom/base.html

@@ -49,6 +49,9 @@
     });
   </script>
   {% endif %}
+  <script>
+    globalThis.FEATURE_FLAGS = {{ config['FEATURE_FLAGS'] | tojson }};
+  </script>
 
   <title>{{ title }} - Custom Data Commons</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />