Merge branch 'release/2.22.0' into feature/SD-387-new-relic-browser

examples/nuxt-app/app.config.ts

@@ -207,16 +207,13 @@ export default defineAppConfig({
         }
       },
       mapResultHooks: {
-        exampleMapResultsHook: (map, results, locationQuery) => {
-          if (!map || !results || !locationQuery) return
+        exampleMapResultsHook: (map, results) => {
+          if (!map || !results) return
 
           centerMap(
             map,
-            [
-              parseFloat(locationQuery?.center[0]),
-              parseFloat(locationQuery?.center[1])
-            ],
-            13,
+            [15809362.126037747, -4543542.166789566],
+            8,
             {},
             'popover'
           )

examples/nuxt-app/layers/map-features/components/global/test/TestMapShapeLayer.vue

@@ -26,6 +26,8 @@ const lgaShapeURL = computed(() => {
 
 const defaultStyleFn = (feature: Feature, style: Style) => {
   style.getFill().setColor([255, 255, 255, 0.5])
+
+  return style
 }
 
 const layerIdentifier = 'shapeLayer'

examples/nuxt-app/test/features/maps/maps.feature

@@ -82,7 +82,7 @@ Feature: Custom collection map component
     Given the "/api/tide/elasticsearch/elasticsearch_index_develop_node/_search" network request is stubbed with fixture "/maps/simple-map-results" and status 200 as alias "searchReq"
     Given I visit the page "/map"
     And the map is loaded
-    When I click the map component at coordinates 606 424
+    When I click the map component at coordinates 606 442
     When I wait 2 seconds
     Then the map matches the image snapshot "map-popup-type-sidebar-with-sidepanel-double-pin"
 
@@ -111,7 +111,7 @@ Feature: Custom collection map component
     And the map is loaded
     Then I click the map component at coordinates 545 385
     And I wait 1 seconds
-    Then I click the map component at coordinates 660 320
+    Then I click the map component at coordinates 650 320
     And I wait 2 seconds
     Then the map matches the image snapshot "map-popover-max-zoom-cluster"
 
@@ -120,9 +120,10 @@ Feature: Custom collection map component
     Given I load the page fixture with "/maps/basic-page"
     And a custom map results hook called "exampleMapResultsHook" is used
     Then the page endpoint for path "/map" returns the loaded fixture
-    And the "/api/tide/elasticsearch/elasticsearch_index_develop_node/_search" network request is stubbed with fixture "/maps/simple-map-results" and status 200 as alias "searchReq"
-    Given I visit the page "/map?location[center]=15809362.126037747&location[center]=-4543542.166789566"
+    And the "/api/tide/elasticsearch/elasticsearch_index_develop_node/_search" network request is delayed by 500 milliseconds and stubbed with fixture "/maps/simple-map-results", status 200 and alias "searchReq"
+    Given I visit the page "/map"
     And the map is loaded
+    When I wait 4 seconds
     Then the map matches the image snapshot "map-initial-location-results-hook"
 
   @mockserver

examples/nuxt-app/test/features/maps/vsba.feature

@@ -88,7 +88,7 @@ Feature: School buildings map
     Given the "/api/tide/elasticsearch/elasticsearch_index_develop_node/_search" network request is stubbed with fixture "/map-table/vsba/response-all" and status 200 as alias "searchReq"
     And I visit the page "/map"
     When the map is loaded
-    When I click the map component at coordinates 650 429
+    When I click the map component at coordinates 630 440
     When I wait 4 seconds
     Then the map matches the image snapshot "map-cluster-zoom"
 

packages/nuxt-ripple/server/api/tide/webform_submission/[formId].ts

@@ -2,6 +2,7 @@
 import { defineEventHandler, H3Event } from 'h3'
 import { createHandler, logger } from '@dpc-sdp/ripple-tide-api'
 import { createProxyMiddleware } from 'http-proxy-middleware'
+import verifyCaptcha from '../../../utils/verifyCaptcha'
 
 export const createWebformProxyHandler = async (event: H3Event) => {
   const { public: config } = useRuntimeConfig()