From 5d523f0285bd8687120429c1bccfa073cf259f8b Mon Sep 17 00:00:00 2001
From: David Featherston <david@lambry.com>
Date: Fri, 24 Jan 2025 08:39:57 +1100
Subject: [PATCH 01/11] feat(@dpc-sdp/ripple-tide-search): allow elastic
 response source to be customised

---
 .../search-listing/result-items.feature       | 28 ++++++++++++
 .../result-items/request-source-exclude.json  | 40 +++++++++++++++++
 .../result-items/request-source-include.json  | 43 +++++++++++++++++++
 .../step_definitions/content-types/listing.ts | 32 ++++++++++++++
 .../composables/useTideSearch.ts              | 31 ++++++++++++-
 packages/ripple-tide-search/types.ts          |  7 +++
 6 files changed, 179 insertions(+), 2 deletions(-)
 create mode 100644 examples/nuxt-app/test/fixtures/search-listing/result-items/request-source-exclude.json
 create mode 100644 examples/nuxt-app/test/fixtures/search-listing/result-items/request-source-include.json

diff --git a/examples/nuxt-app/test/features/search-listing/result-items.feature b/examples/nuxt-app/test/features/search-listing/result-items.feature
index 69f91e0454..c60d1290ff 100644
--- a/examples/nuxt-app/test/features/search-listing/result-items.feature
+++ b/examples/nuxt-app/test/features/search-listing/result-items.feature
@@ -17,3 +17,31 @@ Feature: Result items
       | Accessibility guidelines | tide-search-result-card  |
       | Small business grant     | tide-grant-search-result |
       | GovHack 2022 is coming   | tide-search-result       |
+
+  @mockserver
+  Example: Result contents from elasticsearch can be customised to exclude fields
+    Given I load the page fixture with "/search-listing/result-items/page"
+    And the search listing config has the following excludes added to source
+      | key             |
+      | nid             |
+      | field_node_site |
+    Then the page endpoint for path "/search-results" returns the loaded fixture
+    And the search network request is stubbed with fixture "/search-listing/result-items/response" and status 200
+
+    When I visit the page "/search-results"
+    Then the search listing page should have 4 results
+    And the search network request should be called with the "/search-listing/result-items/request-source-exclude" fixture
+
+  @mockserver
+  Example: Result contents from elasticsearch can be customised to include fields
+    Given I load the page fixture with "/search-listing/result-items/page"
+    And the search listing config has the following includes added to source
+      | key           |
+      | title         |
+      | field_summary |
+    Then the page endpoint for path "/search-results" returns the loaded fixture
+    And the search network request is stubbed with fixture "/search-listing/result-items/response" and status 200
+
+    When I visit the page "/search-results"
+    Then the search listing page should have 4 results
+    And the search network request should be called with the "/search-listing/result-items/request-source-include" fixture
diff --git a/examples/nuxt-app/test/fixtures/search-listing/result-items/request-source-exclude.json b/examples/nuxt-app/test/fixtures/search-listing/result-items/request-source-exclude.json
new file mode 100644
index 0000000000..2dde0c2607
--- /dev/null
+++ b/examples/nuxt-app/test/fixtures/search-listing/result-items/request-source-exclude.json
@@ -0,0 +1,40 @@
+{
+  "query": {
+    "bool": {
+      "must": [
+        {
+          "match_all": {}
+        }
+      ],
+      "filter": [
+        {
+          "terms": {
+            "type": [
+              "news",
+              "grant",
+              "event",
+              "landing_page"
+            ]
+          }
+        },
+        {
+          "terms": {
+            "field_node_site": [
+              8888
+            ]
+          }
+        }
+      ]
+    }
+  },
+  "size": 20,
+  "from": 0,
+  "sort": [
+    {
+      "title.keyword": "asc"
+    }
+  ],
+  "_source": {
+    "exclude": ["nid", "field_node_site"]
+  }
+}
diff --git a/examples/nuxt-app/test/fixtures/search-listing/result-items/request-source-include.json b/examples/nuxt-app/test/fixtures/search-listing/result-items/request-source-include.json
new file mode 100644
index 0000000000..fb0a3f512a
--- /dev/null
+++ b/examples/nuxt-app/test/fixtures/search-listing/result-items/request-source-include.json
@@ -0,0 +1,43 @@
+{
+  "query": {
+    "bool": {
+      "must": [
+        {
+          "match_all": {}
+        }
+      ],
+      "filter": [
+        {
+          "terms": {
+            "type": [
+              "news",
+              "grant",
+              "event",
+              "landing_page"
+            ]
+          }
+        },
+        {
+          "terms": {
+            "field_node_site": [
+              8888
+            ]
+          }
+        }
+      ]
+    }
+  },
+  "size": 20,
+  "from": 0,
+  "sort": [
+    {
+      "title.keyword": "asc"
+    }
+  ],
+  "_source": {
+    "include": [
+      "title",
+      "field_summary"
+    ]
+  }
+}
diff --git a/packages/ripple-test-utils/step_definitions/content-types/listing.ts b/packages/ripple-test-utils/step_definitions/content-types/listing.ts
index 3457e2112c..627b246506 100644
--- a/packages/ripple-test-utils/step_definitions/content-types/listing.ts
+++ b/packages/ripple-test-utils/step_definitions/content-types/listing.ts
@@ -592,3 +592,35 @@ Then(
     })
   }
 )
+
+Then(
+  'the search listing config has the following excludes added to source',
+  (dataTable: DataTable) => {
+    const table = dataTable.hashes()
+    const excludes = table.map((row) => row.key)
+
+    cy.get('@pageFixture').then((response) => {
+      set(
+        response,
+        `config.searchListingConfig.responseSource.exclude`,
+        excludes
+      )
+    })
+  }
+)
+
+Then(
+  'the search listing config has the following includes added to source',
+  (dataTable: DataTable) => {
+    const table = dataTable.hashes()
+    const includes = table.map((row) => row.key)
+
+    cy.get('@pageFixture').then((response) => {
+      set(
+        response,
+        `config.searchListingConfig.responseSource.include`,
+        includes
+      )
+    })
+  }
+)
diff --git a/packages/ripple-tide-search/composables/useTideSearch.ts b/packages/ripple-tide-search/composables/useTideSearch.ts
index 2b9c70583e..39564c14ab 100644
--- a/packages/ripple-tide-search/composables/useTideSearch.ts
+++ b/packages/ripple-tide-search/composables/useTideSearch.ts
@@ -274,6 +274,19 @@ export default ({
     ]
   }
 
+  const getSourceOptions = () => {
+    let source: { include?: string[]; exclude?: string[] } = {}
+
+    if (searchListingConfig?.responseSource?.include) {
+      source.include = searchListingConfig?.responseSource?.include
+    }
+    if (searchListingConfig?.responseSource?.exclude) {
+      source.exclude = searchListingConfig?.responseSource?.exclude
+    }
+
+    return Object.keys(source).length ? source : false
+  }
+
   const getUserFilters = (forAggregations = false) => {
     const filterValues: Record<string, any> = {
       ...filterForm.value,
@@ -510,13 +523,20 @@ export default ({
   const getQueryDSL = async () => {
     const locationFilters = await getLocationFilterClause('listing')
     const query = getQueryClause([...getUserFilterClause(), ...locationFilters])
+    const source = getSourceOptions()
 
-    return {
+    let queryDSL = {
       query,
       size: pageSize.value,
       from: pagingStart.value,
       sort: getSortClause()
     }
+
+    if (source) {
+      queryDSL._source = source
+    }
+
+    return queryDSL
   }
 
   const getQueryDSLForDynamicAggregations = async () => {
@@ -553,14 +573,21 @@ export default ({
   const getQueryDSLForMaps = async () => {
     const locationFilters = await getLocationFilterClause('map')
     const query = getQueryClause([...getUserFilterClause(), ...locationFilters])
+    const source = getSourceOptions()
 
-    return {
+    let queryDSL = {
       query,
       // ES queries have a 10k result limit, maps struggle drawing more than this anyway. If you need more you will need to implement a loading strategy see : https://openlayers.org/en/latest/apidoc/module-ol_loadingstrategy.html
       size: 10000,
       from: 0,
       sort: getSortClause()
     }
+
+    if (source) {
+      queryDSL._source = source
+    }
+
+    return queryDSL
   }
 
   const getSearchResults = async (isFirstRun: boolean) => {
diff --git a/packages/ripple-tide-search/types.ts b/packages/ripple-tide-search/types.ts
index 04025174f6..16b069d7f8 100644
--- a/packages/ripple-tide-search/types.ts
+++ b/packages/ripple-tide-search/types.ts
@@ -296,6 +296,13 @@ export type TideSearchListingConfig = {
      * @description show filters in the sidebar?
      */
     filtersInSidebar?: boolean
+    /**
+     * @description modify the elasticsearch response source
+     */
+    responseSource?: {
+      include?: string[]
+      exclude?: string[]
+    }
   }
   /**
    * @description Tabs to display, key needs to be one of TideSearchListingTabKey

From 7edf6fadb49e7fe254dc6303b1bc2b402116c7c0 Mon Sep 17 00:00:00 2001
From: Jeffrey Dowdle <jeffrey.dowdle@dpc.vic.gov.au>
Date: Thu, 30 Jan 2025 09:10:56 +1100
Subject: [PATCH 02/11] fix(@dpc-sdp/ripple-ui-forms): improve memory usage of
 forms

---
 packages/ripple-ui-forms/src/inputs/checkbox.ts      |  4 ++--
 packages/ripple-ui-forms/src/inputs/checkboxGroup.ts |  4 ++--
 packages/ripple-ui-forms/src/inputs/date.ts          |  4 ++--
 packages/ripple-ui-forms/src/inputs/datePicker.ts    |  4 ++--
 packages/ripple-ui-forms/src/inputs/dateRange.ts     |  4 ++--
 packages/ripple-ui-forms/src/inputs/dropdown.ts      |  4 ++--
 packages/ripple-ui-forms/src/inputs/email.ts         |  4 ++--
 packages/ripple-ui-forms/src/inputs/hidden.ts        |  4 ++--
 packages/ripple-ui-forms/src/inputs/input-utils.ts   | 12 ++++++------
 packages/ripple-ui-forms/src/inputs/number.ts        |  4 ++--
 packages/ripple-ui-forms/src/inputs/optionButtons.ts |  4 ++--
 packages/ripple-ui-forms/src/inputs/radioGroup.ts    |  4 ++--
 packages/ripple-ui-forms/src/inputs/tel.ts           |  4 ++--
 packages/ripple-ui-forms/src/inputs/text.ts          |  4 ++--
 packages/ripple-ui-forms/src/inputs/textarea.ts      |  4 ++--
 packages/ripple-ui-forms/src/inputs/url.ts           |  4 ++--
 16 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/ripple-ui-forms/src/inputs/checkbox.ts b/packages/ripple-ui-forms/src/inputs/checkbox.ts
index 750fce2879..026215aff7 100644
--- a/packages/ripple-ui-forms/src/inputs/checkbox.ts
+++ b/packages/ripple-ui-forms/src/inputs/checkbox.ts
@@ -9,7 +9,7 @@ export const checkbox: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormGroup({
+  schema: createRplFormGroup(() => ({
     $cmp: 'RplFormOption',
     props: {
       type: 'checkbox',
@@ -30,7 +30,7 @@ export const checkbox: FormKitTypeDefinition = {
       variant: '$node.props.variant',
       pii: '$node.props.pii'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/checkboxGroup.ts b/packages/ripple-ui-forms/src/inputs/checkboxGroup.ts
index 2971a5e117..93eae52fa4 100644
--- a/packages/ripple-ui-forms/src/inputs/checkboxGroup.ts
+++ b/packages/ripple-ui-forms/src/inputs/checkboxGroup.ts
@@ -9,7 +9,7 @@ export const checkboxGroup: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormGroup({
+  schema: createRplFormGroup(() => ({
     $cmp: 'RplFormCheckboxGroup',
     props: {
       id: `$id`,
@@ -24,7 +24,7 @@ export const checkboxGroup: FormKitTypeDefinition = {
       layout: '$node.props.layout',
       pii: '$node.props.pii'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/date.ts b/packages/ripple-ui-forms/src/inputs/date.ts
index a0edf8f8dd..0be5fd950d 100644
--- a/packages/ripple-ui-forms/src/inputs/date.ts
+++ b/packages/ripple-ui-forms/src/inputs/date.ts
@@ -9,7 +9,7 @@ export const date: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormGroup({
+  schema: createRplFormGroup(() => ({
     $cmp: 'RplFormDate',
     props: {
       id: `$id`,
@@ -24,7 +24,7 @@ export const date: FormKitTypeDefinition = {
       pii: '$node.props.pii',
       'aria-describedby': '$fns.getAriaDescribedBy()'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/datePicker.ts b/packages/ripple-ui-forms/src/inputs/datePicker.ts
index e7111fd670..c0218ce534 100644
--- a/packages/ripple-ui-forms/src/inputs/datePicker.ts
+++ b/packages/ripple-ui-forms/src/inputs/datePicker.ts
@@ -14,7 +14,7 @@ export const datePicker: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormInput({
+  schema: createRplFormInput(() => ({
     $cmp: 'RplFormInput',
     props: {
       ...defaultRplFormInputProps,
@@ -23,7 +23,7 @@ export const datePicker: FormKitTypeDefinition = {
       type: 'date',
       variant: '$node.props.variant'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/dateRange.ts b/packages/ripple-ui-forms/src/inputs/dateRange.ts
index bebbe1d14e..8e670cc62e 100644
--- a/packages/ripple-ui-forms/src/inputs/dateRange.ts
+++ b/packages/ripple-ui-forms/src/inputs/dateRange.ts
@@ -9,7 +9,7 @@ export const dateRange: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormGroup({
+  schema: createRplFormGroup(() => ({
     $cmp: 'RplFormDateRange',
     props: {
       id: `$id`,
@@ -30,7 +30,7 @@ export const dateRange: FormKitTypeDefinition = {
       pii: '$node.props.pii',
       'aria-describedby': '$fns.getAriaDescribedBy()'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/dropdown.ts b/packages/ripple-ui-forms/src/inputs/dropdown.ts
index 92463b0844..c3956c1b87 100644
--- a/packages/ripple-ui-forms/src/inputs/dropdown.ts
+++ b/packages/ripple-ui-forms/src/inputs/dropdown.ts
@@ -9,7 +9,7 @@ export const dropdown: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormInput({
+  schema: createRplFormInput(() => ({
     $cmp: 'RplFormDropdown',
     props: {
       multiple: '$node.props.multiple',
@@ -32,7 +32,7 @@ export const dropdown: FormKitTypeDefinition = {
       noResultsLabel: '$node.props.noResultsLabel',
       pii: '$node.props.pii'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/email.ts b/packages/ripple-ui-forms/src/inputs/email.ts
index 26b494e233..9c4e670c2b 100644
--- a/packages/ripple-ui-forms/src/inputs/email.ts
+++ b/packages/ripple-ui-forms/src/inputs/email.ts
@@ -16,14 +16,14 @@ export const email: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormInput({
+  schema: createRplFormInput(() => ({
     $cmp: 'RplFormInput',
     props: {
       ...defaultRplFormInputProps,
       ...minMaxRplFormProps,
       type: 'email'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/hidden.ts b/packages/ripple-ui-forms/src/inputs/hidden.ts
index 2930331165..755d8dca70 100644
--- a/packages/ripple-ui-forms/src/inputs/hidden.ts
+++ b/packages/ripple-ui-forms/src/inputs/hidden.ts
@@ -13,7 +13,7 @@ export const hidden: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormInputOnly({
+  schema: createRplFormInputOnly(() => ({
     $cmp: 'RplFormHidden',
     props: {
       id: '$id',
@@ -22,7 +22,7 @@ export const hidden: FormKitTypeDefinition = {
       pii: '$node.props.pii',
       type: 'hidden'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/input-utils.ts b/packages/ripple-ui-forms/src/inputs/input-utils.ts
index 661adbfd76..48766f0e9d 100644
--- a/packages/ripple-ui-forms/src/inputs/input-utils.ts
+++ b/packages/ripple-ui-forms/src/inputs/input-utils.ts
@@ -81,7 +81,7 @@ export const rplFeatures = [
  * this to wrap fields like text inputs
  */
 export const createRplFormInput = (
-  cmp: FormKitSchemaComponent
+  cmpFn: () => FormKitSchemaComponent
 ): FormKitExtendableSchemaRoot => {
   return rplOuter(
     wrapper(
@@ -98,7 +98,7 @@ export const createRplFormInput = (
         inner(
           icon('prefix', 'label'),
           prefix(),
-          createSection('input', () => cmp)(),
+          createSection('input', cmpFn)(),
           suffix(),
           icon('suffix')
         )
@@ -112,7 +112,7 @@ export const createRplFormInput = (
  * fieldset and legend instead of plain label (e.g. radios, checkboxes, date field)
  */
 export const createRplFormGroup = (
-  cmp: FormKitSchemaComponent
+  cmpFn: () => FormKitSchemaComponent
 ): FormKitExtendableSchemaRoot => {
   return rplOuter(
     fieldset(
@@ -125,7 +125,7 @@ export const createRplFormGroup = (
           fieldName: `$node.name`
         }
       }))(),
-      rplInputGrid(createSection('input', () => cmp)())
+      rplInputGrid(createSection('input', cmpFn)())
     )
   ) as unknown as FormKitExtendableSchemaRoot
 }
@@ -136,11 +136,11 @@ export const createRplFormGroup = (
  * and just want the input itself, for example, when using a hidden input
  */
 export const createRplFormInputOnly = (
-  cmp: FormKitSchemaComponent
+  cmpFn: () => FormKitSchemaComponent
 ): FormKitExtendableSchemaRoot => {
   return createSection(
     'input',
-    () => cmp
+    cmpFn
   )() as unknown as FormKitExtendableSchemaRoot
 }
 
diff --git a/packages/ripple-ui-forms/src/inputs/number.ts b/packages/ripple-ui-forms/src/inputs/number.ts
index 1ce2ccaac3..db745bd6e8 100644
--- a/packages/ripple-ui-forms/src/inputs/number.ts
+++ b/packages/ripple-ui-forms/src/inputs/number.ts
@@ -14,7 +14,7 @@ export const number: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormInput({
+  schema: createRplFormInput(() => ({
     $cmp: 'RplFormNumber',
     props: {
       ...defaultRplFormInputProps,
@@ -25,7 +25,7 @@ export const number: FormKitTypeDefinition = {
       max: '$node.props.max',
       step: '$node.props.step'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/optionButtons.ts b/packages/ripple-ui-forms/src/inputs/optionButtons.ts
index 767669f985..949d278d8c 100644
--- a/packages/ripple-ui-forms/src/inputs/optionButtons.ts
+++ b/packages/ripple-ui-forms/src/inputs/optionButtons.ts
@@ -5,7 +5,7 @@ export const optionButtons: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormGroup({
+  schema: createRplFormGroup(() => ({
     $cmp: 'RplFormOptionButtons',
     props: {
       id: `$id`,
@@ -19,7 +19,7 @@ export const optionButtons: FormKitTypeDefinition = {
       perfectSquares: '$node.props.perfectSquares',
       pii: '$node.props.pii'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/radioGroup.ts b/packages/ripple-ui-forms/src/inputs/radioGroup.ts
index f86880934d..840009e384 100644
--- a/packages/ripple-ui-forms/src/inputs/radioGroup.ts
+++ b/packages/ripple-ui-forms/src/inputs/radioGroup.ts
@@ -5,7 +5,7 @@ export const radioGroup: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormGroup({
+  schema: createRplFormGroup(() => ({
     $cmp: 'RplFormRadioGroup',
     props: {
       id: `$id`,
@@ -19,7 +19,7 @@ export const radioGroup: FormKitTypeDefinition = {
       layout: '$node.props.layout',
       pii: '$node.props.pii'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/tel.ts b/packages/ripple-ui-forms/src/inputs/tel.ts
index 5f903032bf..c4c4c10497 100644
--- a/packages/ripple-ui-forms/src/inputs/tel.ts
+++ b/packages/ripple-ui-forms/src/inputs/tel.ts
@@ -16,14 +16,14 @@ export const tel: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormInput({
+  schema: createRplFormInput(() => ({
     $cmp: 'RplFormInput',
     props: {
       ...defaultRplFormInputProps,
       ...minMaxRplFormProps,
       type: 'tel'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/text.ts b/packages/ripple-ui-forms/src/inputs/text.ts
index d3cd2008dc..33fd944794 100644
--- a/packages/ripple-ui-forms/src/inputs/text.ts
+++ b/packages/ripple-ui-forms/src/inputs/text.ts
@@ -18,7 +18,7 @@ export const text: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormInput({
+  schema: createRplFormInput(() => ({
     $cmp: 'RplFormInput',
     props: {
       ...defaultRplFormInputProps,
@@ -26,7 +26,7 @@ export const text: FormKitTypeDefinition = {
       ...minMaxRplFormProps,
       type: 'text'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/textarea.ts b/packages/ripple-ui-forms/src/inputs/textarea.ts
index e7d3fdecd4..8a05d6d590 100644
--- a/packages/ripple-ui-forms/src/inputs/textarea.ts
+++ b/packages/ripple-ui-forms/src/inputs/textarea.ts
@@ -17,7 +17,7 @@ export const textarea: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormInput({
+  schema: createRplFormInput(() => ({
     $cmp: 'RplFormTextarea',
     props: {
       handlers: '$handlers',
@@ -38,7 +38,7 @@ export const textarea: FormKitTypeDefinition = {
       ...minMaxRplFormProps,
       ...counterRplFormProps
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.
diff --git a/packages/ripple-ui-forms/src/inputs/url.ts b/packages/ripple-ui-forms/src/inputs/url.ts
index 551e6653bf..5ab4b48220 100644
--- a/packages/ripple-ui-forms/src/inputs/url.ts
+++ b/packages/ripple-ui-forms/src/inputs/url.ts
@@ -16,14 +16,14 @@ export const url: FormKitTypeDefinition = {
   /**
    * The actual schema of the input, or a function that returns the schema.
    */
-  schema: createRplFormInput({
+  schema: createRplFormInput(() => ({
     $cmp: 'RplFormInput',
     props: {
       ...defaultRplFormInputProps,
       ...minMaxRplFormProps,
       type: 'url'
     }
-  }),
+  })),
   library: inputLibrary,
   /**
    * The type of node, can be a list, group, or input.

From 91cbc09abf6a2ee8bf0644f82e883752a1bdbade Mon Sep 17 00:00:00 2001
From: Jeffrey Dowdle <jeffrey.dowdle@dpc.vic.gov.au>
Date: Thu, 30 Jan 2025 12:08:24 +1100
Subject: [PATCH 03/11] fix(@dpc-sdp/ripple-ui-forms): fixed custom inputs not
 rendering

---
 .../components/global/TideLandingPage/WebForm.vue             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ripple-tide-landing-page/components/global/TideLandingPage/WebForm.vue b/packages/ripple-tide-landing-page/components/global/TideLandingPage/WebForm.vue
index 54bac61b8b..f74fb8ce49 100644
--- a/packages/ripple-tide-landing-page/components/global/TideLandingPage/WebForm.vue
+++ b/packages/ripple-tide-landing-page/components/global/TideLandingPage/WebForm.vue
@@ -69,13 +69,13 @@ customInputs.library = (node: any) => {
   Object.values(customInputDefs).forEach((item: any) => {
     if (node.props.type === item.id) {
       const def: FormKitTypeDefinition = {
-        schema: createRplFormInput({
+        schema: createRplFormInput(() => ({
           $cmp: item.id,
           props: {
             ...defaultRplFormInputProps,
             type: item.type
           }
-        }),
+        })),
         library: {
           [item.id]: resolveComponent(item.id),
           ...inputLibrary

From 1b3c5df570dc0833f72415804673e0b6e8cf81d4 Mon Sep 17 00:00:00 2001
From: David Featherston <david@lambry.com>
Date: Fri, 31 Jan 2025 08:48:06 +1100
Subject: [PATCH 04/11] fix(@dpc-sdp/ripple-ui-maps): remove unneeded key

---
 .../ripple-ui-maps/src/components/cluster/RplMapCluster.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ripple-ui-maps/src/components/cluster/RplMapCluster.vue b/packages/ripple-ui-maps/src/components/cluster/RplMapCluster.vue
index 1794bf44f5..d2dbcd1597 100644
--- a/packages/ripple-ui-maps/src/components/cluster/RplMapCluster.vue
+++ b/packages/ripple-ui-maps/src/components/cluster/RplMapCluster.vue
@@ -1,5 +1,5 @@
 <template>
-  <ol-style :overrideStyleFunction="overrideStyleFunction" :key="key">
+  <ol-style :overrideStyleFunction="overrideStyleFunction">
     <ol-style-text>
       <ol-style-fill color="white"></ol-style-fill>
     </ol-style-text>

From 8147c192fd275dd789e934fb7bdb5eb8f6987015 Mon Sep 17 00:00:00 2001
From: David Featherston <david@lambry.com>
Date: Fri, 31 Jan 2025 13:41:39 +1100
Subject: [PATCH 05/11] feat(@dpc-sdp/ripple-tide-search): add view results
 event to custom collections

make event label also consider location inputs
---
 .../landingpage/custom-collection.feature     |  31 +
 .../features/search-listing/analytics.feature |  31 +
 .../landingpage/custom-collection/page.json   |   1 +
 .../search-listing/filters/page-simple.json   |  77 ++
 .../filters/response-large.json               | 983 ++++++++++++++++++
 .../global/TideCustomCollection.vue           |  23 +-
 6 files changed, 1144 insertions(+), 2 deletions(-)
 create mode 100644 examples/nuxt-app/test/fixtures/search-listing/filters/page-simple.json
 create mode 100644 examples/nuxt-app/test/fixtures/search-listing/filters/response-large.json

diff --git a/examples/nuxt-app/test/features/landingpage/custom-collection.feature b/examples/nuxt-app/test/features/landingpage/custom-collection.feature
index 7be02c7e60..06478f0c44 100644
--- a/examples/nuxt-app/test/features/landingpage/custom-collection.feature
+++ b/examples/nuxt-app/test/features/landingpage/custom-collection.feature
@@ -18,6 +18,37 @@ Feature: Custom Collection
     And the "cslReq" network request should be made to the elasticsearch endpoint
     And the search listing layout should be "table"
 
+  @mockserver
+  Scenario: Custom collection emits search related events for analytics
+    Given the page endpoint for path "/custom-collection" returns fixture "/landingpage/custom-collection/page" with status 200
+    And the search network request is stubbed with fixture "/landingpage/custom-collection/response" and status 200
+
+    When I visit the page "/custom-collection"
+    And I wait 400 milliseconds
+    Then I type "the" into the custom collection input
+    Then I toggle the content collection filters
+    When I click the search listing dropdown field labelled "Topics"
+    And I click the option labelled "Another Demo Topic" in the selected dropdown
+    When I click the search listing dropdown field labelled "Topics"
+    And I submit the search filters
+    And I wait 400 milliseconds
+    Then I clear the search filters
+    Then I toggle the content collection filters
+    And I click 'next' in the pagination controls
+    And I wait 400 milliseconds
+
+    Then the dataLayer should include the following events
+      | event                | name                   | element_id          | element_text         | filters                  | count | label | component              | index |
+      | view_search_results  | Test custom collection | page-component-4470 |                      |                          | 282   |       | tide-custom-collection | 1     |
+      | open_filters         | Test custom collection | page-component-4470 | Filters              |                          |       | the   | tide-custom-collection |       |
+      | search               | Test custom collection | page-component-4470 | Apply search filters | topic=Another+Demo+Topic |       | the   | tide-custom-collection |       |
+      | view_search_results  | Test custom collection | page-component-4470 |                      | topic=Another+Demo+Topic | 282   | the   | tide-custom-collection | 1     |
+      | clear_search_filters | Test custom collection | page-component-4470 | Clear search filters | topic=Another+Demo+Topic | 282   | the   | tide-custom-collection |       |
+      | view_search_results  | Test custom collection | page-component-4470 |                      |                          | 282   |       | tide-custom-collection | 1     |
+      | close_filters        | Test custom collection | page-component-4470 | Filters              |                          |       |       | tide-custom-collection |       |
+      | paginate_next        | Test custom collection | page-component-4470 | Next                 |                          | 282   |       | tide-custom-collection | 2     |
+      | view_search_results  | Test custom collection | page-component-4470 |                      |                          | 282   |       | tide-custom-collection | 2     |
+
   @mockserver
   Scenario: Default page - default form theme
     Given the page endpoint for path "/custom-collection-theme-default" returns fixture "/landingpage/custom-collection/form-theme-default" with status 200
diff --git a/examples/nuxt-app/test/features/search-listing/analytics.feature b/examples/nuxt-app/test/features/search-listing/analytics.feature
index a57fc307fc..cf816f97c3 100644
--- a/examples/nuxt-app/test/features/search-listing/analytics.feature
+++ b/examples/nuxt-app/test/features/search-listing/analytics.feature
@@ -5,6 +5,37 @@ Feature: Search listing - Analytics
     And the search autocomplete request is stubbed with "/search-listing/suggestions/none" fixture
     And I am using a "macbook-16" device
 
+  @mockserver
+  Example: Listing emits search related events for analytics
+    Given the page endpoint for path "/search-listing" returns fixture "/search-listing/filters/page-simple" with status 200
+    And the search network request is stubbed with fixture "/search-listing/filters/response-large" and status 200
+
+    When I visit the page "/search-listing"
+    And I wait 400 milliseconds
+    Then I type "the" into the search input
+    And I toggle the search listing filters section
+    Then I click the search listing dropdown field labelled "Term filter example"
+    And I click the option labelled "Blue" in the selected dropdown
+    And I click the search listing dropdown field labelled "Term filter example"
+    And I submit the search filters
+    And I wait 400 milliseconds
+    Then I clear the search filters
+    And I toggle the search listing filters section
+    And I click 'next' in the pagination controls
+    And I wait 400 milliseconds
+
+    Then the dataLayer should include the following events
+      | event                | name           | form_id             | element_text         | filters         | count | label | component           | index |
+      | view_search_results  | Simple listing | tide-search-listing |                      |                 | 133   |       | tide-search-listing | 1     |
+      | open_filters         | Simple listing | tide-search-listing | Filters              |                 |       | the   | tide-search-listing |       |
+      | search               | Simple listing | tide-search-listing | Apply search filters | termFilter=Blue |       | the   | tide-search-listing |       |
+      | view_search_results  | Simple listing | tide-search-listing |                      | termFilter=Blue | 133   | the   | tide-search-listing | 1     |
+      | clear_search_filters | Simple listing | tide-search-listing | Clear search filters | termFilter=Blue | 133   | the   | tide-search-listing |       |
+      | view_search_results  | Simple listing | tide-search-listing |                      |                 | 133   |       | tide-search-listing | 1     |
+      | close_filters        | Simple listing | tide-search-listing | Filters              |                 |       |       | tide-search-listing |       |
+      | paginate_next        | Simple listing | tide-search-listing | Next                 |                 | 133   |       | tide-search-listing | 2     |
+      | view_search_results  | Simple listing | tide-search-listing |                      |                 | 133   |       | tide-search-listing | 2     |
+
   @mockserver
   Example: Filters emit data for analytics
     Given the page endpoint for path "/filters" returns fixture "/search-listing/filters/page" with status 200
diff --git a/examples/nuxt-app/test/fixtures/landingpage/custom-collection/page.json b/examples/nuxt-app/test/fixtures/landingpage/custom-collection/page.json
index 6cabcce015..6ad02cf2db 100644
--- a/examples/nuxt-app/test/fixtures/landingpage/custom-collection/page.json
+++ b/examples/nuxt-app/test/fixtures/landingpage/custom-collection/page.json
@@ -93,6 +93,7 @@
       "id": "4470",
       "props": {
         "id": "4470",
+        "title": "Test custom collection",
         "searchListingConfig": {
           "resultsPerPage": 20,
           "formTheme": "default",
diff --git a/examples/nuxt-app/test/fixtures/search-listing/filters/page-simple.json b/examples/nuxt-app/test/fixtures/search-listing/filters/page-simple.json
new file mode 100644
index 0000000000..d0e9637e74
--- /dev/null
+++ b/examples/nuxt-app/test/fixtures/search-listing/filters/page-simple.json
@@ -0,0 +1,77 @@
+{
+  "title": "Simple listing",
+  "changed": "2022-11-02T12:47:29+11:00",
+  "created": "2022-11-02T12:47:29+11:00",
+  "type": "tide_search_listing",
+  "nid": "11dede11-10c0-111e1-1100-000000000330",
+  "showTopicTags": true,
+  "summary": "",
+  "config": {
+    "searchListingConfig": {
+      "resultsPerPage": 10
+    },
+    "queryConfig": {
+      "multi_match": {
+        "query": "{{query}}",
+        "fields": [
+          "title^3",
+          "field_landing_page_summary^2",
+          "body",
+          "field_paragraph_body",
+          "summary_processed"
+        ]
+      }
+    },
+    "results": {
+      "layout": {
+        "component": "TideSearchResultsList"
+      },
+      "item": {
+        "grant": {
+          "component": "TideGrantSearchResult"
+        }
+      }
+    },
+    "globalFilters": [
+      { "terms": { "type": ["grant"] } },
+      { "terms": { "field_node_site": [8888] } }
+    ],
+    "userFilters": [
+      {
+        "id": "termFilter",
+        "component": "TideSearchFilterDropdown",
+        "filter": {
+          "type": "term",
+          "value": "termFilter.keyword"
+        },
+        "aggregations": {
+          "field": "termFilter",
+          "source": "taxonomy"
+        },
+        "props": {
+          "id": "termFilter",
+          "label": "Term filter example",
+          "placeholder": "Select a colour",
+          "multiple": true,
+          "options": [
+            {
+              "id": "1",
+              "label": "Red",
+              "value": "Red"
+            },
+            {
+              "id": "2",
+              "label": "Green",
+              "value": "Green"
+            },
+            {
+              "id": "3",
+              "label": "Blue",
+              "value": "Blue"
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/examples/nuxt-app/test/fixtures/search-listing/filters/response-large.json b/examples/nuxt-app/test/fixtures/search-listing/filters/response-large.json
new file mode 100644
index 0000000000..b712335b6e
--- /dev/null
+++ b/examples/nuxt-app/test/fixtures/search-listing/filters/response-large.json
@@ -0,0 +1,983 @@
+{
+  "took": 7,
+  "timed_out": false,
+  "_shards": {
+    "total": 5,
+    "successful": 5,
+    "skipped": 0,
+    "failed": 0
+  },
+  "hits": {
+    "total": {
+      "value": 133,
+      "relation": "eq"
+    },
+    "max_score": null,
+    "hits": [
+      {
+        "_index": "a83890f7a31dea14e1ae83c6f0afacca--elasticsearch_index_production_node",
+        "_id": "entity:node/17551:en",
+        "_score": 1.0,
+        "_source": {
+          "_language": "en",
+          "node_grants": [
+            "node_access_all:0"
+          ],
+          "url": [
+            "/site-4/changing-places-funding-round"
+          ],
+          "changed": [
+            "2023-03-21T07:50:52+11:00"
+          ],
+          "created": [
+            "2021-06-29T13:10:09+10:00"
+          ],
+          "field_audience": [
+            81,
+            82,
+            83
+          ],
+          "field_audience_name": [
+            "Government",
+            "Not-for-profit groups",
+            "Business"
+          ],
+          "field_audience_uuid": [
+            "a888f885-0ce7-4eff-b664-e1c8165f2f18",
+            "4038b20b-a519-4963-9cb6-04364cbe8eba",
+            "eb8e493b-d633-4ec9-99f6-1a825e7242c8"
+          ],
+          "field_landing_page_intro_text": [
+            "The 2023 Changing Places funding is now open for applications to build additional Changing Places facilities across Victoria."
+          ],
+          "field_landing_page_summary": [
+            "The 2023 Changing Places funding is now open for applications to build additional Changing Places facilities across Victoria."
+          ],
+          "field_media_image_absolute_path": [
+            "https://content.vic.gov.au/sites/default/files/2021-06/labelled-changing-places.jpg"
+          ],
+          "field_node_dates_end_value": [
+            "2023-04-14T17:00:00+10:00"
+          ],
+          "field_node_dates_start_value": [
+            "2023-03-17T09:00:00+11:00"
+          ],
+          "field_node_on_going": [
+            false
+          ],
+          "field_node_primary_csite": [
+            4
+          ],
+          "field_node_site": [
+            527,
+            4
+          ],
+          "field_topic": [
+            12
+          ],
+          "field_topic_name": [
+            "Equality"
+          ],
+          "field_topic_path": [
+            "/topic/equality"
+          ],
+          "field_topic_uuid": [
+            "bd2d883f-9537-43a5-bf57-697142036ba9"
+          ],
+          "funding_level_from": [
+            1
+          ],
+          "funding_level_to": [
+            180000
+          ],
+          "langcode": [
+            "en"
+          ],
+          "nid": [
+            17551
+          ],
+          "status": [
+            true
+          ],
+          "title": [
+            "2023 Changing Places funding round"
+          ],
+          "type": [
+            "grant"
+          ],
+          "uid": [
+            7875
+          ],
+          "uuid": [
+            "09e27113-0159-4a06-b722-dfbea94945ca"
+          ]
+        },
+        "sort": [
+          1.0,
+          "2023 Changing Places funding round"
+        ]
+      },
+      {
+        "_index": "a83890f7a31dea14e1ae83c6f0afacca--elasticsearch_index_production_node",
+        "_id": "entity:node/25324:en",
+        "_score": 1.0,
+        "_source": {
+          "_language": "en",
+          "node_grants": [
+            "node_access_all:0"
+          ],
+          "url": [
+            "/site-4/childrens-week-grants-program"
+          ],
+          "changed": [
+            "2024-06-21T10:11:25+10:00"
+          ],
+          "created": [
+            "2022-05-30T15:41:14+10:00"
+          ],
+          "field_audience": [
+            82,
+            81
+          ],
+          "field_audience_name": [
+            "Not-for-profit groups",
+            "Government"
+          ],
+          "field_audience_uuid": [
+            "4038b20b-a519-4963-9cb6-04364cbe8eba",
+            "a888f885-0ce7-4eff-b664-e1c8165f2f18"
+          ],
+          "field_content_category": [
+            1328
+          ],
+          "field_content_category_name": [
+            "Guide/guidance"
+          ],
+          "field_landing_page_contact_name": [
+            "Children\u0027s Week team"
+          ],
+          "field_landing_page_intro_text": [
+            "Local councils or eligible not-for-profit organisations can apply for a grant of up to $1,000 to help host a Children’s Week activity."
+          ],
+          "field_landing_page_summary": [
+            "Local councils or eligible not-for-profit organisations can apply for a grant of up to $1,000 to help host a Children’s Week activity."
+          ],
+          "field_node_dates_end_value": [
+            "2024-06-16T00:00:00+10:00"
+          ],
+          "field_node_dates_start_value": [
+            "2024-05-01T00:00:00+10:00"
+          ],
+          "field_node_on_going": [
+            false
+          ],
+          "field_node_primary_csite": [
+            4
+          ],
+          "field_node_site": [
+            4,
+            840
+          ],
+          "field_topic": [
+            10
+          ],
+          "field_topic_name": [
+            "Education"
+          ],
+          "field_topic_path": [
+            "/topic/education"
+          ],
+          "field_topic_uuid": [
+            "3764c1dc-9475-43cc-a483-96bec239c4f7"
+          ],
+          "funding_level_from": [
+            0
+          ],
+          "funding_level_to": [
+            1000
+          ],
+          "langcode": [
+            "en"
+          ],
+          "nid": [
+            25324
+          ],
+          "status": [
+            true
+          ],
+          "title": [
+            "2024 Children’s Week Grants Program"
+          ],
+          "type": [
+            "grant"
+          ],
+          "uid": [
+            9790
+          ],
+          "uuid": [
+            "bc2234f2-9609-4fb9-871f-d4084b5a2415"
+          ]
+        },
+        "sort": [
+          1.0,
+          "2024 Children’s Week Grants Program"
+        ]
+      },
+      {
+        "_index": "a83890f7a31dea14e1ae83c6f0afacca--elasticsearch_index_production_node",
+        "_id": "entity:node/38385:en",
+        "_score": 1.0,
+        "_source": {
+          "_language": "en",
+          "node_grants": [
+            "node_access_all:0"
+          ],
+          "url": [
+            "/site-4/2024-victorian-landcare-grants"
+          ],
+          "changed": [
+            "2024-03-20T12:57:48+11:00"
+          ],
+          "created": [
+            "2024-03-20T11:41:03+11:00"
+          ],
+          "field_audience": [
+            82
+          ],
+          "field_audience_name": [
+            "Not-for-profit groups"
+          ],
+          "field_audience_uuid": [
+            "4038b20b-a519-4963-9cb6-04364cbe8eba"
+          ],
+          "field_content_category": [
+            1340
+          ],
+          "field_content_category_name": [
+            "Grant"
+          ],
+          "field_landing_page_intro_text": [
+            "Victorian Landcare Grants support Landcare and environmental volunteer groups and networks with on-ground works, education and capacity building projects that protect and restore our land and natural environment."
+          ],
+          "field_landing_page_summary": [
+            "Victorian Landcare Grants support Landcare and environmental volunteer groups and networks with on-ground works, education and capacity building projects that protect and restore our land and natural environment."
+          ],
+          "field_node_dates_end_value": [
+            "2024-04-30T10:00:00+10:00"
+          ],
+          "field_node_dates_start_value": [
+            "2024-03-20T11:00:00+11:00"
+          ],
+          "field_node_link": [
+            "https://www.environment.vic.gov.au/grants/victorian-landcare-grants"
+          ],
+          "field_node_on_going": [
+            false
+          ],
+          "field_node_primary_csite": [
+            4
+          ],
+          "field_node_site": [
+            4
+          ],
+          "field_topic": [
+            11
+          ],
+          "field_topic_name": [
+            "Environment, water \u0026 energy"
+          ],
+          "field_topic_path": [
+            "/topic/environment-water-energy"
+          ],
+          "field_topic_uuid": [
+            "56387cfe-be0a-4f5c-b3ca-f980a154699c"
+          ],
+          "funding_level_from": [
+            500
+          ],
+          "funding_level_to": [
+            20000
+          ],
+          "langcode": [
+            "en"
+          ],
+          "nid": [
+            38385
+          ],
+          "status": [
+            true
+          ],
+          "title": [
+            "2024 Victorian Landcare Grants"
+          ],
+          "type": [
+            "grant"
+          ],
+          "uid": [
+            6087
+          ],
+          "uuid": [
+            "49391301-9889-4214-b721-188254284a56"
+          ]
+        },
+        "sort": [
+          1.0,
+          "2024 Victorian Landcare Grants"
+        ]
+      },
+      {
+        "_index": "a83890f7a31dea14e1ae83c6f0afacca--elasticsearch_index_production_node",
+        "_id": "entity:node/25150:en",
+        "_score": 1.0,
+        "_source": {
+          "_language": "en",
+          "node_grants": [
+            "node_access_all:0"
+          ],
+          "url": [
+            "/site-4/2024-victorian-manufacturing-hall-fame-awards"
+          ],
+          "changed": [
+            "2024-07-24T04:00:04+10:00"
+          ],
+          "created": [
+            "2022-05-12T04:00:24+10:00"
+          ],
+          "field_audience": [
+            83
+          ],
+          "field_audience_name": [
+            "Business"
+          ],
+          "field_audience_uuid": [
+            "eb8e493b-d633-4ec9-99f6-1a825e7242c8"
+          ],
+          "field_landing_page_summary": [
+            "The Victorian Manufacturing Hall of Fame recognises outstanding businesses and individuals in the manufacturing industry."
+          ],
+          "field_node_dates_end_value": [
+            "2024-10-03T22:00:00+10:00"
+          ],
+          "field_node_dates_start_value": [
+            "2024-04-19T22:00:00+10:00"
+          ],
+          "field_node_link": [
+            "https://business.vic.gov.au/grants-and-programs/victorian-manufacturing-hall-of-fame"
+          ],
+          "field_node_on_going": [
+            false
+          ],
+          "field_node_primary_csite": [
+            4
+          ],
+          "field_node_site": [
+            4
+          ],
+          "langcode": [
+            "en"
+          ],
+          "nid": [
+            25150
+          ],
+          "status": [
+            true
+          ],
+          "title": [
+            "2024 Victorian Manufacturing Hall of Fame Awards"
+          ],
+          "type": [
+            "grant"
+          ],
+          "uid": [
+            0
+          ],
+          "uuid": [
+            "8cb2882c-8ae5-432c-9eda-31c252d5684b"
+          ]
+        },
+        "sort": [
+          1.0,
+          "2024 Victorian Manufacturing Hall of Fame Awards"
+        ]
+      },
+      {
+        "_index": "a83890f7a31dea14e1ae83c6f0afacca--elasticsearch_index_production_node",
+        "_id": "entity:node/37844:en",
+        "_score": 1.0,
+        "_source": {
+          "_language": "en",
+          "node_grants": [
+            "node_access_all:0"
+          ],
+          "url": [
+            "/site-4/2024-25-community-road-safety-grants-program"
+          ],
+          "changed": [
+            "2024-02-06T16:34:26+11:00"
+          ],
+          "created": [
+            "2024-02-06T15:12:12+11:00"
+          ],
+          "field_audience": [
+            81,
+            82
+          ],
+          "field_audience_name": [
+            "Government",
+            "Not-for-profit groups"
+          ],
+          "field_audience_uuid": [
+            "a888f885-0ce7-4eff-b664-e1c8165f2f18",
+            "4038b20b-a519-4963-9cb6-04364cbe8eba"
+          ],
+          "field_content_category": [
+            1340
+          ],
+          "field_content_category_name": [
+            "Grant"
+          ],
+          "field_landing_page_intro_text": [
+            "The Community Road Safety Grants Program provides up to $1.5 million in funding to empower local communities to prevent serious injuries and reduce the number of lives lost on Victoria’s roads."
+          ],
+          "field_landing_page_summary": [
+            "The Community Road Safety Grants Program provides up to $1.5 million in funding to empower local communities to prevent serious injuries and reduce the number of lives lost on Victoria’s roads."
+          ],
+          "field_node_dates_end_value": [
+            "2024-03-06T11:00:00+11:00"
+          ],
+          "field_node_dates_start_value": [
+            "2024-02-07T11:00:00+11:00"
+          ],
+          "field_node_link": [
+            "https://www.vicroads.vic.gov.au/safety-and-road-rules/road-safety-programs/vicroads-community-road-safety-grants-program/standard-grants-program"
+          ],
+          "field_node_on_going": [
+            false
+          ],
+          "field_node_primary_csite": [
+            4
+          ],
+          "field_node_site": [
+            4
+          ],
+          "field_topic": [
+            3
+          ],
+          "field_topic_name": [
+            "Communities"
+          ],
+          "field_topic_path": [
+            "/topic/communities"
+          ],
+          "field_topic_uuid": [
+            "99d1629f-0227-4e91-bd83-e5998636074a"
+          ],
+          "funding_level_from": [
+            1
+          ],
+          "funding_level_to": [
+            1500000
+          ],
+          "langcode": [
+            "en"
+          ],
+          "nid": [
+            37844
+          ],
+          "status": [
+            true
+          ],
+          "title": [
+            "2024-25 Community Road Safety Grants Program"
+          ],
+          "type": [
+            "grant"
+          ],
+          "uid": [
+            6087
+          ],
+          "uuid": [
+            "358bccba-b6d4-4be3-96d5-6cb17ff06c31"
+          ]
+        },
+        "sort": [
+          1.0,
+          "2024-25 Community Road Safety Grants Program"
+        ]
+      },
+      {
+        "_index": "a83890f7a31dea14e1ae83c6f0afacca--elasticsearch_index_production_node",
+        "_id": "entity:node/40428:en",
+        "_score": 1.0,
+        "_source": {
+          "_language": "en",
+          "node_grants": [
+            "node_access_all:0"
+          ],
+          "url": [
+            "/site-4/aboriginal-business-growth-program-grants-between-10k-and-100k"
+          ],
+          "changed": [
+            "2024-07-23T04:00:04+10:00"
+          ],
+          "created": [
+            "2024-07-23T04:00:04+10:00"
+          ],
+          "field_audience": [
+            83
+          ],
+          "field_audience_name": [
+            "Business"
+          ],
+          "field_audience_uuid": [
+            "eb8e493b-d633-4ec9-99f6-1a825e7242c8"
+          ],
+          "field_content_category": [
+            1340
+          ],
+          "field_content_category_name": [
+            "Grant"
+          ],
+          "field_landing_page_summary": [
+            "Grants from $10,000 to $100,000 (excluding GST) are available to help eligible Aboriginal businesses in Victoria to grow and develop."
+          ],
+          "field_node_dates_end_value": [
+            "2024-09-06T22:00:00+10:00"
+          ],
+          "field_node_dates_start_value": [
+            "2024-07-16T22:00:00+10:00"
+          ],
+          "field_node_link": [
+            "https://business.vic.gov.au/grants-and-programs/victorian-aboriginal-business-investment-program/aboriginal-business-growth-program-grants-between-10K-and-100K"
+          ],
+          "field_node_on_going": [
+            false
+          ],
+          "field_node_primary_csite": [
+            4
+          ],
+          "field_node_site": [
+            4
+          ],
+          "langcode": [
+            "en"
+          ],
+          "nid": [
+            40428
+          ],
+          "status": [
+            true
+          ],
+          "title": [
+            "Aboriginal Business Growth Program (Grants between $10K and $100K)"
+          ],
+          "type": [
+            "grant"
+          ],
+          "uid": [
+            0
+          ],
+          "uuid": [
+            "f5445072-5fcf-44f8-ab5c-14d3bce55cdb"
+          ]
+        },
+        "sort": [
+          1.0,
+          "Aboriginal Business Growth Program (Grants between $10K and $100K)"
+        ]
+      },
+      {
+        "_index": "a83890f7a31dea14e1ae83c6f0afacca--elasticsearch_index_production_node",
+        "_id": "entity:node/40430:en",
+        "_score": 1.0,
+        "_source": {
+          "_language": "en",
+          "node_grants": [
+            "node_access_all:0"
+          ],
+          "url": [
+            "/site-4/aboriginal-business-support-program-grants-between-5k-and-10k"
+          ],
+          "changed": [
+            "2024-07-23T04:00:04+10:00"
+          ],
+          "created": [
+            "2024-07-23T04:00:04+10:00"
+          ],
+          "field_audience": [
+            83
+          ],
+          "field_audience_name": [
+            "Business"
+          ],
+          "field_audience_uuid": [
+            "eb8e493b-d633-4ec9-99f6-1a825e7242c8"
+          ],
+          "field_content_category": [
+            1340
+          ],
+          "field_content_category_name": [
+            "Grant"
+          ],
+          "field_landing_page_summary": [
+            "Grants from $5,000 to $10,000 (excluding GST) are available to support eligible Aboriginal businesses in Victoria."
+          ],
+          "field_node_dates_end_value": [
+            "2024-09-06T22:00:00+10:00"
+          ],
+          "field_node_dates_start_value": [
+            "2024-07-16T22:00:00+10:00"
+          ],
+          "field_node_link": [
+            "https://business.vic.gov.au/grants-and-programs/victorian-aboriginal-business-investment-program/aboriginal-business-support-program-grants-between-5K-and-10K"
+          ],
+          "field_node_on_going": [
+            false
+          ],
+          "field_node_primary_csite": [
+            4
+          ],
+          "field_node_site": [
+            4
+          ],
+          "langcode": [
+            "en"
+          ],
+          "nid": [
+            40430
+          ],
+          "status": [
+            true
+          ],
+          "title": [
+            "Aboriginal Business Support Program (Grants between $5K and $10K)"
+          ],
+          "type": [
+            "grant"
+          ],
+          "uid": [
+            0
+          ],
+          "uuid": [
+            "7cdfc71b-d622-4e99-83ed-ff2630b0becc"
+          ]
+        },
+        "sort": [
+          1.0,
+          "Aboriginal Business Support Program (Grants between $5K and $10K)"
+        ]
+      },
+      {
+        "_index": "a83890f7a31dea14e1ae83c6f0afacca--elasticsearch_index_production_node",
+        "_id": "entity:node/2180:en",
+        "_score": 1.0,
+        "_source": {
+          "_language": "en",
+          "node_grants": [
+            "node_access_all:0"
+          ],
+          "url": [
+            "/site-4/aboriginal-community-infrastructure-program",
+            "/site-224/aboriginal-community-infrastructure-program"
+          ],
+          "changed": [
+            "2024-04-22T16:16:48+10:00"
+          ],
+          "created": [
+            "2019-08-06T10:28:22+10:00"
+          ],
+          "field_audience": [
+            82
+          ],
+          "field_audience_name": [
+            "Not-for-profit groups"
+          ],
+          "field_audience_uuid": [
+            "4038b20b-a519-4963-9cb6-04364cbe8eba"
+          ],
+          "field_content_category": [
+            1340
+          ],
+          "field_content_category_name": [
+            "Grant"
+          ],
+          "field_landing_page_intro_text": [
+            "Funding up to $1.6 million is available for Aboriginal organisations to build new community infrastructure or repair, refurbish or expand existing community infrastructure."
+          ],
+          "field_landing_page_summary": [
+            "Funding up to $1.6 million is available for Aboriginal organisations to build new community infrastructure or repair, refurbish or expand existing community infrastructure."
+          ],
+          "field_node_dates_end_value": [
+            "2024-04-22T14:00:00+10:00"
+          ],
+          "field_node_dates_start_value": [
+            "2024-02-13T14:41:33+11:00"
+          ],
+          "field_node_on_going": [
+            false
+          ],
+          "field_node_primary_csite": [
+            224
+          ],
+          "field_node_site": [
+            4,
+            224
+          ],
+          "field_topic": [
+            3
+          ],
+          "field_topic_name": [
+            "Communities"
+          ],
+          "field_topic_path": [
+            "/topic/communities"
+          ],
+          "field_topic_uuid": [
+            "99d1629f-0227-4e91-bd83-e5998636074a"
+          ],
+          "funding_level_from": [
+            50000
+          ],
+          "funding_level_to": [
+            1600000
+          ],
+          "langcode": [
+            "en"
+          ],
+          "nid": [
+            2180
+          ],
+          "status": [
+            true
+          ],
+          "title": [
+            "Aboriginal Community Infrastructure Program"
+          ],
+          "type": [
+            "grant"
+          ],
+          "uid": [
+            59
+          ],
+          "uuid": [
+            "24413e6f-082d-4ddc-a099-1033dd002638"
+          ]
+        },
+        "sort": [
+          1.0,
+          "Aboriginal Community Infrastructure Program"
+        ]
+      },
+      {
+        "_index": "a83890f7a31dea14e1ae83c6f0afacca--elasticsearch_index_production_node",
+        "_id": "entity:node/18471:en",
+        "_score": 1.0,
+        "_source": {
+          "_language": "en",
+          "node_grants": [
+            "node_access_all:0"
+          ],
+          "url": [
+            "/site-4/aboriginal-community-initiatives-fund-funding-guidelines"
+          ],
+          "changed": [
+            "2025-01-21T13:53:26+11:00"
+          ],
+          "created": [
+            "2021-09-02T12:21:17+10:00"
+          ],
+          "field_audience": [
+            82
+          ],
+          "field_audience_name": [
+            "Not-for-profit groups"
+          ],
+          "field_audience_uuid": [
+            "4038b20b-a519-4963-9cb6-04364cbe8eba"
+          ],
+          "field_content_category": [
+            1340
+          ],
+          "field_content_category_name": [
+            "Grant"
+          ],
+          "field_landing_page_intro_text": [
+            "Projects funded through the Aboriginal Community Initiatives Fund support and address priorities that are identified by the 11 Dhelk Dja Action Groups to address family violence at a local level."
+          ],
+          "field_landing_page_summary": [
+            "Projects funded through the Aboriginal Community Initiatives Fund support and address priorities that are identified by the 11 Dhelk Dja Action Groups to address family violence at a local level."
+          ],
+          "field_node_dates_end_value": [
+            "2025-02-14T17:00:00+11:00"
+          ],
+          "field_node_dates_start_value": [
+            "2025-01-20T09:00:00+11:00"
+          ],
+          "field_node_on_going": [
+            false
+          ],
+          "field_node_primary_csite": [
+            4
+          ],
+          "field_node_site": [
+            4,
+            122
+          ],
+          "field_tags": [
+            19,
+            32
+          ],
+          "field_tags_name": [
+            "Aboriginal Victorians",
+            "Not-for-profit groups"
+          ],
+          "field_tags_path": [
+            "/tags/aboriginal-victorians",
+            "/tags/not-profit-groups"
+          ],
+          "field_tags_uuid": [
+            "ab3d4289-d60b-475d-a76f-a4290372ae77",
+            "ac13ac18-41e7-4cca-9e23-17cfdb65f420"
+          ],
+          "field_topic": [
+            13
+          ],
+          "field_topic_name": [
+            "Health \u0026 social support"
+          ],
+          "field_topic_path": [
+            "/topic/health-social-support"
+          ],
+          "field_topic_uuid": [
+            "a5145be6-8c91-46f7-8f0e-6834b7a7348b"
+          ],
+          "funding_level_from": [
+            0
+          ],
+          "funding_level_to": [
+            100000
+          ],
+          "langcode": [
+            "en"
+          ],
+          "nid": [
+            18471
+          ],
+          "status": [
+            true
+          ],
+          "title": [
+            "Aboriginal Community Initiatives Fund: 2024–2025 funding round"
+          ],
+          "type": [
+            "grant"
+          ],
+          "uid": [
+            7948
+          ],
+          "uuid": [
+            "f95027f6-5659-4b44-b1d4-4d710960b47d"
+          ]
+        },
+        "sort": [
+          1.0,
+          "Aboriginal Community Initiatives Fund: 2024–2025 funding round"
+        ]
+      },
+      {
+        "_index": "a83890f7a31dea14e1ae83c6f0afacca--elasticsearch_index_production_node",
+        "_id": "entity:node/16232:en",
+        "_score": 1.0,
+        "_source": {
+          "_language": "en",
+          "node_grants": [
+            "node_access_all:0"
+          ],
+          "url": [
+            "/site-4/aboriginal-community-mitigation-and-crisis-management-grants"
+          ],
+          "changed": [
+            "2022-10-17T09:03:00+11:00"
+          ],
+          "created": [
+            "2021-04-16T16:35:09+10:00"
+          ],
+          "field_audience": [
+            82
+          ],
+          "field_audience_name": [
+            "Not-for-profit groups"
+          ],
+          "field_audience_uuid": [
+            "4038b20b-a519-4963-9cb6-04364cbe8eba"
+          ],
+          "field_landing_page_contact_name": [
+            "Grant team"
+          ],
+          "field_landing_page_intro_text": [
+            "To address unmet needs in strengthening Aboriginal communities’ resilience against natural disasters."
+          ],
+          "field_landing_page_summary": [
+            "This grant program seeks to address unmet needs in strengthening Aboriginal communities’ resilience against natural disasters."
+          ],
+          "field_media_image_absolute_path": [
+            "https://content.vic.gov.au/sites/default/files/2020-11/Keith%20Gunnai%20Kurnai%20Bataluk%202019.jpg"
+          ],
+          "field_node_dates_end_value": [
+            "2021-05-16T23:59:00+10:00"
+          ],
+          "field_node_dates_start_value": [
+            "2021-04-19T09:00:00+10:00"
+          ],
+          "field_node_on_going": [
+            false
+          ],
+          "field_node_primary_csite": [
+            4
+          ],
+          "field_node_site": [
+            293,
+            4
+          ],
+          "field_topic": [
+            3
+          ],
+          "field_topic_name": [
+            "Communities"
+          ],
+          "field_topic_path": [
+            "/topic/communities"
+          ],
+          "field_topic_uuid": [
+            "99d1629f-0227-4e91-bd83-e5998636074a"
+          ],
+          "langcode": [
+            "en"
+          ],
+          "nid": [
+            16232
+          ],
+          "status": [
+            true
+          ],
+          "title": [
+            "Aboriginal Community Mitigation and Crisis Management Grants"
+          ],
+          "type": [
+            "grant"
+          ],
+          "uid": [
+            7796
+          ],
+          "uuid": [
+            "f73395ac-6d93-490d-aad3-adbfb5c6d90b"
+          ]
+        },
+        "sort": [
+          1.0,
+          "Aboriginal Community Mitigation and Crisis Management Grants"
+        ]
+      }
+    ]
+  }
+}
diff --git a/packages/ripple-tide-search/components/global/TideCustomCollection.vue b/packages/ripple-tide-search/components/global/TideCustomCollection.vue
index 14c8541d0f..7f579d7d5e 100644
--- a/packages/ripple-tide-search/components/global/TideCustomCollection.vue
+++ b/packages/ripple-tide-search/components/global/TideCustomCollection.vue
@@ -3,7 +3,8 @@ import {
   computed,
   getActiveFiltersTally,
   getActiveFilterURL,
-  ref
+  ref,
+  watch
 } from '#imports'
 import { submitForm } from '@formkit/vue'
 import { useBreakpoints, useDebounceFn } from '@vueuse/core'
@@ -244,7 +245,9 @@ const baseEvent = () => ({
   contextId: props.id,
   name: props.title,
   index: page.value,
-  label: searchTerm.value.q,
+  label: props.locationQueryConfig?.component
+    ? locationOrGeolocation.value?.name
+    : searchTerm.value.q,
   value: totalResults.value,
   options: getActiveFilterURL(filterForm.value),
   section: 'custom-collection'
@@ -554,6 +557,22 @@ const locationOrGeolocation = computed(() => {
     : locationQuery.value
 })
 
+watch(
+  () => isBusy.value,
+  (loading, prevLoading) => {
+    if (!loading && prevLoading) {
+      emitRplEvent(
+        'results',
+        {
+          ...baseEvent(),
+          action: 'view'
+        },
+        { global: true }
+      )
+    }
+  }
+)
+
 onMounted(() => {
   // If filters are shown on load for desktop, we still need to hide them on mobile
   if (initialFiltersExpanded && isMobile.value) {

From 82fc682581b881e4d9bf87b5f17a7c13b857e971 Mon Sep 17 00:00:00 2001
From: David Featherston <david@lambry.com>
Date: Fri, 31 Jan 2025 16:58:52 +1100
Subject: [PATCH 06/11] feat(@dpc-sdp/ripple-ui-core): allow current page class
 and dir to be set in breadcrumbs

---
 .../test/features/landingpage/languages.feature        |  2 ++
 .../test/fixtures/landingpage/languages-ar.json        |  2 +-
 .../test/fixtures/landingpage/languages-ko.json        |  2 +-
 packages/nuxt-ripple/components/TideBreadcrumbs.vue    |  6 +++++-
 .../src/components/breadcrumbs/RplBreadcrumbs.vue      | 10 +++++++++-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/examples/nuxt-app/test/features/landingpage/languages.feature b/examples/nuxt-app/test/features/landingpage/languages.feature
index 9ff1308af2..9a3c8ef44d 100644
--- a/examples/nuxt-app/test/features/landingpage/languages.feature
+++ b/examples/nuxt-app/test/features/landingpage/languages.feature
@@ -23,6 +23,7 @@ Feature: Languages
     When I visit the page "/arabic-page"
     Then the section ".rpl-header" should be display "rtl" in "ar" with the font "Noto Kufi Arabic"
     And the section "#rpl-main" should be display "rtl" in "ar" with the font "Noto Kufi Arabic"
+    And the section ".rpl-breadcrumbs__item:last-child" should be display "rtl" in "ar" with the font "Noto Kufi Arabic"
     And the html language should be "ar"
 
   @mockserver
@@ -31,4 +32,5 @@ Feature: Languages
     When I visit the page "/korean-page"
     Then the section ".rpl-header" should be display "ltr" in "ko" with the font "Noto Sans KR"
     And the section "#rpl-main" should be display "ltr" in "ko" with the font "Noto Sans KR"
+    And the section ".rpl-breadcrumbs__item:last-child" should be display "ltr" in "ko" with the font "Noto Sans KR"
     And the html language should be "ko"
diff --git a/examples/nuxt-app/test/fixtures/landingpage/languages-ar.json b/examples/nuxt-app/test/fixtures/landingpage/languages-ar.json
index 150f0b8f3b..fbd12c3ce9 100644
--- a/examples/nuxt-app/test/fixtures/landingpage/languages-ar.json
+++ b/examples/nuxt-app/test/fixtures/landingpage/languages-ar.json
@@ -1,5 +1,5 @@
 {
-  "title": "Demo Landing Page",
+  "title": "مزايا رياض الأطفال",
   "changed": "2022-11-02T12:47:29+11:00",
   "created": "2022-11-02T12:47:29+11:00",
   "type": "landing_page",
diff --git a/examples/nuxt-app/test/fixtures/landingpage/languages-ko.json b/examples/nuxt-app/test/fixtures/landingpage/languages-ko.json
index 93c19b78cd..c2ef4bcf71 100644
--- a/examples/nuxt-app/test/fixtures/landingpage/languages-ko.json
+++ b/examples/nuxt-app/test/fixtures/landingpage/languages-ko.json
@@ -1,5 +1,5 @@
 {
-  "title": "Demo Landing Page",
+  "title": "지역 사회 서비스, 계약업체 청소 및 경비 산업의 빅토리아주",
   "changed": "2022-11-02T12:47:29+11:00",
   "created": "2022-11-02T12:47:29+11:00",
   "type": "landing_page",
diff --git a/packages/nuxt-ripple/components/TideBreadcrumbs.vue b/packages/nuxt-ripple/components/TideBreadcrumbs.vue
index 29425be05a..1503296fb1 100644
--- a/packages/nuxt-ripple/components/TideBreadcrumbs.vue
+++ b/packages/nuxt-ripple/components/TideBreadcrumbs.vue
@@ -4,11 +4,13 @@
     :items="breadcrumbs"
     :besideQuickExit="besideQuickExit"
     data-cy="breadcrumbs"
+    :current-class="language"
+    :current-dir="direction"
   />
 </template>
 
 <script setup lang="ts">
-import { computed, toRaw, unref } from 'vue'
+import { computed, inject, toRaw, unref } from 'vue'
 import { getBreadcrumbs } from '#imports'
 
 interface IRplBreadcrumbsItem {
@@ -32,6 +34,8 @@ const props = withDefaults(defineProps<Props>(), {
   besideQuickExit: false
 })
 
+const { direction, language } = inject('language')
+
 const breadcrumbs = computed(() => {
   return props.items.length > 0
     ? props.items
diff --git a/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue b/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue
index b2ade0ed53..6f4edae165 100644
--- a/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue
+++ b/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue
@@ -17,13 +17,17 @@ interface Props {
   besideQuickExit?: boolean
   displayBeforeCollapse?: number
   collapse?: boolean
+  currentClass?: string
+  currentDir?: string
 }
 
 const props = withDefaults(defineProps<Props>(), {
   items: () => [],
   besideQuickExit: false,
   displayBeforeCollapse: 3,
-  collapse: false
+  collapse: false,
+  currentClass: undefined,
+  currentDir: undefined
 })
 
 const emit = defineEmits<{
@@ -105,8 +109,12 @@ const toggleCollapsed = () => {
                 !firstItem(index) &&
                 !secondLastItem(index) &&
                 collapseInnerLinks
+            },
+            {
+              [currentClass]: lastItem(index) && currentClass
             }
           ]"
+          :dir="lastItem(index) ? currentDir : undefined"
         >
           <RplTextLink
             v-if="!lastItem(index) || collapseInnerLinks"

From 120997194a797aece6a420c9d77dc2bc005e9010 Mon Sep 17 00:00:00 2001
From: David Featherston <david@lambry.com>
Date: Mon, 3 Feb 2025 08:51:03 +1100
Subject: [PATCH 07/11] feat(@dpc-sdp/ripple-ui-core): make related links
 header a h3 and share links a list

---
 .../related-links/RplRelatedLinks.vue         |  4 +-
 .../social-share/RplSocialShare.css           |  2 +-
 .../social-share/RplSocialShare.vue           | 37 +++++++++++--------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/packages/ripple-ui-core/src/components/related-links/RplRelatedLinks.vue b/packages/ripple-ui-core/src/components/related-links/RplRelatedLinks.vue
index 35c269f74c..fc48d6b064 100644
--- a/packages/ripple-ui-core/src/components/related-links/RplRelatedLinks.vue
+++ b/packages/ripple-ui-core/src/components/related-links/RplRelatedLinks.vue
@@ -36,9 +36,9 @@ const handleClick = (event) => {
 
 <template>
   <div class="rpl-related-links">
-    <div class="rpl-related-links__heading rpl-type-label-large">
+    <h3 class="rpl-related-links__heading rpl-type-label-large">
       {{ title }}
-    </div>
+    </h3>
     <RplList
       :items="items"
       container-class="rpl-related-links__list"
diff --git a/packages/ripple-ui-core/src/components/social-share/RplSocialShare.css b/packages/ripple-ui-core/src/components/social-share/RplSocialShare.css
index 19d619d48d..e4398398ee 100644
--- a/packages/ripple-ui-core/src/components/social-share/RplSocialShare.css
+++ b/packages/ripple-ui-core/src/components/social-share/RplSocialShare.css
@@ -6,6 +6,7 @@
   display: flex;
   align-items: flex-start;
   flex-direction: column;
+  gap: var(--rpl-sp-2);
   margin-top: 0;
   margin-bottom: 0;
   padding-left: 0;
@@ -19,7 +20,6 @@
 
 .rpl-social-share-link {
   display: inline-block;
-  margin: 0 0 var(--rpl-sp-2);
   color: var(--rpl-clr-type-default);
 
   &:active {
diff --git a/packages/ripple-ui-core/src/components/social-share/RplSocialShare.vue b/packages/ripple-ui-core/src/components/social-share/RplSocialShare.vue
index 970de18627..cdb75bdcaf 100644
--- a/packages/ripple-ui-core/src/components/social-share/RplSocialShare.vue
+++ b/packages/ripple-ui-core/src/components/social-share/RplSocialShare.vue
@@ -30,24 +30,29 @@ const hasEmail = computed(() => props.email?.subject && props.email?.body)
     <h3 v-if="title" class="rpl-social-share__title rpl-type-label-large">
       {{ title }}
     </h3>
-    <div class="rpl-social-share__items">
-      <RplSocialShareLink
+    <ul class="rpl-social-share__items">
+      <li
         v-for="network in validNetworks"
         :key="network.toLowerCase()"
-        :network="network"
-        :title="pagetitle"
-        :label="title"
-        :url="url"
-      />
-      <RplSocialShareEmail
-        v-if="hasEmail"
-        :title="pagetitle"
-        :subject="email.subject"
-        :body="email.body"
-        :label="title"
-        :url="url"
-      />
-    </div>
+        class="rpl-social-share__item"
+      >
+        <RplSocialShareLink
+          :network="network"
+          :title="pagetitle"
+          :label="title"
+          :url="url"
+        />
+      </li>
+      <li v-if="hasEmail" class="rpl-social-share__item">
+        <RplSocialShareEmail
+          :title="pagetitle"
+          :subject="email.subject"
+          :body="email.body"
+          :label="title"
+          :url="url"
+        />
+      </li>
+    </ul>
   </div>
 </template>
 

From d2e29c88dc89c128c39e643ed06910c63f20f546 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.smith@dgs.vic.gov.au>
Date: Mon, 3 Feb 2025 16:30:10 +1100
Subject: [PATCH 08/11] fix: :lipstick: improve contrast

---
 packages/ripple-ui-core/src/styles/components/_blockquote.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ripple-ui-core/src/styles/components/_blockquote.css b/packages/ripple-ui-core/src/styles/components/_blockquote.css
index 5424f2e0a3..27a4201b30 100644
--- a/packages/ripple-ui-core/src/styles/components/_blockquote.css
+++ b/packages/ripple-ui-core/src/styles/components/_blockquote.css
@@ -20,11 +20,11 @@
 
       &::before {
         content: '"';
-        content: '"' / "";
+        content: '"' / '';
         font-style: italic;
         font-size: var(--local-icon-size);
         font-weight: var(--rpl-type-weight-bold);
-        color: var(--rpl-clr-primary);
+        color: var(--rpl-clr-link);
         position: absolute;
         top: var(--rpl-sp-2);
         right: calc(100% + var(--rpl-sp-4));

From 219fe41011384482c400d21d5a923543925a12fa Mon Sep 17 00:00:00 2001
From: David Featherston <david@lambry.com>
Date: Tue, 4 Feb 2025 15:42:30 +1100
Subject: [PATCH 09/11] feat(@dpc-sdp/ripple-ui-core): add contact us slot,
 allow multiple hero logos

---
 .../test/features/landingpage/home.feature    |  1 +
 .../components/TideSidebarRelatedLinks.vue    |  2 +-
 .../content-types/landing-page.ts             |  4 ++
 .../components/contact-us/RplContactUs.css    |  4 ++
 .../contact-us/RplContactUs.stories.mdx       | 41 ++++++++++++++++++-
 .../components/contact-us/RplContactUs.vue    |  9 +++-
 .../src/components/header/RplHeader.css       | 16 +++++++-
 .../header/RplHeroHeader.stories.mdx          | 26 ++++++++++++
 .../src/components/header/RplHeroHeader.vue   | 16 +++++++-
 9 files changed, 112 insertions(+), 7 deletions(-)

diff --git a/examples/nuxt-app/test/features/landingpage/home.feature b/examples/nuxt-app/test/features/landingpage/home.feature
index 1c5564802d..597735bb8e 100644
--- a/examples/nuxt-app/test/features/landingpage/home.feature
+++ b/examples/nuxt-app/test/features/landingpage/home.feature
@@ -15,6 +15,7 @@ Feature: Home page
   @mockserver
   Scenario: Hero header
     Then the hero title should be "Test landing page title"
+    Then the hero logo should be "/placeholders/logo.png"
     Then the hero intro text should be "Test landing page title introduction text"
     And the hero should display the following items
       | text               | url                                               |
diff --git a/packages/nuxt-ripple/components/TideSidebarRelatedLinks.vue b/packages/nuxt-ripple/components/TideSidebarRelatedLinks.vue
index 6884682acf..073fdffe22 100644
--- a/packages/nuxt-ripple/components/TideSidebarRelatedLinks.vue
+++ b/packages/nuxt-ripple/components/TideSidebarRelatedLinks.vue
@@ -9,7 +9,7 @@
 
 <script setup lang="ts">
 import { computed } from '#imports'
-import { TideLink } from '../../../../types'
+import { TideLink } from '../types'
 
 interface Props {
   title: string
diff --git a/packages/ripple-test-utils/step_definitions/content-types/landing-page.ts b/packages/ripple-test-utils/step_definitions/content-types/landing-page.ts
index e272b4b389..a83e7e44e9 100644
--- a/packages/ripple-test-utils/step_definitions/content-types/landing-page.ts
+++ b/packages/ripple-test-utils/step_definitions/content-types/landing-page.ts
@@ -27,6 +27,10 @@ Then('the hero intro text should be {string}', (introText: string) => {
   cy.get('[data-cy="hero-summary"]').should('have.text', introText)
 })
 
+Then('the hero logo should be {string}', (image: string) => {
+  cy.get(`.rpl-header__logo`).should('have.attr', 'src').and('contain', image)
+})
+
 Then('the hero should display the following items', (dataTable: DataTable) => {
   const table = dataTable.hashes()
 
diff --git a/packages/ripple-ui-core/src/components/contact-us/RplContactUs.css b/packages/ripple-ui-core/src/components/contact-us/RplContactUs.css
index 77c4f5409f..5cbc1aa71b 100644
--- a/packages/ripple-ui-core/src/components/contact-us/RplContactUs.css
+++ b/packages/ripple-ui-core/src/components/contact-us/RplContactUs.css
@@ -3,6 +3,10 @@
     margin-bottom: var(--rpl-sp-4);
   }
 
+  &__content {
+    margin-bottom: var(--rpl-sp-4);
+  }
+
   &__details {
     border-left-style: solid;
     border-left-width: var(--rpl-border-3);
diff --git a/packages/ripple-ui-core/src/components/contact-us/RplContactUs.stories.mdx b/packages/ripple-ui-core/src/components/contact-us/RplContactUs.stories.mdx
index 38e37dbc29..25eb113cf1 100644
--- a/packages/ripple-ui-core/src/components/contact-us/RplContactUs.stories.mdx
+++ b/packages/ripple-ui-core/src/components/contact-us/RplContactUs.stories.mdx
@@ -12,7 +12,9 @@ export const SingleTemplate = (args) => ({
   setup() {
     return { args }
   },
-  template: '<RplContactUs v-bind="args" />'
+  template: `
+    <RplContactUs v-bind="args"><span v-if="args.content">${args.content}</span></RplContactUs>
+  `
 })
 
 <Meta title='Core/Containers/Contact us' component={RplContactUs} />
@@ -88,3 +90,40 @@ export const SingleTemplate = (args) => ({
     {SingleTemplate.bind()}
   </Story>
 </Canvas>
+
+# With slot content
+
+<ArgsTable of={RplContactUs} />
+
+<Canvas>
+  <Story
+    name='Contact us/With Slot'
+    play={a11yStoryCheck}
+    args={{
+      content: 'This is extra content added in the default slot.',
+      address: {
+        department: 'Department Name',
+        street: 'Address Line, Suburb, 3019'
+      },
+      items: [
+        {
+          text: '99 Street St, Suburb VIC 3000',
+          url: 'googlemaps',
+          icon: 'icon-pin'
+        },
+        {
+          text: '03 9999 9999',
+          url: 'tel:0399999999',
+          icon: 'icon-phone'
+        },
+        {
+          text: 'email@vic.gov.au',
+          url: 'mailto:email',
+          icon: 'icon-mail'
+        }
+      ]
+    }}
+  >
+    {SingleTemplate.bind()}
+  </Story>
+</Canvas>
diff --git a/packages/ripple-ui-core/src/components/contact-us/RplContactUs.vue b/packages/ripple-ui-core/src/components/contact-us/RplContactUs.vue
index f5fb723801..6b66e13418 100644
--- a/packages/ripple-ui-core/src/components/contact-us/RplContactUs.vue
+++ b/packages/ripple-ui-core/src/components/contact-us/RplContactUs.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import type { IRplListItemArray } from '../list/constants'
-import { computed } from 'vue'
+import { computed, useSlots } from 'vue'
 import RplList from '../list/RplList.vue'
 import {
   useRippleEvent,
   rplEventPayload
 } from '../../composables/useRippleEvent'
+import useEmptySlotCheck from '../../composables/useEmptySlotCheck'
 
 interface IRplContactUsDetails {
   name: string
@@ -31,6 +32,9 @@ const emit = defineEmits<{
 
 const { emitRplEvent } = useRippleEvent('rpl-contact-us', emit)
 
+const slots = useSlots()
+const defaultSlotIsEmpty = useEmptySlotCheck(slots.default)
+
 const handleClick = (event) => {
   emitRplEvent(
     'itemClick',
@@ -55,6 +59,9 @@ const socialLinks = computed(() =>
     <h3 v-if="title" class="rpl-contact-us__title rpl-type-label-large">
       {{ title }}
     </h3>
+    <div v-if="!defaultSlotIsEmpty" class="rpl-contact-us__content rpl-type-p">
+      <slot />
+    </div>
     <div v-if="address" class="rpl-contact-us__details rpl-type-p">
       <p>
         <template v-if="address.name"
diff --git a/packages/ripple-ui-core/src/components/header/RplHeader.css b/packages/ripple-ui-core/src/components/header/RplHeader.css
index 3470af419b..63547d2b53 100644
--- a/packages/ripple-ui-core/src/components/header/RplHeader.css
+++ b/packages/ripple-ui-core/src/components/header/RplHeader.css
@@ -113,8 +113,6 @@
 
   width: auto;
   height: auto;
-  max-width: var(--local-logo-width);
-  max-height: var(--local-logo-height);
   margin-top: var(--rpl-sp-1);
   margin-bottom: var(--rpl-sp-4);
 
@@ -127,6 +125,11 @@
   }
 }
 
+img.rpl-header__logo {
+  max-width: var(--local-logo-width);
+  max-height: var(--local-logo-height);
+}
+
 .rpl-header__title {
   display: inline;
   margin-bottom: 0;
@@ -226,6 +229,15 @@
     }
   }
 
+  .rpl-header__upper {
+    @media (--rpl-bp-l) {
+      display: flex;
+      flex-flow: row wrap;
+      align-items: center;
+      column-gap: var(--rpl-sp-6);
+    }
+  }
+
   .rpl-header__content {
     @media (--rpl-bp-xs) {
       margin-top: var(--rpl-sp-1);
diff --git a/packages/ripple-ui-core/src/components/header/RplHeroHeader.stories.mdx b/packages/ripple-ui-core/src/components/header/RplHeroHeader.stories.mdx
index 4d26a40b6a..a0b2227aab 100644
--- a/packages/ripple-ui-core/src/components/header/RplHeroHeader.stories.mdx
+++ b/packages/ripple-ui-core/src/components/header/RplHeroHeader.stories.mdx
@@ -128,6 +128,32 @@ This is an example header with a logo image
   </Story>
 </Canvas>
 
+## Default / Logos
+
+This is an example header with a multiple logos
+
+<Canvas>
+  <Story
+    name='Default/Logos'
+    play={a11yStoryCheck}
+    args={{
+      cornerTop: true,
+      logo: [
+        {
+          src: svgPlaceholder({ width: 150, height: 100 }),
+          alt: 'A description of the logo'
+        },
+        {
+          src: svgPlaceholder({ width: 200, height: 100 }),
+          alt: 'Another description of the logo'
+        }
+      ]
+    }}
+  >
+    {SingleTemplate.bind()}
+  </Story>
+</Canvas>
+
 ## Default / Journey links
 
 This is an example header with journey links
diff --git a/packages/ripple-ui-core/src/components/header/RplHeroHeader.vue b/packages/ripple-ui-core/src/components/header/RplHeroHeader.vue
index e5994d5d08..85d43bec98 100644
--- a/packages/ripple-ui-core/src/components/header/RplHeroHeader.vue
+++ b/packages/ripple-ui-core/src/components/header/RplHeroHeader.vue
@@ -21,7 +21,7 @@ import {
 interface Props {
   theme?: (typeof RplHeaderThemes)[number]
   title: string
-  logo?: IRplImageType
+  logo?: IRplImageType | IRplImageType[]
   background?: IRplImageType
   cornerTop?: string | boolean
   cornerBottom?: string | boolean
@@ -88,6 +88,13 @@ const backImageRatio = computed(() => {
     : { xs: 'wide', m: 'wide' }
 })
 
+const logos = computed((): IRplImageType[] => {
+  if (!props.logo) {
+    return []
+  }
+  return Array.isArray(props.logo) ? props.logo : [props.logo]
+})
+
 const slots = useSlots()
 const defaultSlotIsEmpty = useEmptySlotCheck(slots.default)
 const { emitRplEvent, withOptions } = useRippleEvent('rpl-header', emit)
@@ -130,7 +137,12 @@ const handleClick = (event) => {
       />
     </template>
     <template v-if="logo" #upper>
-      <RplImage class="rpl-header__logo" v-bind="logo" />
+      <RplImage
+        v-for="image in logos"
+        :key="image.src"
+        class="rpl-header__logo"
+        v-bind="image"
+      />
     </template>
     <template #title>
       <h1 :class="titleClasses" data-cy="hero-title">{{ title }}</h1>

From 564b3c525e0d1348c1188c1a109fffd5fde475dd Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.smith@dgs.vic.gov.au>
Date: Tue, 4 Feb 2025 17:55:30 +1100
Subject: [PATCH 10/11] feat: :sparkles: uplift publication content types to
 landingpage

---
 .../components/global/TidePublication.vue              |  8 ++++----
 .../components/global/TidePublicationPage.vue          |  9 +++++----
 .../mapping/publication-page.ts                        |  2 ++
 .../ripple-tide-publication/mapping/publication.ts     |  2 ++
 .../server/plugins/publication.ts                      | 10 ++++++++++
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/packages/ripple-tide-publication/components/global/TidePublication.vue b/packages/ripple-tide-publication/components/global/TidePublication.vue
index af2ae8850b..4bc1a7ec38 100644
--- a/packages/ripple-tide-publication/components/global/TidePublication.vue
+++ b/packages/ripple-tide-publication/components/global/TidePublication.vue
@@ -5,6 +5,7 @@
     :siteSection="page.siteSection"
     :pageTitle="page.title"
     :pageLanguage="page.lang"
+    :topicTags="page.showTopicTags ? page.topicTags : []"
     :updatedDate="page.changed || page.created"
     :showContentRating="page.showContentRating"
   >
@@ -49,10 +50,9 @@
 </template>
 
 <script setup lang="ts">
-import { TideSiteData } from '@dpc-sdp/ripple-tide-api/types'
-import { indexNode, TidePublicationPage } from '../../types'
-import { processMenu, useRoute, useTidePublicationMenu } from '#imports'
-import { ref } from 'vue'
+import type { indexNode, TidePublicationPage } from '../../types'
+import type { TideSiteData } from '@dpc-sdp/ripple-tide-api/types'
+import { processMenu, useRoute, useTidePublicationMenu, ref } from '#imports'
 
 interface Props {
   site: TideSiteData
diff --git a/packages/ripple-tide-publication/components/global/TidePublicationPage.vue b/packages/ripple-tide-publication/components/global/TidePublicationPage.vue
index 29b3e5b0a2..2f1e6d8cc6 100644
--- a/packages/ripple-tide-publication/components/global/TidePublicationPage.vue
+++ b/packages/ripple-tide-publication/components/global/TidePublicationPage.vue
@@ -5,6 +5,7 @@
     :siteSection="page.siteSection"
     :pageTitle="page.title"
     :pageLanguage="page.lang"
+    :topicTags="page.showTopicTags ? page.topicTags : []"
     :updatedDate="page.changed || page.created"
     :showContentRating="page.showContentRating"
   >
@@ -53,12 +54,12 @@
 </template>
 
 <script setup lang="ts">
-import { indexNode, TidePublicationPagePage } from '../../types'
-import { processMenu, useRoute, useTidePublicationMenu } from '#imports'
-import { ref } from 'vue'
+import type { indexNode, TidePublicationPagePage } from '../../types'
+import type { TideSiteData } from '@dpc-sdp/ripple-tide-api/types'
+import { processMenu, useRoute, useTidePublicationMenu, ref } from '#imports'
 
 interface Props {
-  site: any
+  site: TideSiteData
   page: TidePublicationPagePage
 }
 
diff --git a/packages/ripple-tide-publication/mapping/publication-page.ts b/packages/ripple-tide-publication/mapping/publication-page.ts
index d8ffc1e92d..7c9c779d8f 100644
--- a/packages/ripple-tide-publication/mapping/publication-page.ts
+++ b/packages/ripple-tide-publication/mapping/publication-page.ts
@@ -9,6 +9,7 @@ import { heroHeaderMapping } from '@dpc-sdp/ripple-tide-landing-page/mapping'
 const tidePublicationPageModule: IRplTideModuleMapping = {
   mapping: {
     ...tidePageBaseMapping({
+      withTopicTags: true,
       withSidebarContacts: true,
       withSidebarRelatedLinks: true,
       withSidebarSocialShare: true
@@ -67,6 +68,7 @@ const tidePublicationPageModule: IRplTideModuleMapping = {
   },
   includes: [
     ...tidePageBaseIncludes({
+      withTopicTags: true,
       withSidebarContacts: true,
       withSidebarRelatedLinks: true,
       withSidebarSocialShare: true
diff --git a/packages/ripple-tide-publication/mapping/publication.ts b/packages/ripple-tide-publication/mapping/publication.ts
index 2fbc497702..09fd180352 100644
--- a/packages/ripple-tide-publication/mapping/publication.ts
+++ b/packages/ripple-tide-publication/mapping/publication.ts
@@ -19,6 +19,7 @@ const chapters = (src: string) =>
 const tidePublicationModule: IRplTideModuleMapping = {
   mapping: {
     ...tidePageBaseMapping({
+      withTopicTags: true,
       withSidebarContacts: true,
       withSidebarRelatedLinks: true,
       withSidebarSocialShare: true
@@ -66,6 +67,7 @@ const tidePublicationModule: IRplTideModuleMapping = {
   },
   includes: [
     ...tidePageBaseIncludes({
+      withTopicTags: true,
       withSidebarContacts: true,
       withSidebarRelatedLinks: true,
       withSidebarSocialShare: true
diff --git a/packages/ripple-tide-publication/server/plugins/publication.ts b/packages/ripple-tide-publication/server/plugins/publication.ts
index 7f759253ed..44a07205f8 100644
--- a/packages/ripple-tide-publication/server/plugins/publication.ts
+++ b/packages/ripple-tide-publication/server/plugins/publication.ts
@@ -9,6 +9,7 @@ export default defineNitroPlugin(async (nitroApp: NitroApp) => {
     'publication_page',
     tidePublicationPageModule
   )
+
   // Adding support for landing page component includes
   nitroApp.tide?.pageApi.dynamicComponents[
     'paragraph--basic_text'
@@ -46,4 +47,13 @@ export default defineNitroPlugin(async (nitroApp: NitroApp) => {
   nitroApp.tide?.pageApi.dynamicComponents[
     'paragraph--call_to_action'
   ]?.contentTypes.push(...['publication_page'])
+  nitroApp.tide?.pageApi.dynamicComponents[
+    'paragraph--from_library'
+  ]?.contentTypes.push(...['publication', 'publication_page'])
+  nitroApp.tide?.pageApi.dynamicComponents[
+    'paragraph--data_table'
+  ]?.contentTypes.push(...['publication_page'])
+  nitroApp.tide?.pageApi.dynamicComponents[
+    'paragraph--data_driven_component'
+  ]?.contentTypes.push(...['publication_page'])
 })

From 38d43537b284fb09c978dfe8befb85e407b62379 Mon Sep 17 00:00:00 2001
From: SDP Deploy <sdp.devs@dpc.vic.gov.au>
Date: Tue, 4 Feb 2025 23:52:45 +0000
Subject: [PATCH 11/11] chore: release 2.25.0

---
 CHANGELOG.md                                   | 4 ++++
 lerna.json                                     | 2 +-
 packages/eslint-config-ripple/package.json     | 2 +-
 packages/nuxt-ripple-analytics/package.json    | 2 +-
 packages/nuxt-ripple-cli/package.json          | 2 +-
 packages/nuxt-ripple-preview/package.json      | 2 +-
 packages/nuxt-ripple/package.json              | 2 +-
 packages/ripple-sdp-core/package.json          | 2 +-
 packages/ripple-storybook/package.json         | 2 +-
 packages/ripple-test-utils/package.json        | 2 +-
 packages/ripple-tide-api/package.json          | 2 +-
 packages/ripple-tide-event/package.json        | 2 +-
 packages/ripple-tide-grant/package.json        | 2 +-
 packages/ripple-tide-landing-page/package.json | 2 +-
 packages/ripple-tide-media/package.json        | 2 +-
 packages/ripple-tide-news/package.json         | 2 +-
 packages/ripple-tide-publication/package.json  | 2 +-
 packages/ripple-tide-search/package.json       | 2 +-
 packages/ripple-tide-topic/package.json        | 2 +-
 packages/ripple-tide-webform/package.json      | 2 +-
 packages/ripple-ui-core/package.json           | 2 +-
 packages/ripple-ui-forms/package.json          | 2 +-
 packages/ripple-ui-maps/package.json           | 2 +-
 packages/stylelint-config-ripple/package.json  | 2 +-
 24 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 413b410c1e..ab67a60d5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.25.0
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/2.25.0...v2.25.0)
+
 ## v2.24.0
 
 [compare changes](https://github.com/dpc-sdp/ripple-framework/compare/2.24.0...v2.24.0)
diff --git a/lerna.json b/lerna.json
index a192d4799f..ff97a480e0 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.24.0",
+  "version": "2.25.0",
   "npmClient": "pnpm",
   "exact": true,
   "command": {
diff --git a/packages/eslint-config-ripple/package.json b/packages/eslint-config-ripple/package.json
index ebcd05dcfe..9c8456f3a4 100644
--- a/packages/eslint-config-ripple/package.json
+++ b/packages/eslint-config-ripple/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/eslint-config-ripple",
   "description": "ESLint config for Ripple projects",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",
diff --git a/packages/nuxt-ripple-analytics/package.json b/packages/nuxt-ripple-analytics/package.json
index 8ae6e20f4f..265ff7c3fd 100644
--- a/packages/nuxt-ripple-analytics/package.json
+++ b/packages/nuxt-ripple-analytics/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple-analytics",
   "description": "Nuxt module for handling event tracking.",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
diff --git a/packages/nuxt-ripple-cli/package.json b/packages/nuxt-ripple-cli/package.json
index 88df976e91..9fb7c17ade 100644
--- a/packages/nuxt-ripple-cli/package.json
+++ b/packages/nuxt-ripple-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple-cli",
   "description": "A CLI for simplifying common setup and scaffolding tasks",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",
diff --git a/packages/nuxt-ripple-preview/package.json b/packages/nuxt-ripple-preview/package.json
index 1643216144..2c14e3ce36 100644
--- a/packages/nuxt-ripple-preview/package.json
+++ b/packages/nuxt-ripple-preview/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple-preview",
   "description": "Adds support for drupal preview links in Ripple frontend sites",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
diff --git a/packages/nuxt-ripple/package.json b/packages/nuxt-ripple/package.json
index 0dea299cb4..3b10e59f16 100644
--- a/packages/nuxt-ripple/package.json
+++ b/packages/nuxt-ripple/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple",
   "description": "Nuxt module for integrating Ripple and Tide",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
diff --git a/packages/ripple-sdp-core/package.json b/packages/ripple-sdp-core/package.json
index 11d35cf2b6..4b1f4d2318 100644
--- a/packages/ripple-sdp-core/package.json
+++ b/packages/ripple-sdp-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-sdp-core",
   "description": "SDP core content types",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-storybook/package.json b/packages/ripple-storybook/package.json
index c0314b2cc6..d82bc5ba42 100644
--- a/packages/ripple-storybook/package.json
+++ b/packages/ripple-storybook/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ripple-storybook",
   "description": "Ripple Storybook instance",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "private": true,
   "repository": "https://github.com/dpc-sdp/ripple-framework",
diff --git a/packages/ripple-test-utils/package.json b/packages/ripple-test-utils/package.json
index 0e18f4adda..0c6dd305d3 100644
--- a/packages/ripple-test-utils/package.json
+++ b/packages/ripple-test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-test-utils",
   "description": "Test utils for Ripple sites",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/config/index.js",
diff --git a/packages/ripple-tide-api/package.json b/packages/ripple-tide-api/package.json
index 880d0d75fd..4448d816f6 100644
--- a/packages/ripple-tide-api/package.json
+++ b/packages/ripple-tide-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-api",
   "description": "Ripple API endpoints for Tide Drupal backend",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",
diff --git a/packages/ripple-tide-event/package.json b/packages/ripple-tide-event/package.json
index 88d910479e..9ac06f7dd0 100644
--- a/packages/ripple-tide-event/package.json
+++ b/packages/ripple-tide-event/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-event",
   "description": "Ripple mappings and components for Tide Event Content type",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
diff --git a/packages/ripple-tide-grant/package.json b/packages/ripple-tide-grant/package.json
index 60f9eb6b3d..1da7181b67 100644
--- a/packages/ripple-tide-grant/package.json
+++ b/packages/ripple-tide-grant/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-grant",
   "description": "Ripple mappings and components for Tide Grant Content type",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-landing-page/package.json b/packages/ripple-tide-landing-page/package.json
index f8c11d7dc6..784cacb87c 100644
--- a/packages/ripple-tide-landing-page/package.json
+++ b/packages/ripple-tide-landing-page/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-landing-page",
   "description": "Ripple mappings and components for Tide landing-page Content type",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-media/package.json b/packages/ripple-tide-media/package.json
index 5eacc4aeb8..1d0cda2d30 100644
--- a/packages/ripple-tide-media/package.json
+++ b/packages/ripple-tide-media/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-media",
   "description": "Ripple mappings and components for Tide media",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-news/package.json b/packages/ripple-tide-news/package.json
index 4ff999a5a1..7116e7448e 100644
--- a/packages/ripple-tide-news/package.json
+++ b/packages/ripple-tide-news/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-news",
   "description": "Ripple mappings and components for Tide News content type",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-publication/package.json b/packages/ripple-tide-publication/package.json
index b88451bb5a..f767676b12 100644
--- a/packages/ripple-tide-publication/package.json
+++ b/packages/ripple-tide-publication/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-publication",
   "description": "Ripple mappings and components for Tide Publication Content type",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-search/package.json b/packages/ripple-tide-search/package.json
index b0397d4194..5d75e21107 100644
--- a/packages/ripple-tide-search/package.json
+++ b/packages/ripple-tide-search/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-search",
   "description": "Ripple search UI and services for connecting to Tide search",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-topic/package.json b/packages/ripple-tide-topic/package.json
index 450c967973..4d45730cb0 100644
--- a/packages/ripple-tide-topic/package.json
+++ b/packages/ripple-tide-topic/package.json
@@ -9,7 +9,7 @@
     "./mapping": "./mapping/index.ts",
     "./types": "./types.ts"
   },
-  "version": "2.24.0",
+  "version": "2.25.0",
   "dependencies": {
     "@dpc-sdp/nuxt-ripple": "workspace:*",
     "@dpc-sdp/ripple-tide-api": "workspace:*",
diff --git a/packages/ripple-tide-webform/package.json b/packages/ripple-tide-webform/package.json
index fb53609cae..c594d3c752 100644
--- a/packages/ripple-tide-webform/package.json
+++ b/packages/ripple-tide-webform/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-webform",
   "description": "Ripple mappings and components for Tide webforms",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-ui-core/package.json b/packages/ripple-ui-core/package.json
index 11d13baf74..d3d91c5d75 100644
--- a/packages/ripple-ui-core/package.json
+++ b/packages/ripple-ui-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-ui-core",
   "description": "Ripple UI Core component library",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "files": [
diff --git a/packages/ripple-ui-forms/package.json b/packages/ripple-ui-forms/package.json
index 39ee49b8e3..87fbc53b61 100644
--- a/packages/ripple-ui-forms/package.json
+++ b/packages/ripple-ui-forms/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-ui-forms",
   "description": "A form component library built with Formkit",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/rpl-forms.umd.js",
diff --git a/packages/ripple-ui-maps/package.json b/packages/ripple-ui-maps/package.json
index 0896ccdb6c..f3752da1f0 100644
--- a/packages/ripple-ui-maps/package.json
+++ b/packages/ripple-ui-maps/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-ui-maps",
   "description": "Ripple UI Core component library",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "files": [
diff --git a/packages/stylelint-config-ripple/package.json b/packages/stylelint-config-ripple/package.json
index 5e2ec1cba4..e2220c0b5c 100644
--- a/packages/stylelint-config-ripple/package.json
+++ b/packages/stylelint-config-ripple/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/stylelint-config-ripple",
   "description": "ESLint config for Ripple projects",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",