From 3effc7f19b1a779b3092874b54687c9be5f6ad22 Mon Sep 17 00:00:00 2001
From: Greg Clapp <19595525+jookyg@users.noreply.github.com>
Date: Thu, 14 Dec 2023 15:20:22 -0800
Subject: [PATCH] SIT-794 Campsite form post launch tweaks (#2689)

* SIT-794 post launch tweaks: fixed typo in vehicle conf block, updated ZD handler to send anonymous if no contact email provided, removed email requirement, made sure autocomplete is off for fields except contact, add campsite_in_park tag and change group for Ranger campsite tickets, updated IRP handler to use Developer form

* SIT-794 updated next steps block in park maintenance form to use Report a Campsite service link now that the new form is live

* SIT-794 add IRP ticket id to AbAuto, Parks, and ADA tickets; update ADA questions; make email required if requesting accommodation

* SIT-794 add IRP ticket id to AbAuto, Parks, and ADA tickets; update ADA questions; make email required if requesting accommodation

* SIT-794 add campsite tag to AbAutos test tickets

* SIT-794 changed order of answers on ADA accomodation field

* SIT-794 switched ADA question order

* SIT-794 updated zendesk handler to check for ticket ID from previous handler submission

* SIT-794 removed extra spaces

* SIT-794 removed space

* SIT-794 add hash symbol before campsite report ticket ID in ADA tickets, so that Zendesk turns it into a link

* SIT-794 changed value of new ADA option to 'no report'

* SIT-794 hide zendesk ticket ID field in CSUO block

* SIT-794 fix typo

* SIT-794 removed public records statement from ADA accommodation form

* SIT-794 demographics hotfix

* SIT-794 fix anon email

---------

Co-authored-by: Oden <hello@odensc.com>
---
 .../src/Element/PortlandLocationPicker.php    |  4 +-
 .../Element/PortlandSupportAgentWidget.php    |  2 +-
 .../Plugin/WebformHandler/ZendeskHandler.php  | 14 ++++
 ...bform.location_widget_test_open_reques.yml | 11 ++-
 .../webform.webform.report_campsite.yml       | 71 +++++++++++--------
 .../webform.webform.report_demographics.yml   |  6 +-
 .../webform.webform.report_parks_issue.yml    |  2 +-
 ...form.webform.request_ada_accommodation.yml |  9 ---
 8 files changed, 70 insertions(+), 49 deletions(-)

diff --git a/web/modules/custom/portland/modules/portland_location_picker/src/Element/PortlandLocationPicker.php b/web/modules/custom/portland/modules/portland_location_picker/src/Element/PortlandLocationPicker.php
index 8adf9b4877..f11ee09ff7 100644
--- a/web/modules/custom/portland/modules/portland_location_picker/src/Element/PortlandLocationPicker.php
+++ b/web/modules/custom/portland/modules/portland_location_picker/src/Element/PortlandLocationPicker.php
@@ -160,7 +160,7 @@ public static function getCompositeElements(array $element) {
       '#type' => 'textfield',
       '#id' => 'place_name',
       '#title' => t('Location Name'),
-      '#attributes' => ['class' => ['place-name']],
+      '#attributes' => ['class' => ['place-name'], 'autocomplete' => 'off'],
       '#description' => t('If this location has a name, such as a business or public building, please enter it here.'),
       '#description_display' => 'before',
     ];
@@ -168,7 +168,7 @@ public static function getCompositeElements(array $element) {
       '#type' => 'textarea',
       '#id' => 'location_details',
       '#title' => t('Location Details'),
-      '#attributes' => ['class' => ['location-details']],
+      '#attributes' => ['class' => ['location-details'], 'autocomplete' => 'off'],
       '#description' => t('Please provide any other details that might help us locate the site you are reporting.'),
       '#description_display' => 'before',
     ];
diff --git a/web/modules/custom/portland/modules/portland_zendesk/src/Element/PortlandSupportAgentWidget.php b/web/modules/custom/portland/modules/portland_zendesk/src/Element/PortlandSupportAgentWidget.php
index a07cc1cac2..e340d78015 100644
--- a/web/modules/custom/portland/modules/portland_zendesk/src/Element/PortlandSupportAgentWidget.php
+++ b/web/modules/custom/portland/modules/portland_zendesk/src/Element/PortlandSupportAgentWidget.php
@@ -81,7 +81,7 @@ public static function getCompositeElements(array $element) {
       '#type' => 'checkbox',
       '#title' => t('Test Submission'),
       '#id' => 'test_submission',
-      '#description' => 'For administrtor use only. Handlers can be configured to process form submissions differently based on whether this box is checked. Typically configured to place tickets in the Developer Test Group in Zendesk.',
+      '#description' => 'For administrator use only. Handlers can be configured to process form submissions differently based on whether this box is checked. Typically configured to place tickets in the Developer Test Group in Zendesk.',
       '#access_create_roles' => ['administrator'],
       '#access_update_roles' => ['administrator'],
       '#access_view_roles' => ['administrator'],
diff --git a/web/modules/custom/portland/modules/portland_zendesk/src/Plugin/WebformHandler/ZendeskHandler.php b/web/modules/custom/portland/modules/portland_zendesk/src/Plugin/WebformHandler/ZendeskHandler.php
index 92aa0d09dd..bccc09ad33 100644
--- a/web/modules/custom/portland/modules/portland_zendesk/src/Plugin/WebformHandler/ZendeskHandler.php
+++ b/web/modules/custom/portland/modules/portland_zendesk/src/Plugin/WebformHandler/ZendeskHandler.php
@@ -43,6 +43,7 @@
  */
 class ZendeskHandler extends WebformHandlerBase
 {
+  private const ANONYMOUS_EMAIL = 'anonymous@portlandoregon.gov';
   private const JSON_FORM_DATA_FIELD_ID = 17698062540823;
 
   /**
@@ -504,6 +505,13 @@ public function sendToZendesk(array &$form, FormStateInterface &$form_state) {
     // a webform_submission object from form_state and pull form values from that for the API submission.
     $webform_submission = $form_state->getFormObject()->getEntity();
 
+    // check for a report_ticket_id value in the form state; if a handler previously submitted
+    // a ticket, the ID should be available to subsequent handlers.
+    $prev_ticket_id = $form_state->getValue('report_ticket_id');
+    if ($prev_ticket_id) {
+      $webform_submission->setElementData('report_ticket_id', $prev_ticket_id);
+    }
+
     if ($fork_field_name) {
       // if the handler has a fork field configured, grab the values array from that field so we can
       // spin through it and stuff a single value into the webform_submission for each ticket being created.
@@ -569,6 +577,12 @@ public function submitTicket($submission_fields, $configuration, $webform_submis
 
     // restructure requester
     if(!isset($request['requester'])){
+      // if requester email doesn't contain an @, that means the field was empty or the value wasn't set,
+      // so default to anonymous.
+      if (!str_contains($request['requester_email'], '@')) {
+        $request['requester_email'] = self::ANONYMOUS_EMAIL;
+      }
+
       $request['requester'] = $request['requester_name']
         ? [
           'name' => Utility::convertName($request['requester_name']),
diff --git a/web/sites/default/config/webform.webform.location_widget_test_open_reques.yml b/web/sites/default/config/webform.webform.location_widget_test_open_reques.yml
index e7f24ef765..8141520e0b 100644
--- a/web/sites/default/config/webform.webform.location_widget_test_open_reques.yml
+++ b/web/sites/default/config/webform.webform.location_widget_test_open_reques.yml
@@ -62,6 +62,8 @@ elements: |-
   support_agent_use_only:
     '#type': portland_support_agent_widget
     '#title': 'Support Agent Use Only'
+    '#access_create_roles':
+      - authenticated
 css: ''
 javascript: ''
 settings:
@@ -201,11 +203,13 @@ settings:
 access:
   create:
     roles:
-      - administrator
+      - anonymous
+      - authenticated
     users: {  }
     permissions: {  }
   view_any:
     roles:
+      - sitewide_editor
       - administrator
     users: {  }
     permissions: {  }
@@ -226,16 +230,18 @@ access:
     permissions: {  }
   view_own:
     roles:
-      - administrator
+      - authenticated
     users: {  }
     permissions: {  }
   update_own:
     roles:
+      - sitewide_editor
       - administrator
     users: {  }
     permissions: {  }
   delete_own:
     roles:
+      - sitewide_editor
       - administrator
     users: {  }
     permissions: {  }
@@ -246,6 +252,7 @@ access:
     permissions: {  }
   test:
     roles:
+      - sitewide_editor
       - administrator
     users: {  }
     permissions: {  }
diff --git a/web/sites/default/config/webform.webform.report_campsite.yml b/web/sites/default/config/webform.webform.report_campsite.yml
index 21845745e5..92b4eb66c8 100644
--- a/web/sites/default/config/webform.webform.report_campsite.yml
+++ b/web/sites/default/config/webform.webform.report_campsite.yml
@@ -109,17 +109,20 @@ elements: |-
               '!value': ''
         report_blocking_pedestrians:
           '#type': radios
-          '#title': 'Is the campsite blocking pedestrian access?'
-          '#description': 'For example, is it blocking a sidewalk, trail, or path?'
+          '#title': 'Is the campsite blocking pedestrian access, like a sidewalk, trail, or path?'
+          '#description': '<p>The City will also assess all reported sites for potential pedestrian obstructions.&nbsp;</p>'
           '#description_display': before
-          '#options': yes_no
+          '#options':
+            'No': 'No'
+            'Yes': 'Yes'
           '#options_display': side_by_side
         report_is_ada:
           '#type': radios
           '#title': 'Do you, or someone you legally represent (e.g. child, spouse), have a disability that is affected by this obstruction?'
           '#options':
-            'yes': 'Yes, and I would like to request an accommodation'
             'no': 'No'
+            'no request': 'Yes, but I do not want to request an ADA accommodation'
+            'yes': 'Yes, and I would like to request an ADA accommodation -- I have, or represent someone with, a disability covered under the Americans with Disabilities Act (ADA). The campsite is creating a barrier that preventing my/their access and I would like to request an accommodation. By checking this option, I acknowledge that the City may contact me to complete the ADA accommodation request process.'
           '#states':
             visible:
               ':input[name="report_blocking_pedestrians"]':
@@ -256,6 +259,9 @@ elements: |-
               visible:
                 ':input[name="report_is_ada"]':
                   value: 'yes'
+              required:
+                ':input[name="report_is_ada"]':
+                  value: 'yes'
           contact_phone:
             '#type': textfield
             '#title': Phone
@@ -267,10 +273,13 @@ elements: |-
           contact_email:
             '#type': textfield
             '#title': Email
-            '#description': 'We will use your email to confirm your submission.'
+            '#description': '<p>Enter your email to receive a confirmation, or leave this field blank to remain anonymous.</p>'
             '#pattern': '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
             '#pattern_error': 'Please enter a correctly formatted email address, such as myname@example.com.'
-            '#required': true
+            '#states':
+              required:
+                ':input[name="report_is_ada"]':
+                  value: 'yes'
         public_records_statement_standard:
           '#type': webform_markup
           '#markup': |
@@ -351,7 +360,7 @@ elements: |-
       {% endif %}
 
     '#ajax': true
-css: "div.form-item-report-vehicle .webform-multiple-table tbody tr:hover,\r\ndiv.form-item-report-vehicle .webform-multiple-table tbody tr:focus {\r\n    background: inherit;\r\n}\r\n\r\ndiv.form-item-report-vehicle .webform-multiple-table tbody {\r\n    counter-reset: vehicle;\r\n}\r\n\r\ndiv.form-item-report-vehicle .webform-multiple-table tbody td {\r\n    padding: 0;\r\n}\r\n\r\ndiv.form-item-report-vehicle .webform-multiple-table tbody tr {\r\n    display: block;\r\n    margin-bottom: 1rem;\r\n}\r\n\r\ndiv.form-item-report-vehicle .webform-multiple-table tbody tr::before {\r\n    counter-increment: vehicle;\r\n    content: \"Vehicle \" counter(vehicle);\r\n    display: block;\r\n    font-size: 1.5rem;\r\n    font-weight: 600;\r\n    line-height: 1.3333333333;\r\n    margin: 0 0 1rem;\r\n}\r\n\r\ndiv.form-item-report-vehicle .webform-multiple-table .form-control {\r\n    width: 100%;\r\n}"
+css: "div.form-item-report-vehicle .webform-multiple-table tbody tr:hover,\r\ndiv.form-item-report-vehicle .webform-multiple-table tbody tr:focus {\r\n    background: inherit;\r\n}\r\n\r\ndiv.form-item-report-vehicle .webform-multiple-table tbody {\r\n    counter-reset: vehicle;\r\n}\r\n\r\ndiv.form-item-report-vehicle .webform-multiple-table tbody td {\r\n    padding: 0;\r\n}\r\n\r\ndiv.form-item-report-vehicle .webform-multiple-table tbody tr {\r\n    display: block;\r\n    margin-bottom: 1rem;\r\n}\r\n\r\ndiv.form-item-report-vehicle .webform-multiple-table tbody tr::before {\r\n    counter-increment: vehicle;\r\n    content: \"Vehicle \" counter(vehicle);\r\n    display: block;\r\n    font-size: 1.5rem;\r\n    font-weight: 600;\r\n    line-height: 1.3333333333;\r\n    margin: 0 0 1rem;\r\n}\r\n\r\ndiv.form-item-report-vehicle .webform-multiple-table .form-control {\r\n    width: 100%;\r\n}\r\n\r\ndiv.form-item-support-agent-use-only-zendesk-request-number {\r\n  display: none;\r\n}"
 javascript: ''
 settings:
   ajax: false
@@ -368,7 +377,7 @@ settings:
   form_open_message: ''
   form_close_message: ''
   form_exception_message: ''
-  form_previous_submissions: false
+  form_previous_submissions: true
   form_confidential: false
   form_confidential_message: ''
   form_disable_remote_addr: true
@@ -625,7 +634,7 @@ handlers:
       collaborators: ''
       custom_fields: "6353388345367: 'report_campsite'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n5873270225303: '[webform_submission:values:report_visible_items:checked:vehicle]'"
       ticket_id_field: report_ticket_id
-      ticket_form_id: '5873307855767'
+      ticket_form_id: '4990038807319'
       recipient: ''
       ticket_fork_field: ''
   submit_to_zendesk_abautos:
@@ -645,15 +654,15 @@ handlers:
       requester_name: contact_name
       requester_email: contact_email
       subject: 'Abandoned Vehicle Report'
-      comment: "<h2>Location</h2>\r\n[webform_submission:values:report_location:html]\r\n<h2>Vehicle info</h2>\r\n<strong>Color:</strong> [webform_submission:values:report_vehicle:color]\r\n<br>\r\n<strong>License Plate Number:</strong> [webform_submission:values:report_vehicle:license_plate_number]\r\n<br>\r\n<strong>License Plate State:</strong> [webform_submission:values:report_vehicle:license_plate_state]\r\n<br>\r\n<strong>Make:</strong> [webform_submission:values:report_vehicle:make]\r\n<br>\r\n<strong>Type:</strong> [webform_submission:values:report_vehicle:type]"
-      tags: 'drupal webform'
+      comment: "<h2>Location</h2>\r\n[webform_submission:values:report_location:html]\r\n<h2>Vehicle info</h2>\r\n<strong>Color:</strong> [webform_submission:values:report_vehicle:color]\r\n<br>\r\n<strong>License Plate Number:</strong> [webform_submission:values:report_vehicle:license_plate_number]\r\n<br>\r\n<strong>License Plate State:</strong> [webform_submission:values:report_vehicle:license_plate_state]\r\n<br>\r\n<strong>Make:</strong> [webform_submission:values:report_vehicle:make]\r\n<br>\r\n<strong>Type:</strong> [webform_submission:values:report_vehicle:type]\r\n<br>\r\n<strong>Related campsite report:</strong> #[webform_submission:values:report_ticket_id]"
+      tags: 'drupal webform campsite'
       priority: normal
       status: new
       group_id: '18716157058327'
       assignee_id: ''
       type: incident
       collaborators: ''
-      custom_fields: "6353388345367: 'report_campsite'\r\n14510509580823: 'true'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n14971313641239: ['[webform_submission:values:report_vehicle:color:raw]', 'report_vehicle:color']\r\n5873310799383: ['[webform_submission:values:report_vehicle:license_plate_number]', 'report_vehicle:license_plate_number']\r\n18716068517783: ['[webform_submission:values:report_vehicle:license_plate_state:raw]', 'report_vehicle:license_plate_state']\r\n5873293014679: ['[webform_submission:values:report_vehicle:make:raw]', 'report_vehicle:make']\r\n14971350075799: ['[webform_submission:values:report_vehicle:type:raw]', 'report_vehicle:type']"
+      custom_fields: "6353388345367: 'report_campsite'\r\n14510509580823: 'true'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n14971313641239: ['[webform_submission:values:report_vehicle:color:raw]', 'report_vehicle:color']\r\n5873310799383: ['[webform_submission:values:report_vehicle:license_plate_number]', 'report_vehicle:license_plate_number']\r\n18716068517783: ['[webform_submission:values:report_vehicle:license_plate_state:raw]', 'report_vehicle:license_plate_state']\r\n5873293014679: ['[webform_submission:values:report_vehicle:make:raw]', 'report_vehicle:make']\r\n14971350075799: ['[webform_submission:values:report_vehicle:type:raw]', 'report_vehicle:type']\r\n8692493739543: '[webform_submission:values:report_ticket_id]'"
       ticket_id_field: report_ticket_id
       ticket_form_id: '17751920813847'
       recipient: ''
@@ -675,16 +684,16 @@ handlers:
       requester_name: contact_name
       requester_email: contact_email
       subject: 'Abandoned Vehicle Report'
-      comment: "<h2>Location</h2>\r\n[webform_submission:values:report_location:html]\r\n<h2>Vehicle info</h2>\r\n<strong>Color:</strong> [webform_submission:values:report_vehicle:color]\r\n<br>\r\n<strong>License Plate Number:</strong> [webform_submission:values:report_vehicle:license_plate_number]\r\n<br>\r\n<strong>License Plate State:</strong> [webform_submission:values:report_vehicle:license_plate_state]\r\n<br>\r\n<strong>Make:</strong> [webform_submission:values:report_vehicle:make]\r\n<br>\r\n<strong>Type:</strong> [webform_submission:values:report_vehicle:type]"
-      tags: 'drupal webform'
+      comment: "<h2>Location</h2>\r\n[webform_submission:values:report_location:html]\r\n<h2>Vehicle info</h2>\r\n<strong>Color:</strong> [webform_submission:values:report_vehicle:color]\r\n<br>\r\n<strong>License Plate Number:</strong> [webform_submission:values:report_vehicle:license_plate_number]\r\n<br>\r\n<strong>License Plate State:</strong> [webform_submission:values:report_vehicle:license_plate_state]\r\n<br>\r\n<strong>Make:</strong> [webform_submission:values:report_vehicle:make]\r\n<br>\r\n<strong>Type:</strong> [webform_submission:values:report_vehicle:type]\r\n<br>\r\n<strong>Related campsite report:</strong>\r\n#[webform_submission:values:report_ticket_id]"
+      tags: 'drupal webform campsite'
       priority: normal
       status: new
       group_id: '4549352062487'
       assignee_id: ''
       type: incident
       collaborators: ''
-      custom_fields: "6353388345367: 'report_campsite'\r\n14510509580823: 'true'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n14971313641239: ['[webform_submission:values:report_vehicle:color:raw]', 'report_vehicle:color']\r\n5873310799383: ['[webform_submission:values:report_vehicle:license_plate_number]', 'report_vehicle:license_plate_number']\r\n18716068517783: ['[webform_submission:values:report_vehicle:license_plate_state:raw]', 'report_vehicle:license_plate_state']\r\n5873293014679: ['[webform_submission:values:report_vehicle:make:raw]', 'report_vehicle:make']\r\n14971350075799: ['[webform_submission:values:report_vehicle:type:raw]', 'report_vehicle:type']"
-      ticket_id_field: report_ticket_id
+      custom_fields: "6353388345367: 'report_campsite'\r\n14510509580823: 'true'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n14971313641239: ['[webform_submission:values:report_vehicle:color:raw]', 'report_vehicle:color']\r\n5873310799383: ['[webform_submission:values:report_vehicle:license_plate_number]', 'report_vehicle:license_plate_number']\r\n18716068517783: ['[webform_submission:values:report_vehicle:license_plate_state:raw]', 'report_vehicle:license_plate_state']\r\n5873293014679: ['[webform_submission:values:report_vehicle:make:raw]', 'report_vehicle:make']\r\n14971350075799: ['[webform_submission:values:report_vehicle:type:raw]', 'report_vehicle:type']\r\n8692493739543: '[webform_submission:values:report_ticket_id]'"
+      ticket_id_field: ''
       ticket_form_id: '17751920813847'
       recipient: ''
       ticket_fork_field: report_vehicle
@@ -706,15 +715,15 @@ handlers:
       requester_name: contact_name
       requester_email: contact_email
       subject: 'Campsite Report Inside Park'
-      comment: "A campsite has been reported inside of a park by a community member:\r\n\r\n[webform_submission:values:html]"
-      tags: 'drupal webform campsite'
+      comment: "A campsite has been reported inside of a park by a community member:\r\n\r\n[webform_submission:values:html]\r\n\r\n<br><strong>Related campsite report:</strong>\r\n#[webform_submission:values:report_ticket_id]"
+      tags: 'drupal webform campsite campsite_in_park'
       priority: normal
       status: new
-      group_id: '16341182522007'
+      group_id: '12927681093399'
       assignee_id: ''
       type: incident
       collaborators: ''
-      custom_fields: "6353388345367: 'report_campsite'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n5873270225303: '[webform_submission:values:report_visible_items:checked:vehicle]'"
+      custom_fields: "6353388345367: 'report_campsite'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n5873270225303: '[webform_submission:values:report_visible_items:checked:vehicle]'\r\n8692493739543: '[webform_submission:values:report_ticket_id]'"
       ticket_id_field: report_ticket_id
       ticket_form_id: '13176953771287'
       recipient: ''
@@ -737,16 +746,16 @@ handlers:
       requester_name: contact_name
       requester_email: contact_email
       subject: 'Campsite Report Inside Park'
-      comment: "A campsite has been reported inside of a park by a community member:\r\n\r\n[webform_submission:values:html]"
-      tags: 'drupal webform campsite'
+      comment: "A campsite has been reported inside of a park by a community member:\r\n\r\n[webform_submission:values:html]\r\n\r\n<br><strong>Related campsite report:</strong>\r\n#[webform_submission:values:report_ticket_id]"
+      tags: 'drupal webform campsite campsite_in_park'
       priority: normal
       status: new
       group_id: '4549352062487'
       assignee_id: ''
       type: incident
       collaborators: ''
-      custom_fields: "6353388345367: 'report_campsite'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n5873270225303: '[webform_submission:values:report_visible_items:checked:vehicle]'"
-      ticket_id_field: report_ticket_id
+      custom_fields: "6353388345367: 'report_campsite'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n5873270225303: '[webform_submission:values:report_visible_items:checked:vehicle]'\r\n8692493739543: '[webform_submission:values:report_ticket_id]'"
+      ticket_id_field: ''
       ticket_form_id: '13176953771287'
       recipient: ''
       ticket_fork_field: ''
@@ -767,16 +776,16 @@ handlers:
       requester_name: contact_name
       requester_email: contact_email
       subject: 'Campsite ADA Accommodation Request'
-      comment: "A campsite has been reported and the community member requested an ADA accommodation:\r\n\r\n[webform_submission:values:html]"
-      tags: 'drupal webform campsite'
+      comment: "A campsite has been reported and the community member requested an ADA accommodation:\r\n\r\n[webform_submission:values:html]\r\n\r\n<br><strong>Related campsite report:</strong>\r\n#[webform_submission:values:report_ticket_id]"
+      tags: 'drupal webform campsite ada_campsite'
       priority: normal
       status: new
       group_id: '4549352062487'
       assignee_id: ''
       type: incident
       collaborators: ''
-      custom_fields: "6353388345367: 'report_campsite'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n5873270225303: '[webform_submission:values:report_visible_items:checked:vehicle]'"
-      ticket_id_field: report_ticket_id
+      custom_fields: "6353388345367: 'report_campsite'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n5873270225303: '[webform_submission:values:report_visible_items:checked:vehicle]'\r\n8692493739543: '[webform_submission:values:report_ticket_id]'"
+      ticket_id_field: ''
       ticket_form_id: '12923141466007'
       recipient: ''
       ticket_fork_field: ''
@@ -797,15 +806,15 @@ handlers:
       requester_name: contact_name
       requester_email: contact_email
       subject: 'Campsite ADA Accommodation Request'
-      comment: "A campsite has been reported and the community member requested an ADA accommodation:\r\n\r\n[webform_submission:values:html]"
-      tags: 'drupal webform campsite'
+      comment: "A campsite has been reported and the community member requested an ADA accommodation:\r\n\r\n[webform_submission:values:html]\r\n\r\n<br><strong>Related campsite report:</strong>\r\n#[webform_submission:values:report_ticket_id]"
+      tags: 'drupal webform campsite ada_campsite'
       priority: normal
       status: new
       group_id: '4763233132567'
       assignee_id: ''
       type: incident
       collaborators: ''
-      custom_fields: "6353388345367: 'report_campsite'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n5873270225303: '[webform_submission:values:report_visible_items:checked:vehicle]'"
+      custom_fields: "6353388345367: 'report_campsite'\r\n5581480390679: ['[webform_submission:values:report_location:location_lat]', 'report_location:location_lat']\r\n5581490332439: ['[webform_submission:values:report_location:location_lon]', 'report_location:location_lon']\r\n13407901552407: ['[webform_submission:values:report_location:location_x]', 'report_location:location_x']\r\n13407918835095: ['[webform_submission:values:report_location:location_y]', 'report_location:location_y']\r\n1500012743961: ['[webform_submission:values:report_location:location_address]', 'report_location:location_address']\r\n1500013095781: '[webform_submission:uuid]'\r\n9205221816983: ['[webform_submission:values:computed_property_type]', 'property_type']\r\n5873270225303: '[webform_submission:values:report_visible_items:checked:vehicle]'\r\n8692493739543: '[webform_submission:values:report_ticket_id]'"
       ticket_id_field: report_ticket_id
       ticket_form_id: '12923141466007'
       recipient: ''
diff --git a/web/sites/default/config/webform.webform.report_demographics.yml b/web/sites/default/config/webform.webform.report_demographics.yml
index cc12a85e72..d896fb964f 100644
--- a/web/sites/default/config/webform.webform.report_demographics.yml
+++ b/web/sites/default/config/webform.webform.report_demographics.yml
@@ -490,24 +490,24 @@ handlers:
       sheet_id: '5651392804218756'
       column_mappings:
         5906210767562628: __submission_id
-        3668701731573636: purpose
         857686929631108: report_form_id
         839661186770820: report_race_ethnicity
         5343260814141316: report_gender
+        6441191047384964: ''
         3091461000456068: report_annual_household_income
         2954311722395524: report_household_size
         7457911349766020: report_age
+        4189391233699716: ''
         1828411815552900: report_disabilities
         6978614094784388: report_zip_code
         7014782091612036: report_disability_details
         4159241006829444: report_languages
         3875800948363140: report_tribal_affiliation
         1349114560571268: report_suggestions
-        8172301358944132: report_bds_project_type
-        853951964467076: report_bds_project_relation
         8482598244640644: ''
       multiple_rows_enable: null
       multiple_rows_field: ''
       multiple_rows_separator: ''
       row_location: toBottom
+      upload_attachments: '1'
 variants: {  }
diff --git a/web/sites/default/config/webform.webform.report_parks_issue.yml b/web/sites/default/config/webform.webform.report_parks_issue.yml
index 1d7ad62b32..b8db171c5a 100644
--- a/web/sites/default/config/webform.webform.report_parks_issue.yml
+++ b/web/sites/default/config/webform.webform.report_parks_issue.yml
@@ -251,7 +251,7 @@ elements: |-
               <div class="alert alert--info next-steps">
               <h2>Next Steps</h2>
 
-              <p>Campsite report</p>
+              <p>If you want to report an unsanctioned campsite, please use the <a href="/homelessnessimpactreduction/report-campsite">Report a Campsite service</a>. A copy of the report will be sent to the Park Rangers.</p>
               </div>
           markup_call_ppb:
             '#type': webform_markup
diff --git a/web/sites/default/config/webform.webform.request_ada_accommodation.yml b/web/sites/default/config/webform.webform.request_ada_accommodation.yml
index 1b91fe3bca..70d3dee7b8 100644
--- a/web/sites/default/config/webform.webform.request_ada_accommodation.yml
+++ b/web/sites/default/config/webform.webform.request_ada_accommodation.yml
@@ -22,15 +22,6 @@ title: 'A.D.A. Accommodation Request'
 description: ''
 categories: {  }
 elements: |-
-  section_public_records_statement:
-    '#type': webform_section
-    '#title': 'Public Records Statement'
-    '#title_display': invisible
-    public_records_statement_standard:
-      '#type': webform_markup
-      '#markup': |
-        <strong>Public Records Statement</strong><br />
-        Information you provide to the City is a public record and may be subject to release under Oregon&rsquo;s <a data-renderer-mark="true" href="https://www.doj.state.or.us/oregon-department-of-justice/public-records/attorney-generals-public-records-and-meetings-manual/i-public-records/#:~:text=Under%20Oregon's%20Public%20Records%20Law,committee%20of%20the%20Legislative%20Assembly" title="https://www.doj.state.or.us/oregon-department-of-justice/public-records/attorney-generals-public-records-and-meetings-manual/i-public-records/#:~:text=Under%20Oregon's%20Public%20Records%20Law,committee%20of%20the%20Legislative%20Assembly">Public Records Law</a>. This law classifies certain information as available to the public on request. See our <a data-renderer-mark="true" href="/help/about/privacy" title="https://www.portland.gov/help/about/privacy">privacy statement</a> for more information.
   request_how:
     '#type': radios
     '#title': 'How would you like to make your request?'