UHF-11231: Merge branch 'main' of https://github.com/City-of-Helsinki…

…/drupal-hdbt into UHF-11231
City-of-Helsinki · Feb 21, 2025 · 2fece9e · 2fece9e
2 parents 7c06206 + 19bddd6
commit 2fece9e
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 32 deletions.
diff --git a/dist/js/health-station-search.min.js b/dist/js/health-station-search.min.js
diff --git a/dist/js/maternity-and-child-health-clinic-search.min.js b/dist/js/maternity-and-child-health-clinic-search.min.js
diff --git a/dist/js/school-search.min.js b/dist/js/school-search.min.js
diff --git a/src/js/react/common/CookieComplianceStatement.tsx b/src/js/react/common/CookieComplianceStatement.tsx
@@ -1,5 +1,12 @@
+import {Link} from 'hds-react';
 import ExternalLink from './ExternalLink';
 
+declare global {
+  interface Window {
+    hdsCookieConsentClickEvent: (event: Event, element: HTMLElement) => void;
+  }
+}
+
 type CookiCookieComplianceStatementProps = {
   host: string;
   policyUrl?: string;
@@ -19,10 +26,29 @@ const CookieComplianceStatement = ({ host, policyUrl, sourceUrl }: CookiCookieCo
       </p>
       <div className='buttons'>
           {sourceUrl &&
-            <ExternalLink data-hds-component='button' data-hds-variant='primary' href={sourceUrl} title={Drupal.t('See content on external site', {}, { context: 'Cookie compliance' })} />
+            <ExternalLink
+              data-hds-component='button'
+              data-hds-variant='primary'
+              href={sourceUrl}
+              title={Drupal.t('See content on external site', {}, { context: 'Cookie compliance' })}
+            />
           }
           {policyUrl &&
-            <ExternalLink  data-hds-component='button' data-hds-variant='secondary' href={policyUrl} title={Drupal.t('Change cookie settings', {}, { context: 'Cookie compliance' })} />
+            <Link
+              data-hds-component='button'
+              data-hds-variant='secondary'
+              data-cookie-consent-groups='preferences, statistics'
+              href={policyUrl}
+              onClick={(event) => {
+                if (typeof window.hdsCookieConsentClickEvent === 'function') {
+                  window.hdsCookieConsentClickEvent(event.nativeEvent, event.currentTarget);
+                } else {
+                  console.warn('hdsCookieConsentClickEvent is not defined');
+                }
+              }}
+            >
+              {Drupal.t('Change cookie settings', {}, { context: 'Cookie compliance' })}
+            </Link>
           }
       </div>
     </div>

diff --git a/src/js/react/common/ResultsMap.tsx b/src/js/react/common/ResultsMap.tsx
@@ -1,5 +1,4 @@
 import bucketToMap from '@/react/common/helpers/Aggregations';
-import CookieComplianceStatement from '@/react/common/CookieComplianceStatement';
 import ExternalLink from '@/react/common/ExternalLink';
 import { AggregationItem } from '@/types/Aggregation';
 
@@ -44,33 +43,20 @@ const ResultsMap = ({ ids }: ResultsMapProps) => {
 
   const mapUrl = getMapUrl();
 
-  if (Drupal.cookieConsent && Drupal.cookieConsent.getConsentStatus(['preferences', 'statistics'])) {
-    return (
-      <div className='hdbt-search--react__map-container'>
-        <div className='unit-search__result--map'>
-          <iframe
-            title='Palvelukartta - Etusivu'
-            className='unit-search__map'
-            src={mapUrl}
-          >
-          </iframe>
-        </div>
-        <div className='unit-search__map-actions'>
-          <ExternalLink href={mapUrl} title={<span>{Drupal.t('Open large version of the map', {}, {context: 'React search: result display'})}</span>} />
-        </div>
-      </div>
-    );
-  }
-
-  const url = new URL(mapUrl);
-
-  // @todo UHF-10862 Remove policyUrl fallback once the HDBT cookie banner module is in use.
   return (
-    <CookieComplianceStatement
-      host={url.host}
-      policyUrl={drupalSettings.hdbt_cookie_banner.settingsPageUrl || drupalSettings.helfi_react_search.cookie_privacy_url}
-      sourceUrl={mapUrl}
-    />
+    <div className='hdbt-search--react__map-container'>
+      <div className='unit-search__result--map'>
+        <iframe
+          title={Drupal.t('Service Map - Front page', {}, {context: 'React search: result display'})}
+          className='unit-search__map'
+          src={mapUrl}
+        >
+        </iframe>
+      </div>
+      <div className='unit-search__map-actions'>
+        <ExternalLink href={mapUrl} title={<span>{Drupal.t('Open large version of the map', {}, {context: 'React search: result display'})}</span>} />
+      </div>
+    </div>
   );
 };
 

diff --git a/translations/fi.po b/translations/fi.po
@@ -990,6 +990,10 @@ msgctxt "React search: result display"
 msgid "View in a map"
 msgstr "Näytä kartalla"
 
+msgctxt "React search: result display"
+msgid "Service Map - Front page"
+msgstr "Palvelukartta - Etusivu"
+
 msgctxt "React search: result display"
 msgid "Open large version of the map"
 msgstr "Avaa kartta suurempana"

diff --git a/translations/sv.po b/translations/sv.po
@@ -988,6 +988,10 @@ msgctxt "React search: result display"
 msgid "View in a map"
 msgstr "Visa på kartan"
 
+msgctxt "React search: result display"
+msgid "Service Map - Front page"
+msgstr "Servicekarta - Framsida"
+
 msgctxt "React search: result display"
 msgid "Open large version of the map"
 msgstr "Öppna kartan i större format"