address autocomplete will populate sublocality with sublocality, sublocality_level_1, etc. depending on what is available; utm parameters preserved when /run endpoint used

Author: jhpyle

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [1.5.16] - 2024-10-16
+
+### Changed
+- The `address autocomplete` will now populate the `.sublocality`
+  field with `sublocality`, `sublocality_level_1`,
+  `sublocality_level_2`, whichever is first available.
+- URL parameters `utm_source`, `utm_medium`, `utm_campaign`,
+  `utm_term`, and `utm_content` will be preserved when analytics is
+  configured and the `/run` endpoint is used.
+- Upgraded Pandoc to version 3.5.11 (system upgrade required).
+
 ## [1.5.15] - 2024-10-13
 
 ### Fixed

Docker/run-postgresql.sh

@@ -43,6 +43,10 @@ if [[ $PGVERSION == 16* ]]; then
     PGVERSION=16
 fi
 
+if [[ $PGVERSION == 17* ]]; then
+    PGVERSION=17
+fi
+
 chown -R postgres:postgres /etc/postgresql
 chown -R postgres:postgres /var/lib/postgresql
 chown -R postgres:postgres /var/run/postgresql

docassemble_webapp/docassemble/webapp/server.py

@@ -6734,6 +6734,13 @@ def update_current_info_with_session_info(the_current_info, session_info):
     the_current_info.update({'session': user_code, 'encrypted': encrypted})
 
 
+def remove_i_from_dict(the_dict):
+    the_dict = copy.copy(the_dict)
+    if 'i' in the_dict:
+        del the_dict['i']
+    return the_dict
+
+
 @app.route(index_path, methods=['POST', 'GET'])
 def index(action_argument=None, refer=None):
     # if refer is None and request.method == 'GET':
@@ -8753,19 +8760,19 @@ def index(action_argument=None, refer=None):
         if refer is None:
             location_bar = url_for('index', **index_params)
         elif refer[0] in ('start', 'run'):
-            location_bar = url_for('run_interview_in_package', package=refer[1], filename=refer[2])
+            location_bar = url_for('run_interview_in_package', package=refer[1], filename=refer[2], **remove_i_from_dict(index_params))
             page_sep = "#/"
         elif refer[0] in ('start_dispatch', 'run_dispatch'):
-            location_bar = url_for('run_interview', dispatch=refer[1])
+            location_bar = url_for('run_interview', dispatch=refer[1], **remove_i_from_dict(index_params))
             page_sep = "#/"
         elif refer[0] in ('start_directory', 'run_directory'):
-            location_bar = url_for('run_interview_in_package_directory', package=refer[1], directory=refer[2], filename=refer[3])
+            location_bar = url_for('run_interview_in_package_directory', package=refer[1], directory=refer[2], filename=refer[3], **remove_i_from_dict(index_params))
             page_sep = "#/"
         else:
             location_bar = None
             for k, v in daconfig['dispatch'].items():
                 if v == yaml_filename:
-                    location_bar = url_for('run_interview', dispatch=k)
+                    location_bar = url_for('run_interview', dispatch=k, **remove_i_from_dict(index_params))
                     page_sep = "#/"
                     break
             if location_bar is None:

docassemble_webapp/docassemble/webapp/static/app/app.js

@@ -345,12 +345,12 @@ function daInitAutocomplete(info) {
       var opts = info[i][1];
       daAutocomplete[id] = new google.maps.places.Autocomplete(
         document.getElementById(id),
-        opts
+        opts,
       );
       google.maps.event.addListener(
         daAutocomplete[id],
         "place_changed",
-        daFillInAddressFor(id)
+        daFillInAddressFor(id),
       );
     }
   }, timePeriod);
@@ -414,7 +414,7 @@ function daAddMarker(map, marker_info, show_marker) {
   marker = new google.maps.Marker({
     position: new google.maps.LatLng(
       marker_info.latitude,
-      marker_info.longitude
+      marker_info.longitude,
     ),
     map: map.map,
     icon: marker_info.icon,
@@ -428,7 +428,7 @@ function daAddMarker(map, marker_info, show_marker) {
           map.infowindow.setContent(info);
           map.infowindow.open(map.map, marker);
         };
-      })(marker, marker_info.info)
+      })(marker, marker_info.info),
     );
   }
   if (show_marker) {
@@ -531,7 +531,7 @@ function daFillInAddress(origId) {
       var val = place.address_components[i][componentForm[addressType]];
       if (typeof val != "undefined") {
         document.getElementById(
-          id_for_part[componentTrans[addressType]]
+          id_for_part[componentTrans[addressType]],
         ).value = val;
         toChange.push("#" + id_for_part[componentTrans[addressType]]);
       }
@@ -598,6 +598,46 @@ function daFillInAddress(origId) {
         savedValues["administrative_area_level_3"];
     }
   }
+  if (
+    typeof id_for_part["sublocality"] != "undefined" &&
+    document.getElementById(id_for_part["sublocality"]) != null
+  ) {
+    if (
+      document.getElementById(id_for_part["sublocality"]).value == "" &&
+      typeof savedValues["sublocality_level_1"] != "undefined"
+    ) {
+      document.getElementById(id_for_part["sublocality"]).value =
+        savedValues["sublocality_level_1"];
+    }
+    if (
+      document.getElementById(id_for_part["sublocality"]).value == "" &&
+      typeof savedValues["sublocality_level_2"] != "undefined"
+    ) {
+      document.getElementById(id_for_part["sublocality"]).value =
+        savedValues["sublocality_level_2"];
+    }
+    if (
+      document.getElementById(id_for_part["sublocality"]).value == "" &&
+      typeof savedValues["sublocality_level_3"] != "undefined"
+    ) {
+      document.getElementById(id_for_part["sublocality"]).value =
+        savedValues["sublocality_level_3"];
+    }
+    if (
+      document.getElementById(id_for_part["sublocality"]).value == "" &&
+      typeof savedValues["sublocality_level_4"] != "undefined"
+    ) {
+      document.getElementById(id_for_part["sublocality"]).value =
+        savedValues["sublocality_level_4"];
+    }
+    if (
+      document.getElementById(id_for_part["sublocality"]).value == "" &&
+      typeof savedValues["sublocality_level_5"] != "undefined"
+    ) {
+      document.getElementById(id_for_part["sublocality"]).value =
+        savedValues["sublocality_level_5"];
+    }
+  }
   if (
     place.adr_address &&
     typeof id_for_part["adr_address"] != "undefined" &&