Merge branch 'master' into remove_place_query

datacommonsorg · Dec 9, 2024 · a6331b8 · a6331b8
2 parents ddf2b3b + 480a56e
commit a6331b8
Show file tree

Hide file tree

Showing 48 changed files with 52,168 additions and 661 deletions.
diff --git a/server/routes/dev_place/utils.py b/server/routes/dev_place/utils.py
@@ -317,6 +317,7 @@ def chart_config_to_overview_charts(chart_config, child_place_type: str):
 # Maps each parent place type to a list of valid child place types.
 # This hierarchy defines how places are related in terms of containment.
 PLACE_TYPES_TO_CHILD_PLACE_TYPES = {
+    "Continent": ["Country"],
     "GeoRegion": ["Country", "City"],
     "Country": [
         "State", "EurostatNUTS1", "EurostatNUTS2", "AdministrativeArea1"

diff --git a/server/routes/place/html.py b/server/routes/place/html.py
@@ -24,7 +24,7 @@
 from flask import current_app
 from flask import g
 from flask_babel import gettext
-from multidict import MultiDict
+from werkzeug.datastructures import MultiDict
 
 from server.lib.cache import cache
 from server.lib.config import GLOBAL_CONFIG_BUCKET

diff --git a/server/templates/base.html b/server/templates/base.html
@@ -21,7 +21,7 @@
 
   Optional variables:
 
-  is_show_header_search_bar: boolean, if true, a search bar will appear in the header. Default false.
+  is_hide_header_search_bar: boolean, if true, the header will not contain a search bar. Default false.
   is_hide_full_footer: boolean, if true, hides the full expanded footer. Default false
   is_hide_sub_footer: boolean, if true, hides the sub footer. Default false
   locale: string, value for html lang attr
@@ -108,7 +108,7 @@
   </script>
 </head>
 
-<body {% if not is_show_header_search_bar %}class="no-header-search-bar"{% endif %}>
+<body {% if is_hide_header_search_bar %}class="no-header-search-bar"{% endif %}>
 
 <div id="metadata-base" class="d-none"
   data-header="{{ HEADER_MENU_V2 }}"
@@ -118,7 +118,9 @@
   data-name="{{ NAME }}"
   data-show-disaster="{{ SHOW_DISASTER }}"
   data-show-sustainability="{{ SHOW_SUSTAINABILITY }}"
-  data-show-header-search-bar="{{ is_show_header_search_bar }}"
+  data-hide-header-search-bar="{{ is_hide_header_search_bar }}"
+  data-ga-value-search-source="{{ ga_value_search_source }}"
+  data-search-bar-hash-mode="{{ is_search_bar_hash_mode }}"
   data-hide-full-footer="{{ is_hide_full_footer }}"
   data-hide-sub-footer="{{ is_hide_sub_footer }}"
   data-subfooter-extra="{{ subfooter_extra_content|safe }}"
@@ -129,6 +131,7 @@
 {% include 'metadata/labels.html' %}
 {% include 'metadata/routes.html' %}
 
+<script src={{url_for('static', filename='queryStore.js', t=config['VERSION'])}} async></script>
 <script src={{url_for('static', filename='base.js', t=config['VERSION'])}} async></script>
 
 <div id="main">

diff --git a/server/templates/custom_dc/custom/base.html b/server/templates/custom_dc/custom/base.html
@@ -62,6 +62,7 @@
   {% if OVERRIDE_CSS_PATH %}
   <link href="{{ OVERRIDE_CSS_PATH }}" rel="stylesheet">
   {% endif %}
+  <script src={{url_for('static', filename='queryStore.js', t=config['VERSION'])}} async></script>
 </head>
 
 <body>

diff --git a/server/templates/custom_dc/feedingamerica/base.html b/server/templates/custom_dc/feedingamerica/base.html
@@ -54,6 +54,7 @@
   {% block head %}
   {% endblock %}
   <link href="/custom_dc/feedingamerica/css/overrides.css" rel="stylesheet">
+  <script src={{url_for('static', filename='queryStore.js', t=config['VERSION'])}} async></script>
 </head>
 
 <body id="dc-fa">

diff --git a/server/templates/custom_dc/floret/base.html b/server/templates/custom_dc/floret/base.html
@@ -69,6 +69,7 @@
     globalThis.isCustomDC = {{ config['CUSTOM']|int }};
     globalThis.STAT_VAR_HIERARCHY_CONFIG = {{ config['STAT_VAR_HIERARCHY_CONFIG'] | tojson }};
   </script>
+  <script src={{url_for('static', filename='queryStore.js', t=config['VERSION'])}} async></script>
 </head>
 
 <body>

diff --git a/server/templates/custom_dc/iitm/base.html b/server/templates/custom_dc/iitm/base.html
@@ -53,6 +53,7 @@
   {% block head %}
   {% endblock %}
   <link href="/custom_dc/iitm/style.css" rel="stylesheet">
+  <script src={{url_for('static', filename='queryStore.js', t=config['VERSION'])}} async></script>
 </head>
 
 <body id="iitm-india">

diff --git a/server/templates/custom_dc/stanford/base.html b/server/templates/custom_dc/stanford/base.html
@@ -64,6 +64,7 @@
   {% if OVERRIDE_CSS_PATH %}
   <link href="{{ OVERRIDE_CSS_PATH }}" rel="stylesheet">
   {% endif %}
+  <script src={{url_for('static', filename='queryStore.js', t=config['VERSION'])}} async></script>
 </head>
 
 <body>

diff --git a/server/templates/custom_dc/unsdg/base.html b/server/templates/custom_dc/unsdg/base.html
@@ -57,6 +57,7 @@
   <script>
     globalThis.STAT_VAR_HIERARCHY_CONFIG = {{ config['STAT_VAR_HIERARCHY_CONFIG'] | tojson }};
   </script>
+  <script src={{url_for('static', filename='queryStore.js', t=config['VERSION'])}} async></script>
 </head>
 
 <body id="dc-unsdg">

diff --git a/server/templates/explore.html b/server/templates/explore.html
@@ -15,6 +15,8 @@
  #}
  {%- extends BASE_HTML -%}
 
+ {% set is_search_bar_hash_mode = true %}
+ {% set ga_value_search_source = 'explore' %}
  {% set is_hide_full_footer = true %}
  {% set main_id = 'explore' %}
  {% set page_id = 'explore-page' %}

diff --git a/server/templates/explore_landing.html b/server/templates/explore_landing.html
@@ -20,7 +20,7 @@
  {% set main_id = 'explore-landing' %}
  {% set page_id = 'explore-landing-page' %}
  {% set title = 'Explore ' + topic | title %}
-{% set is_show_header_search_bar = true %}
+ {% set is_hide_header_search_bar = true %}
 
  {% block head %}
  <link rel="stylesheet" href={{url_for('static', filename='css/explore_landing.min.css', t=config['VERSION'])}} >

diff --git a/server/templates/place.html b/server/templates/place.html
@@ -62,8 +62,8 @@ <h3 id="place-type" data-pt="{{ place_type }}">{{ place_type_with_parent_places_
             <h3 id="locale" data-lc="{{ locale }}"></h3>
             <div id="place-highlight"></div>
           </div>
-          <div id="place-change-ui">
-            <div id="place-search-container"></div>
+          <div class="dcid-and-knowledge-graph">
+            dcid:&nbsp;<a href="/browser/{{ place_dcid }}">{{ place_dcid }}</a>
           </div>
         </div>
       </div>

diff --git a/server/templates/static/about.html b/server/templates/static/about.html
@@ -18,7 +18,6 @@
 {% set main_id = 'about' %}
 {% set page_id = 'page-about' %}
 {% set title = 'About Us' %}
-{% set is_show_header_search_bar = true %}
 
 {% block head %}
 <link rel="stylesheet" href={{url_for('static', filename='css/about.min.css', t=config['VERSION'])}}>

diff --git a/server/templates/static/build.html b/server/templates/static/build.html
@@ -13,13 +13,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 #}
-
 {%- extends BASE_HTML -%}
 
 {% set main_id = 'build' %}
 {% set page_id = 'page-build' %}
 {% set title = 'Build your own Data Commons' %}
-{% set is_show_header_search_bar = true %}
 
 {% block head %}
 <link rel="stylesheet" href={{url_for('static', filename='css/build.min.css', t=config['VERSION'])}}>